Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kea: 1.5.0-P1 -> 1.8.2 #107759

Merged
merged 1 commit into from Jan 16, 2021
Merged

kea: 1.5.0-P1 -> 1.8.2 #107759

merged 1 commit into from Jan 16, 2021

Conversation

mweinelt
Copy link
Member

@mweinelt mweinelt commented Dec 27, 2020

Motivation for this change

A whole bunch of releases. Haven't skimmed the release notes yet, only made sure stuff builds.

https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.8.2
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.8.1
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.8.0

https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.7.10
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.7.9
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.7.8
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.7.7
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.7.6
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.7.5
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.7.4
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.7.3
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.7.2
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.7.1
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.7.0

https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.6.3
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.6.2
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.6.1
https://gitlab.isc.org/isc-projects/kea/-/wikis/release%20notes/release-notes-1.6-final

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
    /nix/store/4bk4p1pl6gxsqzrncf7b7yd0rxq99nh2-kea-1.5.0-P1	 341.1M
    /nix/store/whjp7zcavl3ydkkmdn06xil7224fpq1c-kea-1.8.2		 395.6M
    
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 107759 run on x86_64-linux 1

1 package built:
  • kea

pkgs/tools/networking/kea/default.nix Outdated Show resolved Hide resolved
pkgs/tools/networking/kea/default.nix Outdated Show resolved Hide resolved
Enables kea-shell and perfdhcp, drops several unused dependencies.
@SuperSandro2000
Copy link
Member

darwin patch

diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index f7d94f42469..173f074ead7 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -4,7 +4,8 @@
 , sourceExtension ? "tar.xz"
 , extraConfigureFlags ? ""
 , postPatch ? null
-, darwin
+, CoreServices
+, Security
 , ...
 }:
 
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
   inherit postPatch;
 
   buildInputs = [ python bzip2 zlib gmp openssl boost ]
-             ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
 
   configurePhase = ''
     python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b080f3d3b81..d28a1eba595 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12777,8 +12777,14 @@ in
 
   boost_process = callPackage ../development/libraries/boost-process { };
 
-  botan = callPackage ../development/libraries/botan { openssl = openssl_1_0_2; };
-  botan2 = callPackage ../development/libraries/botan/2.0.nix { };
+  botan = callPackage ../development/libraries/botan {
+    openssl = openssl_1_0_2;
+    inherit (darwin.apple_sdk.frameworks) CoreServices Security;
+  };
+
+  botan2 = callPackage ../development/libraries/botan/2.0.nix {
+    inherit (darwin.apple_sdk.frameworks) CoreServices Security;
+  };
 
   box2d = callPackage ../development/libraries/box2d { };
 

@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 107759 run on x86_64-linux 1

1 package built:
  • kea

@SuperSandro2000 SuperSandro2000 merged commit 1fb0c48 into NixOS:master Jan 16, 2021
@mweinelt mweinelt deleted the kea branch January 16, 2021 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants