dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-06-02 06:01:50 +00:00 committed by GitHub
commit 41af093f2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 118 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -42,6 +42,7 @@
, xorg
, libgudev
, wavpack
, glib
}:
assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64);
@ -57,6 +58,10 @@ stdenv.mkDerivation rec {
sha256 = "1al4f35mx41cy2h6agvmsqkjfchsyfs0iyxzpv6pnl0xh9pqfriw";
};
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [
pkg-config
python3
@ -64,6 +69,9 @@ stdenv.mkDerivation rec {
ninja
gettext
nasm
orc
libshout
glib
] ++ lib.optionals stdenv.isLinux [
wayland-protocols
];

1
pkgs/development/libraries/libshout/default.nix
View File

@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "doc" ];
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ libvorbis libtheora speex ];

33
pkgs/development/python-modules/pydrive/default.nix
View File

@ -1,33 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, google-api-python-client
, oauth2client
, pyyaml
}:
buildPythonPackage rec {
pname = "pydrive";
version = "1.3.1";
src = fetchPypi {
pname = "PyDrive";
inherit version;
sha256 = "11q7l94mb34hfh9wkdwfrh5xw99y13wa33ba7xp1q23q4b60v2c3";
};
propagatedBuildInputs = [
google-api-python-client
oauth2client
pyyaml
];
# requires client_secrets.json
doCheck = false;
meta = {
description = "Google Drive API Python wrapper library";
homepage = "https://github.com/gsuitedevs/PyDrive";
license = lib.licenses.asl20;
};
}

2
pkgs/development/python-modules/pytest-httpx/default.nix
View File

@ -43,6 +43,6 @@ buildPythonPackage rec {
description = "Send responses to httpx";
homepage = "https://github.com/Colin-b/pytest_httpx";
license = licenses.mit;
maintainers = with maintainers; [ fab SuperSandro2000 ];
maintainers = with maintainers; [ fab ];
};
}

13
pkgs/development/python-modules/tempest/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, buildPythonApplication
, fetchPypi
, fetchpatch
, pbr
, cliff
, jsonschema
@ -29,21 +28,13 @@
buildPythonApplication rec {
pname = "tempest";
version = "29.2.0";
version = "30.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "0521d3042360c0fb469b16f99174a9abddbae8a2d2a81268cfc664f1ccfdd0f9";
sha256 = "sha256-yaNw3c3d8TsSK9cXF9Lw9rKEcqx8YC6cigPURNdJy0A=";
};
patches = [
# remove need for unittest2
(fetchpatch {
url = "https://github.com/openstack/tempest/commit/cd3745c27b7d8fcdaffc72b965a3d803d9ee12c2.patch";
sha256 = "sha256-UwUmyFZokH66Xqfsj982MBHb0w7x6v4SAtXlqA5dpnk=";
})
];
propagatedBuildInputs = [
pbr
cliff

17
pkgs/development/python-modules/wcmatch/default.nix
View File

@ -1,14 +1,25 @@
{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, bracex }:
{ lib
, buildPythonPackage
, fetchPypi
, hatchling
, pytestCheckHook
, bracex
}:
buildPythonPackage rec {
pname = "wcmatch";
version = "8.3";
version = "8.4";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "371072912398af61d1e4e78609e18801c6faecd3cb36c54c82556a60abc965db";
sha256 = "sha256-uk/FVY+JRr8f/HA0sFuBTYJdaUESSZyGA14OTTmLamc=";
};
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [ bracex ];
checkInputs = [ pytestCheckHook ];

4
pkgs/development/python-modules/wsgi-intercept/default.nix
View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "wsgi-intercept";
version = "1.9.3";
version = "1.10.0";
src = fetchPypi {
pname = "wsgi_intercept";
inherit version;
sha256 = "0c4dc31dc7aabdd263ba45338c201b89e3096a3baaa7d8e3260c68ff18016fb4";
sha256 = "sha256-BX8EWtR8pXkibcliJbfBw6/5VdHs9HczjM1c1SWx3wk=";
};
propagatedBuildInputs = [ six ];

6
pkgs/development/tools/misc/reviewdog/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "reviewdog";
version = "0.14.0";
version = "0.14.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-mMpbV02yoso+Nvq1wkenvlbmTsOcTlpfKIhvyttrIf8=";
sha256 = "sha256-6NsGTpVj6m0sUVhTPmgtfhGz11IfYjjAiRKETUhqf2w=";
};
vendorSha256 = "sha256-UQbZjN7GaGXvBmMPAeQqaWriV+t3XSUd6hUOuZCiR24=";
vendorSha256 = "sha256-tdB/XPGr7pZeYZOkKH3XQggXtDUetkI75Ylu/E7ma64=";
doCheck = false;

10
pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "cstore_fdw";
version = "1.7.0";
version = "unstable-2022-03-08";
nativeBuildInputs = [ protobufc ];
buildInputs = [ postgresql ];
@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "citusdata";
repo = "cstore_fdw";
rev = "refs/tags/v${version}";
sha256 = "129mpq8rq16jg7idh6c1j6nij64iywrs7wl3cn02bdb3h8f19z1b";
rev = "90e22b62fbee6852529104fdd463f532cf7a3311";
sha256 = "sha256-02wcCqs8A5ZOZX080fgcNJTQrYQctnlwnA8+YPaRTZc=";
};
installPhase = ''
@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
broken = true;
broken = versionAtLeast postgresql.version "14";
description = "Columnar storage for PostgreSQL";
homepage = "https://www.citusdata.com/";
homepage = "https://github.com/citusdata/cstore_fdw";
maintainers = with maintainers; [ thoughtpolice ];
platforms = postgresql.meta.platforms;
license = licenses.asl20;

50
pkgs/tools/admin/fastlane/Gemfile.lock
View File

@ -8,20 +8,20 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.558.0)
aws-sdk-core (3.126.2)
aws-partitions (1.595.0)
aws-sdk-core (3.131.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.54.0)
aws-sdk-core (~> 3, >= 3.126.0)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.57.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.112.0)
aws-sdk-core (~> 3, >= 3.126.0)
aws-sdk-s3 (1.114.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.4.0)
aws-sigv4 (1.5.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
claide (1.1.0)
@ -36,7 +36,7 @@ GEM
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.6)
emoji_regex (3.2.3)
excon (0.91.0)
excon (0.92.3)
faraday (1.10.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
@ -66,7 +66,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.6)
fastlane (2.204.3)
fastlane (2.206.2)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
@ -106,9 +106,9 @@ GEM
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.16.0)
google-apis-androidpublisher_v3 (0.21.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-core (0.4.2)
google-apis-core (0.5.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
@ -121,15 +121,15 @@ GEM
google-apis-core (>= 0.4, < 2.a)
google-apis-playcustomapp_v1 (0.7.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-storage_v1 (0.11.0)
google-apis-storage_v1 (0.14.0)
google-apis-core (>= 0.4, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.5.0)
faraday (>= 0.17.3, < 2.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.2.0)
google-cloud-storage (1.36.1)
google-cloud-storage (1.36.2)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
@ -137,19 +137,19 @@ GEM
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.1.1)
faraday (>= 0.17.3, < 2.0)
googleauth (1.1.3)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.4)
http-cookie (1.0.5)
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.6.0)
json (2.6.1)
jmespath (1.6.1)
json (2.6.2)
jwt (2.3.0)
memoist (0.16.2)
mini_magick (4.11.0)
@ -161,9 +161,9 @@ GEM
optparse (0.1.1)
os (1.1.4)
plist (3.6.0)
public_suffix (4.0.6)
public_suffix (4.0.7)
rake (13.0.6)
representable (3.1.1)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
@ -192,7 +192,7 @@ GEM
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8)
unf_ext (0.0.8.2)
unicode-display_width (1.8.0)
webrick (1.7.0)
word_wrap (1.0.0)
@ -215,4 +215,4 @@ DEPENDENCIES
fastlane
BUNDLED WITH
2.1.4
2.3.9

32
pkgs/tools/admin/fastlane/default.nix
View File

@ -1,36 +1,28 @@
{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }:
{ lib, bundlerApp, bundlerUpdateScript, makeBinaryWrapper }:
stdenv.mkDerivation rec {
bundlerApp {
pname = "fastlane";
version = (import ./gemset.nix).fastlane.version;
gemdir = ./.;
exes = [ "fastlane" ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ makeBinaryWrapper ];
dontUnpack = true;
installPhase = let
env = bundlerEnv {
name = "${pname}-${version}-gems";
inherit pname ruby;
gemdir = ./.;
};
in ''
mkdir -p $out/bin
makeWrapper ${env}/bin/fastlane $out/bin/fastlane \
--set FASTLANE_SKIP_UPDATE_CHECK 1
postBuild = ''
wrapProgram $out/bin/fastlane --set FASTLANE_SKIP_UPDATE_CHECK 1
'';
passthru.updateScript = bundlerUpdateScript "fastlane";
meta = with lib; {
description = "A tool to automate building and releasing iOS and Android apps";
description = "A tool to automate building and releasing iOS and Android apps";
longDescription = "fastlane is a tool for iOS and Android developers to automate tedious tasks like generating screenshots, dealing with provisioning profiles, and releasing your application.";
homepage = "https://github.com/fastlane/fastlane";
license = licenses.mit;
maintainers = with maintainers; [
homepage = "https://github.com/fastlane/fastlane";
license = licenses.mit;
maintainers = with maintainers; [
peterromfeldhk
nicknovitski
shahrukh330
marsam
];
};
}

76
pkgs/tools/admin/fastlane/gemset.nix
View File

@ -45,10 +45,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0q5c8jjnlz6dlkxwsm6cj9n1z08pylvibsx8r42z50ws0jw2f7jm";
sha256 = "0vgm7l4nyj23sif850mfsh170jbkhm7j34686ygc0nfyzzm90c08";
type = "gem";
};
version = "1.558.0";
version = "1.595.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@ -56,10 +56,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19xi4dr675f7x9dmk1fc10jmjdgv45j3dn9k44m5xavd3qnpzx7v";
sha256 = "0yiz3aaik62rxhxipwznb2bv8ywha13vdxg9nk6anq9bd0nn0728";
type = "gem";
};
version = "3.126.2";
version = "3.131.1";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -67,10 +67,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h2mn5ywrla2wqsvzvp9m8jhzr93ywqmyi2l0b538hrq6pmdhjq2";
sha256 = "1m8vwm4cakfv3i4f723a6id07myx18fpdbq8ypa2j7r5njwxpmzz";
type = "gem";
};
version = "1.54.0";
version = "1.57.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@ -78,10 +78,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09fc16hdvripmpn1bj5bayqvmfz0pj2l1h2w954id9c9ar7vv7f5";
sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf";
type = "gem";
};
version = "1.112.0";
version = "1.114.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -89,10 +89,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";
sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z";
type = "gem";
};
version = "1.4.0";
version = "1.5.0";
};
babosa = {
groups = ["default"];
@ -213,10 +213,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0391r0nz1bbcph9dmdi4n0gwn2f64y8pffxa9zm8wjkqlynhhx74";
sha256 = "1rv2hq29lx2337214a1p2qy70fi77ch6p0p77nw9h6x84q028qr0";
type = "gem";
};
version = "0.91.0";
version = "0.92.3";
};
faraday = {
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
@ -368,10 +368,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1akkqh0px6xb47zxdmmi5w3dhm4692yd7jkizv0fq54pivz40d80";
sha256 = "0plwdkdnxq5x59bc45f6978yys4r5m85wmw8daa5136l33iypl41";
type = "gem";
};
version = "2.204.3";
version = "2.206.2";
};
gh_inspector = {
groups = ["default"];
@ -389,10 +389,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00qx111vfdh9xs74j26k19kap8iga4d94fc5iqw5lbrrviqwxmv6";
sha256 = "14ll3kbnb5glbb7qrqcsmy5rslb1hz9xdc16dl3a6j0a9nxrmiiv";
type = "gem";
};
version = "0.16.0";
version = "0.21.0";
};
google-apis-core = {
dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
@ -400,10 +400,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19v15vkgg86k79l51gfs7fab4h7fkv8358ckmkyp33jgsx3zr17b";
sha256 = "06s6kcvc6k5vgqkxf9xw1yaklr7yqf9kfvirm6i9b0lfmjfv26xv";
type = "gem";
};
version = "0.4.2";
version = "0.5.0";
};
google-apis-iamcredentials_v1 = {
dependencies = ["google-apis-core"];
@ -433,10 +433,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m2f4i9bbhwz0r3pkcliv6mx29lz5vvbd623jxkdik5ls8g92grm";
sha256 = "08qhbzxpnn278zlx79zzx27q66djksjym6jhwalb25qlcdnk6wvs";
type = "gem";
};
version = "0.11.0";
version = "0.14.0";
};
google-cloud-core = {
dependencies = ["google-cloud-env" "google-cloud-errors"];
@ -455,10 +455,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ajc3w4wqg46ywcbmb5fz1q6gfm6g7874s9h31i1r038kz2bzfag";
sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1";
type = "gem";
};
version = "1.5.0";
version = "1.6.0";
};
google-cloud-errors = {
groups = ["default"];
@ -476,10 +476,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g8nkvrpxqs9c061n2rd26waq6vwdws5siirgga1rx0n9v50chfp";
sha256 = "09d1bvxma4czbgay9lhcqsrhh6pd8s9i5djflzpsn00h4isdilw3";
type = "gem";
};
version = "1.36.1";
version = "1.36.2";
};
googleauth = {
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@ -487,10 +487,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bzqdvva06ydn3kzivbcfqxc5mfkz8xvazlpmp7zvkl3i5s5djr7";
sha256 = "1y80y72bpz04piiskfn93i5rzfy02mjchp3ym77yf2811gzz33d9";
type = "gem";
};
version = "1.1.1";
version = "1.1.3";
};
highline = {
groups = ["default"];
@ -508,10 +508,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9";
sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk";
type = "gem";
};
version = "1.0.4";
version = "1.0.5";
};
httpclient = {
groups = ["default"];
@ -528,20 +528,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gjrr5pdcl3l3skhp9d0jzs4yhmknpv3ldcz59b339b9lqbqasnr";
sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
type = "gem";
};
version = "1.6.0";
version = "1.6.1";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz";
sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl";
type = "gem";
};
version = "2.6.1";
version = "2.6.2";
};
jwt = {
groups = ["default"];
@ -658,10 +658,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
type = "gem";
};
version = "4.0.6";
version = "4.0.7";
};
rake = {
groups = ["default"];
@ -679,10 +679,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09xwzz94ryp57wyjrqysiz1sslnxd4r4m9wayy63jb7f8qfx1kys";
sha256 = "1kms3r6w6pnryysnaqqa9fsn0v73zx1ilds9d1c565n3xdzbyafc";
type = "gem";
};
version = "3.1.1";
version = "3.2.0";
};
retriable = {
groups = ["default"];
@ -854,10 +854,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd";
sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch";
type = "gem";
};
version = "0.0.8";
version = "0.0.8.2";
};
unicode-display_width = {
groups = ["default"];

2
pkgs/tools/misc/yle-dl/default.nix
View File

@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
homepage = "https://aajanki.github.io/yle-dl/";
changelog = "https://github.com/aajanki/yle-dl/blob/${version}/ChangeLog";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dezgeg SuperSandro2000 ];
maintainers = with maintainers; [ dezgeg ];
platforms = platforms.unix;
};
}

18
pkgs/tools/networking/wget2/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
# build support
, autoreconfHook
, flex
@ -27,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "wget2";
version = "2.0.0";
version = "2.0.1";
outputs = [ "out" "lib" "dev" ];
@ -35,22 +34,9 @@ stdenv.mkDerivation rec {
owner = "gnuwget";
repo = pname;
rev = "v${version}";
sha256 = "07zs2x2k62836l0arzc333j96yjpwal1v4mr8j99x6qxgmmssrbj";
sha256 = "sha256-9IOM8IA8Kezk3SP3YVenxQkm8UMZgD8/ztWoDNqM0vc=";
};
patches = [
(fetchpatch {
name = "fix-bashism-in-configure-ac.patch";
url = "https://gitlab.com/gnuwget/wget2/-/commit/da9788f5d62b89ba796393d9bc496b1d8d7a7b30.patch";
sha256 = "0bn3vkgyknks7jzs5722s2c4qlx7k5lwfiyz204bi42v1m28s1a5";
})
(fetchpatch {
name = "fix-double-quotes-in-configure-ac.patch";
url = "https://gitlab.com/gnuwget/wget2/-/commit/574c8ae08dfd8949da039879d85899123d31ab1d.patch";
sha256 = "14rfmij5w3bvj0fnkkkrxg0lfw3vgwiyvbkal3nqhgb0mlhlmd47";
})
];
# wget2_noinstall contains forbidden reference to /build/
postPatch = ''
substituteInPlace src/Makefile.am \

6
pkgs/tools/networking/xh/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "xh";
version = "0.15.0";
version = "0.16.1";
src = fetchFromGitHub {
owner = "ducaale";
repo = "xh";
rev = "v${version}";
sha256 = "sha256-+GiVehgU0g/rHeikSyACbTdCdpjHd8WxjkP+uxCylnY=";
sha256 = "sha256-y+Bixr+WRoTGjenkHSLbVmb9IHr9nicrAWyvkg5ey8E=";
};
cargoSha256 = "sha256-G3jaM6U7O+GLAiAbaWMIyh6Ksu4ypTK50s/RNe2wT3c=";
cargoSha256 = "sha256-wyK10D9MMyNF+JSacWW6GQcaMYMbDf1PHhuZ5LwZo+I=";
buildFeatures = lib.optional withNativeTls "native-tls";

1
pkgs/top-level/python-aliases.nix
View File

@ -109,6 +109,7 @@ mapAliases ({
prometheus_client = prometheus-client; # added 2021-06-10
prompt_toolkit = prompt-toolkit; # added 2021-07-22
pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08
pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28

2
pkgs/top-level/python-packages.nix
View File

@ -7201,8 +7201,6 @@ in {
inherit (pkgs) graphviz;
};
pydrive = callPackage ../development/python-modules/pydrive { };
pydrive2 = callPackage ../development/python-modules/pydrive2 { };
pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { };