From 94d92fd046feeb8d56c8ad88b2916005ef6305ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Apr 2018 16:43:27 +0100 Subject: [PATCH] Revert "nix-pin: 0.1.2 -> 0.2.2" This reverts commit 92f083af238f844a0267531cc25275f80e97622e. breaks evaluation --- .../package-management/nix-pin/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index e2c18f33d61..c12b82a61e1 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -1,12 +1,12 @@ { pkgs, stdenv, fetchFromGitHub, mypy, python3 }: let self = stdenv.mkDerivation rec { name = "nix-pin-${version}"; - version = "0.2.2"; + version = "0.1.2"; src = fetchFromGitHub { owner = "timbertson"; repo = "nix-pin"; - rev = "version-0.2.2"; - sha256 = "1kw43kzy4m6lnnif51r2a8i4vcgr7d4vqb1c75p7pk2b9y3jwxsz"; + rev = "version-0.1.2"; + sha256 = "1zwfb5198qzbjwivgiaxbwva9frgrrqaj92nw8vz95yi08pijssh"; }; buildInputs = [ python3 mypy ]; buildPhase = '' @@ -16,11 +16,12 @@ let self = stdenv.mkDerivation rec { mkdir "$out" cp -r bin share "$out" ''; - passthru = - let api = import "${self}/share/nix/api.nix" { inherit pkgs; }; in - { - inherit (api) augmentedPkgs pins callPackage; - }; + passthru = { + callWithPins = path: args: + import "${self}/share/nix/call.nix" { + inherit pkgs path args; + }; + }; meta = with stdenv.lib; { homepage = "https://github.com/timbertson/nix-pin"; description = "nixpkgs development utility";