public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
This commit is contained in:
Vladimír Čunát
2019-08-24 08:55:37 +02:00
parent 84a91208a9 8943fb5f24
commit 2e6bf42a22
865 changed files with 29587 additions and 14316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/uuidm/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }:
stdenv.mkDerivation rec {
version = "0.9.6";
version = "0.9.7";
pname = "uuidm";
src = fetchurl {
url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz";
sha256 = "0hz4fdx0x16k0pw9995vkz5d1hmzz6b16wck9li399rcbfnv5jlc";
sha256 = "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8";
};
buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ];