Revert "gup: 0.5.5 -> 0.6.0 and derivation update"

This reverts commit a59c3038cd due to
use of importJSON.
This commit is contained in:
Eelco Dolstra 2017-01-30 11:25:59 +01:00
parent c20cc6d0b3
commit 12dd086c39
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
4 changed files with 20 additions and 59 deletions

View File

@ -1,30 +1,14 @@
# NOTE: the `nixpkgs` version of this file is copied from the upstream repository
# for this package. Please make any changes to https://github.com/timbertson/gup/
# NOTE: this file is copied from the upstream repository for this package.
# Please submit any changes you make here to https://github.com/timbertson/gup/
{ stdenv, lib, pythonPackages }:
{ src, version, meta ? {}, passthru ? {}, forceTests ? false }:
let
testInputs = [
pythonPackages.mocktest or null
pythonPackages.whichcraft
pythonPackages.nose
pythonPackages.nose_progressive
];
pychecker = pythonPackages.pychecker or null;
usePychecker = forceTests || pychecker != null;
enableTests = forceTests || (lib.all (dep: dep != null) testInputs);
in
{ stdenv, lib, python, which, pychecker ? null }:
{ src, version, meta ? {} }:
stdenv.mkDerivation {
inherit src meta passthru;
inherit src meta;
name = "gup-${version}";
buildInputs = [ pythonPackages.python ]
++ (lib.optionals enableTests testInputs)
++ (lib.optional usePychecker pychecker)
;
SKIP_PYCHECKER = !usePychecker;
buildInputs = lib.remove null [ python which pychecker ];
SKIP_PYCHECKER = pychecker == null;
buildPhase = "make python";
inherit pychecker;
testPhase = if enableTests then "make test" else "true";
installPhase = ''
mkdir $out
cp -r python/bin $out/bin

View File

@ -1,6 +0,0 @@
#!/bin/bash
set -eu
if [ -n "${GUP_TARGET:-}" ]; then
gup --always
fi
curl -LSs -o "$1" https://raw.githubusercontent.com/timbertson/gup/master/nix/gup-python.nix

View File

@ -1,21 +1,21 @@
{ stdenv, fetchFromGitHub, lib, pythonPackages, nix-update-source, curl }:
{ stdenv, fetchFromGitHub, lib, python, which }:
let
version = "0.5.5";
src = fetchFromGitHub {
sha256 = "12yv0j333z6jkaaal8my3jx3k4ml9hq8ldis5zfvr8179d4xah7q";
rev = "version-${version}";
repo = "gup";
owner = "timbertson";
};
in
import ./build.nix
{ inherit stdenv lib pythonPackages; }
{ inherit (nix-update-source.fetch ./src.json) src version;
{ inherit stdenv lib python which; }
{ inherit src version;
meta = {
homepage = https://github.com/timbertson/gup/;
inherit (src.meta) homepage;
description = "A better make, inspired by djb's redo";
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.timbertson ];
platforms = stdenv.lib.platforms.all;
};
passthru = {
updateScript = ''
set -e
echo
cd ${toString ./.}
${nix-update-source}/bin/nix-update-source --prompt version src.json
./build.nix.gup build.nix
'';
};
}

View File

@ -1,17 +0,0 @@
{
"fetch": {
"args": {
"owner": "timbertson",
"repo": "gup",
"rev": "version-0.6.0",
"sha256": "053xnx39jh9kn9l572z4k0q7bbxjpisf1fm9aq27ybj2ha1rh6wr"
},
"fn": "fetchFromGitHub",
"rev": "version-0.6.0",
"version": "0.6.0"
},
"owner": "timbertson",
"repo": "gup",
"rev": "version-{version}",
"type": "fetchFromGitHub"
}