dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #32400 from vbgl/ocamlnet-4.1.5

Browse Source 
ocamlPackages.ocamlnet: 4.1.4 -> 4.1.5
This commit is contained in:
Pascal Wittmann 2017-12-08 10:32:03 +01:00 committed by GitHub
commit b00f806ed0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/nettle/3.3.nix
View File

@ -1,10 +0,0 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.3";
src = fetchurl {
url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
sha256 = "07mif3af077763vc35s1x8vzhzlgqcgxh67c1xr13jnhslkjd526";
};
})

12
pkgs/development/ocaml-modules/ocamlnet/default.nix
View File

@ -1,20 +1,14 @@
{ stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
, gnutls, nettle_3_3 }: , gnutls, nettle }:
# These overrides are just temporary, until ocamlnet supports nettle-3.4. let version = "4.1.5"; in
let gnutls_orig = gnutls; in
let gnutls = gnutls_orig.override { nettle = nettle_3_3; };
nettle = nettle_3_3;
in
let version = "4.1.4"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml${ocaml.version}-ocamlnet-${version}"; name = "ocaml${ocaml.version}-ocamlnet-${version}";
src = fetchurl { src = fetchurl {
url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
sha256 = "0hhi3s4xas5i3p7214qfji5pvr7d30d89vnmkznxsfqj4v7dmhs6"; sha256 = "1ppcd2zjhj6s3ib9q8dngnr53qlmkhvv7a8hzp88r79k6jygn4cm";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

1
pkgs/top-level/all-packages.nix
View File

@ -10060,7 +10060,6 @@ with pkgs;
}; };
nettle = callPackage ../development/libraries/nettle { }; nettle = callPackage ../development/libraries/nettle { };
nettle_3_3 = callPackage ../development/libraries/nettle/3.3.nix { };
newt = callPackage ../development/libraries/newt { }; newt = callPackage ../development/libraries/newt { };