diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/development/libraries/jitterentropy | |
parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/jitterentropy')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/jitterentropy/default.nix | 30 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch | 13 |
2 files changed, 12 insertions, 31 deletions
diff --git a/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix b/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix index 11f6141872db..c65a3af9c42a 100644 --- a/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch b/nixpkgs/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch deleted file mode 100644 index 68de5a8ae781..000000000000 --- a/nixpkgs/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) |