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

merge 'staging' into modular-stdenv

Browse Source 
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
This commit is contained in:
Vladimír Čunát
2014-09-08 18:16:54 +02:00
parent a8fc68a5c0 773595540b
commit 1e389c976c
1133 changed files with 11926 additions and 2831 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/pcre/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, pcre, ocaml, findlib}:
stdenv.mkDerivation {
name = "ocaml-pcre-7.0.4";
name = "ocaml-pcre-7.1.1";
src = fetchurl {
url = https://bitbucket.org/mmottl/pcre-ocaml/downloads/pcre-ocaml-7.0.4.tar.gz;
sha256 = "0h2qlza7jkzgrglw1k0fydpbil0dgpv526kxyyd1apdbyzhb0mpw";
url = https://github.com/mmottl/pcre-ocaml/releases/download/v7.1.1/pcre-ocaml-7.1.1.tar.gz;
sha256 = "0nj4gb6hjjjmz5gnl9cjrh4w82rw8cvbwnk0hxhfgfd25p9k50n3";
};
buildInputs = [ocaml findlib];