summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2019-02-20 14:50:45 -0800
committerBen Sima <ben@bsima.me>2019-02-20 14:50:45 -0800
commit3b90927e818729f2983ae7ebe5ab65c0b96bcd2a (patch)
tree769368793aeccb91376b09da471e492e700fc6ef
parentcdf7034e47c62807930a9da7effdbffd6cc36066 (diff)
Move pkgs.nix to pack/nixpkgs.nix
-rw-r--r--ibb/default.nix2
-rw-r--r--nixos.nix2
-rw-r--r--pack/nixpkgs.nix (renamed from pkgs.nix)0
3 files changed, 2 insertions, 2 deletions
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/pkgs.nix b/pack/nixpkgs.nix
index 154daca..154daca 100644
--- a/pkgs.nix
+++ b/pack/nixpkgs.nix