diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-02-16 18:32:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-02-16 18:32:21 +0000 |
| commit | 9becdcc5df71b47a5da84ad670e9a7eae9e0c65a (patch) | |
| tree | 2ddf0335eb393f89501e3753b50c3f7ab0552d12 /nixpkgs/pkgs/development/libraries/libhugetlbfs | |
| parent | 49f2a77ac9abc88c253f68952eda26557fc3b555 (diff) | |
| parent | ff96a0fa5635770390b184ae74debea75c3fd534 (diff) | |
| download | nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.gz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.bz2 nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.lz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.xz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.zst nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.zip | |
nixpkgs: merge nixos-unstable
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libhugetlbfs')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix b/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix index ed5f67d43709..061fe51ed5ba 100644 --- a/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix @@ -1,26 +1,16 @@ -{ stdenv, lib, fetchurl, fetchpatch }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { pname = "libhugetlbfs"; - version = "2.22"; + version = "2.23"; src = fetchurl { url = "https://github.com/libhugetlbfs/libhugetlbfs/releases/download/${version}/libhugetlbfs-${version}.tar.gz"; - sha256 = "11b7k8xvgx68rjzidm12a6l6b23hwi7hj149y9xxfz2j5kmakp4l"; + sha256 = "0ya4q001g111d3pqlzrf3yaifadl0ccirx5dndz1pih7x3qp41mp"; }; outputs = [ "bin" "dev" "man" "doc" "lib" "out" ]; - patches = [ - # Don't check that 32-bit and 64-bit libraries don't get installed - # to the same place if only one platform is being built for. - # Can be removed if build succeeds without it. - (fetchpatch { - url = "https://groups.google.com/forum/message/raw?msg=libhugetlbfs/IswjDAygfwA/PKy7MZbVAAAJ"; - sha256 = "00fyrhn380d6swil8pcf4x0krl1113ghswrvjn3m9czc3h4p385a"; - }) - ]; - postConfigure = '' patchShebangs ld.hugetlbfs ''; @@ -34,8 +24,8 @@ stdenv.mkDerivation rec { "LIBDIR64=$(lib)/$(LIB64)" "EXEDIR=$(bin)/bin" "DOCDIR=$(doc)/share/doc/libhugetlbfs" - ] ++ map (n: "MANDIR${n}=$(man)/share/man/man${n}") - (lib.genList (n: toString (n + 1)) 8); + "MANDIR=$(man)/share/man" + ]; # Default target builds tests as well, and the tests want a static # libc. |