diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
| commit | 9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d (patch) | |
| tree | 4368f9e4cb2d5b93a956c085337e45cb70f1e331 /nixpkgs/pkgs/development/libraries/hivex | |
| parent | a9cbfb6941b47d6f50129e6e36927882392daed7 (diff) | |
| parent | 2344fe1da14cb08b0c18743b207995f9b8597915 (diff) | |
| download | nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.gz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.bz2 nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.lz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.xz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.zst nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.zip | |
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/hivex')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/hivex/default.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/hivex/hivex-syms.patch | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/hivex/default.nix b/nixpkgs/pkgs/development/libraries/hivex/default.nix index 650fd5bb6df1..d8e320a44c19 100644 --- a/nixpkgs/pkgs/development/libraries/hivex/default.nix +++ b/nixpkgs/pkgs/development/libraries/hivex/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "hivex"; - version = "1.3.21"; + version = "1.3.23"; src = fetchurl { url = "https://libguestfs.org/download/hivex/${pname}-${version}.tar.gz"; - sha256 = "sha256-ms4+9KL/LKUKmb4Gi2D7H9vJ6rivU+NF6XznW6S2O1Y="; + hash = "sha256-QM9UhPFclGciWfs7makL7285DmPzelKhwGgIogFqa70="; }; patches = [ ./hivex-syms.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/hivex/hivex-syms.patch b/nixpkgs/pkgs/development/libraries/hivex/hivex-syms.patch index bacd34e8515d..f2b06da6aaf1 100644 --- a/nixpkgs/pkgs/development/libraries/hivex/hivex-syms.patch +++ b/nixpkgs/pkgs/development/libraries/hivex/hivex-syms.patch @@ -1,13 +1,11 @@ diff -rupN hivex-1.3.14/lib/Makefile.am hivex-1.3.14-new/lib/Makefile.am --- hivex-1.3.14/lib/Makefile.am 2013-09-10 13:04:12.000000000 +0200 +++ hivex-1.3.14-new/lib/Makefile.am 2014-11-06 01:31:05.956106861 +0100 -@@ -40,8 +40,7 @@ libhivex_la_SOURCES = \ - - libhivex_la_LIBADD = ../gnulib/lib/libgnu.la $(LTLIBOBJS) - libhivex_la_LDFLAGS = \ -- -version-info 0:0:0 \ +@@ -51,7 +51,6 @@ + -pthread \ + -version-info 0:0:0 \ + -no-undefined \ - $(VERSION_SCRIPT_FLAGS)$(srcdir)/hivex.syms \ -+ -version-info 0:0:0 $(LTLIBICONV) \ $(LTLIBINTL) \ $(LTLIBTHREAD) |