From 116e30b8d5c609a0d84847e3b95a11ea9b180095 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sat, 9 Jul 2022 15:35:57 +0200
Subject: [PATCH] lib: move manual nixpkgs initialization to lib folder

---
 .../cross-pkgs.nix => lib/nixpkgs-cross.nix    | 13 +++----------
 .../load-nixpkgs.nix => lib/nixpkgs-pinned.nix |  2 +-
 overlays/lib/nixpkgs.nix                       | 18 ------------------
 overlays/typespeed.nix                         |  2 +-
 pkgs/cross-compiling/proot-termux.nix          |  2 +-
 pkgs/cross-compiling/talloc-static.nix         |  2 +-
 pkgs/default.nix                               |  2 +-
 7 files changed, 8 insertions(+), 33 deletions(-)
 rename pkgs/cross-compiling/cross-pkgs.nix => lib/nixpkgs-cross.nix (60%)
 rename pkgs/lib/load-nixpkgs.nix => lib/nixpkgs-pinned.nix (90%)
 delete mode 100644 overlays/lib/nixpkgs.nix

diff --git a/pkgs/cross-compiling/cross-pkgs.nix b/lib/nixpkgs-cross.nix
similarity index 60%
rename from pkgs/cross-compiling/cross-pkgs.nix
rename to lib/nixpkgs-cross.nix
index 5ea7deb..ee7e07e 100644
--- a/pkgs/cross-compiling/cross-pkgs.nix
+++ b/lib/nixpkgs-cross.nix
@@ -1,13 +1,9 @@
 # Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
 
-#{ config }:
-{ }:
-
-let
-  loadNixpkgs = import ../lib/load-nixpkgs.nix;
+{}:
 
+import ./nixpkgs-pinned.nix {
   crossSystem = {
-    #config = "${config.build.arch}-unknown-linux-android";
     config = "aarch64-unknown-linux-android";
     sdkVer = "32";
     libc = "bionic";
@@ -15,7 +11,4 @@ let
     useLLVM = true;
     isStatic = true;
   };
-
-in
-
-loadNixpkgs { inherit crossSystem; }
+}
diff --git a/pkgs/lib/load-nixpkgs.nix b/lib/nixpkgs-pinned.nix
similarity index 90%
rename from pkgs/lib/load-nixpkgs.nix
rename to lib/nixpkgs-pinned.nix
index ab25acf..a2efb4e 100644
--- a/pkgs/lib/load-nixpkgs.nix
+++ b/lib/nixpkgs-pinned.nix
@@ -14,4 +14,4 @@ let
   };
 in
 
-args: import pinnedPkgsSrc (args // defaultNixpkgsArgs)
+args: import pinnedPkgsSrc (defaultNixpkgsArgs // args)
diff --git a/overlays/lib/nixpkgs.nix b/overlays/lib/nixpkgs.nix
deleted file mode 100644
index 2ad1437..0000000
--- a/overlays/lib/nixpkgs.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE.
-
-{ super }:
-
-let
-  # head of nixos-22.05 as of 2022-06-27
-  pinnedPkgsSrc = super.fetchFromGitHub {
-    owner = "NixOS";
-    repo = "nixpkgs";
-    rev = "cd90e773eae83ba7733d2377b6cdf84d45558780";
-    sha256 = "1b2wn1ncx9x4651vfcgyqrm93pd7ghnrgqjbkf6ckkpidah69m03";
-  };
-in
-
-import pinnedPkgsSrc {
-  inherit (super) config system;
-  overlays = [ ];
-}
diff --git a/overlays/typespeed.nix b/overlays/typespeed.nix
index 421b539..b356911 100644
--- a/overlays/typespeed.nix
+++ b/overlays/typespeed.nix
@@ -3,7 +3,7 @@
 self: super:
 
 let
-  nixpkgs = import ./lib/nixpkgs.nix { inherit super; };
+  nixpkgs = import ../lib/nixpkgs-pinned.nix { inherit (super) config system; };
 in
 
 {
diff --git a/pkgs/cross-compiling/proot-termux.nix b/pkgs/cross-compiling/proot-termux.nix
index 2f2a05a..d5d7157 100644
--- a/pkgs/cross-compiling/proot-termux.nix
+++ b/pkgs/cross-compiling/proot-termux.nix
@@ -3,7 +3,7 @@
 { callPackage, tallocStatic }:
 
 let
-  pkgsCross = callPackage ./cross-pkgs.nix { };
+  pkgsCross = callPackage ../../lib/nixpkgs-cross.nix { };
   stdenv = pkgsCross.stdenvAdapters.makeStaticBinaries pkgsCross.stdenv;
 
 in
diff --git a/pkgs/cross-compiling/talloc-static.nix b/pkgs/cross-compiling/talloc-static.nix
index c85de7d..831e84c 100644
--- a/pkgs/cross-compiling/talloc-static.nix
+++ b/pkgs/cross-compiling/talloc-static.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  pkgsCross = callPackage ./cross-pkgs.nix { };
+  pkgsCross = callPackage ../../lib/nixpkgs-cross.nix { };
 in
 
 pkgsCross.stdenv.mkDerivation rec {
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 9bfac85..d23cf00 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -6,7 +6,7 @@ let
   nixDirectory = callPackage ./nix-directory.nix { };
   packageInfo = import "${nixDirectory}/nix-support/package-info.nix";
 
-  nixpkgs = import lib/load-nixpkgs.nix { };
+  nixpkgs = import ../lib/nixpkgs-pinned.nix { };
 
   modules = import ../modules {
     pkgs = nixpkgs;