pin nixpkgs and prepare shell.nix

f5af4e33 · Justin Woo · 7d909e60 · f5af4e33 · f5af4e33 · f5af4e33
Commit f5af4e33 authored Mar 02, 2020 by Justin Woo
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 1 deletion

build-shell.nix build-shell.nix +1 -1

pinned.nix pinned.nix +6 -0

shell.nix shell.nix +15 -0

No files found.
--- a/build-shell.nix
+++ b/build-shell.nix
 {ghc}:
-with (import <nixpkgs> {});
+with (import ./pinned.nix {});

 haskell.lib.buildStackProject {
  inherit ghc;

--- a/pinned.nix
+++ b/pinned.nix
+import (
+  builtins.fetchTarball {
+    url = "https://github.com/nixos/nixpkgs/archive/ece829033b7b8f4e81261fef5427144df4147bc4.tar.gz";
+    sha256 = "07n91k3d9i9pym8npsszha9mnvg4d1r0l0ldnhk4g8sx15vv1br5";
+  }
+)
--- a/default.nix
+++ b/default.nix
-with (import <nixpkgs> {});
-stdenv.mkDerivation rec {
-  name = "env";
-  env = buildEnv {
-    name = name;
-    paths = buildInputs;
-  };
-  buildInputs = [
+{ pkgs ? import ./pinned.nix {} }:
+
+pkgs.mkShell {
+  buildInputs = with pkgs; [
    docker-compose
    #glibc
    #gmp
@@ -16,8 +12,4 @@ stdenv.mkDerivation rec {
    #stack
    #xz
  ];
-  builder = builtins.toFile "builder.sh" ''
-    source $stdenv/setup
-    touch $out
-  '';
 }