From 183be28fcac622c006dd81caa4fa62c2298d4834 Mon Sep 17 00:00:00 2001
From: Oleh Stolyar <oleh.stolyar@smarkets.com>
Date: Tue, 7 May 2019 10:09:39 +0100
Subject: [PATCH] nix: delete pinnedNixpkgs.nix

`nixpkgs` is now pinned in `nix/sources.json`.
---
 .gitignore             | 1 +
 Makefile               | 2 +-
 dockerize.nix          | 2 +-
 pinnedNixpkgs.nix      | 8 --------
 pinnedNixpkgs.src.json | 6 ------
 5 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 pinnedNixpkgs.nix
 delete mode 100644 pinnedNixpkgs.src.json

diff --git a/.gitignore b/.gitignore
index d48ad92f..6b92becc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ ENV/
 
 # nix stuff
 result
+result-*
diff --git a/Makefile b/Makefile
index b2b82579..d95ea86e 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ marge-bot:
 
 .PHONY: clean
 clean:
-	rm -rf .cache result requirements_frozen.txt
+	rm -rf .cache result result-* requirements_frozen.txt
 
 .PHONY: bump
 bump: bump-requirements bump-sources
diff --git a/dockerize.nix b/dockerize.nix
index e68b7c53..7fbe4d6f 100644
--- a/dockerize.nix
+++ b/dockerize.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import ./pinnedNixpkgs.nix }:
+{ pkgs }:
 let
   marge = pkgs.callPackage ./marge.nix {};
   version = marge.version;
diff --git a/pinnedNixpkgs.nix b/pinnedNixpkgs.nix
deleted file mode 100644
index a43f4bb2..00000000
--- a/pinnedNixpkgs.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-let
-  spec = builtins.fromJSON (builtins.readFile ./pinnedNixpkgs.src.json);
-  src = builtins.fetchTarball {
-    url = "https://github.com/${spec.owner}/${spec.repo}/archive/${spec.rev}.tar.gz";
-    sha256 = spec.sha256;
-  };
-in
-  import src {}
diff --git a/pinnedNixpkgs.src.json b/pinnedNixpkgs.src.json
deleted file mode 100644
index b654658c..00000000
--- a/pinnedNixpkgs.src.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "owner": "NixOS",
-  "repo": "nixpkgs",
-  "rev": "1985e76c2ee8b0bfc144ff4a495d68bb432d9153",
-  "sha256": "0lvdd749idxkqb91damn504zd310d9hqxhph8mg874wpld5kv87n"
-}