diff options
| author | c0bw3b <c0bw3b@users.noreply.github.com> | 2022-01-27 16:55:30 +0100 |
|---|---|---|
| committer | c0bw3b <c0bw3b@users.noreply.github.com> | 2022-01-27 16:55:30 +0100 |
| commit | b30014d473c73820bf4dd07d219437eab169fc83 (patch) | |
| tree | 37ce9a850067f683ab04b104a7bdf8f2c0a43a1e /pkgs/development/libraries/jitterentropy | |
| parent | b3a390543b6de62ed9f6c44c2dba452df914afc2 (diff) | |
| download | nixpkgs-b30014d473c73820bf4dd07d219437eab169fc83.tar nixpkgs-b30014d473c73820bf4dd07d219437eab169fc83.tar.gz nixpkgs-b30014d473c73820bf4dd07d219437eab169fc83.tar.bz2 nixpkgs-b30014d473c73820bf4dd07d219437eab169fc83.tar.lz nixpkgs-b30014d473c73820bf4dd07d219437eab169fc83.tar.xz nixpkgs-b30014d473c73820bf4dd07d219437eab169fc83.tar.zst nixpkgs-b30014d473c73820bf4dd07d219437eab169fc83.zip | |
jitterentropy: 2.2.0 -> 3.3.1
Split outputs to put headers aside
Diffstat (limited to 'pkgs/development/libraries/jitterentropy')
| -rw-r--r-- | pkgs/development/libraries/jitterentropy/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/development/libraries/jitterentropy/reproducible-manpages.patch | 13 |
2 files changed, 12 insertions, 31 deletions
diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index 11f6141872d..c65a3af9c42 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -1,37 +1,31 @@ { lib, stdenv, fetchFromGitHub }: + stdenv.mkDerivation rec { pname = "jitterentropy"; - version = "2.2.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "jitterentropy-library"; rev = "v${version}"; - sha256 = "0n2l1fxr7bynnarpwdjifb2fvlsq8w5wmfh31yk5nrc756cjlgyw"; + hash = "sha256-go7eGwBoZ58LkgKL7t8oZSc1cFlE6fPOT/ML3Aa8+CM="; }; - patches = [ - # Can be removed when upgrading beyond 2.2.0 - ./reproducible-manpages.patch - ]; - enableParallelBuilding = true; + outputs = [ "out" "dev" ]; - preInstall = '' - mkdir -p $out/include - substituteInPlace Makefile \ - --replace "install -m 0755 -s" \ - 'install -m 0755 -s --strip-program $(STRIP)' - ''; + enableParallelBuilding = true; + hardeningDisable = [ "fortify" ]; # avoid warnings installFlags = [ - "PREFIX=$(out)" + "PREFIX=${placeholder "out"}" ]; - meta = { + meta = with lib; { description = "Provides a noise source using the CPU execution timing jitter"; homepage = "https://github.com/smuellerDD/jitterentropy-library"; - license = with lib.licenses; [ gpl2 bsd3 ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ johnazoidberg ]; + changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${version}/CHANGES.md"; + license = with licenses; [ bsd3 /* OR */ gpl2Only ]; + platforms = platforms.linux; + maintainers = with maintainers; [ johnazoidberg c0bw3b ]; }; } diff --git a/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch b/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch deleted file mode 100644 index 68de5a8ae78..00000000000 --- a/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 4ff069b..3b8714a 100644 ---- a/Makefile -+++ b/Makefile -@@ -58,7 +58,7 @@ cppcheck: - install: - install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 - install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ -- gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 -+ gzip -n -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) - install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR) |