arpa2: migrate into root flake

Co-authored-by: Shahar "Dawn" Or <mightyiampresence@gmail.com>
ngi-nix · Oct 25, 2023 · a6ec27e · a6ec27e
1 parent 2e2d881
commit a6ec27e
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 151 deletions.
diff --git a/flake.nix b/flake.nix
@@ -53,6 +53,7 @@
         explicitPkgs = import ./pkgs {
           inherit (pkgs) lib;
           inherit callPackage;
+          libsForQt5 = pkgs.lib.makeScope pkgs.libsForQt5.newScope (final: allPackages);
         };
         allPackages = pkgsByName // explicitPkgs;
       in

diff --git a/pkgs/arpa2/README.md b/pkgs/arpa2/README.md
diff --git a/pkgs/arpa2/default.nix b/pkgs/arpa2/default.nix
diff --git a/pkgs/arpa2/flake.lock b/pkgs/arpa2/flake.lock
diff --git a/pkgs/arpa2/flake.nix b/pkgs/arpa2/flake.nix
diff --git a/pkgs/arpa2/overlays/arpa2-packages/default.nix b/pkgs/arpa2/overlays/arpa2-packages/default.nix
diff --git a/...a2-packages/pkgs/freeDiameter/default.nix → pkgs/by-name/freeDiameter/package.nix b/...a2-packages/pkgs/freeDiameter/default.nix → pkgs/by-name/freeDiameter/package.nix
diff --git a/...rlays/arpa2-packages/pkgs/kip/default.nix → pkgs/by-name/kip/package.nix b/...rlays/arpa2-packages/pkgs/kip/default.nix → pkgs/by-name/kip/package.nix
diff --git a/...lays/arpa2-packages/pkgs/leaf/default.nix → pkgs/by-name/leaf/package.nix b/...lays/arpa2-packages/pkgs/leaf/default.nix → pkgs/by-name/leaf/package.nix
diff --git a/.../arpa2-packages/pkgs/lillydap/default.nix → pkgs/by-name/lillydap/package.nix b/.../arpa2-packages/pkgs/lillydap/default.nix → pkgs/by-name/lillydap/package.nix
diff --git a/...arpa2-packages/pkgs/quicksasl/default.nix → pkgs/by-name/quicksasl/package.nix b/...arpa2-packages/pkgs/quicksasl/default.nix → pkgs/by-name/quicksasl/package.nix
diff --git a/.../steamworks-pulleyback/install-dirs.patch → .../steamworks-pulleyback/install-dirs.patch b/.../steamworks-pulleyback/install-dirs.patch → .../steamworks-pulleyback/install-dirs.patch
diff --git a/...es/pkgs/steamworks-pulleyback/default.nix → ...by-name/steamworks-pulleyback/package.nix b/...es/pkgs/steamworks-pulleyback/default.nix → ...by-name/steamworks-pulleyback/package.nix
diff --git a/...rpa2-packages/pkgs/steamworks/default.nix → pkgs/by-name/steamworks/package.nix b/...rpa2-packages/pkgs/steamworks/default.nix → pkgs/by-name/steamworks/package.nix
diff --git a/...s/arpa2-packages/pkgs/tlspool/default.nix → pkgs/by-name/tlspool/package.nix b/...s/arpa2-packages/pkgs/tlspool/default.nix → pkgs/by-name/tlspool/package.nix
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   callPackage,
+  libsForQt5
 }: let
   self = rec {
     # LiberaForms is intentionally disabled.
@@ -28,6 +29,8 @@
       pretalx-venueless
       pretalx-public-voting
       ;
+
+    tlspool-gui = libsForQt5.callPackage ./tlspool-gui {};
   };
 in
   self
diff --git a/...pa2-packages/pkgs/tlspool-gui/default.nix → pkgs/tlspool-gui/default.nix b/...pa2-packages/pkgs/tlspool-gui/default.nix → pkgs/tlspool-gui/default.nix