From 3b90927e818729f2983ae7ebe5ab65c0b96bcd2a Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Wed, 20 Feb 2019 14:50:45 -0800 Subject: Move pkgs.nix to pack/nixpkgs.nix --- ibb/default.nix | 2 +- nixos.nix | 2 +- pack/nixpkgs.nix | 5 +++++ pkgs.nix | 5 ----- 4 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 pack/nixpkgs.nix delete mode 100644 pkgs.nix diff --git a/ibb/default.nix b/ibb/default.nix index 310e790..8525d99 100644 --- a/ibb/default.nix +++ b/ibb/default.nix @@ -3,7 +3,7 @@ , doBenchmark ? false , doCheck ? true , withHoogle ? false -, nixpkgs ? builtins.fetchTarball (import ../pkgs.nix) +, nixpkgs ? builtins.fetchTarball (import ../pack/nixpkgs.nix) }: with import "${nixpkgs}" {}; diff --git a/nixos.nix b/nixos.nix index a1a1205..23f60a4 100644 --- a/nixos.nix +++ b/nixos.nix @@ -1,7 +1,7 @@ # Nix config for the main biz machine. let - nixpkgs = builtins.fetchTarball (import ./pkgs.nix); + nixpkgs = builtins.fetchTarball (import ./pack/nixpkgs.nix); in import "${nixpkgs}/nixos" { system = "x86_64-linux"; diff --git a/pack/nixpkgs.nix b/pack/nixpkgs.nix new file mode 100644 index 0000000..154daca --- /dev/null +++ b/pack/nixpkgs.nix @@ -0,0 +1,5 @@ +# Get the sha256 with: nix-prefetch-url --unpack ${url} +{ + url = "https://github.com/NixOS/nixpkgs/archive/da81531c1d76b4c24b944f6cf69b7025770662c1.tar.gz"; + sha256 = "00qqchbvvbcmmkfpjkp1ki4kwcm33ch1ljbi2n3zxy36r430way1"; +} diff --git a/pkgs.nix b/pkgs.nix deleted file mode 100644 index 154daca..0000000 --- a/pkgs.nix +++ /dev/null @@ -1,5 +0,0 @@ -# Get the sha256 with: nix-prefetch-url --unpack ${url} -{ - url = "https://github.com/NixOS/nixpkgs/archive/da81531c1d76b4c24b944f6cf69b7025770662c1.tar.gz"; - sha256 = "00qqchbvvbcmmkfpjkp1ki4kwcm33ch1ljbi2n3zxy36r430way1"; -} -- cgit v1.2.3