Skip to content

Commit

Permalink
nix: delete pinnedNixpkgs.nix
Browse files Browse the repository at this point in the history
`nixpkgs` is now pinned in `nix/sources.json`.
  • Loading branch information
Oleh Stolyar authored and aschmolck committed May 7, 2019
1 parent 006713e commit 183be28
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 16 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ ENV/

# nix stuff
result
result-*
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dockerize.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs ? import ./pinnedNixpkgs.nix }:
{ pkgs }:
let
marge = pkgs.callPackage ./marge.nix {};
version = marge.version;
Expand Down
8 changes: 0 additions & 8 deletions pinnedNixpkgs.nix

This file was deleted.

6 changes: 0 additions & 6 deletions pinnedNixpkgs.src.json

This file was deleted.

0 comments on commit 183be28

Please sign in to comment.