From 1770604df99a2071163dd2e24cae0befca528749 Mon Sep 17 00:00:00 2001 From: Joris Date: Fri, 28 Feb 2020 11:27:12 +0100 Subject: Pin nixpkgs --- Makefile | 2 +- default.nix | 2 +- nix/nixpkgs.nix | 6 ++++++ nix/tools.nix | 15 +++++++++++++++ tools.nix | 13 ------------- 5 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 nix/nixpkgs.nix create mode 100644 nix/tools.nix delete mode 100644 tools.nix diff --git a/Makefile b/Makefile index 5097b56..46bbcc7 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ start: - @nix-shell tools.nix --command "tmuxinator local" + @nix-shell nix/tools.nix --command "tmuxinator local" stop: @tmux kill-session -t sharedCost diff --git a/default.nix b/default.nix index 7969fc7..fbb3725 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -with import {}; +with import ./nix/nixpkgs.nix {}; let reflex-platform = import (pkgs.fetchFromGitHub { diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix new file mode 100644 index 0000000..9d61277 --- /dev/null +++ b/nix/nixpkgs.nix @@ -0,0 +1,6 @@ +import ((import {}).fetchFromGitHub { + owner = "NixOS"; + repo = "nixpkgs"; + rev = "19.09"; + sha256 = "1ib96has10v5nr6bzf7v8kw7yzww8zanxgw2qi1ll1sbv6kj6zpd"; +}) diff --git a/nix/tools.nix b/nix/tools.nix new file mode 100644 index 0000000..c14e4e2 --- /dev/null +++ b/nix/tools.nix @@ -0,0 +1,15 @@ +with import ./nixpkgs.nix {}; + +{ + env = stdenv.mkDerivation { + name = "tools"; + buildInputs = with pkgs; with nodePackages; [ + nodemon + sqlite + cabal-install + tmux + tmuxinator + haskellPackages.stylish-haskell + ]; + }; +} diff --git a/tools.nix b/tools.nix deleted file mode 100644 index 9a506c7..0000000 --- a/tools.nix +++ /dev/null @@ -1,13 +0,0 @@ -with import {}; { - env = stdenv.mkDerivation { - name = "tools"; - buildInputs = with pkgs; with nodePackages; [ - nodemon - sqlite - cabal-install - tmux - tmuxinator - haskellPackages.stylish-haskell - ]; - }; -} -- cgit v1.2.3