kip: unstable-2021-07-27 -> 0.15.0 (#358)

* treewide: drop unused arguments * tlspool: 0.9.6 -> 0.9.7 * lillydap: 0.9.2 -> 1.0.1 * leaf: unstable-2020-04-28 -> 0.2 * kip: unstable-2021-07-27 -> 0.15.0
ngi-nix · Sep 12, 2024 · 5b6dfa4 · 5b6dfa4
1 parent 1a58348
commit 5b6dfa4
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 30 deletions.
diff --git a/pkgs/by-name/kip/package.nix b/pkgs/by-name/kip/package.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   stdenv,
   cmake,
   pkg-config,
@@ -40,15 +41,15 @@
     buildInputs = old.buildInputs ++ [e2fsprogs];
   });
 in
-  stdenv.mkDerivation {
+  stdenv.mkDerivation rec {
     pname = "kip";
-    version = "unstable-2021-07-27";
+    version = "0.15.0";
 
     src = fetchFromGitLab {
       owner = "arpa2";
       repo = "kip";
-      rev = "7683e76368cfd432c740907f4d27592b1364b732";
-      hash = "sha256-SImz4ZzUXRmk4ZPbVjtUuRPqla8AiiVGa4HdSKVVI6g=";
+      rev = "v${version}";
+      hash = "sha256-A+tPaImjd9j1Vq69Dgh3j86xI/OcovwTZSULLkOVZaI=";
     };
 
     nativeBuildInputs = [cmake pkg-config cacert openssl libressl gnutls];
@@ -71,19 +72,11 @@ in
       python-with-packages
     ];
 
-    configurePhase = ''
-      mkdir -p build
-      cd build
-      cmake .. -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_PREFIX_PATH=$out \
-            -DfreeDiameter_EXTENSION_DIR=$out/lib/freeDiameter
-      patchShebangs test
-    '';
-
-    buildPhase = ''
-      cmake --build .
-    '';
+    cmakeFlags = [
+      (lib.cmakeFeature "freeDiameter_EXTENSION_DIR" "${placeholder "out"}/lib/freeDiameter")
+    ];
 
-    installPhase = ''
-      cmake --install . --prefix $out
+    preBuild = ''
+      patchShebangs test
     '';
   }
diff --git a/pkgs/by-name/leaf/package.nix b/pkgs/by-name/leaf/package.nix
@@ -4,19 +4,21 @@
   arpa2cm,
   arpa2common,
   quickder,
+  quickmem,
+  quicksasl,
   lillydap,
   fetchFromGitLab,
 }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "leaf";
-  version = "unstable-2020-04-28";
+  version = "0.2";
 
   src = fetchFromGitLab {
     owner = "arpa2";
     repo = "leaf";
-    rev = "b3861efce0ba143f6eb5451aac5be24f18e6d8ab";
-    hash = "sha256-woEzlXyulVSpeJJQU0SsfC3U90cv3b9zzVh/w5iouJY=";
+    rev = "v${version}";
+    hash = "sha256-s52gtxM+BmG7oVrB5F0ORjkb4F3fWONiOxIWdDn2P5k=";
   };
 
-  nativeBuildInputs = [cmake arpa2cm arpa2common quickder lillydap];
+  nativeBuildInputs = [cmake arpa2cm arpa2common quickder quickmem quicksasl lillydap];
 }
diff --git a/pkgs/by-name/lillydap/package.nix b/pkgs/by-name/lillydap/package.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "lillydap";
-  version = "0.9.2";
+  version = "1.0.1";
 
   src = fetchFromGitLab {
     owner = "arpa2";
     repo = "lillydap";
     rev = "v${version}";
-    hash = "sha256-L2zmitXezGzDZXLDxohU3DTuHE18KUZEMg98ui2AF+c=";
+    hash = "sha256-SQuvu1A9Iq/fKthfYyVQGWFuyHYnhIry/wvnwgdMKHY=";
   };
 
   nativeBuildInputs = [cmake arpa2cm arpa2common quickder gperf];

diff --git a/pkgs/by-name/steamworks-pulleyback/package.nix b/pkgs/by-name/steamworks-pulleyback/package.nix
@@ -7,8 +7,6 @@
   lua,
   doxygen,
   graphviz,
-  libressl,
-  lmdb,
   libuuid,
   fetchFromGitLab,
 }:

diff --git a/pkgs/by-name/steamworks/package.nix b/pkgs/by-name/steamworks/package.nix
@@ -8,7 +8,6 @@
   flex,
   bison,
   sqlite,
-  catch2,
   log4cpp,
   fetchFromGitLab,
 }: let

diff --git a/pkgs/by-name/tlspool-gui/package.nix b/pkgs/by-name/tlspool-gui/package.nix
@@ -1,6 +1,5 @@
 {
   stdenv,
-  lib,
   cmake,
   arpa2common,
   arpa2cm,

diff --git a/pkgs/by-name/tlspool/package.nix b/pkgs/by-name/tlspool/package.nix
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "tlspool";
-  version = "0.9.6";
+  version = "0.9.7";
 
   src = fetchFromGitLab {
     owner = "arpa2";
     repo = "tlspool";
     rev = "v${version}";
-    hash = "sha256-cscA7204nONYyuthDoVOlVwN1AW2EtvSamXpqjAAaqY=";
+    hash = "sha256-nODnRoFlgCTtBjPief9SkVlLgD3g+2zbwM0V9pt3Crk=";
   };
 
   nativeBuildInputs = [cmake arpa2common arpa2cm quickder gnutls db ldns libtasn1 p11-kit unbound libkrb5 openldap pkg-config];