diff options
author | Robin Gloster <mail@glob.in> | 2019-08-21 14:25:13 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2019-08-21 14:25:13 +0200 |
commit | f4fc845e5b8195b7ef4c7bc6a0e83495ae472d2d (patch) | |
tree | 43c003d74f5de4cf4f42207cfd933d1077f8f04a /pkgs/tools/package-management | |
parent | 9135412b63fcdb8d5cf1be659b657628f754d9c5 (diff) | |
parent | 609d408970362522c3b85ea5f903321247ed502f (diff) |
Merge remote-tracking branch 'upstream/master' into openssl-1.1
Diffstat (limited to 'pkgs/tools/package-management')
4 files changed, 42 insertions, 18 deletions
diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index f75bf6bf1625..3299ab8b63b6 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}: +{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java, fetchpatch }: stdenv.mkDerivation { name = "DisnixWebService-0.8"; @@ -11,7 +11,14 @@ stdenv.mkDerivation { AXIS2_LIB = "${axis2}/lib"; AXIS2_WEBAPP = "${axis2}/webapps/axis2"; DBUS_JAVA_LIB = "${dbus_java}/share/java"; - patchPhase = '' + patches = [ + # Safe to remove once https://github.com/svanderburg/DisnixWebService/pull/1 is merged + (fetchpatch { + url = "https://github.com/mmahut/DisnixWebService/commit/cf07918b8c81b4ce01e0b489c1b5a3ef9c9a1cd6.patch"; + sha256 = "15zi1l69wzgwvvqx4492s7l444gfvc9vcm7ckgif4b6cvp837brn"; + }) + ]; + prePatch = '' sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \ -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \ scripts/disnix-soap-client diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix new file mode 100644 index 000000000000..5cbb207ec4f4 --- /dev/null +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "nfpm"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "goreleaser"; + repo = pname; + rev = "v${version}"; + sha256 = "090mxkmbfzi3mby18zhrr34fr6vzc7j0r2ss3rjr5lyfgilw1qwr"; + }; + + modSha256 = "02nkqmljb528ppsr2dw2r3rc83j3qmys3a8v0a1z2b4sq2sv1v7w"; + + meta = with lib; { + description = "A simple deb and rpm packager written in Go"; + homepage = "https://github.com/goreleaser/nfpm"; + maintainers = [ maintainers.marsam ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index ae8dfc590750..2683192c89e3 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -4,13 +4,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "1v7bgr1rkm8j99s5bv45cslw01qcx8i8zb6ysfrb53qz86zgkgsn"; + sha256 = "0kwf2m62v4w7ds9y2fpcb8scazirkj114rn8y0ak62ph7lav8ma4"; }; propagatedBuildInputs = [ vdf ]; diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 4e2c8a7b3a7a..9e5a3f4d6978 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -1,30 +1,25 @@ -{ lib, python3Packages, fetchFromGitLab }: +{ lib, python3Packages, fetchFromGitHub }: with python3Packages; buildPythonApplication rec { pname = "reuse"; - version = "0.3.4"; + version = "0.4.1"; - src = fetchFromGitLab { - owner = "reuse"; - repo = "reuse"; + src = fetchFromGitHub { + owner = "fsfe"; + repo = "reuse-tool"; rev = "v${version}"; - sha256 = "07acv02wignrsfhym2i3dhlcs501yj426lnff2cjampl6m5cgsk3"; + sha256 = "0gwipwikhxsk0p8wvdl90xm7chfi2jywb1namzznyymifl1vsbgh"; }; - propagatedBuildInputs = [ chardet debian pygit2 ]; + propagatedBuildInputs = [ debian license-expression requests ]; - checkInputs = [ pytest jinja2 ]; - - # Some path based tests are currently broken under nix - checkPhase = '' - pytest tests -k "not test_lint_none and not test_lint_ignore_debian and not test_lint_twice_path" - ''; + checkInputs = [ pytest ]; meta = with lib; { description = "A tool for compliance with the REUSE Initiative recommendations"; - license = with licenses; [ cc-by-sa-40 cc0 gpl3 ]; + license = with licenses; [ asl20 cc-by-sa-40 cc0 gpl3 ]; maintainers = [ maintainers.FlorianFranzen ]; }; } |