From c256347ceea6c0434fd755e8c8fb5f6a7df620d6 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 9 Jun 2018 11:25:13 -0400 Subject: pcsclite: fix URL for debian move to gitlab Another repo moved as part of https://github.com/NixOS/nixpkgs/issues/39927 --- pkgs/tools/security/pcsclite/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 589316b1d1c5..3904a1eaca35 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2 +{ stdenv, fetchFromGitLab, pkgconfig, udev, dbus_libs, perl, python2 , IOKit ? null }: stdenv.mkDerivation rec { name = "pcsclite-${version}"; version = "1.8.23"; - src = fetchurl { - # This URL changes in unpredictable ways, so it is not sensible - # to put a version variable in there. - url = "https://alioth.debian.org/frs/download.php/file/4235/pcsc-lite-1.8.23.tar.bz2"; - sha256 = "1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = "pcsc-lite"; + rev = "upstream%2F${version}"; + sha256 = "09b7a79hjkgiyvhyvwf8gpxaf8b7wd0342hx6zrpd269hhfbjvwy"; }; patches = [ ./no-dropdir-literals.patch ]; @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; - homepage = http://pcsclite.alioth.debian.org/; + homepage = https://salsa.debian.org/debian/pcsc-lite; license = licenses.bsd3; maintainers = with maintainers; [ viric wkennington ]; platforms = with platforms; unix; -- cgit 1.4.1 From e93a8cba4a00e8b1ca5be16c69f2d2adb193aa90 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 9 Jun 2018 12:56:53 -0400 Subject: unbound: also replace -R in libunbound.la This was increasing closure sizes as well. --- pkgs/tools/networking/unbound/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index d7ef54a2497d..974849d29460 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # get rid of runtime dependencies on $dev outputs + ''substituteInPlace "$lib/lib/libunbound.la" '' + stdenv.lib.concatMapStrings - (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' ") + (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'") buildInputs; meta = with stdenv.lib; { -- cgit 1.4.1 From 2ed34da4cec1656f35d048a5075cf961251a9459 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 12 Jun 2018 20:36:30 +0000 Subject: Revert "pcsclite: fix URL for debian move to gitlab" This reverts commit c256347ceea6c0434fd755e8c8fb5f6a7df620d6 on staging. The issue was fixed on master in #41790 (aa18847e004293a0bc7239d9e6d22922dc51d690) Closes #41869 --- pkgs/tools/security/pcsclite/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 3904a1eaca35..589316b1d1c5 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,16 +1,15 @@ -{ stdenv, fetchFromGitLab, pkgconfig, udev, dbus_libs, perl, python2 +{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2 , IOKit ? null }: stdenv.mkDerivation rec { name = "pcsclite-${version}"; version = "1.8.23"; - src = fetchFromGitLab { - domain = "salsa.debian.org"; - owner = "debian"; - repo = "pcsc-lite"; - rev = "upstream%2F${version}"; - sha256 = "09b7a79hjkgiyvhyvwf8gpxaf8b7wd0342hx6zrpd269hhfbjvwy"; + src = fetchurl { + # This URL changes in unpredictable ways, so it is not sensible + # to put a version variable in there. + url = "https://alioth.debian.org/frs/download.php/file/4235/pcsc-lite-1.8.23.tar.bz2"; + sha256 = "1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"; }; patches = [ ./no-dropdir-literals.patch ]; @@ -37,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; - homepage = https://salsa.debian.org/debian/pcsc-lite; + homepage = http://pcsclite.alioth.debian.org/; license = licenses.bsd3; maintainers = with maintainers; [ viric wkennington ]; platforms = with platforms; unix; -- cgit 1.4.1 From 94d678d9b3086966e735223733c7b9efbe0f7a42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 13 Jun 2018 08:56:56 -0700 Subject: unbound: 1.7.1 -> 1.7.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/unbound/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/pka3ii26dp5xsxi7xs2rx3laxca2bv9l-unbound-1.7.2/bin/unbound had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/pka3ii26dp5xsxi7xs2rx3laxca2bv9l-unbound-1.7.2/bin/unbound-checkconf had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/pka3ii26dp5xsxi7xs2rx3laxca2bv9l-unbound-1.7.2/bin/unbound-control had a zero exit code or showed the expected version - /nix/store/pka3ii26dp5xsxi7xs2rx3laxca2bv9l-unbound-1.7.2/bin/unbound-host passed the binary check. - Warning: no invocation of /nix/store/pka3ii26dp5xsxi7xs2rx3laxca2bv9l-unbound-1.7.2/bin/unbound-anchor had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/pka3ii26dp5xsxi7xs2rx3laxca2bv9l-unbound-1.7.2/bin/unbound-control-setup had a zero exit code or showed the expected version - 1 of 6 passed binary check by having a zero exit code. - 0 of 6 passed binary check by having the new version present in output. - found 1.7.2 with grep in /nix/store/pka3ii26dp5xsxi7xs2rx3laxca2bv9l-unbound-1.7.2 - directory tree listing: https://gist.github.com/24f2136689bd3209095feb3b71734811 - du listing: https://gist.github.com/9efb5b527b161e93a47f0237c7d556a8 --- pkgs/tools/networking/unbound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index d7ef54a2497d..dcb2f960837d 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "https://unbound.net/downloads/${name}.tar.gz"; - sha256 = "13b210hd200xxvaffyzqb4g58knv1sfigph70ai74lrcb3pqbq2n"; + sha256 = "187a8l4292b43wwam2w12pzc33dvirii484b2b7r46bi6jxwfpx8"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB -- cgit 1.4.1 From f769004e5b00627527351e92cf90f97e85dcf412 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 21 Jun 2018 13:51:20 +0200 Subject: unbound: 1.7.2 -> 1.7.3 The NEWS seems safe. My motivation: fixes resolution of some Microsoft names if using qname-minimisation: yes --- pkgs/tools/networking/unbound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 6e28e15c4c10..a009e76d9e0a 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://unbound.net/downloads/${name}.tar.gz"; - sha256 = "187a8l4292b43wwam2w12pzc33dvirii484b2b7r46bi6jxwfpx8"; + sha256 = "c11de115d928a6b48b2165e0214402a7a7da313cd479203a7ce7a8b62cba602d"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB -- cgit 1.4.1 From 0726d95372119c3c3e069a89e4dba5b9fe8f524f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 12 Jun 2018 18:47:09 +0200 Subject: python: pirate-get: 0.2.13 -> 0.3.0 --- pkgs/tools/networking/pirate-get/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index 8e05e49962cd..b13c9e4ab0b2 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -5,13 +5,13 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pirate-get"; - version = "0.2.13"; + version = "0.3.0"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "c5b159e02067136d3157d56061958a50e997a078510e4403bb7de40217833f3f"; + sha256 = "171dd2d387fd8af726abcf4cac0d806463bedc8e5f892655179fb4b215df47b2"; }; propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 ]; -- cgit 1.4.1 From 37c3de2380669c85e05b089c6677ddd9842eef5f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 21 Jun 2018 07:37:19 +0200 Subject: python: pirate-get: 0.3.0 -> 0.3.1 --- pkgs/tools/networking/pirate-get/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index b13c9e4ab0b2..6390776e1be8 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -5,13 +5,13 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pirate-get"; - version = "0.3.0"; + version = "0.3.1"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "171dd2d387fd8af726abcf4cac0d806463bedc8e5f892655179fb4b215df47b2"; + sha256 = "9d7cc4b15dd8c6a82f9e03a666372e38613ccafdc846ad4c1226ba936beea68d"; }; propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 ]; -- cgit 1.4.1 From e4a4ce1eb74268c84f92b95eb69b2390bb390897 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 21 Jun 2018 07:37:19 +0200 Subject: python: rst2html5: 1.9.3 -> 1.9.4 --- pkgs/tools/text/rst2html5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix index 8db3d4eea2b6..8aadbb0b8062 100644 --- a/pkgs/tools/text/rst2html5/default.nix +++ b/pkgs/tools/text/rst2html5/default.nix @@ -4,11 +4,11 @@ pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "rst2html5"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "1js90asy7s0278b4p28inkkp0r7ajr5fk5pcdgcdw628a30vl3i6"; + sha256 = "d044589d30eeaf7336986078b7bd175510fd649a212b01a457d7806b279e6c73"; }; propagatedBuildInputs = with pythonPackages; -- cgit 1.4.1 From ab7f440a66774abd599808965fbc2b00fbe599f3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 21 Jun 2018 07:37:19 +0200 Subject: python: xml2rfc: 2.9.6 -> 2.9.8 --- pkgs/tools/typesetting/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/typesetting/xml2rfc/default.nix b/pkgs/tools/typesetting/xml2rfc/default.nix index d1f01ccd8677..7fe0396ae440 100644 --- a/pkgs/tools/typesetting/xml2rfc/default.nix +++ b/pkgs/tools/typesetting/xml2rfc/default.nix @@ -4,14 +4,14 @@ with python.pkgs; buildPythonPackage rec { pname = "xml2rfc"; - version = "2.9.6"; + version = "2.9.8"; buildInputs = [ intervaltree lxml requests pyflakes ]; propagatedBuildInputs = [ intervaltree lxml requests six ]; src = fetchPypi { inherit pname version; - sha256 = "1wr161lx6f1b3fq14ddr3y4jl0myrcmqs1s3fzsighvlmqfdihj7"; + sha256 = "b50ce2f98bc431cadbcef0523213497049b78c2829ee81c399976f1e4832afc6"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From 5523162e859a90ece625383fb00cd63cb120a72a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 21 Jun 2018 17:43:56 +0200 Subject: pirate-get: add missing dependency --- pkgs/tools/networking/pirate-get/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index 6390776e1be8..5258d53a18ae 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -3,7 +3,6 @@ with python3Packages; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "pirate-get"; version = "0.3.1"; @@ -14,7 +13,7 @@ buildPythonApplication rec { sha256 = "9d7cc4b15dd8c6a82f9e03a666372e38613ccafdc846ad4c1226ba936beea68d"; }; - propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 ]; + propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 pyperclip ]; meta = with stdenv.lib; { description = "A command line interface for The Pirate Bay"; -- cgit 1.4.1