Get rid of unstable input

codedownio · Sep 17, 2024 · 9e8c3e2 · 9e8c3e2
1 parent d0c5df4
commit 9e8c3e2
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 94 deletions.
diff --git a/channels.nix b/channels.nix
diff --git a/codedown.nix b/codedown.nix
@@ -1,5 +1,4 @@
 { pkgsStable
-, pkgsUnstable
 , pkgsMaster
 , requiredPackages ? []
 , system ? "x86_64-linux"
@@ -15,7 +14,7 @@ let
 in
 
 rec {
-  spellchecker = pkgsUnstable.callPackage ./language_servers/markdown-spellcheck-lsp {};
+  spellchecker = pkgsMaster.callPackage ./language_servers/markdown-spellcheck-lsp {};
 
   testing = {
     builds-forever = pkgsMaster.callPackage ./misc/builds-forever.nix {};
@@ -58,11 +57,11 @@ rec {
   languages = everythingEnv.config.builtKernels;
 
   makeEnvironment = callPackage ./codedown/makeEnvironment.nix {
-    inherit pkgsStable pkgsUnstable pkgsMaster;
+    inherit pkgsStable pkgsMaster;
   };
 
   validateCodeDownEnvironment = callPackage ./codedown/validateCodeDownEnvironment.nix {};
 
   # Exposed so it's easier to compute build dependencies in the presence of IFD
-  inherit pkgsStable pkgsUnstable requiredPackages;
+  inherit pkgsStable pkgsMaster requiredPackages;
 }
diff --git a/codedown/makeEnvironment.nix b/codedown/makeEnvironment.nix
@@ -8,7 +8,6 @@
 , writeText
 
 , pkgsStable
-, pkgsUnstable
 , pkgsMaster
 
 , name ? "codedown-environment"

diff --git a/default.nix b/default.nix
@@ -12,13 +12,6 @@ let
     hash = "sha256-D2YTs7K33zAzoQdAcVzePgDn6bdIEexGgHluoB07+Yw="; # nixpkgs-sha256
   }) { inherit overlays; };
 
-  pkgsUnstable = import (fetchFromGitHub {
-    owner = "NixOS";
-    repo = "nixpkgs";
-    rev = "ab82a9612aa45284d4adf69ee81871a389669a9e"; # nixpkgs-unstable-rev
-    hash = "sha256-5r0pInVo5d6Enti0YwUSQK4TebITypB42bWy5su3MrQ="; # nixpkgs-unstable-sha256
-  }) { inherit overlays; };
-
   pkgsMaster = import (fetchFromGitHub {
     owner = "NixOS";
     repo = "nixpkgs";
@@ -28,4 +21,4 @@ let
 
 in
 
-pkgsStable.callPackage ./codedown.nix { inherit pkgsStable pkgsUnstable pkgsMaster; }
+pkgsStable.callPackage ./codedown.nix { inherit pkgsStable pkgsMaster; }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,20 +2,18 @@
   description = "CodeDown languages";
 
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
-  inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   inputs.nixpkgs-master.url = "github:NixOS/nixpkgs/master";
 
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-master, flake-utils }@inputs:
+  outputs = { self, nixpkgs, nixpkgs-master, flake-utils }@inputs:
     flake-utils.lib.eachDefaultSystem (system:
       let
         overlays = [(import ./overlays.nix)];
         pkgsStable = import nixpkgs { inherit system overlays; };
-        pkgsUnstable = import nixpkgs-unstable { inherit system overlays; };
         pkgsMaster = import nixpkgs-master { inherit system overlays; };
 
-        codedown = import ./codedown.nix { inherit pkgsStable pkgsUnstable pkgsMaster; };
+        codedown = import ./codedown.nix { inherit pkgsStable pkgsMaster; };
 
       in
         rec {

diff --git a/tests/flake.lock b/tests/flake.lock
diff --git a/tests/flake.nix b/tests/flake.nix
@@ -1,15 +1,13 @@
 {
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
-  inputs.nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  outputs = { self, nixpkgs, nixpkgsUnstable, flake-utils }@inputs:
+  outputs = { self, nixpkgs, flake-utils }@inputs:
     # flake-utils.lib.eachDefaultSystem (system:
     flake-utils.lib.eachSystem ["x86_64-linux"] (system:
       let
         pkgs = import nixpkgs { inherit system; };
-        pkgsUnstable = import nixpkgsUnstable { inherit system; };
         tests = pkgs.haskell.packages.ghc965.callPackage ./tests.nix {};
       in
         rec {
@@ -18,7 +16,6 @@
             inherit (pkgs) cabal2nix;
 
             nixpkgsPath = pkgs.writeShellScriptBin "nixpkgsPath.sh" "echo -n ${pkgs.path}";
-            nixpkgsUnstablePath = pkgsUnstable.writeShellScriptBin "nixpkgsPath.sh" "echo -n ${pkgsUnstable.path}";
 
             # Print a trivial PATH that we can use to run kernel and LSP tests, to ensure
             # they aren't depending on anything on the test machine's PATH.