From 5bf6a8fe24db25881aeca7c2fa75e31cfbd063cd Mon Sep 17 00:00:00 2001
From: Tobias SN <15670490+TobiasSN@users.noreply.github.com>
Date: Fri, 22 Mar 2024 21:05:36 +0100
Subject: [PATCH] refactor: avoid dependency on Nix channels (#23)

---
 .github/workflows/main.yml                               | 6 ++----
 flake.nix                                                | 2 ++
 pkgs/stregsystemet/default.nix                           | 6 +++---
 pkgs/stregsystemet/dependencies/certifi.nix              | 2 +-
 pkgs/stregsystemet/dependencies/chardet.nix              | 2 +-
 pkgs/stregsystemet/dependencies/coverage.nix             | 4 ++--
 pkgs/stregsystemet/dependencies/django-appconf.nix       | 2 +-
 pkgs/stregsystemet/dependencies/django-debug-toolbar.nix | 2 +-
 pkgs/stregsystemet/dependencies/django-select2.nix       | 2 +-
 pkgs/stregsystemet/dependencies/django.nix               | 2 +-
 pkgs/stregsystemet/dependencies/freezegun.nix            | 2 +-
 pkgs/stregsystemet/dependencies/idna.nix                 | 2 +-
 pkgs/stregsystemet/dependencies/pillow.nix               | 2 +-
 pkgs/stregsystemet/dependencies/python-dateutil.nix      | 2 +-
 pkgs/stregsystemet/dependencies/pytz.nix                 | 2 +-
 pkgs/stregsystemet/dependencies/qrcode.nix               | 2 +-
 pkgs/stregsystemet/dependencies/regex.nix                | 2 +-
 pkgs/stregsystemet/dependencies/requests.nix             | 2 +-
 pkgs/stregsystemet/dependencies/six.nix                  | 2 +-
 pkgs/stregsystemet/dependencies/sqlparse.nix             | 2 +-
 pkgs/stregsystemet/dependencies/urllib3.nix              | 2 +-
 21 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 96d7fc7..5903d19 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,7 +3,7 @@ name: NixOS Package Building
 on:
     push:
         branches: [ main ]
-    pull_request: 
+    pull_request:
         branches: [ main ]
 
 jobs:
@@ -13,8 +13,6 @@ jobs:
             - uses: actions/checkout@v4.1.1
 
             - uses: cachix/install-nix-action@v25
-              with:
-                nix_path: nixpkgs=channel:nixos-23.11
 
             - name: build-stregsystemet
-              run: nix build -f ./pkgs/stregsystemet
+              run: nix build .#stregsystemet
diff --git a/flake.nix b/flake.nix
index 9a6904c..9e39ca2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,5 +27,7 @@
                 }
             ];
         };
+
+        packages."${system}".stregsystemet = pkgs.callPackage ./pkgs/stregsystemet {};
     };
 }
diff --git a/pkgs/stregsystemet/default.nix b/pkgs/stregsystemet/default.nix
index 708ef5a..9e2c1ea 100644
--- a/pkgs/stregsystemet/default.nix
+++ b/pkgs/stregsystemet/default.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 let
     env = pkgs.python3.withPackages (py: with py; [
         pillow
@@ -16,14 +16,14 @@ let
 in pkgs.stdenv.mkDerivation {
 	pname = "stregsystemet";
     name = "stregsystemet";
-	
+
 	src = pkgs.fetchFromGitHub {
 		owner = "f-klubben";
 		repo = "stregsystemet";
 		rev = "af0efd806ae743b0e8a9639376c4a31b81d61cd2";
 		sha256 = "sha256-0IwvGMyVd91h7bECTEqL2XydVewJZC+soctLnzTFASo=";
 	};
-	
+
 	installPhase = ''
 		mkdir -p $out/bin
 		mkdir -p $out/share/stregsystemet
diff --git a/pkgs/stregsystemet/dependencies/certifi.nix b/pkgs/stregsystemet/dependencies/certifi.nix
index d8c3ed9..8371fe2 100644
--- a/pkgs/stregsystemet/dependencies/certifi.nix
+++ b/pkgs/stregsystemet/dependencies/certifi.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "certifi";
diff --git a/pkgs/stregsystemet/dependencies/chardet.nix b/pkgs/stregsystemet/dependencies/chardet.nix
index a1408e4..186b07b 100644
--- a/pkgs/stregsystemet/dependencies/chardet.nix
+++ b/pkgs/stregsystemet/dependencies/chardet.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "chardet";
diff --git a/pkgs/stregsystemet/dependencies/coverage.nix b/pkgs/stregsystemet/dependencies/coverage.nix
index 824854a..1dbde7c 100644
--- a/pkgs/stregsystemet/dependencies/coverage.nix
+++ b/pkgs/stregsystemet/dependencies/coverage.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}: 
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "Coverage";
@@ -13,5 +13,5 @@ pkgs.python3Packages.buildPythonPackage {
     checkInputs = [];
     nativeBuildInputs = [];
     propagatedBuildInputs = [];
-  
+
 }
diff --git a/pkgs/stregsystemet/dependencies/django-appconf.nix b/pkgs/stregsystemet/dependencies/django-appconf.nix
index 1823b3f..50eb19f 100644
--- a/pkgs/stregsystemet/dependencies/django-appconf.nix
+++ b/pkgs/stregsystemet/dependencies/django-appconf.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "django-appconf";
diff --git a/pkgs/stregsystemet/dependencies/django-debug-toolbar.nix b/pkgs/stregsystemet/dependencies/django-debug-toolbar.nix
index c5d54f2..b28d478 100644
--- a/pkgs/stregsystemet/dependencies/django-debug-toolbar.nix
+++ b/pkgs/stregsystemet/dependencies/django-debug-toolbar.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "django-debug-toolbar";
diff --git a/pkgs/stregsystemet/dependencies/django-select2.nix b/pkgs/stregsystemet/dependencies/django-select2.nix
index 05507c3..a81c10b 100644
--- a/pkgs/stregsystemet/dependencies/django-select2.nix
+++ b/pkgs/stregsystemet/dependencies/django-select2.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "Django-Select2";
diff --git a/pkgs/stregsystemet/dependencies/django.nix b/pkgs/stregsystemet/dependencies/django.nix
index 2854497..221094c 100644
--- a/pkgs/stregsystemet/dependencies/django.nix
+++ b/pkgs/stregsystemet/dependencies/django.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "Django";
diff --git a/pkgs/stregsystemet/dependencies/freezegun.nix b/pkgs/stregsystemet/dependencies/freezegun.nix
index d1c0de8..334061f 100644
--- a/pkgs/stregsystemet/dependencies/freezegun.nix
+++ b/pkgs/stregsystemet/dependencies/freezegun.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "freezegun";
diff --git a/pkgs/stregsystemet/dependencies/idna.nix b/pkgs/stregsystemet/dependencies/idna.nix
index fed39c1..411a2e7 100644
--- a/pkgs/stregsystemet/dependencies/idna.nix
+++ b/pkgs/stregsystemet/dependencies/idna.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "idna";
diff --git a/pkgs/stregsystemet/dependencies/pillow.nix b/pkgs/stregsystemet/dependencies/pillow.nix
index 9cd113a..cd3a8f7 100644
--- a/pkgs/stregsystemet/dependencies/pillow.nix
+++ b/pkgs/stregsystemet/dependencies/pillow.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "Pillow";
diff --git a/pkgs/stregsystemet/dependencies/python-dateutil.nix b/pkgs/stregsystemet/dependencies/python-dateutil.nix
index c9dde0a..1aa28b7 100644
--- a/pkgs/stregsystemet/dependencies/python-dateutil.nix
+++ b/pkgs/stregsystemet/dependencies/python-dateutil.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "python-dateutil";
diff --git a/pkgs/stregsystemet/dependencies/pytz.nix b/pkgs/stregsystemet/dependencies/pytz.nix
index 8929b76..52931fb 100644
--- a/pkgs/stregsystemet/dependencies/pytz.nix
+++ b/pkgs/stregsystemet/dependencies/pytz.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "pytz";
diff --git a/pkgs/stregsystemet/dependencies/qrcode.nix b/pkgs/stregsystemet/dependencies/qrcode.nix
index 77364d5..13d5c68 100644
--- a/pkgs/stregsystemet/dependencies/qrcode.nix
+++ b/pkgs/stregsystemet/dependencies/qrcode.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "qrcode";
diff --git a/pkgs/stregsystemet/dependencies/regex.nix b/pkgs/stregsystemet/dependencies/regex.nix
index 9507c32..b8a3b2a 100644
--- a/pkgs/stregsystemet/dependencies/regex.nix
+++ b/pkgs/stregsystemet/dependencies/regex.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "regex";
diff --git a/pkgs/stregsystemet/dependencies/requests.nix b/pkgs/stregsystemet/dependencies/requests.nix
index 3758983..d51d3cf 100644
--- a/pkgs/stregsystemet/dependencies/requests.nix
+++ b/pkgs/stregsystemet/dependencies/requests.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "requests";
diff --git a/pkgs/stregsystemet/dependencies/six.nix b/pkgs/stregsystemet/dependencies/six.nix
index 7231c51..dbe2826 100644
--- a/pkgs/stregsystemet/dependencies/six.nix
+++ b/pkgs/stregsystemet/dependencies/six.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "six";
diff --git a/pkgs/stregsystemet/dependencies/sqlparse.nix b/pkgs/stregsystemet/dependencies/sqlparse.nix
index 50a2063..c78e40c 100644
--- a/pkgs/stregsystemet/dependencies/sqlparse.nix
+++ b/pkgs/stregsystemet/dependencies/sqlparse.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "sqlparse";
diff --git a/pkgs/stregsystemet/dependencies/urllib3.nix b/pkgs/stregsystemet/dependencies/urllib3.nix
index ef40594..9ddb5af 100644
--- a/pkgs/stregsystemet/dependencies/urllib3.nix
+++ b/pkgs/stregsystemet/dependencies/urllib3.nix
@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{pkgs}:
 
 pkgs.python3Packages.buildPythonPackage {
     pname = "urllib3";