Merge pull request #14 from hercules-ci/issue-5

Pin and make the project structure conform more to todomvc-nix

default.nix

@@ -1,6 +1,5 @@
-{ pkgs ? import ./pkgs.nix }:
+args@{ pkgs ? import ./nix args, ... }:
 
 {
-  inherit (pkgs) arion;
-  tests = pkgs.callPackage ./tests {};
+  inherit (pkgs) arion tests;
 }

nix/default.nix

@@ -0,0 +1,13 @@
+/**
+ * This is the entry-point for all nix execution in this project.
+ */
+{ nixpkgsSrc ? ./nixpkgs.nix, ... }:
+import (import ./nixpkgs.nix) {
+  # Makes the config pure as well. See <nixpkgs>/top-level/impure.nix:
+  config = {
+  };
+  overlays = [
+    # all the packages are defined there:
+    (import ./overlay.nix)
+  ];
+}

nix/nixpkgs.nix

@@ -0,0 +1,5 @@
+# to update: $ nix-prefetch-url --unpack url
+builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/be445a9074f139d63e704fa82610d25456562c3d.tar.gz";
+  sha256 = "15dc7gdspimavcwyw9nif4s59v79gk18rwsafylffs9m1ld2dxwa";
+}

nix/overlay.nix

@@ -0,0 +1,4 @@
+self: super: {
+  arion = super.callPackage ../arion.nix {};
+  tests = super.callPackage ../tests {};
+}

pkgs.nix

@@ -1,3 +0,0 @@
-import <nixpkgs> {
-  overlays = [ (self: super: { arion = super.callPackage ./arion.nix {}; }) ];
-}