arpa2: pull package sources into package files

Co-authored-by: Auguste Baum <[email protected]>
ngi-nix · Oct 23, 2023 · 8e62d1e · 8e62d1e
1 parent c8a13f4
commit 8e62d1e
Show file tree

Hide file tree

Showing 10 changed files with 106 additions and 133 deletions.
diff --git a/pkgs/arpa2/overlays/arpa2-packages/default.nix b/pkgs/arpa2/overlays/arpa2-packages/default.nix
@@ -2,102 +2,21 @@ inputs: sources: final: prev:
 with final.pkgs; rec {
   helpers = import ./lib {inherit (final) pkgs stdenv lib;};
 
-  steamworks = callPackage ./pkgs/steamworks rec {
-    src = fetchFromGitLab {
-      owner = "arpa2";
-      repo = "steamworks";
-      rev = "v${version}";
-      hash = "sha256-hD1nTyv/t7MQdopqivfSE0o4Qk1ymG8zQVg56lY+t9o=";
-    };
-    pname = "steamworks";
-    version = "0.97.2";
-  };
+  steamworks = callPackage ./pkgs/steamworks {};
 
-  steamworks-pulleyback = callPackage ./pkgs/steamworks-pulleyback rec {
-    src = fetchFromGitLab {
-      owner = "arpa2";
-      repo = "steamworks-pulleyback";
-      rev = "v${version}";
-      hash = "sha256-MtZDwWLcKVrNlNqhsT9tnT6qEpt2rR5S37UhHS232XI=";
-    };
-    pname = "steamworks-pulleyback";
-    version = "0.3.0";
-  };
+  steamworks-pulleyback = callPackage ./pkgs/steamworks-pulleyback {};
 
-  lillydap = callPackage ./pkgs/lillydap rec {
-    src = fetchFromGitLab {
-      owner = "arpa2";
-      repo = "lillydap";
-      rev = "v${version}";
-      hash = "sha256-L2zmitXezGzDZXLDxohU3DTuHE18KUZEMg98ui2AF+c=";
-    };
-    pname = "lillydap";
-    version = "0.9.2";
-  };
+  lillydap = callPackage ./pkgs/lillydap {};
 
-  leaf = callPackage ./pkgs/leaf {
-    src = fetchFromGitLab {
-      owner = "arpa2";
-      repo = "leaf";
-      rev = "b3861efce0ba143f6eb5451aac5be24f18e6d8ab";
-      hash = "sha256-woEzlXyulVSpeJJQU0SsfC3U90cv3b9zzVh/w5iouJY=";
-    };
-    pname = "leaf";
-    version = "unstable-2020-04-28";
-  };
+  leaf = callPackage ./pkgs/leaf {};
 
-  quicksasl = callPackage ./pkgs/quicksasl rec {
-    src = fetchFromGitLab {
-      owner = "arpa2";
-      repo = "quick-sasl";
-      rev = "v${version}";
-      hash = "sha256-z9kgKssuXq8qae9dTLP5REzkp1C4/jnJr7ydOavPWKM=";
-    };
-    pname = "quicksasl";
-    version = "0.11.0";
-  };
+  quicksasl = callPackage ./pkgs/quicksasl {};
 
-  tlspool = callPackage ./pkgs/tlspool rec {
-    src = fetchFromGitLab {
-      owner = "arpa2";
-      repo = "tlspool";
-      rev = "v${version}";
-      hash = "sha256-cscA7204nONYyuthDoVOlVwN1AW2EtvSamXpqjAAaqY=";
-    };
-    pname = "tlspool";
-    version = "0.9.6";
-  };
+  tlspool = callPackage ./pkgs/tlspool {};
 
-  tlspool-gui = libsForQt5.callPackage ./pkgs/tlspool-gui rec {
-    src = fetchFromGitLab {
-      owner = "arpa2";
-      repo = "tlspool-gui";
-      rev = "v${version}";
-      hash = "sha256-87AY5GxIeDvsc9jrjam1aAYK+RQwhEgt+GO4TE4d6Js=";
-    };
-    pname = "tlspool-gui";
-    version = "0.0.6";
-  };
+  tlspool-gui = libsForQt5.callPackage ./pkgs/tlspool-gui {};
 
-  kip = callPackage ./pkgs/kip {
-    src = fetchFromGitLab {
-      owner = "arpa2";
-      repo = "kip";
-      rev = "7683e76368cfd432c740907f4d27592b1364b732";
-      hash = "sha256-SImz4ZzUXRmk4ZPbVjtUuRPqla8AiiVGa4HdSKVVI6g=";
-    };
-    pname = "kip";
-    version = "unstable-2021-07-27";
-  };
+  kip = callPackage ./pkgs/kip {};
 
-  freeDiameter = callPackage ./pkgs/freeDiameter rec {
-    src = fetchFromGitLab {
-      owner = "freeDiameter";
-      repo = "freeDiameter";
-      rev = "v${version}";
-      hash = "sha256-hd71wR4b/pnAUcd2U4/InmubCAqkKUZeZTBrGTV3FSY=";
-    };
-    pname = "freeDiameter";
-    version = "1.5.0";
-  };
+  freeDiameter = callPackage ./pkgs/freeDiameter {};
 }
diff --git a/pkgs/arpa2/overlays/arpa2-packages/pkgs/freeDiameter/default.nix b/pkgs/arpa2/overlays/arpa2-packages/pkgs/freeDiameter/default.nix
@@ -1,7 +1,4 @@
 {
-  src,
-  pname,
-  version,
   stdenv,
   cmake,
   pkg-config,
@@ -11,9 +8,18 @@
   libidn,
   libgcrypt,
   gnutls,
+  fetchFromGitLab,
 }:
-stdenv.mkDerivation {
-  inherit src pname version;
+stdenv.mkDerivation rec {
+  pname = "freeDiameter";
+  version = "1.5.0";
+
+  src = fetchFromGitLab {
+    owner = "freeDiameter";
+    repo = "freeDiameter";
+    rev = "v${version}";
+    hash = "sha256-hd71wR4b/pnAUcd2U4/InmubCAqkKUZeZTBrGTV3FSY=";
+  };
 
   nativeBuildInputs = [cmake pkg-config flex bison lksctp-tools libidn libgcrypt gnutls];
 

diff --git a/pkgs/arpa2/overlays/arpa2-packages/pkgs/kip/default.nix b/pkgs/arpa2/overlays/arpa2-packages/pkgs/kip/default.nix
@@ -1,7 +1,4 @@
 {
-  src,
-  pname,
-  version,
   stdenv,
   cmake,
   pkg-config,
@@ -24,6 +21,7 @@
   libressl,
   cacert,
   gnutls,
+  fetchFromGitLab,
 }: let
   python-with-packages =
     python3.withPackages
@@ -43,7 +41,15 @@
   });
 in
   stdenv.mkDerivation {
-    inherit src pname version;
+    pname = "kip";
+    version = "unstable-2021-07-27";
+
+    src = fetchFromGitLab {
+      owner = "arpa2";
+      repo = "kip";
+      rev = "7683e76368cfd432c740907f4d27592b1364b732";
+      hash = "sha256-SImz4ZzUXRmk4ZPbVjtUuRPqla8AiiVGa4HdSKVVI6g=";
+    };
 
     nativeBuildInputs = [cmake pkg-config cacert openssl libressl gnutls];
 

diff --git a/pkgs/arpa2/overlays/arpa2-packages/pkgs/leaf/default.nix b/pkgs/arpa2/overlays/arpa2-packages/pkgs/leaf/default.nix
@@ -1,14 +1,20 @@
 {
-  src,
-  pname,
-  version,
   stdenv,
   helpers,
   quickder,
   lillydap,
+  fetchFromGitLab,
 }:
 helpers.mkArpa2Derivation {
-  inherit src pname version;
+  pname = "leaf";
+  version = "unstable-2020-04-28";
+
+  src = fetchFromGitLab {
+    owner = "arpa2";
+    repo = "leaf";
+    rev = "b3861efce0ba143f6eb5451aac5be24f18e6d8ab";
+    hash = "sha256-woEzlXyulVSpeJJQU0SsfC3U90cv3b9zzVh/w5iouJY=";
+  };
 
   nativeBuildInputs = [quickder lillydap];
 }
diff --git a/pkgs/arpa2/overlays/arpa2-packages/pkgs/lillydap/default.nix b/pkgs/arpa2/overlays/arpa2-packages/pkgs/lillydap/default.nix
@@ -1,14 +1,20 @@
 {
-  src,
-  pname,
-  version,
   stdenv,
   helpers,
   quickder,
   gperf,
+  fetchFromGitLab,
 }:
-helpers.mkArpa2Derivation {
-  inherit src pname version;
+helpers.mkArpa2Derivation rec {
+  pname = "lillydap";
+  version = "0.9.2";
+
+  src = fetchFromGitLab {
+    owner = "arpa2";
+    repo = "lillydap";
+    rev = "v${version}";
+    hash = "sha256-L2zmitXezGzDZXLDxohU3DTuHE18KUZEMg98ui2AF+c=";
+  };
 
   nativeBuildInputs = [quickder gperf];
 }
diff --git a/pkgs/arpa2/overlays/arpa2-packages/pkgs/quicksasl/default.nix b/pkgs/arpa2/overlays/arpa2-packages/pkgs/quicksasl/default.nix
@@ -1,7 +1,4 @@
 {
-  src,
-  pname,
-  version,
   pkg-config,
   stdenv,
   helpers,
@@ -11,9 +8,18 @@
   libkrb5,
   libev,
   e2fsprogs,
+  fetchFromGitLab,
 }:
-helpers.mkArpa2Derivation {
-  inherit src pname version;
+helpers.mkArpa2Derivation rec {
+  pname = "quicksasl";
+  version = "0.11.0";
+
+  src = fetchFromGitLab {
+    owner = "arpa2";
+    repo = "quick-sasl";
+    rev = "v${version}";
+    hash = "sha256-z9kgKssuXq8qae9dTLP5REzkp1C4/jnJr7ydOavPWKM=";
+  };
 
   nativeBuildInputs = [libkrb5 quickmem cyrus_sasl quickder libev e2fsprogs pkg-config];
 }
diff --git a/pkgs/arpa2/overlays/arpa2-packages/pkgs/steamworks-pulleyback/default.nix b/pkgs/arpa2/overlays/arpa2-packages/pkgs/steamworks-pulleyback/default.nix
@@ -1,7 +1,4 @@
 {
-  src,
-  pname,
-  version,
   stdenv,
   helpers,
   steamworks,
@@ -11,9 +8,18 @@
   libressl,
   lmdb,
   libuuid,
+  fetchFromGitLab,
 }:
-helpers.mkArpa2Derivation {
-  inherit src pname version;
+helpers.mkArpa2Derivation rec {
+  pname = "steamworks-pulleyback";
+  version = "0.3.0";
+
+  src = fetchFromGitLab {
+    owner = "arpa2";
+    repo = "steamworks-pulleyback";
+    rev = "v${version}";
+    hash = "sha256-MtZDwWLcKVrNlNqhsT9tnT6qEpt2rR5S37UhHS232XI=";
+  };
 
   buildInputs = [steamworks lua doxygen graphviz libuuid];
 

diff --git a/pkgs/arpa2/overlays/arpa2-packages/pkgs/steamworks/default.nix b/pkgs/arpa2/overlays/arpa2-packages/pkgs/steamworks/default.nix
@@ -1,7 +1,4 @@
 {
-  src,
-  pname,
-  version,
   stdenv,
   lib,
   helpers,
@@ -11,9 +8,18 @@
   sqlite,
   catch2,
   log4cpp,
+  fetchFromGitLab,
 }:
-helpers.mkArpa2Derivation {
-  inherit src pname version;
+helpers.mkArpa2Derivation rec {
+  pname = "steamworks";
+  version = "0.97.2";
+
+  src = fetchFromGitLab {
+    owner = "arpa2";
+    repo = "steamworks";
+    rev = "v${version}";
+    hash = "sha256-hD1nTyv/t7MQdopqivfSE0o4Qk1ymG8zQVg56lY+t9o=";
+  };
 
   buildInputs = [
     openldap

diff --git a/pkgs/arpa2/overlays/arpa2-packages/pkgs/tlspool-gui/default.nix b/pkgs/arpa2/overlays/arpa2-packages/pkgs/tlspool-gui/default.nix
@@ -1,16 +1,22 @@
 {
-  src,
-  pname,
-  version,
   stdenv,
   lib,
   helpers,
   tlspool,
   qtbase,
   wrapQtAppsHook,
+  fetchFromGitLab,
 }:
-helpers.mkArpa2Derivation {
-  inherit src pname version;
+helpers.mkArpa2Derivation rec {
+  pname = "tlspool-gui";
+  version = "0.0.6";
+
+  src = fetchFromGitLab {
+    owner = "arpa2";
+    repo = "tlspool-gui";
+    rev = "v${version}";
+    hash = "sha256-87AY5GxIeDvsc9jrjam1aAYK+RQwhEgt+GO4TE4d6Js=";
+  };
 
   nativeBuildInputs = [tlspool wrapQtAppsHook];
   buildInputs = [qtbase];

diff --git a/pkgs/arpa2/overlays/arpa2-packages/pkgs/tlspool/default.nix b/pkgs/arpa2/overlays/arpa2-packages/pkgs/tlspool/default.nix
@@ -1,7 +1,4 @@
 {
-  src,
-  pname,
-  version,
   stdenv,
   helpers,
   pkg-config,
@@ -14,9 +11,18 @@
   unbound,
   libkrb5,
   openldap,
+  fetchFromGitLab,
 }:
-helpers.mkArpa2Derivation {
-  inherit src pname version;
+helpers.mkArpa2Derivation rec {
+  pname = "tlspool";
+  version = "0.9.6";
+
+  src = fetchFromGitLab {
+    owner = "arpa2";
+    repo = "tlspool";
+    rev = "v${version}";
+    hash = "sha256-cscA7204nONYyuthDoVOlVwN1AW2EtvSamXpqjAAaqY=";
+  };
 
   nativeBuildInputs = [quickder gnutls db ldns libtasn1 p11-kit unbound libkrb5 openldap pkg-config];
 }