From 831dbf4e0a8ce8d1b4d2830ead35461aba4a72ac Mon Sep 17 00:00:00 2001 From: kfollesdal Date: Mon, 8 Mar 2021 09:36:02 +0100 Subject: [PATCH 001/120] nixos/virtualisation/azure-common: add auto resize of os disk At the moment os disk do not automatically expand in Azure. This commit fixes this so os disk expands to whole disk when created or changed. --- nixos/modules/virtualisation/azure-common.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index 8efa177e30d..dc7853b9503 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -21,7 +21,11 @@ with lib; # way to select them anyway. boot.loader.grub.configurationLimit = 0; - fileSystems."/".device = "/dev/disk/by-label/nixos"; + fileSystems."/" = { + device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; + autoResize = true; + }; # Allow root logins only using the SSH key that the user specified # at instance creation time, ping client connections to avoid timeouts From 5100787ca284f6749807b33225ab0489d2ba14d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 19:50:27 +0000 Subject: [PATCH 002/120] spaceship-prompt: 3.16.3 -> 3.16.4 --- pkgs/shells/zsh/spaceship-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index 9c3843a7cef..5bdcb21f8dd 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "3.16.3"; + version = "3.16.4"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eIvNfs9c8Ftcnbtg7lNNc2d3OWWpse91yTzcLqoeFqI="; + sha256 = "sha256-4G1+K6ENLwChtivR7Ura0vl6Ph9Wae3SOXCW1pNbgHI="; }; dontBuild = true; From 155d379451b1d84be804ef2babda55e0ebfcc5a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Feb 2022 12:59:39 +0000 Subject: [PATCH 003/120] flyway: 7.13.0 -> 8.5.1 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 0e1d18d2eb1..c7ecf4cace2 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "7.13.0"; + version = "8.5.1"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-rZUVxswJdCFKwuXlzko+t+ZO1plRgH2VcZFJ5kkiM2s="; + sha256 = "sha256-aD8++IhpV89hgx6pIe8CDg07ps+44si4Z6RcZD8g1Fc="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From 5f4816c06a7ff35468cf194c42b5ccc1d1568556 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Feb 2022 17:22:12 +0000 Subject: [PATCH 004/120] python310Packages.phonenumbers: 8.12.43 -> 8.12.44 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 9faad1e96de..92b621e49c6 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.43"; + version = "8.12.44"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HIJwouJX1sZUWKQig/gtPsp/e52SVFSmlm4vBN914c8="; + sha256 = "sha256-Js/QJX0XBP4viMr/LKq7cNFqh3seZbaq5R+fu+EKqM4="; }; checkInputs = [ From a5c3d34c636a11e3b1d4940d9b80283c7de289ac Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Sun, 27 Feb 2022 00:19:51 +0100 Subject: [PATCH 005/120] fastlane: 2.171.0 -> 2.204.3 --- pkgs/tools/admin/fastlane/Gemfile.lock | 170 ++++++----- pkgs/tools/admin/fastlane/gemset.nix | 378 ++++++++++++++++++------- 2 files changed, 375 insertions(+), 173 deletions(-) diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 19305c7d137..be99ed9bdc3 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -1,60 +1,80 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.3) - addressable (2.7.0) + CFPropertyList (3.0.5) + rexml + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) + artifactory (3.0.15) atomos (0.1.3) - aws-eventstream (1.1.0) - aws-partitions (1.414.0) - aws-sdk-core (3.110.0) + aws-eventstream (1.2.0) + aws-partitions (1.558.0) + aws-sdk-core (3.126.2) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.40.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (1.54.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.87.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-s3 (1.112.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.2) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) - claide (1.0.3) + claide (1.1.0) colored (1.2) colored2 (3.1.2) - commander-fastlane (4.4.6) - highline (~> 1.7.2) + commander (4.6.0) + highline (~> 2.0.0) declarative (0.0.20) - declarative-option (0.1.0) - digest-crc (0.6.3) + digest-crc (0.6.4) rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.6) - emoji_regex (3.2.1) - excon (0.78.1) - faraday (1.3.0) + emoji_regex (3.2.3) + excon (0.91.0) + faraday (1.10.0) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday-net_http (1.0.0) - faraday_middleware (1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.3) + multipart-post (>= 1.2, < 3) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.1) - fastlane (2.171.0) + fastimage (2.2.6) + fastlane (2.204.3) CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.3, < 3.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) colored - commander-fastlane (>= 4.4.6, < 5.0.0) + commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) excon (>= 0.71.0, < 1.0.0) @@ -63,18 +83,20 @@ GEM faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.37.0, < 0.39.0) - google-cloud-storage (>= 1.15.0, < 2.0.0) - highline (>= 1.7.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-storage (~> 1.31) + highline (~> 2.0) json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) multipart-post (~> 2.0.0) + naturally (~> 2.2) + optparse (~> 0.1.1) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) simctl (~> 1.6.3) - slack-notifier (>= 2.0.0, < 3.0.0) terminal-notifier (>= 2.0.0, < 3.0.0) terminal-table (>= 1.4.5, < 2.0.0) tty-screen (>= 0.6.3, < 1.0.0) @@ -84,73 +106,85 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-api-client (0.38.0) + google-apis-androidpublisher_v3 (0.16.0) + google-apis-core (>= 0.4, < 2.a) + google-apis-core (0.4.2) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.9) - httpclient (>= 2.8.1, < 3.0) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) - retriable (>= 2.0, < 4.0) - signet (~> 0.12) - google-cloud-core (1.5.0) + retriable (>= 2.0, < 4.a) + rexml + webrick + google-apis-iamcredentials_v1 (0.10.0) + 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-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.4.0) + google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.0.1) - google-cloud-storage (1.29.2) - addressable (~> 2.5) + google-cloud-errors (1.2.0) + google-cloud-storage (1.36.1) + addressable (~> 2.8) digest-crc (~> 0.4) - google-api-client (~> 0.33) - google-cloud-core (~> 1.2) - googleauth (~> 0.9) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.1) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (0.14.0) + googleauth (1.1.1) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.14) - highline (1.7.10) - http-cookie (1.0.3) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - jmespath (1.4.0) - json (2.5.1) - jwt (2.2.2) + jmespath (1.6.0) + json (2.6.1) + jwt (2.3.0) memoist (0.16.2) mini_magick (4.11.0) - mini_mime (1.0.2) + mini_mime (1.1.2) multi_json (1.15.0) multipart-post (2.0.0) nanaimo (0.3.0) - naturally (2.2.0) - os (1.1.1) + naturally (2.2.1) + optparse (0.1.1) + os (1.1.4) plist (3.6.0) public_suffix (4.0.6) - rake (13.0.3) - representable (3.0.4) + rake (13.0.6) + representable (3.1.1) declarative (< 0.1.0) - declarative-option (< 0.2.0) + trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) + rexml (3.2.5) rouge (2.0.7) - ruby2_keywords (0.0.2) - rubyzip (2.3.0) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) security (0.1.3) - signet (0.14.0) - addressable (~> 2.3) - faraday (>= 0.17.3, < 2.0) + signet (0.16.1) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simctl (1.6.8) CFPropertyList naturally - slack-notifier (2.3.2) terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) + trailblazer-option (0.1.2) tty-cursor (0.7.1) tty-screen (0.8.1) tty-spinner (0.9.3) @@ -158,15 +192,17 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unf_ext (0.0.8) + unicode-display_width (1.8.0) + webrick (1.7.0) word_wrap (1.0.0) - xcodeproj (1.19.0) + xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) + rexml (~> 3.2.4) xcpretty (0.3.0) rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index e747537b241..52583ebc8cf 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -5,10 +5,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; + }; + artifactory = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wify8rhjwr5bw5y6ary61vba290vk766cxw9a9mg05yswmaisls"; + type = "gem"; + }; + version = "3.0.15"; }; atomos = { groups = ["default"]; @@ -25,20 +35,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; + sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dy7y0zgc53cz1qiifx74glixkjd96nk8p6qrq1n5cdylnlpng8k"; + sha256 = "0q5c8jjnlz6dlkxwsm6cj9n1z08pylvibsx8r42z50ws0jw2f7jm"; type = "gem"; }; - version = "1.414.0"; + version = "1.558.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -46,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lrxwi9im4bpdcga6w7bmam7hywy5c2yss09377lyqm89whb4kl4"; + sha256 = "19xi4dr675f7x9dmk1fc10jmjdgv45j3dn9k44m5xavd3qnpzx7v"; type = "gem"; }; - version = "3.110.0"; + version = "3.126.2"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -57,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pk76w1w9z4dh1sic08jp1j2rbbmnrfci53a6pkxq0g3y4kkx2g4"; + sha256 = "0h2mn5ywrla2wqsvzvp9m8jhzr93ywqmyi2l0b538hrq6pmdhjq2"; type = "gem"; }; - version = "1.40.0"; + version = "1.54.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -68,10 +78,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7"; + sha256 = "09fc16hdvripmpn1bj5bayqvmfz0pj2l1h2w954id9c9ar7vv7f5"; type = "gem"; }; - version = "1.87.0"; + version = "1.112.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -79,10 +89,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; + sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; type = "gem"; }; - version = "1.2.2"; + version = "1.4.0"; }; babosa = { groups = ["default"]; @@ -95,24 +105,25 @@ version = "1.0.4"; }; CFPropertyList = { + dependencies = ["rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4"; + sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7"; type = "gem"; }; - version = "3.0.3"; + version = "3.0.5"; }; claide = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; + sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; colored = { groups = ["default"]; @@ -134,16 +145,16 @@ }; version = "3.1.2"; }; - commander-fastlane = { + commander = { dependencies = ["highline"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65"; + sha256 = "1n8k547hqq9hvbyqbx2qi08g0bky20bbjca1df8cqq5frhzxq7bx"; type = "gem"; }; - version = "4.4.6"; + version = "4.6.0"; }; declarative = { groups = ["default"]; @@ -155,26 +166,16 @@ }; version = "0.0.20"; }; - declarative-option = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p"; - type = "gem"; - }; - version = "0.1.0"; - }; digest-crc = { dependencies = ["rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "118d5p02kdw6a5pi8af12dxma7q3b77zz5q5xjjf5kgp8qh1930a"; + sha256 = "1czaak53w8n13y1fr0q23gp0fhklvxjac5n562qj3xk6sh5ad0x2"; type = "gem"; }; - version = "0.6.3"; + version = "0.6.4"; }; domain_name = { dependencies = ["unf"]; @@ -202,31 +203,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qbzlracxw4xwyvrgr0qcl1alk4ijk6pv53ni6f43csi649y3n3s"; + sha256 = "0jsnrkfy345v66jlm2xrz8znivfnamg3mfzkddn414bndf2vxn7c"; type = "gem"; }; - version = "3.2.1"; + version = "3.2.3"; }; excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16ij8617v3js03yj1zd32mmrf7kpi9l96bid5mpqk30c4mzai55r"; + sha256 = "0391r0nz1bbcph9dmdi4n0gwn2f64y8pffxa9zm8wjkqlynhhx74"; type = "gem"; }; - version = "0.78.1"; + version = "0.91.0"; }; faraday = { - dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; + 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"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; + sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; type = "gem"; }; - version = "1.3.0"; + version = "1.10.0"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; @@ -239,47 +240,138 @@ }; version = "0.0.7"; }; + faraday-em_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-em_synchrony = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; + }; + faraday-httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-multipart = { + dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + type = "gem"; + }; + version = "1.0.3"; + }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kk5d1c5nxbmwawl5gcznwiscjz24nz3vdhxrlzvj7748c1qqr6d"; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http_persistent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; + type = "gem"; + }; + version = "1.2.0"; + }; + faraday-patron = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; type = "gem"; }; version = "1.0.0"; }; + faraday-rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-retry = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; + type = "gem"; + }; + version = "1.0.3"; + }; faraday_middleware = { dependencies = ["faraday"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r"; + sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy"; type = "gem"; }; - version = "1.0.0"; + version = "1.2.0"; }; fastimage = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vqp53s9vgd28f4l17q0vs7xv32y64af0ny3wb1fgg4i534rzg6j"; + sha256 = "0nnggg20za5vamdpkgrxxa32z33d8hf0g2bciswkhqnc6amb3yjr"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.6"; }; fastlane = { - dependencies = ["CFPropertyList" "addressable" "aws-sdk-s3" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "plist" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; + dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h921zfck75f5b50z9jxnhanf8q9d58n122ffnpd1980q5w912rp"; + sha256 = "1akkqh0px6xb47zxdmmi5w3dhm4692yd7jkizv0fq54pivz40d80"; type = "gem"; }; - version = "2.171.0"; + version = "2.204.3"; }; gh_inspector = { groups = ["default"]; @@ -291,16 +383,60 @@ }; version = "1.1.3"; }; - google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"]; + google-apis-androidpublisher_v3 = { + dependencies = ["google-apis-core"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jybks8i00rxrxx9mkx90dbdk6pczh2w757wchlavmrkrk0dp9s1"; + sha256 = "00qx111vfdh9xs74j26k19kap8iga4d94fc5iqw5lbrrviqwxmv6"; type = "gem"; }; - version = "0.38.0"; + version = "0.16.0"; + }; + google-apis-core = { + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19v15vkgg86k79l51gfs7fab4h7fkv8358ckmkyp33jgsx3zr17b"; + type = "gem"; + }; + version = "0.4.2"; + }; + google-apis-iamcredentials_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yibminaffzz5npq605m0vqc024dcybiw7xk5vr0jxzlsh8nxvhn"; + type = "gem"; + }; + version = "0.10.0"; + }; + google-apis-playcustomapp_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15wnkbn6kzijbyqkqrh7s6apjf5630yvf2v8zy93zk0x87n2drcd"; + type = "gem"; + }; + version = "0.7.0"; + }; + google-apis-storage_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m2f4i9bbhwz0r3pkcliv6mx29lz5vvbd623jxkdik5ls8g92grm"; + type = "gem"; + }; + version = "0.11.0"; }; google-cloud-core = { dependencies = ["google-cloud-env" "google-cloud-errors"]; @@ -308,10 +444,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qjn7vs8f85vxi1nkikbjfja6bv9snrj26vzscjii0cm8n4dy0i1"; + sha256 = "0amp8vd16pzbdrfbp7k0k38rqxpwd88bkyp35l3x719hbb6l85za"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -319,31 +455,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i"; + sha256 = "0ajc3w4wqg46ywcbmb5fz1q6gfm6g7874s9h31i1r038kz2bzfag"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; google-cloud-errors = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hvs1x39g77hbdqjxmzcl6gq8160pv3kskvzbbch0ww1np6qwm67"; + sha256 = "0nakfswnck6grjpyhckzl40qccyys3sy999h5axk0rldx96fnivd"; type = "gem"; }; - version = "1.0.1"; + version = "1.2.0"; }; google-cloud-storage = { - dependencies = ["addressable" "digest-crc" "google-api-client" "google-cloud-core" "googleauth" "mini_mime"]; + dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dy5f00jsnd6id7bkc03pl2d6c78rl3lkysdn0f90padys5id1k5"; + sha256 = "1g8nkvrpxqs9c061n2rd26waq6vwdws5siirgga1rx0n9v50chfp"; type = "gem"; }; - version = "1.29.2"; + version = "1.36.1"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -351,20 +487,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6"; + sha256 = "0bzqdvva06ydn3kzivbcfqxc5mfkz8xvazlpmp7zvkl3i5s5djr7"; type = "gem"; }; - version = "0.14.0"; + version = "1.1.1"; }; highline = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; type = "gem"; }; - version = "1.7.10"; + version = "2.0.3"; }; http-cookie = { dependencies = ["domain_name"]; @@ -372,10 +508,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; httpclient = { groups = ["default"]; @@ -392,30 +528,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + sha256 = "1gjrr5pdcl3l3skhp9d0jzs4yhmknpv3ldcz59b339b9lqbqasnr"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.0"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; type = "gem"; }; - version = "2.5.1"; + version = "2.6.1"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n"; + sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.0"; }; memoist = { groups = ["default"]; @@ -442,10 +578,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.2"; }; multi_json = { groups = ["default"]; @@ -482,20 +618,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dzqdawqr4agx7zr1fr5zxdwl8vb5rhpz57l1lk7d2y46ha6l4l7"; + sha256 = "04x1nkx6gkqzlc4phdvq05v3vjds6mgqhjqzqpcs6vdh5xyqrf59"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; + }; + optparse = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j9l5a1zszvrlggp1ldx82i4kkqx34g4g3amwp488s499w5l1cvj"; + type = "gem"; + }; + version = "0.1.1"; }; os = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; + sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.4"; }; plist = { groups = ["default"]; @@ -522,21 +668,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; type = "gem"; }; - version = "13.0.3"; + version = "13.0.6"; }; representable = { - dependencies = ["declarative" "declarative-option" "uber"]; + dependencies = ["declarative" "trailblazer-option" "uber"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07"; + sha256 = "09xwzz94ryp57wyjrqysiz1sslnxd4r4m9wayy63jb7f8qfx1kys"; type = "gem"; }; - version = "3.0.4"; + version = "3.1.1"; }; retriable = { groups = ["default"]; @@ -548,6 +694,16 @@ }; version = "3.1.2"; }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; rouge = { groups = ["default"]; platforms = []; @@ -563,20 +719,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "0.0.2"; + version = "0.0.5"; }; rubyzip = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.2"; }; security = { groups = ["default"]; @@ -594,10 +750,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10g2667fvxnc50hcd1aywgsbf8j7nrckg3n7zjvywmyz82pwmpqp"; + sha256 = "1jwyggz80xb3yi2hycmmw214c4072g8i56y0b0gsmpkiyk5d0vh1"; type = "gem"; }; - version = "0.14.0"; + version = "0.16.1"; }; simctl = { dependencies = ["CFPropertyList" "naturally"]; @@ -610,16 +766,6 @@ }; version = "1.6.8"; }; - slack-notifier = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv"; - type = "gem"; - }; - version = "2.3.2"; - }; terminal-notifier = { groups = ["default"]; platforms = []; @@ -641,6 +787,16 @@ }; version = "1.8.0"; }; + trailblazer-option = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18s48fndi2kfvrfzmq6rxvjfwad347548yby0341ixz1lhpg3r10"; + type = "gem"; + }; + version = "0.1.2"; + }; tty-cursor = { groups = ["default"]; platforms = []; @@ -698,17 +854,27 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd"; type = "gem"; }; - version = "0.0.7.7"; + version = "0.0.8"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; + type = "gem"; + }; + version = "1.8.0"; + }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; type = "gem"; }; version = "1.7.0"; @@ -724,15 +890,15 @@ version = "1.0.0"; }; xcodeproj = { - dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; + sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4"; type = "gem"; }; - version = "1.19.0"; + version = "1.21.0"; }; xcpretty = { dependencies = ["rouge"]; From 534cb85ea247e4299f56520320f9954cf2cd1c14 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Sun, 27 Feb 2022 00:25:36 +0100 Subject: [PATCH 006/120] fdroidserver: 2.0.3 -> 2.1 --- pkgs/development/tools/fdroidserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 32886038559..9bbe6164852 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -5,14 +5,14 @@ }: python.pkgs.buildPythonApplication rec { - version = "2.0.3"; + version = "2.1"; pname = "fdroidserver"; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; rev = version; - sha256 = "sha256-/tX45t/DsWd0/R9VJJsqNjoOkgGIvqvq05YaVp0pLf0="; + sha256 = "0xmmjj7f05p4q8xbbkxqns2vvk2rsvb9n43vjdv0wbydmgpa34k7"; }; postPatch = '' From 03d38f77498c155c5439dbf596409a7f9ff2c0e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Mar 2022 01:27:51 +0000 Subject: [PATCH 007/120] azure-storage-azcopy: 10.13.0 -> 10.14.0 --- pkgs/development/tools/azcopy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 27d1c866725..4e85770a7f2 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.13.0"; + version = "10.14.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-L5gfS2hwk1uaWEygn+liupdANL9qizHAjxNz25KBwaY="; + sha256 = "sha256-9NuX4BbQx/ZeWvyTxlZjrb7ETwSFwBpfDcSt8qvKAxE="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-ePEpc18Y99Moe/aj8n1+no6D70vZoIEjC023Uup98Uo="; + vendorSha256 = "sha256-9ThsJySzsyS0eX/0BlAAvtaeJpPYCP0cN1YgIShYrKw="; doCheck = false; From de0ff65232aaa38b61a0e07f120173b7d1c793c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Mar 2022 03:46:50 +0000 Subject: [PATCH 008/120] cwltool: 3.1.20220221074232 -> 3.1.20220224085855 --- pkgs/applications/science/misc/cwltool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index b3647e0f1b6..6a1bdc3de16 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20220221074232"; + version = "3.1.20220224085855"; format = "setuptools"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = version; - sha256 = "sha256-hUdwtqYHcfyJ68LzwwCXAxr7YIkJm64brb+kA/WJqU8="; + sha256 = "sha256-7+1xOV5Lodqtku0wX1urAEHsCcYKM3Vcd5RDg4DdVow="; }; postPatch = '' From 6fb7d8e67593549838da839f7435156f1fd81f31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Mar 2022 19:38:22 +0000 Subject: [PATCH 009/120] tmux-mem-cpu-load: 3.5.1 -> 3.6.0 --- pkgs/tools/misc/tmux-mem-cpu-load/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix index 45a5edd6ae5..7370a21512d 100644 --- a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix +++ b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tmux-mem-cpu-load"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "thewtex"; repo = "tmux-mem-cpu-load"; rev = "v${version}"; - sha256 = "sha256-4ZMF+RacZL9dJRCz63XPNuigTKHOW+ZcA4vB4jsnASc="; + sha256 = "sha256-1smhlp30y0qihm+d9RcCKY1CFbPm5gzago+OIQQT5jE="; }; nativeBuildInputs = [ cmake ]; From a9aa5ccb3a01ee8d04c5e8f5b9693c8b2539d38c Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 16 Mar 2022 15:48:50 +0800 Subject: [PATCH 010/120] taskwarrior: 2.6.1 -> 2.6.2 --- pkgs/applications/misc/taskwarrior/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 8290a868ef0..5a12380a4ff 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "taskwarrior"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "taskwarrior"; rev = "v${version}"; - sha256 = "sha256-jMZzo2cegoapEHTvfD6ThU1IsXru3iOcpyDbZxkSXzQ="; + sha256 = "sha256-0YveqiylXJi4cdDCfnPtwCVOJbQrZYsxnXES+9B4Yfw="; fetchSubmodules = true; }; From 729988f5c66734bab710b691b778929eb86a4b1e Mon Sep 17 00:00:00 2001 From: Abraham Chan Date: Wed, 16 Mar 2022 23:00:28 +1100 Subject: [PATCH 011/120] elasticsearch7: add darwin-aarch64 --- pkgs/servers/search/elasticsearch/7.x.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 592cc947a42..83c169eb25e 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -18,9 +18,10 @@ let plat = elemAt info 1; shas = { - x86_64-linux = "1s16l95wc589cr69pfbgmkn9rkvxn6sd6jlbiqpm6p6iyxiaxd6c"; - x86_64-darwin = "05h7pvq4pb816wgcymnfklp3w6sv54x6138v2infw5219dnk8pfs"; - aarch64-linux = "0q4xnjzhlx1b2lkikca88qh9glfxaifsm419k2bxxlrfrx31zlkq"; + x86_64-linux = "1s16l95wc589cr69pfbgmkn9rkvxn6sd6jlbiqpm6p6iyxiaxd6c"; + x86_64-darwin = "05h7pvq4pb816wgcymnfklp3w6sv54x6138v2infw5219dnk8pfs"; + aarch64-linux = "0q4xnjzhlx1b2lkikca88qh9glfxaifsm419k2bxxlrfrx31zlkq"; + aarch64-darwin = "067mb1dianwiarw8cz1va4g6zfhp9ls4s174xbpkxwsknvvyhgz6"; }; in stdenv.mkDerivation rec { @@ -44,7 +45,8 @@ stdenv.mkDerivation rec { "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" ''; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook; buildInputs = [ jre_headless util-linux zlib ]; From 1075b17c83b0557c20dc6ffe4824c979d163c0d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 17:17:02 +0000 Subject: [PATCH 012/120] lasso: 2.7.0 -> 2.8.0 --- pkgs/development/libraries/lasso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index e5503169fd5..74b03006f25 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "lasso"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz"; - sha256 = "138x8pmj4k1pbah32z14rd8ylyx4lgz70s93m39vd17f8sjz50lj"; + sha256 = "sha256-/8vVhR2YWGx+HK9DutZhZCEaO2HRK/hgoFmESP+fKzg="; }; From d2efc3ef70401636ca117b9a4025c0ce2121f0a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 17 Mar 2022 04:04:10 +0100 Subject: [PATCH 013/120] nixos/networkmanager: Allow overriding installed plug-ins Now, one can just use `networking.networkmanager.plugins = lib.mkForce [];` if they want to get rid of the plug-ins. Co-authored-by: lassulus --- .../services/networking/networkmanager.nix | 106 +++++++++--------- .../networkmanager/fortisslvpn/default.nix | 1 + .../networkmanager/iodine/default.nix | 1 + .../networkmanager/l2tp/default.nix | 4 + .../networkmanager/openconnect/default.nix | 1 + .../networkmanager/openvpn/default.nix | 1 + .../networkmanager/sstp/default.nix | 1 + .../networkmanager/strongswan/default.nix | 4 + .../networkmanager/vpnc/default.nix | 1 + 9 files changed, 69 insertions(+), 51 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 7a9d9e5428a..2b3577eb92c 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -5,18 +5,6 @@ with lib; let cfg = config.networking.networkmanager; - basePackages = with pkgs; [ - modemmanager - networkmanager - networkmanager-fortisslvpn - networkmanager-iodine - networkmanager-l2tp - networkmanager-openconnect - networkmanager-openvpn - networkmanager-vpnc - networkmanager-sstp - ] ++ optional (!delegateWireless && !enableIwd) wpa_supplicant; - delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != []; enableIwd = cfg.wifi.backend == "iwd"; @@ -145,6 +133,15 @@ let ''; }; + packages = [ + pkgs.modemmanager + pkgs.networkmanager + ] + ++ cfg.plugins + ++ lib.optionals (!delegateWireless && !enableIwd) [ + pkgs.wpa_supplicant + ]; + in { meta = { @@ -227,13 +224,29 @@ in { ''; }; - packages = mkOption { - type = types.listOf types.package; + plugins = mkOption { + type = + let + networkManagerPluginPackage = types.package // { + description = "NetworkManager plug-in"; + check = + p: + lib.assertMsg + (types.package.check p + && p ? networkManagerPlugin + && lib.isString p.networkManagerPlugin) + '' + Package ‘${p.name}’, is not a NetworkManager plug-in. + Those need to have a ‘networkManagerPlugin’ attribute. + ''; + }; + in + types.listOf networkManagerPluginPackage; default = [ ]; description = '' - Extra packages that provide NetworkManager plugins. + List of NetworkManager plug-ins to enable. + Some plug-ins are enabled by the NetworkManager module by default. ''; - apply = list: basePackages ++ list; }; dhcp = mkOption { @@ -380,7 +393,7 @@ in { If you enable this option the networkmanager_strongswan plugin will be added to - the option + the option so you don't need to to that yourself. ''; }; @@ -399,6 +412,9 @@ in { }; imports = [ + (mkRenamedOptionModule + [ "networking" "networkmanager" "packages" ] + [ "networking" "networkmanager" "plugins" ]) (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ]) (mkRemovedOptionModule ["networking" "networkmanager" "dynamicHosts"] '' This option was removed because allowing (multiple) regular users to @@ -426,31 +442,12 @@ in { hardware.wirelessRegulatoryDatabase = true; - environment.etc = with pkgs; { - "NetworkManager/NetworkManager.conf".source = configFile; - - "NetworkManager/VPN/nm-openvpn-service.name".source = - "${networkmanager-openvpn}/lib/NetworkManager/VPN/nm-openvpn-service.name"; - - "NetworkManager/VPN/nm-vpnc-service.name".source = - "${networkmanager-vpnc}/lib/NetworkManager/VPN/nm-vpnc-service.name"; - - "NetworkManager/VPN/nm-openconnect-service.name".source = - "${networkmanager-openconnect}/lib/NetworkManager/VPN/nm-openconnect-service.name"; - - "NetworkManager/VPN/nm-fortisslvpn-service.name".source = - "${networkmanager-fortisslvpn}/lib/NetworkManager/VPN/nm-fortisslvpn-service.name"; - - "NetworkManager/VPN/nm-l2tp-service.name".source = - "${networkmanager-l2tp}/lib/NetworkManager/VPN/nm-l2tp-service.name"; - - "NetworkManager/VPN/nm-iodine-service.name".source = - "${networkmanager-iodine}/lib/NetworkManager/VPN/nm-iodine-service.name"; - - "NetworkManager/VPN/nm-sstp-service.name".source = - "${networkmanager-sstp}/lib/NetworkManager/VPN/nm-sstp-service.name"; - + environment.etc = { + "NetworkManager/NetworkManager.conf".source = configFile; } + // builtins.listToAttrs (map (pkg: nameValuePair "NetworkManager/${pkg.networkManagerPlugin}" { + source = "${pkg}/lib/NetworkManager/${pkg.networkManagerPlugin}"; + }) cfg.plugins) // optionalAttrs cfg.enableFccUnlock { "ModemManager/fcc-unlock.d".source = @@ -460,18 +457,13 @@ in { { "NetworkManager/dispatcher.d/02overridedns".source = overrideNameserversScript; } - // optionalAttrs cfg.enableStrongSwan - { - "NetworkManager/VPN/nm-strongswan-service.name".source = - "${pkgs.networkmanager_strongswan}/lib/NetworkManager/VPN/nm-strongswan-service.name"; - } // listToAttrs (lib.imap1 (i: s: { name = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}"; value = { mode = "0544"; inherit (s) source; }; }) cfg.dispatcherScripts); - environment.systemPackages = cfg.packages; + environment.systemPackages = packages; users.groups = { networkmanager.gid = config.ids.gids.networkmanager; @@ -490,7 +482,7 @@ in { }; }; - systemd.packages = cfg.packages; + systemd.packages = packages; systemd.tmpfiles.rules = [ "d /etc/NetworkManager/system-connections 0700 root root -" @@ -534,8 +526,20 @@ in { useDHCP = false; }) + { + networkmanager.plugins = with pkgs; [ + networkmanager-fortisslvpn + networkmanager-iodine + networkmanager-l2tp + networkmanager-openconnect + networkmanager-openvpn + networkmanager-vpnc + networkmanager-sstp + ]; + } + (mkIf cfg.enableStrongSwan { - networkmanager.packages = [ pkgs.networkmanager_strongswan ]; + networkmanager.plugins = [ pkgs.networkmanager_strongswan ]; }) (mkIf enableIwd { @@ -559,10 +563,10 @@ in { security.polkit.enable = true; security.polkit.extraConfig = polkitConf; - services.dbus.packages = cfg.packages + services.dbus.packages = packages ++ optional cfg.enableStrongSwan pkgs.strongswanNM ++ optional (cfg.dns == "dnsmasq") pkgs.dnsmasq; - services.udev.packages = cfg.packages; + services.udev.packages = packages; }; } diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix index f97bac13cf7..da30fc6cbe1 100644 --- a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { attrPath = "networkmanager-fortisslvpn"; versionPolicy = "odd-unstable"; }; + networkManagerPlugin = "VPN/nm-fortisslvpn-service.name"; }; meta = with lib; { diff --git a/pkgs/tools/networking/networkmanager/iodine/default.nix b/pkgs/tools/networking/networkmanager/iodine/default.nix index e56d9411b39..8c8d0dd6a32 100644 --- a/pkgs/tools/networking/networkmanager/iodine/default.nix +++ b/pkgs/tools/networking/networkmanager/iodine/default.nix @@ -48,6 +48,7 @@ in stdenv.mkDerivation { packageName = pname; attrPath = "networkmanager-iodine"; }; + networkManagerPlugin = "VPN/nm-iodine-service.name"; }; meta = with lib; { diff --git a/pkgs/tools/networking/networkmanager/l2tp/default.nix b/pkgs/tools/networking/networkmanager/l2tp/default.nix index 5f00c1fa9d8..88ccad59bd1 100644 --- a/pkgs/tools/networking/networkmanager/l2tp/default.nix +++ b/pkgs/tools/networking/networkmanager/l2tp/default.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + networkManagerPlugin = "VPN/nm-l2tp-service.name"; + }; + meta = with lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; diff --git a/pkgs/tools/networking/networkmanager/openconnect/default.nix b/pkgs/tools/networking/networkmanager/openconnect/default.nix index c03a698514a..fec313e820b 100644 --- a/pkgs/tools/networking/networkmanager/openconnect/default.nix +++ b/pkgs/tools/networking/networkmanager/openconnect/default.nix @@ -71,6 +71,7 @@ in stdenv.mkDerivation { attrPath = "networkmanager-openconnect"; versionPolicy = "odd-unstable"; }; + networkManagerPlugin = "VPN/nm-openconnect-service.name"; }; meta = with lib; { diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index 20a90fffed2..d2cc69a5c5e 100644 --- a/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -36,6 +36,7 @@ in stdenv.mkDerivation { attrPath = "networkmanager-openvpn"; versionPolicy = "odd-unstable"; }; + networkManagerPlugin = "VPN/nm-openvpn-service.name"; }; meta = with lib; { diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix index f4866234438..8b75db6495f 100644 --- a/pkgs/tools/networking/networkmanager/sstp/default.nix +++ b/pkgs/tools/networking/networkmanager/sstp/default.nix @@ -54,6 +54,7 @@ in stdenv.mkDerivation { packageName = pname; attrPath = "networkmanager-sstp"; }; + networkManagerPlugin = "VPN/nm-sstp-service.name"; }; meta = with lib; { diff --git a/pkgs/tools/networking/networkmanager/strongswan/default.nix b/pkgs/tools/networking/networkmanager/strongswan/default.nix index cebcec35a31..be0dcf234ff 100644 --- a/pkgs/tools/networking/networkmanager/strongswan/default.nix +++ b/pkgs/tools/networking/networkmanager/strongswan/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { "--with-nm-plugindir=$(out)/lib/NetworkManager" ]; + passthru = { + networkManagerPlugin = "VPN/nm-strongswan-service.name"; + }; + PKG_CONFIG_LIBNM_VPNSERVICEDIR = "$(out)/lib/NetworkManager/VPN"; meta = with lib; { diff --git a/pkgs/tools/networking/networkmanager/vpnc/default.nix b/pkgs/tools/networking/networkmanager/vpnc/default.nix index 70e7104696e..a094e427188 100644 --- a/pkgs/tools/networking/networkmanager/vpnc/default.nix +++ b/pkgs/tools/networking/networkmanager/vpnc/default.nix @@ -40,6 +40,7 @@ in stdenv.mkDerivation { attrPath = "networkmanager-vpnc"; versionPolicy = "odd-unstable"; }; + networkManagerPlugin = "VPN/nm-vpnc-service.name"; }; meta = with lib; { From 6cfaf0a464edc98cf9f00258d20791905c5ebf2f Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 18 Mar 2022 10:03:50 -0500 Subject: [PATCH 014/120] eggnog-mapper: 1.0.3 -> 2.1.7 https://github.com/eggnogdb/eggnog-mapper/releases --- .../science/biology/eggnog-mapper/default.nix | 46 ++++++++++++------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index b42fed8da28..44caca2fa2c 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -1,29 +1,43 @@ -{ lib, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }: +{ lib +, autoPatchelfHook +, fetchFromGitHub +, python3Packages +, wget +, zlib +}: -python27Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "eggnog-mapper"; - version = "1.0.3"; + version = "2.1.7"; src = fetchFromGitHub { owner = "eggnogdb"; - repo = "eggnog-mapper"; + repo = pname; rev = version; - sha256 = "1aaaflppy84bhkh2hb5gnzm4xgrz0rz0cgfpadr9w8cva8p0sqdv"; + hash = "sha256-auVD/r8m3TAB1KYMQ7Sae23eDg6LRx/daae0505cjwU="; }; - patches = (fetchpatch { - url = "https://github.com/eggnogdb/eggnog-mapper/commit/6972f601ade85b65090efca747d2302acb58507f.patch"; - sha256 = "0abnmn0bh11jihf5d3cggiild1ykawzv5f5fhb4cyyi8fvy4hcxf"; - }); + postPatch = '' + # Not a great solution... + substituteInPlace setup.cfg \ + --replace "==" ">=" + ''; - nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ python27Packages.biopython wget diamond hmmer ]; + nativeBuildInputs = [ + autoPatchelfHook + ]; - # make emapper find diamond & hmmer - makeWrapperArgs = [ - ''--prefix PATH ':' "${diamond}/bin"'' - ''--prefix PATH ':' "${hmmer}/bin"'' - ]; + buildInputs = [ + zlib + ]; + + propagatedBuildInputs = [ + wget + ] ++ (with python3Packages; [ + biopython + psutil + XlsxWriter + ]); # Tests rely on some of the databases being available, which is not bundled # with this package as (1) in total, they represent >100GB of data, and (2) From f244256dfbcf2b242948761998d02118d51a7721 Mon Sep 17 00:00:00 2001 From: tgunnoe Date: Sun, 20 Mar 2022 19:53:03 -0400 Subject: [PATCH 015/120] openjk: 2020-07-03 -> unstable-2022-01-30 --- pkgs/games/openjk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index d2844809eea..7c69c9035a9 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -21,13 +21,13 @@ let }; in stdenv.mkDerivation { pname = "OpenJK"; - version = "2020-07-03"; + version = "unstable-2022-01-30"; src = fetchFromGitHub { owner = "JACoders"; repo = "OpenJK"; - rev = "0a336ce4dffe6505e3f754b59732402a1db95752"; - sha256 = "1xagbz42hi3ivs208mnay2dbgh90pmwwbar2p1yfhj3zl3cghcs8"; + rev = "235fb9e1a9c4537a603b2e54e444327d20d198a3"; + sha256 = "sha256-DqP6wnu5sE7lQJGEdsEPOc6FIaJjqxt5ANKZ5eiabC4="; }; dontAddPrefix = true; From c3612bf87cb3263976ffed40455866ba70ee51dc Mon Sep 17 00:00:00 2001 From: tgunnoe Date: Sun, 20 Mar 2022 20:04:44 -0400 Subject: [PATCH 016/120] openjk: add Jedi Outcast and split up into outputs --- pkgs/games/openjk/default.nix | 44 ++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index 7c69c9035a9..ffcbb6dca3f 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -19,6 +19,15 @@ let genericName = "Jedi Academy"; categories = [ "Game" ]; }; + josp = makeDesktopItem rec { + name = "josp"; + exec = name; + icon = "OpenJK_Icon_128"; + comment = "Open Source Jedi Outcast game released by Raven Software"; + desktopName = "Jedi Outcast (Single Player)"; + genericName = "Jedi Outcast"; + categories = [ "Game" ]; + }; in stdenv.mkDerivation { pname = "OpenJK"; version = "unstable-2022-01-30"; @@ -35,22 +44,39 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper cmake ]; buildInputs = [ libjpeg zlib libpng libGL SDL2 ]; + outputs = [ "out" "openjo" "openja" ]; + # move from $out/JediAcademy to $out/opt/JediAcademy preConfigure = '' cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$out/opt") ''; + cmakeFlags = ["-DBuildJK2SPEngine:BOOL=ON" + "-DBuildJK2SPGame:BOOL=ON" + "-DBuildJK2SPRdVanilla:BOOL=ON"]; postInstall = '' - mkdir -p $out/bin $out/share/applications $out/share/icons/hicolor/128x128/apps - prefix=$out/opt/JediAcademy + mkdir -p $out/bin $openja/bin $openjo/bin + mkdir -p $openja/share/applications $openjo/share/applications + mkdir -p $openja/share/icons/hicolor/128x128/apps $openjo/share/icons/hicolor/128x128/apps + mkdir -p $openja/opt $openjo/opt + mv $out/opt/JediAcademy $openja/opt/ + mv $out/opt/JediOutcast $openjo/opt/ + jaPrefix=$openja/opt/JediAcademy + joPrefix=$openjo/opt/JediOutcast - makeWrapper $prefix/openjk.* $out/bin/jamp --run "cd $prefix" - makeWrapper $prefix/openjk_sp.* $out/bin/jasp --run "cd $prefix" - makeWrapper $prefix/openjkded.* $out/bin/openjkded --run "cd $prefix" + makeWrapper $jaPrefix/openjk.* $openja/bin/jamp --run "cd $jaPrefix" + makeWrapper $jaPrefix/openjk_sp.* $openja/bin/jasp --run "cd $jaPrefix" + makeWrapper $jaPrefix/openjkded.* $openja/bin/openjkded --run "cd $jaPrefix" + makeWrapper $joPrefix/openjo_sp.* $openjo/bin/josp --run "cd $joPrefix" - cp $src/shared/icons/OpenJK_Icon_128.png $out/share/icons/hicolor/128x128/apps - ln -s ${jamp}/share/applications/* $out/share/applications - ln -s ${jasp}/share/applications/* $out/share/applications + cp $src/shared/icons/OpenJK_Icon_128.png $openjo/share/icons/hicolor/128x128/apps + cp $src/shared/icons/OpenJK_Icon_128.png $openja/share/icons/hicolor/128x128/apps + ln -s ${jamp}/share/applications/* $openja/share/applications + ln -s ${jasp}/share/applications/* $openja/share/applications + ln -s ${josp}/share/applications/* $openjo/share/applications + ln -s $openja/bin/* $out/bin + ln -s $openjo/bin/* $out/bin + rm -rf $out/opt ''; meta = with lib; { @@ -58,6 +84,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/JACoders/OpenJK"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ tgunnoe ]; }; } From 99984987a8c570a0beb26400efe3c7ed2628edc0 Mon Sep 17 00:00:00 2001 From: Anatolii Prylutskyi Date: Sun, 27 Mar 2022 13:23:04 +0300 Subject: [PATCH 017/120] dragon-drop: remove duplicate package Removing package because it is duplicate package of "xdragon". --- pkgs/tools/X11/dragon-drop/default.nix | 28 -------------------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/tools/X11/dragon-drop/default.nix diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix deleted file mode 100644 index adf43ae8c08..00000000000 --- a/pkgs/tools/X11/dragon-drop/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, gtk, pkg-config, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "dragon-drop"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "mwh"; - repo = "dragon"; - rev = "v${version}"; - sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk ]; - - installPhase = '' - install -D dragon -t $out/bin - ''; - - meta = with lib; { - description = "Simple drag-and-drop source/sink for X"; - homepage = "https://github.com/mwh/dragon"; - maintainers = with maintainers; [ jb55 markus1189 ]; - license = licenses.gpl3; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69e0f05c77b..b29994d3a57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2982,9 +2982,7 @@ with pkgs; dpic = callPackage ../tools/graphics/dpic { }; - dragon-drop = callPackage ../tools/X11/dragon-drop { - gtk = gtk3; - }; + dragon-drop = throw "'dragon-drop' has been renamed to/replaced by 'xdragon'"; # Converted to throw 2022-03-27; dstp = callPackage ../development/tools/dstp { }; From 7ee72e55974beb5a8aaf7ad283f120e0287df0c2 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Tue, 15 Mar 2022 21:52:27 +0200 Subject: [PATCH 018/120] rootlesskit: 0.11.1 -> 1.0.0 --- .../tools/virtualization/rootlesskit/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index 61da0d86e33..d40eb2e07ae 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -1,15 +1,21 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nix-update-script, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "rootlesskit"; - version = "0.11.1"; - goPackagePath = "github.com/rootless-containers/rootlesskit"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - sha256 = "15k0503077ang9ywvmhpr1l7ax0v3wla0x8n6lqpmd71w0j2zm5r"; + hash = "sha256-Tml6zTc9l3O8qB+NSKlClWl5lj1rkiDHwI5exxBL83A="; + }; + + vendorSha256 = "sha256-CpDPa1LAinvXCnVYbn9ZXuEjyHHlDU4bzZ2R+ctoCzQ="; + + passthru = { + updateScript = nix-update-script { attrPath = pname; }; + tests = nixosTests.docker-rootless; }; meta = with lib; { From f105227fc6486633c4c55f72c4e1b6932c5ffa19 Mon Sep 17 00:00:00 2001 From: Bryan Hyshka Date: Mon, 28 Mar 2022 21:06:29 +0000 Subject: [PATCH 019/120] psitransfer: pin to nodejs-14_x to unbreak the build --- pkgs/servers/psitransfer/default.nix | 5 +- pkgs/servers/psitransfer/node-packages.nix | 347 ++++++++++----------- 2 files changed, 162 insertions(+), 190 deletions(-) diff --git a/pkgs/servers/psitransfer/default.nix b/pkgs/servers/psitransfer/default.nix index d1d1e13d1b8..791f656eeba 100644 --- a/pkgs/servers/psitransfer/default.nix +++ b/pkgs/servers/psitransfer/default.nix @@ -7,11 +7,14 @@ { stdenv , pkgs , lib -, nodejs +, nodejs-14_x , fetchzip }: let + # nodejs-16_x fails with ENOTCACHED + nodejs = nodejs-14_x; + nodePackages = import ./node-composition.nix { inherit pkgs nodejs; inherit (stdenv.hostPlatform) system; diff --git a/pkgs/servers/psitransfer/node-packages.nix b/pkgs/servers/psitransfer/node-packages.nix index 7453a4ff1b8..126fe854b28 100644 --- a/pkgs/servers/psitransfer/node-packages.nix +++ b/pkgs/servers/psitransfer/node-packages.nix @@ -4,40 +4,40 @@ let sources = { - "@babel/helper-validator-identifier-7.15.7" = { + "@babel/helper-validator-identifier-7.16.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.15.7"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; - sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; + sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; }; }; - "@babel/parser-7.16.4" = { + "@babel/parser-7.17.8" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.16.4"; + version = "7.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz"; - sha512 = "6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz"; + sha512 = "BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ=="; }; }; - "@babel/types-7.16.0" = { + "@babel/types-7.17.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.16.0"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz"; - sha512 = "PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz"; + sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; }; }; - "accepts-1.3.7" = { + "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; + sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; "acorn-7.4.1" = { @@ -103,13 +103,13 @@ let sha512 = "TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw=="; }; }; - "async-3.2.2" = { + "async-3.2.3" = { name = "async"; packageName = "async"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.2.tgz"; - sha512 = "H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g=="; + url = "https://registry.npmjs.org/async/-/async-3.2.3.tgz"; + sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; }; }; "axios-0.21.4" = { @@ -166,13 +166,13 @@ let sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; }; - "body-parser-1.19.0" = { + "body-parser-1.19.2" = { name = "body-parser"; packageName = "body-parser"; - version = "1.19.0"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"; + sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; }; }; "brace-expansion-1.1.11" = { @@ -211,13 +211,13 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; - "bytes-3.1.0" = { + "bytes-3.1.2" = { name = "bytes"; packageName = "bytes"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; - sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"; + sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; }; "call-bind-1.0.2" = { @@ -292,13 +292,13 @@ let sha512 = "vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw=="; }; }; - "content-disposition-0.5.3" = { + "content-disposition-0.5.4" = { name = "content-disposition"; packageName = "content-disposition"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; - sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"; + sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; }; "content-type-1.0.4" = { @@ -310,13 +310,13 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "cookie-0.4.0" = { + "cookie-0.4.2" = { name = "cookie"; packageName = "cookie"; - version = "0.4.0"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; - sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; + sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; }; }; "cookie-signature-1.0.6" = { @@ -391,13 +391,13 @@ let sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; }; }; - "debug-4.3.3" = { + "debug-4.3.4" = { name = "debug"; packageName = "debug"; - version = "4.3.3"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"; - sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; }; "depd-1.1.2" = { @@ -481,13 +481,13 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "express-4.17.1" = { + "express-4.17.3" = { name = "express"; packageName = "express"; - version = "4.17.1"; + version = "4.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; - sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz"; + sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; }; }; "finalhandler-1.1.2" = { @@ -499,13 +499,13 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; - "follow-redirects-1.14.5" = { + "follow-redirects-1.14.9" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.5"; + version = "1.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz"; - sha512 = "wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz"; + sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; }; }; "forwarded-0.2.0" = { @@ -589,13 +589,13 @@ let sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; }; - "graceful-fs-4.2.8" = { + "graceful-fs-4.2.9" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.8"; + version = "4.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; }; }; "has-1.0.3" = { @@ -607,13 +607,13 @@ let sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; - "has-symbols-1.0.2" = { + "has-symbols-1.0.3" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; }; "has-tostringtag-1.0.0" = { @@ -625,24 +625,6 @@ let sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; }; }; - "http-errors-1.7.2" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; - sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; - }; - }; - "http-errors-1.7.3" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"; - sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; - }; - }; "http-errors-1.8.1" = { name = "http-errors"; packageName = "http-errors"; @@ -679,15 +661,6 @@ let sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; }; }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; "inherits-2.0.4" = { name = "inherits"; packageName = "inherits"; @@ -706,13 +679,13 @@ let sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; - "is-core-module-2.8.0" = { + "is-core-module-2.8.1" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz"; - sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"; + sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; }; }; "is-expression-4.0.0" = { @@ -886,31 +859,31 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.51.0" = { + "mime-db-1.52.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.51.0"; + version = "1.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; - sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; }; }; - "mime-types-2.1.34" = { + "mime-types-2.1.35" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.34"; + version = "2.1.35"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; - sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; + sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; }; }; - "minimatch-3.0.4" = { + "minimatch-3.1.2" = { name = "minimatch"; packageName = "minimatch"; - version = "3.0.4"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; "morgan-1.10.0" = { @@ -931,15 +904,6 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; - "ms-2.1.1" = { - name = "ms"; - packageName = "ms"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; - }; - }; "ms-2.1.2" = { name = "ms"; packageName = "ms"; @@ -949,6 +913,15 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; + "ms-2.1.3" = { + name = "ms"; + packageName = "ms"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + }; "mz-2.7.0" = { name = "mz"; packageName = "mz"; @@ -958,13 +931,13 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "negotiator-0.6.2" = { + "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; }; }; "normalize-path-3.0.0" = { @@ -1183,13 +1156,13 @@ let sha512 = "yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ=="; }; }; - "qs-6.7.0" = { + "qs-6.9.7" = { name = "qs"; packageName = "qs"; - version = "6.7.0"; + version = "6.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; - sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz"; + sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; }; }; "range-parser-1.2.1" = { @@ -1201,13 +1174,13 @@ let sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; - "raw-body-2.4.0" = { + "raw-body-2.4.3" = { name = "raw-body"; packageName = "raw-body"; - version = "2.4.0"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; - sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz"; + sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; }; }; "readable-stream-2.3.7" = { @@ -1228,13 +1201,13 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; - "resolve-1.20.0" = { + "resolve-1.22.0" = { name = "resolve"; packageName = "resolve"; - version = "1.20.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; - sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; + sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; }; }; "safe-buffer-5.1.2" = { @@ -1246,6 +1219,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-buffer-5.2.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -1255,31 +1237,22 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "send-0.17.1" = { + "send-0.17.2" = { name = "send"; packageName = "send"; - version = "0.17.1"; + version = "0.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; - sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz"; + sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; }; }; - "serve-static-1.14.1" = { + "serve-static-1.14.2" = { name = "serve-static"; packageName = "serve-static"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; - sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; - }; - }; - "setprototypeof-1.1.1" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz"; + sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; }; }; "setprototypeof-1.2.0" = { @@ -1309,6 +1282,15 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; + "supports-preserve-symlinks-flag-1.0.0" = { + name = "supports-preserve-symlinks-flag"; + packageName = "supports-preserve-symlinks-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; + }; + }; "tar-stream-2.2.0" = { name = "tar-stream"; packageName = "tar-stream"; @@ -1354,15 +1336,6 @@ let sha1 = "82445234ff5edc4c00ad4211aa59f96f12354f84"; }; }; - "toidentifier-1.0.0" = { - name = "toidentifier"; - packageName = "toidentifier"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; - sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; - }; - }; "toidentifier-1.0.1" = { name = "toidentifier"; packageName = "toidentifier"; @@ -1484,10 +1457,10 @@ in sha256 = "2421deb23c075381476ff3bd3216ac26610a2b403b02e82d47ac214cb4f8dbe2"; }; dependencies = [ - sources."@babel/helper-validator-identifier-7.15.7" - sources."@babel/parser-7.16.4" - sources."@babel/types-7.16.0" - sources."accepts-1.3.7" + sources."@babel/helper-validator-identifier-7.16.7" + sources."@babel/parser-7.17.8" + sources."@babel/types-7.17.0" + sources."accepts-1.3.8" sources."acorn-7.4.1" sources."any-promise-1.3.0" sources."archiver-4.0.2" @@ -1499,19 +1472,17 @@ in sources."array-flatten-1.1.1" sources."asap-2.0.6" sources."assert-never-1.2.1" - sources."async-3.2.2" + sources."async-3.2.3" sources."axios-0.21.4" sources."babel-walk-3.0.0-canary-5" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."basic-auth-2.0.1" sources."bl-4.1.0" - (sources."body-parser-1.19.0" // { + (sources."body-parser-1.19.2" // { dependencies = [ - sources."bytes-3.1.0" + sources."bytes-3.1.2" sources."debug-2.6.9" - sources."http-errors-1.7.2" - sources."inherits-2.0.3" ]; }) sources."brace-expansion-1.1.11" @@ -1534,16 +1505,20 @@ in }) sources."concat-map-0.0.1" sources."constantinople-4.0.1" - sources."content-disposition-0.5.3" + (sources."content-disposition-0.5.4" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) sources."content-type-1.0.4" - sources."cookie-0.4.0" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."crc-3.8.0" sources."crc32-stream-3.0.1" sources."crypto-js-4.1.1" - (sources."debug-4.3.3" // { + (sources."debug-4.3.4" // { dependencies = [ sources."ms-2.1.2" ]; @@ -1556,9 +1531,10 @@ in sources."end-of-stream-1.4.4" sources."escape-html-1.0.3" sources."etag-1.8.1" - (sources."express-4.17.1" // { + (sources."express-4.17.3" // { dependencies = [ sources."debug-2.6.9" + sources."safe-buffer-5.2.1" ]; }) (sources."finalhandler-1.1.2" // { @@ -1566,7 +1542,7 @@ in sources."debug-2.6.9" ]; }) - sources."follow-redirects-1.14.5" + sources."follow-redirects-1.14.9" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-constants-1.0.0" @@ -1576,22 +1552,17 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."glob-7.2.0" - sources."graceful-fs-4.2.8" + sources."graceful-fs-4.2.9" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - (sources."http-errors-1.8.1" // { - dependencies = [ - sources."setprototypeof-1.2.0" - sources."toidentifier-1.0.1" - ]; - }) + sources."http-errors-1.8.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ipaddr.js-1.9.1" - sources."is-core-module-2.8.0" + sources."is-core-module-2.8.1" sources."is-expression-4.0.0" sources."is-promise-2.2.2" sources."is-regex-1.1.4" @@ -1619,9 +1590,9 @@ in }) sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" (sources."morgan-1.10.0" // { dependencies = [ sources."debug-2.6.9" @@ -1630,7 +1601,7 @@ in }) sources."ms-2.0.0" sources."mz-2.7.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" @@ -1655,40 +1626,38 @@ in sources."pug-runtime-3.0.1" sources."pug-strip-comments-2.0.0" sources."pug-walk-2.0.0" - sources."qs-6.7.0" + sources."qs-6.9.7" sources."range-parser-1.2.1" - (sources."raw-body-2.4.0" // { + (sources."raw-body-2.4.3" // { dependencies = [ - sources."bytes-3.1.0" - sources."http-errors-1.7.2" - sources."inherits-2.0.3" + sources."bytes-3.1.2" ]; }) sources."readable-stream-3.6.0" - sources."resolve-1.20.0" + sources."resolve-1.22.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - (sources."send-0.17.1" // { + (sources."send-0.17.2" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ sources."ms-2.0.0" ]; }) - sources."http-errors-1.7.3" - sources."ms-2.1.1" + sources."ms-2.1.3" ]; }) - sources."serve-static-1.14.1" - sources."setprototypeof-1.1.1" + sources."serve-static-1.14.2" + sources."setprototypeof-1.2.0" sources."statuses-1.5.0" sources."string_decoder-1.1.1" + sources."supports-preserve-symlinks-flag-1.0.0" sources."tar-stream-2.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-fast-properties-2.0.0" sources."to-object-reducer-1.0.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."token-stream-1.0.0" sources."type-is-1.6.18" sources."unpipe-1.0.0" From 9f6472500ab4ef94ea3c878ff16253520ef338ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Mar 2022 00:57:38 +0200 Subject: [PATCH 020/120] xdg-utils: switch to fetchFromGitLab --- pkgs/tools/X11/xdg-utils/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index f10510051ed..dc079809273 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub +{ lib, stdenv, fetchFromGitLab, fetchFromGitHub , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto , w3m, gnugrep, gnused, coreutils, xset, perlPackages , mimiSupport ? false, gawk ? null }: @@ -24,8 +24,10 @@ stdenv.mkDerivation rec { pname = "xdg-utils"; version = "unstable-2020-10-21"; - src = fetchgit { - url = "https://gitlab.freedesktop.org/xdg/${pname}.git"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "xdg"; + repo = "xdg-utils"; rev = "d11b33ec7f24cfb1546f6b459611d440013bdc72"; sha256 = "sha256-8PtXfI8hRneEpnUvIV3M+6ACjlkx0w/NEiJFdGbbHnQ="; }; From e3833894287e947919437a1ffeef9da52e9a5bbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Mar 2022 01:01:47 +0200 Subject: [PATCH 021/120] xdg-utils: remove `? null` from inputs --- pkgs/tools/X11/xdg-utils/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index dc079809273..7d01ee59b3e 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,9 +1,7 @@ { lib, stdenv, fetchFromGitLab, fetchFromGitHub , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto , w3m, gnugrep, gnused, coreutils, xset, perlPackages -, mimiSupport ? false, gawk ? null }: - -assert mimiSupport -> gawk != null; +, mimiSupport ? false, gawk }: let # A much better xdg-open From 9416b239fd1bd73f60a7506de1f2cda87d218046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Mar 2022 02:09:31 +0200 Subject: [PATCH 022/120] go-migrate: enable all db backends --- pkgs/development/tools/go-migrate/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix index ed2d508017a..2b7b70e36c4 100644 --- a/pkgs/development/tools/go-migrate/default.nix +++ b/pkgs/development/tools/go-migrate/default.nix @@ -15,11 +15,13 @@ buildGoModule rec { subPackages = [ "cmd/migrate" ]; + tags = [ "postgres" "mysql" "redshift" "cassandra" "spanner" "cockroachdb" "clickhouse" "mongodb" "sqlserver" "firebird" "neo4j" "pgx" ]; + meta = with lib; { - homepage = "https://github.com/golang-migrate/migrate"; + homepage = "https://github.com/golang-migrate/migrate"; description = "Database migrations. CLI and Golang library"; maintainers = with maintainers; [ offline ]; - license = licenses.mit; + license = licenses.mit; mainProgram = "migrate"; }; } From 7579d10e76374a240ecf4eae285ef7436372d554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Mar 2022 12:07:55 +0200 Subject: [PATCH 023/120] openntpd: patch in correct phase, update homepage --- pkgs/tools/networking/openntpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index e6703c748fc..e1497ab0852 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0ijsylc7a4jlpxsqa0jq1w1c7333id8pcakzl7a5749ria1xp0l5"; }; - prePatch = '' + postPatch = '' sed -i '20i#include ' src/ntpd.h sed -i '19i#include ' src/log.c ''; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://www.openntpd.org/"; + homepage = "https://www.openntpd.org/"; license = licenses.bsd3; description = "OpenBSD NTP daemon (Debian port)"; platforms = platforms.all; From 1b89d0a9cbc1e6feffe6c0d3dc976e50cc4603f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Mar 2022 15:38:43 +0200 Subject: [PATCH 024/120] join-desktop: init at 1.1.2 --- .../misc/join-desktop/default.nix | 73 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/applications/misc/join-desktop/default.nix diff --git a/pkgs/applications/misc/join-desktop/default.nix b/pkgs/applications/misc/join-desktop/default.nix new file mode 100644 index 00000000000..0b09911ddb2 --- /dev/null +++ b/pkgs/applications/misc/join-desktop/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchurl +, alsa-lib +, autoPatchelfHook +, dpkg +, gtk3 +, makeWrapper +, mesa +, nss +, systemd +, xorg +}: + +stdenv.mkDerivation rec { + pname = "join-desktop"; + version = "1.1.2"; + + src = fetchurl { + url = "https://github.com/joaomgcd/JoinDesktop/releases/download/v${version}/com.joaomgcd.join_${version}_amd64.deb"; + sha256 = "sha256-k1LX/HC3tfL4Raipo7wp/LnfrPa38x8NBeKRyHJ72CU="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + ]; + + buildInputs = [ + alsa-lib + gtk3 + mesa + nss + xorg.libXScrnSaver + xorg.libXtst + ]; + + unpackPhase = "dpkg-deb -x $src ."; + + runtimeDependencies = [ + (lib.getLib systemd) + # TODO: check if they are required + # libnotify + # libappindicator + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/join-desktop + + mv usr/share/* $out/share + mv opt/Join\ Desktop/* $out/share/join-desktop + + ln -s $out/share/join-desktop/com.joaomgcd.join $out/bin/ + + substituteInPlace $out/share/applications/com.joaomgcd.join.desktop \ + --replace "/opt/Join Desktop/com.joaomgcd.join" "com.joaomgcd.join" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/joaomgcd/JoinDesktop/"; + description = "Desktop app for Join"; + # on https://joaoapps.com/join/desktop/ "Join Desktop is an open source app" but no license + license = licenses.free; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b12158d94bc..44c59788c6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24863,6 +24863,8 @@ with pkgs; jnetmap = callPackage ../applications/networking/jnetmap {}; + join-desktop = callPackage ../applications/misc/join-desktop { }; + libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { boost = boost175; # fatal error: 'boost/interprocess/detail/posix_time_types_wrk.hpp' file not found }; From 8eb6f8ea410aa6d704e0cb66424eafc74ba5257b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Mar 2022 01:12:31 +0200 Subject: [PATCH 025/120] python3Packages.aioh2: drop --- .../python-modules/aioh2/default.nix | 24 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 pkgs/development/python-modules/aioh2/default.nix diff --git a/pkgs/development/python-modules/aioh2/default.nix b/pkgs/development/python-modules/aioh2/default.nix deleted file mode 100644 index 1ae997c60e8..00000000000 --- a/pkgs/development/python-modules/aioh2/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi, h2, priority }: - -buildPythonPackage rec { - pname = "aioh2"; - version = "0.2.2"; - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "03i24wzpw0mrnrpck3w6qy83iigwl7n99sdrndqzxfyrc69b99wd"; - }; - - propagatedBuildInputs = [ h2 priority ]; - - doCheck = false; # https://github.com/decentfox/aioh2/issues/17 - - meta = with lib; { - homepage = "https://github.com/decentfox/aioh2"; - description = "HTTP/2 implementation with hyper-h2 on Python 3 asyncio"; - license = licenses.bsd3; - maintainers = [ maintainers.qyliss ]; - broken = true; # requires h2<4 - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0abf2b58986..851396a6bb7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -33,6 +33,7 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ + aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 asyncio-nats-client = nats-py; # added 2022-02-08 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64c4629eaa0..cc3a593ad56 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -298,8 +298,6 @@ in { aiogithubapi = callPackage ../development/python-modules/aiogithubapi { }; - aioh2 = callPackage ../development/python-modules/aioh2 { }; - aioharmony = callPackage ../development/python-modules/aioharmony { }; aiohomekit = callPackage ../development/python-modules/aiohomekit { }; From 4bba51b8d05bee3ecef8a51fa72985f9d9778115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Mar 2022 01:12:55 +0200 Subject: [PATCH 026/120] doh-proxy: drop --- pkgs/servers/dns/doh-proxy/default.nix | 40 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/servers/dns/doh-proxy/default.nix diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix deleted file mode 100644 index 8128ec6f04d..00000000000 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, python3Packages }: - -with python3Packages; -buildPythonApplication rec { - pname = "doh-proxy"; - version = "0.0.9"; - - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "1fxzxipzdvk75yrcr78mpdz8lwpisba67lk4jcwxdnkv6997dwfp"; - }; - - nativeBuildInputs = [ pytest-runner flake8]; - - propagatedBuildInputs = [ - aioh2 - dnspython - aiohttp-remotes - ]; - - checkInputs = [ - asynctest - unittest-data-provider - pytest - pytest-cov - pytest-aiohttp - ]; - - # attempts to resolve address - checkPhase = '' - pytest -k 'not servers' - ''; - - meta = with lib; { - homepage = "https://facebookexperimental.github.io/doh-proxy/"; - description = "A proof of concept DNS-Over-HTTPS proxy"; - license = licenses.bsd3; - maintainers = [ maintainers.qyliss ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 65a742ad5f8..6749b5d8afa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -260,6 +260,7 @@ mapAliases ({ docbook5_xsl = throw "'docbook5_xsl' has been renamed to/replaced by 'docbook_xsl_ns'"; # Converted to throw 2022-02-22 docbookrx = throw "docbookrx has been removed since it was unmaintained"; # Added 2021-01-12 docbook_xml_xslt = throw "'docbook_xml_xslt' has been renamed to/replaced by 'docbook_xsl'"; # Converted to throw 2022-02-22 + doh-proxy = throw "doh-proxy has been removed because upstream abandoned it and its depedencies where removed."; # Added 2022-03-30 docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22 dolphinEmu = dolphin-emu; # Added 2021-11-10 dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62ab14368aa..909e63f28e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21308,8 +21308,6 @@ with pkgs; dex2jar = callPackage ../development/tools/java/dex2jar { }; - doh-proxy = callPackage ../servers/dns/doh-proxy { }; - doh-proxy-rust = callPackage ../servers/dns/doh-proxy-rust { inherit (darwin.apple_sdk.frameworks) Security; }; From 0cd73588690f10c53e1b5e13fda4e0708bf44d9f Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sat, 26 Mar 2022 17:15:17 +0100 Subject: [PATCH 027/120] imagemagick: use libjxl on aarch64-linux, as it builds now for that target Works since f24cab5396085e138ff82d53888af8a9a7d83055 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 7a8cae9bf81..523903c53ab 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -64,9 +64,7 @@ stdenv.mkDerivation rec { ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ lib.optional (librsvg != null) "--with-rsvg" ++ lib.optional (liblqr1 != null) "--with-lqr" - # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, - # let's disable it for now to unbreak the imagemagick build. - ++ lib.optional (libjxl != null && !stdenv.isAarch64) "--with-jxl" + ++ lib.optional (libjxl != null ) "--with-jxl" ++ lib.optionals (ghostscript != null) [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" @@ -92,11 +90,8 @@ stdenv.mkDerivation rec { libxml2 libheif djvulibre + libjxl ] - # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, - # let's disable it for now to unbreak the imagemagick build. - ++ lib.optionals (!stdenv.isAarch64) - [ libjxl ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] ++ lib.optionals stdenv.isDarwin [ From 388d576fd1d0c8c271af82572c132dd13ec8a203 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sat, 12 Mar 2022 11:10:46 +0100 Subject: [PATCH 028/120] imagemagick: 7.1.0-26 -> 7.1.0-29 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 523903c53ab..13a40cee5ed 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-26"; + version = "7.1.0-29"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-q1CL64cfyb5fN9aVYJfls+v0XRFd4jH+B8n+UJqPE1I="; + hash = "sha256-46fJMOIGnK5aNIcG7+8mJdZDcSFyFmhmkLcuVlnupSU="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 0881f01c5b1f1e7fd613b36880f89b379879b856 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 30 Mar 2022 20:39:03 +0200 Subject: [PATCH 029/120] dhcp: 4.4.2-P1 -> 4.4.3 https://downloads.isc.org/isc/dhcp/4.4.3/dhcp-4.4.3-RELNOTES --- pkgs/tools/networking/dhcp/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 10418d97810..b2d33d0fe3e 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "dhcp"; - version = "4.4.2-P1"; + version = "4.4.3"; src = fetchurl { url = "https://ftp.isc.org/isc/dhcp/${version}/${pname}-${version}.tar.gz"; - sha256 = "06jsr0cg5rsmyibshrpcb9za0qgwvqccashdma7mlm1rflrh8pmh"; + sha256 = "sha256-Dj7GtMKgXsAUiHS82ZmmbQVRg3jXdCH2B/sLydATWBg="; }; patches = @@ -18,20 +18,6 @@ stdenv.mkDerivation rec { # patch, the hostname doesn't get set properly if the old # hostname (i.e. before reboot) is equal to the new hostname. ./set-hostname.patch - - (fetchpatch { - # upstream build fix against -fno-common compilers like >=gcc-10 - url = "https://gitlab.isc.org/isc-projects/dhcp/-/commit/6c7e61578b1b449272dbb40dd8b98d03dad8a57a.patch"; - sha256 = "1g37ix0yf9zza8ri8bg438ygcjviniblfyb20y4gzc8lysy28m8b"; - }) - - # Fix parallel build failure, the patch is pending upstream inclusion: - # https://gitlab.isc.org/isc-projects/dhcp/-/merge_requests/76 - (fetchpatch { - name = "parallel-make.patch"; - url = "https://gitlab.isc.org/isc-projects/dhcp/-/commit/46d101b97c5a3b19a3f63f7b60e5f88994a64e22.patch"; - sha256 = "1y3nsmqjzcg4bhp1xmqp47v7rkl3bpcildkx6mlrg255yvxapmdp"; - }) ]; nativeBuildInputs = [ perl makeWrapper ]; From a2c379d4b6df39bb5a0355bb4bb68cc3f75f4cc7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 30 Mar 2022 20:39:55 +0200 Subject: [PATCH 030/120] dhcp: make client and relay component optional and mark the package with knownVulnerabilities when they are enabled. Closes: #163472 --- pkgs/tools/networking/dhcp/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index b2d33d0fe3e..1d1a01d17cf 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -1,6 +1,10 @@ { stdenv, fetchurl, fetchpatch, perl, file, nettools, iputils, iproute2, makeWrapper , coreutils, gnused, openldap ? null , buildPackages, lib + +# client and relay are end of life, remove after 4.4.3 +, withClient ? false +, withRelay ? false }: stdenv.mkDerivation rec { @@ -63,6 +67,10 @@ stdenv.mkDerivation rec { --replace /sbin/ip ${iproute2}/sbin/ip wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \ "${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin" + '' + lib.optionalString (!withClient) '' + rm $out/sbin/{dhclient,dhclient-script,.dhclient-script-wrapped} + '' + lib.optionalString (!withRelay) '' + rm $out/sbin/dhcrelay ''; preConfigure = @@ -89,5 +97,6 @@ stdenv.mkDerivation rec { homepage = "https://www.isc.org/dhcp/"; license = licenses.mpl20; platforms = platforms.unix; + knownVulnerabilities = lib.optional (withClient || withRelay) "The client and relay component of the dhcp package have reached their end of life"; }; } From a31f123c1cb68e107f54d1a54500de6ba8b9b0ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 30 Mar 2022 20:43:16 +0200 Subject: [PATCH 031/120] networkmanager: remove dhcp and pass dhcpcd instead The ISC DHCP client has reached its end of life. --- nixos/modules/services/networking/networkmanager.nix | 3 +-- pkgs/tools/networking/networkmanager/default.nix | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 7a9d9e5428a..f14eea50ada 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -237,7 +237,7 @@ in { }; dhcp = mkOption { - type = types.enum [ "dhclient" "dhcpcd" "internal" ]; + type = types.enum [ "dhcpcd" "internal" ]; default = "internal"; description = '' Which program (or internal library) should be used for DHCP. @@ -497,7 +497,6 @@ in { "d /etc/ipsec.d 0700 root root -" "d /var/lib/NetworkManager-fortisslvpn 0700 root root -" - "d /var/lib/dhclient 0755 root root -" "d /var/lib/misc 0755 root root -" # for dnsmasq.leases ]; diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 2c984da8737..86195ba8692 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -12,7 +12,7 @@ , polkit , gnutls , ppp -, dhcp +, dhcpcd , iptables , nftables , python3 @@ -96,9 +96,9 @@ stdenv.mkDerivation rec { "-Dresolvconf=${openresolv}/bin/resolvconf" # DHCP clients - "-Ddhclient=${dhcp}/bin/dhclient" - # Upstream prefers dhclient, so don't add dhcpcd to the closure - "-Ddhcpcd=no" + # ISC DHCP client has reached it's end of life, so stop using it + "-Ddhclient=no" + "-Ddhcpcd=${dhcpcd}/bin/dhcpcd" "-Ddhcpcanon=no" # Miscellaneous From c6e3a81aea61b7e12560e1b346d285f90b70274d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 30 Mar 2022 20:49:30 +0200 Subject: [PATCH 032/120] pipework: remove dhcp package Pipework can optionally use dhclient, but supports other dhcp clients as well, so we can safely remove it. --- pkgs/os-specific/linux/pipework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index 33192392888..ea274377ced 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, bridge-utils, iproute2, lxc, openvswitch, docker, busybox, dhcpcd, dhcp +, bridge-utils, iproute2, lxc, openvswitch, docker, busybox, dhcpcd }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { installPhase = '' install -D pipework $out/bin/pipework wrapProgram $out/bin/pipework --prefix PATH : \ - ${lib.makeBinPath [ bridge-utils iproute2 lxc openvswitch docker busybox dhcpcd dhcp ]}; + ${lib.makeBinPath [ bridge-utils iproute2 lxc openvswitch docker busybox dhcpcd ]}; ''; meta = with lib; { description = "Software-Defined Networking tools for LXC"; From 4de2c2a00c92f1fc9ae1d3800898954dc074ab33 Mon Sep 17 00:00:00 2001 From: wheelsandmetal Date: Wed, 23 Feb 2022 19:01:22 +0000 Subject: [PATCH 033/120] boost178: init at 1.78.0 --- pkgs/development/libraries/boost/1.78.nix | 15 +++++++++++++++ pkgs/development/libraries/boost/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 3 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/boost/1.78.nix diff --git a/pkgs/development/libraries/boost/1.78.nix b/pkgs/development/libraries/boost/1.78.nix new file mode 100644 index 00000000000..a7ec9b0e04e --- /dev/null +++ b/pkgs/development/libraries/boost/1.78.nix @@ -0,0 +1,15 @@ +{ callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.78.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_78_0.html + sha256 = "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc"; + }; +}) + diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index aeb0878a0d1..60dbc00f67f 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -45,4 +45,5 @@ in { boost174 = makeBoost ./1.74.nix; boost175 = makeBoost ./1.75.nix; boost177 = makeBoost ./1.77.nix; + boost178 = makeBoost ./1.78.nix; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e30157ec978..d6f7eddab15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16104,6 +16104,7 @@ with pkgs; boost174 boost175 boost177 + boost178 ; boost15x = boost159; From 84d6565d52d1f9f25280f8dc1716b90238fbb738 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 31 Mar 2022 02:34:42 +0200 Subject: [PATCH 034/120] nixos/man: prevent duplication of options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libxslt 1.1.35 fixed conflict resolution for templates to match the specification. This uncovered a bug in docbook-xsl (https://github.com/docbook/xslt10-stylesheets/issues/240), which causes option names to be duplicated into the option descriptions. Let’s resolve the conflict by patching the stylesheets. Fixes: https://github.com/NixOS/nixpkgs/issues/166304 --- nixos/doc/manual/default.nix | 4 ++++ .../sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 6 +++++- .../docbook-xsl/fix-man-options-duplication.patch | 11 +++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index e96bc47b4a5..bcb5d0d02f7 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -14,6 +14,10 @@ with pkgs; let lib = pkgs.lib; + docbook_xsl_ns = pkgs.docbook-xsl-ns.override { + withManOptDedupPatch = true; + }; + # We need to strip references to /nix/store/* from options, # including any `extraSources` if some modules came from elsewhere, # or else the build will fail. diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 735dfdb4f81..2f9d22e57d8 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, substituteAll, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash }: +{ lib, stdenv, substituteAll, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash, withManOptDedupPatch ? false }: let @@ -36,6 +36,10 @@ let src = ./catalog-legacy-uris.patch; inherit legacySuffix suffix version; }) + ] ++ lib.optionals withManOptDedupPatch [ + # Fixes https://github.com/NixOS/nixpkgs/issues/166304 + # https://github.com/docbook/xslt10-stylesheets/pull/241 + ./fix-man-options-duplication.patch ]; propagatedBuildInputs = [ findXMLCatalogs ]; diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch new file mode 100644 index 00000000000..304d9781e6a --- /dev/null +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch @@ -0,0 +1,11 @@ +--- a/manpages/lists.xsl ++++ b/manpages/lists.xsl +@@ -110,7 +110,7 @@ + .RE + + +- ++ + + + Date: Tue, 5 Apr 2022 18:09:08 -0300 Subject: [PATCH 036/120] goawk: enable tests --- pkgs/tools/text/goawk/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix index b665c182332..19c8e516e96 100644 --- a/pkgs/tools/text/goawk/default.nix +++ b/pkgs/tools/text/goawk/default.nix @@ -1,4 +1,5 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, stdenv }: + buildGoModule rec { pname = "goawk"; version = "1.16.0"; @@ -12,8 +13,18 @@ buildGoModule rec { vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - # checks do not pass at the moment - doCheck = false; + postPatch = '' + substituteInPlace goawk_test.go \ + --replace "TestCommandLine" "SkipCommandLine" \ + --replace "TestDevStdout" "SkipDevStdout" \ + --replace "TestFILENAME" "SkipFILENAME" \ + --replace "TestWildcards" "SkipWildcards" + + substituteInPlace interp/interp_test.go \ + --replace "TestShellCommand" "SkipShellCommand" + ''; + + doCheck = (stdenv.system != "aarch64-darwin"); meta = with lib; { description = "A POSIX-compliant AWK interpreter written in Go"; From 001b24bd25399d0aadc4d81e35563a13eb5a7a10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Apr 2022 21:35:06 +0000 Subject: [PATCH 037/120] sslscan: 2.0.12 -> 2.0.13 --- pkgs/tools/security/sslscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 0885c1d2de6..ae94b6e2547 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.0.12"; + version = "2.0.13"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = version; - sha256 = "sha256-lFb+W2PSmXzzNhG+yNmnDNqtUc0TsDYYnsBnKdsiPSo="; + sha256 = "sha256-boXp26f8jiw73lMLwUMuAuDBRIw8JzokYadbKx/VeSg="; }; buildInputs = [ openssl ]; From 0203357872cfb0e3275870eb7019f90da3dd170d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 05:32:14 +0000 Subject: [PATCH 038/120] aws-iam-authenticator: 0.5.5 -> 0.5.6 --- pkgs/tools/security/aws-iam-authenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index b1f5d8b56c3..84a5cef2b46 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5QtNAcInp1mUE8SHUUMS8/XURbPx/q8xMsvEEo/rnCs="; + sha256 = "sha256-tKvFcCPjxwX424zv100gLRjWRtVgCw2ILyXP8XEUiTA="; }; # Upstream has inconsistent vendoring, see https://github.com/kubernetes-sigs/aws-iam-authenticator/issues/377 From 82fb8df8c0302b7a47302936d3da26b475245778 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 7 Apr 2022 15:13:35 +0800 Subject: [PATCH 039/120] matterbridge: 1.24.1 -> 1.25.0 --- pkgs/servers/matterbridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index e5fbe803854..8882853a3b4 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "matterbridge"; - version = "1.24.1"; + version = "1.25.0"; src = fetchFromGitHub { owner = "42wim"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oT7CFJ266guNM6CEWn1BoNcERvLv89cVSlsrN6S/0h0="; + sha256 = "sha256-R5eoFpCbfPPkWgK1NFgRvWzUR5uTV4YpdEBE09g9D3A="; }; vendorSha256 = null; From b9832511698066dbe0a7e02fddf5e8afedfc5603 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 08:37:39 +0000 Subject: [PATCH 040/120] cpp-utilities: 5.13.0 -> 5.14.0 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index a3de08a838b..996609451bf 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.13.0"; + version = "5.14.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R22nWkI778LpCK3a5C6tvuIsEXU49wPya1fFQxdpocg="; + sha256 = "sha256-WS/2iLwVIYZBu4/uuKgEQ5H/BdeG2aMeZBucFPvlOpI="; }; nativeBuildInputs = [ cmake ]; From e2ad783617d349fea21f8307d8391a18346dfd69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 09:35:29 +0000 Subject: [PATCH 041/120] clib: 1.11.4 -> 2.8.1 --- pkgs/tools/package-management/clib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index e79c376ab79..aac1b8d6000 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation rec { - version = "1.11.4"; + version = "2.8.1"; pname = "clib"; src = fetchFromGitHub { rev = version; owner = "clibs"; repo = "clib"; - sha256 = "0cxldyx5bsld8gdasqpqlnzyap294hlkgcjyw3vlzlxcb0izjy8i"; + sha256 = "sha256-AzPpGwtZemKX2r/XKyNTJ+lVwU1QUxkB2OywtCwTAWs="; }; hardeningDisable = [ "fortify" ]; From a4b33a0047a1b833d31a50f1eefa0f32a06b28a5 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 7 Apr 2022 11:56:02 -0400 Subject: [PATCH 042/120] atlassian-bamboo: 8.1.3 -> 8.1.4 --- pkgs/servers/atlassian/bamboo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/bamboo.nix b/pkgs/servers/atlassian/bamboo.nix index a60d41d41c1..33c8aceeb26 100644 --- a/pkgs/servers/atlassian/bamboo.nix +++ b/pkgs/servers/atlassian/bamboo.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "atlassian-bamboo"; - version = "8.1.3"; + version = "8.1.4"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/bamboo/downloads/atlassian-bamboo-${version}.tar.gz"; - sha256 = "sha256-M406audmwCS4SRPj8oYxZ+tBpt9bGoOsA3+9WwdZ1fw="; + sha256 = "sha256-v30Q3yGKkpHQFitOcH764SE6KuCdUJWn50buY7pb/Ng="; }; buildPhase = '' From 71075041d49d763d3d405f0555382f6e68b18109 Mon Sep 17 00:00:00 2001 From: tim-tx Date: Thu, 7 Apr 2022 12:48:25 -0400 Subject: [PATCH 043/120] dendrite: 0.7.0 -> 0.8.1 --- pkgs/servers/dendrite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index c17c301421f..82c6d4ba3e6 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-R0xGsngNk8osBh3vRUeYxmEgbbNa+wKOihRjOU40D48="; + sha256 = "sha256-cEqedl6iVt/HZEh1zeEcqby8gfJEcqIDEQnPewyErMI="; }; - vendorSha256 = "sha256-0Y/RVRWZ0osU/kEcf+Y8TH8K2rmxFmQSqMMNHoRIugo="; + vendorSha256 = "sha256-nQx+PyjRvECeIerZ9jq7YMTSS8LfohY7NgK8DklREQQ="; passthru.tests = { inherit (nixosTests) dendrite; From 11a41a4889a8c56ef14be3b472ae00942b3f5e3f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 7 Apr 2022 16:34:13 -0300 Subject: [PATCH 044/120] nebula: enable tests --- pkgs/tools/networking/nebula/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 494fb946ea6..61cb7bd6382 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "5Yv2t5vdUNCcCo2KAm1xCkRVrt6gIasKHLqH7VVPDuU="; - doCheck = false; - subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; ldflags = [ "-X main.Build=${version}" ]; From e72fc6554f6385ab3e9dadf7518f8e9789654ad9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 23:22:34 +0000 Subject: [PATCH 045/120] helmfile: 0.143.5 -> 0.144.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index da3b85d8993..14cb38d60ce 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmfile"; - version = "0.143.5"; + version = "0.144.0"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-48DbN3O5HVlNpHct6uKw9CjeaDlAZqY+/Tqd4a9mmUw="; + sha256 = "sha256-mfRPrgnOXqfmbpvaIxJNkgkdTEJKcFycrgFmQ7YDvTU="; }; vendorSha256 = "sha256-ddf3m0DGsjubzp/aERvhfJ51UKKSNMC1Xu7ybyif8HA="; From ebe2adcc71e9bbd4406d2893a866834bfa2ae6a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 23:42:13 +0000 Subject: [PATCH 046/120] godot: 3.4.2 -> 3.4.4 --- pkgs/development/tools/godot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 1860b864fd5..1bf38bbacf3 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "3.4.2"; + version = "3.4.4"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "sha256-RVXBFTHiI2yAkXWlHNa/jL8svQgqtsml6RuykhL1qa4="; + sha256 = "sha256-3AESLzqozi7Fc80u8Ml3ergZMkIhHy4tNlRe/3FsE6k="; }; nativeBuildInputs = [ pkg-config ]; From d454d73698e1057a96b6865bf695b504ff4be4e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 02:40:41 +0000 Subject: [PATCH 047/120] intel-media-sdk: 22.2.1 -> 22.3.0 --- pkgs/development/libraries/intel-media-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 034d5b74b56..31f25ec10d7 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "22.2.1"; + version = "22.3.0"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-S8RShdpXz1WQoyuLxUDT94ftnep2WCy8oYKzeYBgftw="; + sha256 = "sha256-6/MOjISfLsrsocdeFC148hRwl2os5dvJV1eYq/jIMr4="; }; nativeBuildInputs = [ cmake pkg-config ]; From 0c066f0d0e1ce6739a9a2f1e11429ddc22d8c7ba Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Sat, 26 Mar 2022 22:54:02 +0100 Subject: [PATCH 048/120] nixos/openconnect: add module --- .../from_md/release-notes/rl-2205.section.xml | 7 + .../manual/release-notes/rl-2205.section.md | 2 + nixos/modules/module-list.nix | 1 + .../services/networking/openconnect.nix | 135 ++++++++++++++++++ 4 files changed, 145 insertions(+) create mode 100644 nixos/modules/services/networking/openconnect.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 4453c907f67..feb3a8bd2d4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1631,6 +1631,13 @@ true. + + + A module for declarative configuration of openconnect VPN + profiles was added under + networking.openconnect. + + The element-desktop package now has an diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index abc16b8d66e..9a7ee88e617 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -569,6 +569,8 @@ In addition to numerous new and upgraded packages, this release has the followin using `fetchgit` or `fetchhg` if the argument `fetchSubmodules` is set to `true`. +- A module for declarative configuration of openconnect VPN profiles was added under `networking.openconnect`. + - The `element-desktop` package now has an `useKeytar` option (defaults to `true`), which allows disabling `keytar` and in turn `libsecret` usage (which binds to native credential managers / keychain libraries). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1ad2592b1dd..813ac397d7f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -851,6 +851,7 @@ ./services/networking/ofono.nix ./services/networking/oidentd.nix ./services/networking/onedrive.nix + ./services/networking/openconnect.nix ./services/networking/openvpn.nix ./services/networking/ostinato.nix ./services/networking/owamp.nix diff --git a/nixos/modules/services/networking/openconnect.nix b/nixos/modules/services/networking/openconnect.nix new file mode 100644 index 00000000000..7b2ef48e1c4 --- /dev/null +++ b/nixos/modules/services/networking/openconnect.nix @@ -0,0 +1,135 @@ +{ config, lib, options, pkgs, ... }: +with lib; +let + cfg = config.networking.openconnect; + openconnect = cfg.package; + pkcs11 = types.strMatching "pkcs11:.+" // { + name = "pkcs11"; + description = "PKCS#11 URI"; + }; + interfaceOptions = { + options = { + gateway = mkOption { + description = "Gateway server to connect to."; + example = "gateway.example.com"; + type = types.str; + }; + + protocol = mkOption { + description = "Protocol to use."; + example = "anyconnect"; + type = + types.enum [ "anyconnect" "array" "nc" "pulse" "gp" "f5" "fortinet" ]; + }; + + user = mkOption { + description = "Username to authenticate with."; + example = "example-user"; + type = types.nullOr types.str; + }; + + # Note: It does not make sense to provide a way to declaratively + # set an authentication cookie, because they have to be requested + # for every new connection and would only work once. + passwordFile = mkOption { + description = '' + File containing the password to authenticate with. This + is passed to openconnect via the + --passwd-on-stdin option. + ''; + default = null; + example = "/var/lib/secrets/openconnect-passwd"; + type = types.nullOr types.path; + }; + + certificate = mkOption { + description = "Certificate to authenticate with."; + default = null; + example = "/var/lib/secrets/openconnect_certificate.pem"; + type = with types; nullOr (either path pkcs11); + }; + + privateKey = mkOption { + description = "Private key to authenticate with."; + example = "/var/lib/secrets/openconnect_private_key.pem"; + default = null; + type = with types; nullOr (either path pkcs11); + }; + + extraOptions = mkOption { + description = '' + Extra config to be appended to the interface config. It should + contain long-format options as would be accepted on the command + line by openconnect + (see https://www.infradead.org/openconnect/manual.html). + Non-key-value options like deflate can be used by + declaring them as booleans, i. e. deflate = true;. + ''; + default = { }; + example = { + compression = "stateless"; + + no-http-keepalive = true; + no-dtls = true; + }; + type = with types; attrsOf (either str bool); + }; + }; + }; + generateExtraConfig = extra_cfg: + strings.concatStringsSep "\n" (attrsets.mapAttrsToList + (name: value: if (value == true) then name else "${name}=${value}") + (attrsets.filterAttrs (_: value: value != false) extra_cfg)); + generateConfig = name: icfg: + pkgs.writeText "config" '' + interface=${name} + ${optionalString (icfg.user != null) "user=${icfg.user}"} + ${optionalString (icfg.passwordFile != null) "passwd-on-stdin"} + ${optionalString (icfg.certificate != null) + "certificate=${icfg.certificate}"} + ${optionalString (icfg.privateKey != null) "sslkey=${icfg.privateKey}"} + + ${generateExtraConfig icfg.extraOptions} + ''; + generateUnit = name: icfg: { + description = "OpenConnect Interface - ${name}"; + requires = [ "network-online.target" ]; + after = [ "network.target" "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + ExecStart = "${openconnect}/bin/openconnect --config=${ + generateConfig name icfg + } ${icfg.gateway}"; + StandardInput = "file:${icfg.passwordFile}"; + }; + }; +in { + options.networking.openconnect = { + package = mkPackageOption pkgs "openconnect" { }; + + interfaces = mkOption { + description = "OpenConnect interfaces."; + default = { }; + example = { + openconnect0 = { + gateway = "gateway.example.com"; + protocol = "anyconnect"; + user = "example-user"; + passwordFile = "/var/lib/secrets/openconnect-passwd"; + }; + }; + type = with types; attrsOf (submodule interfaceOptions); + }; + }; + + config = { + systemd.services = mapAttrs' (name: value: { + name = "openconnect-${name}"; + value = generateUnit name value; + }) cfg.interfaces; + }; + + meta.maintainers = with maintainers; [ alyaeanyx ]; +} From 22aa50baf4d7d057239453981a9529fcca7eb475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Apr 2022 16:26:20 +0200 Subject: [PATCH 049/120] pgcli: 3.3.1 -> 3.4.1 --- pkgs/development/tools/database/pgcli/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index e8f053679c3..40c20481288 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -5,7 +5,6 @@ , cli-helpers , click , configobj -, humanize , prompt-toolkit , psycopg2 , pygments @@ -15,25 +14,23 @@ , keyring , pendulum , pytestCheckHook +, sshtunnel , mock }: buildPythonApplication rec { pname = "pgcli"; - version = "3.3.1"; - - disabled = !isPy3k; + version = "3.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/MyeVcpopK0Ih6z6KZGvs7ivk/PM6a2iSeatiYeZM6E="; + sha256 = "sha256-8DkwGH4n1g32WMqKBPtgHsXXR2xzXysVQsat7Fysj+I="; }; propagatedBuildInputs = [ cli-helpers click configobj - humanize prompt-toolkit psycopg2 pygments @@ -42,6 +39,7 @@ buildPythonApplication rec { setproctitle keyring pendulum + sshtunnel ]; checkInputs = [ pytestCheckHook mock ]; From 7203cae13b74e6c38fa8993cde084967a0de72a4 Mon Sep 17 00:00:00 2001 From: yuu Date: Thu, 7 Apr 2022 12:32:26 -0300 Subject: [PATCH 050/120] brmodelo: init at 3.31 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sandro Jäckel --- .../science/engineering/brmodelo/default.nix | 109 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 113 insertions(+) create mode 100644 pkgs/applications/science/engineering/brmodelo/default.nix diff --git a/pkgs/applications/science/engineering/brmodelo/default.nix b/pkgs/applications/science/engineering/brmodelo/default.nix new file mode 100644 index 00000000000..c0573ae131d --- /dev/null +++ b/pkgs/applications/science/engineering/brmodelo/default.nix @@ -0,0 +1,109 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, openjdk8 +, ant +, makeWrapper +, makeDesktopItem +, copyDesktopItems +}: + +stdenv.mkDerivation rec { + pname = "brmodelo"; + version = "3.31"; + + src = fetchFromGitHub { + owner = "chcandido"; + repo = pname; + rev = version; + sha256 = "09qrhqhv264x8phnf3pnb0cwq75l7xdsj9xkwlvhry81nxz0d5v0"; + }; + + nativeBuildInputs = [ ant makeWrapper copyDesktopItems ]; + + buildInputs = [ openjdk8 ]; + + patches = [ + # Fixes for building with Ant. + # https://github.com/chcandido/brModelo/pull/22 + (fetchpatch { + name = "fix-self-closing-element-not-allowed.patch"; + url = "https://github.com/yuuyins/brModelo/commit/0d712b74fd5d29d67be07480ed196da28a77893b.patch"; + sha256 = "sha256-yy03arE6xetotzyvpToi9o9crg3KnMRn1J70jDUvSXE="; + }) + (fetchpatch { + name = "fix-tag-closing.patch"; + url = "https://github.com/yuuyins/brModelo/commit/e8530ff75f024cf6effe0408ed69985405e9709c.patch"; + sha256 = "sha256-MNuh/ORbaAkB5qDSlA/nPrXN+tqzz4oOglVyEtSangI="; + }) + (fetchpatch { + name = "fix-bad-use-greater-than.patch"; + url = "https://github.com/yuuyins/brModelo/commit/498a6ef8129daff5a472b318f93c8f7f2897fc7f.patch"; + sha256 = "sha256-MmAwYUmx38DGRsiSxCWCObtpqxk0ykUQiDSC76bCpFc="; + }) + (fetchpatch { + name = "fix-param-errors.patch"; + url = "https://github.com/yuuyins/brModelo/commit/8a508aaba0bcffe13a3f95cff495230beea36bc4.patch"; + sha256 = "sha256-qME9gZChSMzu1vs9HaosD+snb+jlOrQLY97meNoA8oU="; + }) + + # Add SVG icons. + # https://github.com/chcandido/brModelo/pull/23 + (fetchpatch { + name = "add-brmodelo-logo-icons-svg.patch"; + url = "https://github.com/yuuyins/brModelo/commit/f260b82b664fad3325bbf3ebd7a15488d496946b.patch"; + sha256 = "sha256-UhgcWxsHkNFS1GgaRnmlZohjDR8JwHof2cIb3SBetYs="; + }) + ]; + + buildPhase = '' + ant + ''; + + desktopItems = [ + (makeDesktopItem { + name = "brmodelo"; + desktopName = "brModelo"; + genericName = "Entity-relationship diagramming tool"; + exec = "brmodelo"; + icon = "brmodelo"; + comment = meta.description; + categories = [ "Development" "Education" "Database" "2DGraphics" "ComputerScience" "DataVisualization" "Engineering" "Java" ]; + }) + ]; + + installPhase = '' + install -d $out/bin $out/share/doc/${pname} $out/share/java + + cp -rv ./dist/javadoc $out/share/doc/${pname}/ + + install -Dm755 ./dist/brModelo.jar -t $out/share/java/ + # NOTE: The standard Java GUI toolkit has a + # hard-coded list of "non-reparenting" window managers, + # which cause issues while running brModelo + # in WMs that are not in that list (e.g. XMonad). + # Solution/Workaround: set the environment variable + # _JAVA_AWT_WM_NONREPARENTING=1. + makeWrapper ${openjdk8}/bin/java $out/bin/brmodelo \ + --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ + --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" \ + --add-flags "-jar $out/share/java/brModelo.jar" + + runHook postInstall + ''; + + postInstall = '' + for size in 16 24 32 48 64 128 256; do + install -Dm644 ./src/imagens/icone_"$size"x"$size".svg \ + $out/share/icons/hicolor/"$size"x"$size"/apps/brmodelo.svg + done + ''; + + meta = with lib; { + description = "Entity-relationship diagram tool for making conceptual and logical database models"; + homepage = "https://github.com/chcandido/brModelo"; + license = licenses.gpl3; + maintainers = with maintainers; [ yuu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5677de306b1..93e8c32469d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32836,6 +32836,10 @@ with pkgs; lingeling = callPackage ../applications/science/logic/lingeling {}; + ### SCIENCE / ENGINEERING + + brmodelo = callPackage ../applications/science/engineering/brmodelo { }; + ### SCIENCE / ELECTRONICS adms = callPackage ../applications/science/electronics/adms { }; From befb10cd43d8b905c0fe61e878acd0856eee06cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 21:30:02 +0000 Subject: [PATCH 051/120] pgbouncer: 1.16.1 -> 1.17.0 --- pkgs/servers/sql/pgbouncer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 441b99c7bcd..0a6bfda03a7 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.16.1"; + version = "1.17.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "1z7p3ghpmbp5qv1bz9s186jn0hfnr300dc5p0hmh6vbnwklpfx08"; + sha256 = "sha256-ZXMJt7xceoXL9wqaRBtTX3gkEjCB6rt7qG0ANJolbiM="; }; nativeBuildInputs = [ pkg-config ]; From f3751e938d8f3d5621fc509141f51bf9e032255e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 21:34:30 +0000 Subject: [PATCH 052/120] phash: 0.9.4 -> 0.9.6 --- pkgs/development/libraries/phash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix index 4596c5aaf4f..73097db5ccc 100644 --- a/pkgs/development/libraries/phash/default.nix +++ b/pkgs/development/libraries/phash/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pHash"; - version = "0.9.4"; + version = "0.9.6"; buildInputs = [ cimg ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "clearscene"; repo = "pHash"; rev = version; - sha256 = "0y4gknfkns5sssfaj0snyx29752my20xmxajg6xggijx0myabbv0"; + sha256 = "sha256-frISiZ89ei7XfI5F2nJJehfQZsk0Mlb4n91q/AiZ2vA="; }; meta = with lib; { From 83a826e41138632877ac6f2bc37bec69cc9c1463 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 7 Apr 2022 12:40:25 -0400 Subject: [PATCH 053/120] waypoint: 0.7.2 -> 0.8.1 --- pkgs/applications/networking/cluster/waypoint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 12871719172..df0ae08eede 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.7.2"; + version = "0.8.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ek3WOL1sNPAIkZN/cWDSmlNtN41VL3SKb7Qb4kew8vo="; + sha256 = "sha256-NRR/N61QdBF4jaioF7+X3xOdvaJ8COEzXL4hVHYSqW4="; }; - vendorSha256 = "sha256-a0O36zyQQSVrGXWpTdCkAAwNAXU23pcFJBB+o2KYnWw="; + vendorSha256 = "sha256-57/MzO5TulGKMkGdQRoFNKIKF7upJiPazF0+Ovt/LG8="; nativeBuildInputs = [ go-bindata installShellFiles ]; From 31764768f363245f8c1118f55c7850f8a2032cf3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 00:04:10 +0000 Subject: [PATCH 054/120] prometheus-nginxlog-exporter: 1.9.0 -> 1.9.2 --- pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index 04e2772ca2a..0ada418872d 100644 --- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nginxlog_exporter"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "martin-helmich"; repo = "prometheus-nginxlog-exporter"; rev = "v${version}"; - sha256 = "0kcwhaf9k7c1xsz78064qz5zb4x3xgi1ifi49qkwiaqrzx2xy26p"; + sha256 = "sha256-rRmWy6c5bvmJO0h7uleabQnBLm8Qarp2iEBGfodGdKE="; }; vendorSha256 = "sha256-5C5xQx8I5aHgi9P5gpHmPw6nV76D68/agVAP1vGab4w="; From 7df06b163f76d1ac5912b920e7d7a03825b6ebea Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 8 Apr 2022 18:23:11 -0700 Subject: [PATCH 055/120] =?UTF-8?q?zulip:=205.9.0=20=E2=86=92=205.9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- .../networking/instant-messengers/zulip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 3c43715dd98..c15a5377173 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "5.9.0"; + version = "5.9.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-qiGkZuGJsKuquMuAcO+9wbU4KW++uyOb4TKb9lCgZmI="; + hash = "sha256-hUi4t7WdZG6GmNQfUcG4E9qGJDdPIMbglJzwR7tFNVQ="; name="${pname}-${version}.AppImage"; }; From 76492d0c26aa6a2f22dd34557f060b40cc01dc4d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 9 Apr 2022 04:17:27 +0200 Subject: [PATCH 056/120] leveldb: fix static building 1. The Makefile is long gone and the patch in not needed anymore. 2. For some reason LEVELDB_BUILD_BENCHMARKS=OFF is necessary when building statically. (Note: this has always been of for the shared build) --- pkgs/development/libraries/leveldb/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index c29a3232727..a6f75413c91 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -38,13 +38,9 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DLEVELDB_BUILD_TESTS=OFF" + "-DLEVELDB_BUILD_BENCHMARKS=OFF" ]; - postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' - # remove shared objects from "all" target - sed -i '/^all:/ s/$(SHARED_LIBS) $(SHARED_PROGRAMS)//' Makefile - ''; - postInstall = '' substituteInPlace "$out"/lib/cmake/leveldb/leveldbTargets.cmake \ --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES "'$dev'"' From 7fdfe7ffea2916e3f6c7749da76ad10149bdf482 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 9 Apr 2022 13:29:31 +1000 Subject: [PATCH 057/120] talosctl: update ldflags - https://github.com/siderolabs/talos/blob/v1.0.1/Makefile - add/update ldflags from makefile - also update src.owner and homepage --- .../networking/cluster/talosctl/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 7e12f18a78c..c04785027ca 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { # nixpkgs-update: no auto update src = fetchFromGitHub { - owner = "talos-systems"; + owner = "siderolabs"; repo = "talos"; rev = "v${version}"; inherit sha256; @@ -26,14 +26,16 @@ buildGoModule rec { mgmtHelpersPkg = "github.com/talos-systems/talos/cmd/talosctl/pkg/mgmt/helpers"; #MGMT_HELPERS_PKG in [ - "-X ${versionPkg}.Name=Talos" + "-X ${versionPkg}.Name=Client" "-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do "-X ${versionPkg}.Tag=${src.rev}" "-X ${versionPkg}.PkgsVersion=${pkgsVersion}" # PKGS "-X ${versionPkg}.ExtrasVersion=${extrasVersion}" # EXTRAS - "-X ${imagesPkgs}.Username=talos-systems" # USERNAME + "-X ${imagesPkgs}.Username=siderolabs" # USERNAME "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS + "-s" + "-w" ]; subPackages = [ "cmd/talosctl" ]; @@ -51,7 +53,7 @@ buildGoModule rec { meta = with lib; { description = "A CLI for out-of-band management of Kubernetes nodes created by Talos"; - homepage = "https://github.com/talos-systems/talos"; + homepage = "https://www.talos.dev/"; license = licenses.mpl20; maintainers = with maintainers; [ flokli ]; }; From ffaa19174ec3494a8933b0ef10bce50b5e358817 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 9 Apr 2022 12:25:47 +0000 Subject: [PATCH 058/120] git-sizer: 1.3.0 -> 1.5.0 --- .../version-management/git-sizer/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix index 049a2aa2c1d..daabe71bebb 100644 --- a/pkgs/applications/version-management/git-sizer/default.nix +++ b/pkgs/applications/version-management/git-sizer/default.nix @@ -1,20 +1,29 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testVersion, git-sizer }: -buildGoPackage rec { +buildGoModule rec { pname = "git-sizer"; - version = "1.3.0"; - - goPackagePath = "github.com/github/git-sizer"; + version = "1.5.0"; src = fetchFromGitHub { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "0kmyvai5xfalm56ywa6mhdvvjnacdzwcyz28bw0pz9a4gyf1mgvh"; + sha256 = "sha256-On7QBTzKfnuuzwMQ8m1odxGqfIKL+EDg5V05Kxuhmqw="; + }; + + vendorSha256 = "sha256-oRlsD99XiI/0ZWibjyRcycmGab+vMbXrV5hIdIyUDYg="; + + ldflags = [ "-s" "-w" "-X main.BuildVersion=${version}" ]; + + doCheck = false; + + passthru.tests.vesion = testVersion { + package = git-sizer; }; meta = with lib; { description = "Compute various size metrics for a Git repository"; + homepage = "https://github.com/github/git-sizer"; license = licenses.mit; maintainers = with maintainers; [ matthewbauer ]; }; From 77e907b8056d8fab60f135dc964dfadeaa5a426c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 19:28:02 +0000 Subject: [PATCH 059/120] runiq: 1.2.1 -> 1.2.2 --- pkgs/tools/text/runiq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/runiq/default.nix b/pkgs/tools/text/runiq/default.nix index 6d7bb5e7eb0..7b1e99978a4 100644 --- a/pkgs/tools/text/runiq/default.nix +++ b/pkgs/tools/text/runiq/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "runiq"; - version = "1.2.1"; + version = "1.2.2"; src = fetchCrate { inherit pname version; - sha256 = "0xhd1z8mykxg9kiq8nw5agy1jxfk414czq62xm1s13ssig3h7jqj"; + sha256 = "sha256-WPQgTQICZ0DFr+7D99UGMx+I78376IC6iIJ3tCsj0Js="; }; - cargoSha256 = "1g4yfz5xq9lqwh0ggyn8kn8bnzrqfmh7kx455md5ranrqqh0x5db"; + cargoSha256 = "sha256-QKtrd690eoPXyd5CQg5/yAiTDk297y60XaUdoeFAe0c="; meta = with lib; { description = "An efficient way to filter duplicate lines from input, à la uniq"; From 211ad64d3e51bc49c3090cef55e0fce2ead048b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 20:06:43 +0000 Subject: [PATCH 060/120] smartdns: 36 -> 36.1 --- pkgs/tools/networking/smartdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix index fd4cdbaf977..399aeefd9c3 100644 --- a/pkgs/tools/networking/smartdns/default.nix +++ b/pkgs/tools/networking/smartdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "36"; + version = "36.1"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - sha256 = "sha256-sjrRPmTJRCUnMrA08M/VdYhL7/OfQY30/t1loLPSrlQ="; + sha256 = "sha256-5pAt7IjgbCCGaHeSoQvuoc6KPD9Yn5iXL1CAawgBeY0="; }; buildInputs = [ openssl ]; From 79b5e4118410ca5fed8bc63d94909bff5cb674d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 20:46:34 +0000 Subject: [PATCH 061/120] skeema: 1.7.0 -> 1.7.1 --- pkgs/tools/system/skeema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/skeema/default.nix b/pkgs/tools/system/skeema/default.nix index 0b6bf003e5b..bf1bacede8d 100644 --- a/pkgs/tools/system/skeema/default.nix +++ b/pkgs/tools/system/skeema/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skeema"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "skeema"; repo = "skeema"; rev = "v${version}"; - sha256 = "1a75vixrpidim641809nj931r73zvbj2rsls7d80z7w87maav51m"; + sha256 = "sha256-DHdc6Le4WhL5QC/hqtbtq7rdBdLiRflDNnXQY2l2aJ8="; }; vendorSha256 = null; From 05d016978b4bd004329cd00d4c8d0597fa768988 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 21:08:42 +0000 Subject: [PATCH 062/120] subfinder: 2.5.0 -> 2.5.1 --- pkgs/tools/networking/subfinder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 9f0dfe7c388..5433fb67745 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RzZlr0mscJgOGWOn4RU9SOr/WkKOrY39cIUKFKxis6Y="; + sha256 = "sha256-t5bIIb31gb6f7hVeiTmMut0wXl40/Du4W9lnB49jlFA="; }; - vendorSha256 = "sha256-P98giu0a5FLBsE87XVTurYNGnNk8JUfz1awY49OBj9M="; + vendorSha256 = "sha256-lyqjODNk7R6mvSl/I1zFgXvs4m60D4gwfgJ6ocoOHhc="; modRoot = "./v2"; From 86a9d06c7d30a0d2dc67e1a33e1627f9dd02e1a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 21:24:55 +0000 Subject: [PATCH 063/120] sudo-font: 0.63.1 -> 0.64 --- pkgs/data/fonts/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index b78880824c7..e1b43e39c60 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.63.1"; + version = "0.64"; in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "sha256-z/1Y2eJMrQ+43UIt4HWcLwjYs+hfCY/g4iRxJ+yBAqw="; + sha256 = "sha256-ewLTeIVY76eq5mHTnjIsJ5Q2CMuBqXJzxvjZTONPsr8="; postFetch = '' mkdir -p $out/share/fonts/ From dc508e7f5af09a01abdb41cdf580cd151ade72f2 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 10 Apr 2022 01:35:55 +0400 Subject: [PATCH 064/120] kotatogram-desktop-with-webkit: init This allows to get maximum from the dlopen-based code and install webkit dependency only when needed and without rebuilds Tested with https://t.me/ShopBot --- .../telegram/kotatogram-desktop/default.nix | 21 ----------------- .../kotatogram-desktop/with-webkit.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index ce5dc0e266e..f46a918d3c6 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -7,7 +7,6 @@ , ninja , clang , python3 -, wrapGAppsHook , wrapQtAppsHook , removeReferencesTo , extra-cmake-modules @@ -27,7 +26,6 @@ , tl-expected , hunspell , glibmm -, webkitgtk , jemalloc , rnnoise , abseil-cpp @@ -65,7 +63,6 @@ , IOSurface , Metal , MetalKit -, withWebKit ? false }: with lib; @@ -113,9 +110,6 @@ stdenv.mkDerivation rec { --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' - '' + optionalString (stdenv.isLinux && withWebKit) '' - substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \ - --replace '"libwebkit2gtk-4.0.so.37"' '"${webkitgtk}/lib/libwebkit2gtk-4.0.so.37"' '' + optionalString stdenv.isDarwin '' substituteInPlace Telegram/CMakeLists.txt \ --replace 'COMMAND iconutil' 'COMMAND png2icns' \ @@ -124,10 +118,6 @@ stdenv.mkDerivation rec { --replace "\''${appicon_path}" "\''${appicon_path}/icon_16x16.png \''${appicon_path}/icon_32x32.png \''${appicon_path}/icon_128x128.png \''${appicon_path}/icon_256x256.png \''${appicon_path}/icon_512x512.png" ''; - # We want to run wrapProgram manually (with additional parameters) - dontWrapGApps = stdenv.isLinux; - dontWrapQtApps = stdenv.isLinux && withWebKit; - nativeBuildInputs = [ pkg-config cmake @@ -139,8 +129,6 @@ stdenv.mkDerivation rec { # to build bundled libdispatch clang extra-cmake-modules - ] ++ optionals (stdenv.isLinux && withWebKit) [ - wrapGAppsHook ]; buildInputs = [ @@ -166,8 +154,6 @@ stdenv.mkDerivation rec { glibmm jemalloc wayland - ] ++ optionals (stdenv.isLinux && withWebKit) [ - webkitgtk ] ++ optionals stdenv.isDarwin [ Cocoa CoreFoundation @@ -225,13 +211,6 @@ stdenv.mkDerivation rec { remove-references-to -t ${tg_owt.dev} $out/bin/$binName ''; - postFixup = optionalString (stdenv.isLinux && withWebKit) '' - # We also use gappsWrapperArgs from wrapGAppsHook. - wrapProgram $out/bin/kotatogram-desktop \ - "''${gappsWrapperArgs[@]}" \ - "''${qtWrapperArgs[@]}" - ''; - passthru = { inherit tg_owt; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix new file mode 100644 index 00000000000..435268cdf62 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk, makeWrapper }: + +with lib; + +stdenv.mkDerivation { + pname = "${kotatogram-desktop.pname}-with-webkit"; + version = kotatogram-desktop.version; + nativeBuildInputs = [ makeWrapper ]; + dontUnpack = true; + installPhase = '' + mkdir -p $out + cp -r ${kotatogram-desktop}/share $out + ''; + postFixup = '' + mkdir -p $out/bin + makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \ + --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ webkitgtk ]} + ''; + meta = kotatogram-desktop.meta // { + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b746e502f24..78aeb1257ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27058,6 +27058,8 @@ with pkgs; abseil-cpp = abseil-cpp_202111; }; + kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix {}; + kpt = callPackage ../applications/networking/cluster/kpt { }; krane = callPackage ../applications/networking/cluster/krane { }; From 112afa2c566d2c81544e637935a315d006998c8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 22:48:51 +0000 Subject: [PATCH 065/120] syncthing: 1.19.1 -> 1.19.2 --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 31d0ce461d0..e4088c3c460 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.19.1"; + version = "1.19.2"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "sha256-/CRDdKUeLQ/jSLrd44Tjbb0lfgFFnJkpmFEYZJFQHY8="; + sha256 = "sha256-Zday5lBsRCl00vnnXNKu6VMlq8zmwgI0I+73Pir7ss4="; }; - vendorSha256 = "sha256-GBDGckGewo5Yp8zwAKwwXkSP5lx0fQR4AHQFkzO7Q0Q="; + vendorSha256 = "sha256-2yK0eE34cA7U1nDWRp/JigFpeveipmCuL4jP+94T3Sg="; doCheck = false; From 8c2236f63fb327e0ab8684410eab25a38de89010 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 23:19:29 +0000 Subject: [PATCH 066/120] telegraf: 1.22.0 -> 1.22.1 --- pkgs/servers/monitoring/telegraf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 3250d233994..5c1f2e6862b 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.22.0"; + version = "1.22.1"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-Y7vR6kmh1rObDyyHA2NFvBkilBz+Bx8BHqlAoVY/gGo="; + sha256 = "sha256-W6o+dFUdnH4c+SLwqhoutOsXf+XLu2qNjYytPp43fjk="; }; - vendorSha256 = "sha256-oSN6nHOtXA2cSZEmToRvALkSxAyel9BU7bh1groEnsw="; + vendorSha256 = "sha256-28Xz8fIlrdCVkG0x5toJXht+RIkBmey4wi6WGqsq80k="; proxyVendor = true; ldflags = [ From f785845577a7c719042c9a06031148abbe1068ff Mon Sep 17 00:00:00 2001 From: Joel Date: Sun, 20 Feb 2022 10:27:54 +1000 Subject: [PATCH 067/120] melody: init at 0.13.9 --- pkgs/tools/misc/melody/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/misc/melody/default.nix diff --git a/pkgs/tools/misc/melody/default.nix b/pkgs/tools/misc/melody/default.nix new file mode 100644 index 00000000000..7dfc7eab4fd --- /dev/null +++ b/pkgs/tools/misc/melody/default.nix @@ -0,0 +1,21 @@ +{ lib, stdenv, fetchCrate, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "melody"; + version = "0.13.9"; + + src = fetchCrate { + pname = "melody_cli"; + inherit version; + sha256 = "1vqiciridm0pbh5yf42p2jfis908p6r9q3jaqy2hx3f5aggbf09q"; + }; + + cargoSha256 = "1gf2km06qzvc0xv4vfxm6vdp3c5lgcjwwl92f4frga3cx51vbrzh"; + + meta = with lib; { + description = "Language that compiles to regular expressions"; + homepage = "https://github.com/yoav-lavi/melody"; + license = licenses.mit; + maintainers = with maintainers; [ jyooru ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b746e502f24..15a513bca1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27499,6 +27499,8 @@ with pkgs; melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; + melody = callPackage ../tools/misc/melody { }; + melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; meme-image-generator = callPackage ../applications/graphics/meme-image-generator { }; From 5182ce10fe38cabb8071659ab076bf2ecf138b01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 00:56:59 +0000 Subject: [PATCH 068/120] python310Packages.aioairzone: 0.3.3 -> 0.3.4 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index acb49627d58..fc62525915e 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.3.3"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mInpqQsH6GUyakA+74c3xvGRQvIFJ1rBa4bqWlJ9ea0="; + hash = "sha256-ENdgaG30Fll5HQOTcghkmqOAiMYEY1aHRIel4Bd25Pk="; }; propagatedBuildInputs = [ From 7ae938330517dc85516b5e2cd0ccbf44b0bfc7cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 10 Apr 2022 03:14:44 +0200 Subject: [PATCH 069/120] golint: disable broken tests, normalize version --- pkgs/development/tools/golint/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index aa6ce6c7cda..4a835067ac8 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -1,22 +1,27 @@ { lib, buildGoModule, fetchgit }: buildGoModule rec { - pname = "lint"; - version = "20201208-${lib.strings.substring 0 7 rev}"; - rev = "83fdc39ff7b56453e3793356bcff3070b9b96445"; + pname = "golint"; + version = "unstable-2020-12-08"; # we must allow references to the original `go` package, as golint uses # compiler go/build package to load the packages it's linting. allowGoReference = true; src = fetchgit { - inherit rev; url = "https://go.googlesource.com/lint"; + rev = "83fdc39ff7b56453e3793356bcff3070b9b96445"; sha256 = "sha256-g4Z9PREOxGoN7n/XhutawsITBznJlbz6StXeDYvOQ1c="; }; vendorSha256 = "sha256-dPadFoymYu2Uw2AXZfbaBfxsN8IWMuK1TrcknHco3Bo="; + # tests no longer work: + # found packages pkg (4.go) and foo (blank-import-lib.go) in /build/lint-6edffad/testdata + # testdata/errorf-custom.go:9:2: cannot find package "." in: + # /build/lint-6edffad/vendor/github.com/pkg/errors + doCheck = false; + meta = with lib; { homepage = "https://golang.org"; description = "Linter for Go source code"; From 5b0661970a88a875937d200990face27b6b25642 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 15:55:57 +0000 Subject: [PATCH 070/120] robin-map: 1.0.0 -> 1.0.1 --- pkgs/development/libraries/robin-map/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix index 4ab48c48442..229714723cd 100644 --- a/pkgs/development/libraries/robin-map/default.nix +++ b/pkgs/development/libraries/robin-map/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "robin-map"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "Tessil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h59khOUg7vzw64EAMT/uzTKHzx2M9q+pc2BhfGQiY3Q="; + sha256 = "sha256-4OW7PHow+O7R4t5+6iPV3E+1+6XPhqxrL1LQZitmCzQ="; }; nativeBuildInputs = [ cmake ]; From e8c84f90ed0f4f0f880d1217b26d6c026ec43a2f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Mar 2022 15:42:41 +0200 Subject: [PATCH 071/120] chromium: remove deprecated libgnome-keyring dependency libgnome-keyring has been deprecated for a long time. It has been superseded by libsecret, which allows access to not only GNOME Keyring secret manager but any other service implementing the Secret Service D-Bus API. In fact Chromium links against libsecret when use_glib is enabled: https://source.chromium.org/chromium/chromium/src/+/main:components/os_crypt/BUILD.gn;l=142;drc=35be6215ec8f09e50176f36753c68f26c63d1885 And use_glib is on by default on Linux: https://source.chromium.org/chromium/chromium/src/+/main:components/os_crypt/BUILD.gn;l=142;drc=35be6215ec8f09e50176f36753c68f26c63d1885 Unfortunately, Chromium is vendoring libsecret: https://source.chromium.org/chromium/chromium/src/+/main:components/os_crypt/BUILD.gn;l=187;drc=35be6215ec8f09e50176f36753c68f26c63d1885 We need to disable the flag explicitly, since it is enabled by default: https://source.chromium.org/chromium/chromium/src/+/main:components/os_crypt/features.gni;l=11;drc=35be6215ec8f09e50176f36753c68f26c63d1885 --- pkgs/applications/networking/browsers/chromium/common.nix | 4 +--- pkgs/applications/networking/browsers/chromium/default.nix | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 6dd6d98c0ef..4ddda3a2ba7 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -40,7 +40,6 @@ # Package customization: , gnomeSupport ? false, gnome2 ? null -, gnomeKeyringSupport ? false, libgnome-keyring3 ? null , cupsSupport ? true, cups ? null , proprietaryCodecs ? true , pulseSupport ? false, libpulseaudio ? null @@ -155,7 +154,6 @@ let libepoxy ] ++ optional systemdSupport systemd ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] - ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; @@ -271,7 +269,7 @@ let # Optional features: use_gio = true; - use_gnome_keyring = gnomeKeyringSupport; + use_gnome_keyring = false; # Superseded by libsecret use_cups = cupsSupport; # Feature overrides: diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index e8d9a13f9ac..35ff8b1de84 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -9,7 +9,6 @@ # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" , gnomeSupport ? false, gnome2 ? null -, gnomeKeyringSupport ? false , proprietaryCodecs ? true , enableWideVine ? false , ungoogled ? false # Whether to build chromium or ungoogled-chromium @@ -46,7 +45,7 @@ let mkChromiumDerivation = callPackage ./common.nix ({ inherit channel chromiumVersionAtLeast versionRange; - inherit gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs + inherit gnome2 gnomeSupport proprietaryCodecs cupsSupport pulseSupport ungoogled; gnChromium = gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; From e3e625ffe4f256440699717bdb8b7f6d52d9084d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Mar 2022 16:10:35 +0200 Subject: [PATCH 072/120] chromium: remove unused GConf dependency GConf has been deprecated for ages and support for it removed from Chromium a while ago: - Removal of `use_gconf` gn build system flag: https://chromium.googlesource.com/chromium/src/+/a28f4d062f4c030eeddd085f261988d7958db2ba --- pkgs/applications/networking/browsers/chromium/common.nix | 4 +--- pkgs/applications/networking/browsers/chromium/default.nix | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4ddda3a2ba7..a303dabad32 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -39,13 +39,12 @@ , glibc # gconv + locale # Package customization: -, gnomeSupport ? false, gnome2 ? null , cupsSupport ? true, cups ? null , proprietaryCodecs ? true , pulseSupport ? false, libpulseaudio ? null , ungoogled ? false, ungoogled-chromium # Optional dependencies: -, libgcrypt ? null # gnomeSupport || cupsSupport +, libgcrypt ? null # cupsSupport , systemdSupport ? stdenv.isLinux , systemd }: @@ -153,7 +152,6 @@ let curl libepoxy ] ++ optional systemdSupport systemd - ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 35ff8b1de84..5bd24faafe4 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -8,7 +8,6 @@ # package customization # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" -, gnomeSupport ? false, gnome2 ? null , proprietaryCodecs ? true , enableWideVine ? false , ungoogled ? false # Whether to build chromium or ungoogled-chromium @@ -45,7 +44,7 @@ let mkChromiumDerivation = callPackage ./common.nix ({ inherit channel chromiumVersionAtLeast versionRange; - inherit gnome2 gnomeSupport proprietaryCodecs + inherit proprietaryCodecs cupsSupport pulseSupport ungoogled; gnChromium = gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; From 2ba10610273a4163dbc506eceb4b60c3045f71ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 02:11:39 +0000 Subject: [PATCH 073/120] python310Packages.astroquery: 0.4.5 -> 0.4.6 --- pkgs/development/python-modules/astroquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index a022c80b16b..6c1d39a82b0 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "astroquery"; - version = "0.4.5"; + version = "0.4.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "20002f84b61fb11ceeae408a4cd23b379490e174054ec777f946df8a3f06be1b"; + sha256 = "sha256-MHylVMtzSgypoi+G9e/+fkE6+ROuZeFXiXLYR7H+E+4="; }; disabled = !isPy3k; From 1ddb0fe08cac0605f04c30929d82b2302d4ccbbd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 20:05:47 +0000 Subject: [PATCH 074/120] glibmm_2_68: 2.70.0 -> 2.72.0 --- pkgs/development/libraries/glibmm/2.68.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index 1ba18898ad8..e0ef34a451e 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.70.0"; + version = "2.72.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-gAj9iu3cyGej+X8RPeYl9ulu+Yz3hgN5gTqcD+/9tSA="; + sha256 = "sha256-eCkkvxNklvOHj9wqCqnvQPDFFeLD4FTK/6XS5SOAxx4="; }; nativeBuildInputs = [ From 3a999186fd5ecfaf2b0da7481ab3cfe966eb663d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 05:19:21 +0000 Subject: [PATCH 075/120] python310Packages.cupy: 10.2.0 -> 10.3.1 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index beba7d21e0c..cdd11e5010b 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -9,12 +9,12 @@ let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "10.2.0"; + version = "10.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-5ovvA76QGOsOnVztMfDgLerks5nJrKR08rLc+ArmWA8="; + sha256 = "sha256-c8BOKI1AWU+zN8lhliRus55PUAgvFm+TlxKToYn7jWc="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both From 2fd4f690a90a8405073ff040935807ef86a06512 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 05:36:08 +0000 Subject: [PATCH 076/120] xmedcon: 0.21.2 -> 0.22.0 --- pkgs/applications/science/medicine/xmedcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix index bee2be729d1..2050517894b 100644 --- a/pkgs/applications/science/medicine/xmedcon/default.nix +++ b/pkgs/applications/science/medicine/xmedcon/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "xmedcon"; - version = "0.21.2"; + version = "0.22.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0svff8rc3j2p47snaq1hx9mv4ydmxawpb0hf3d165g1ccjwvmm6m"; + sha256 = "sha256-Ui7XoLSzTMPIFW/3nARCmvlGF+1l7pmcnKsnvn3NFJE="; }; buildInputs = [ From ab3d8bd20ddda39c1a7cb85082560c31bd1e1b66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 06:47:06 +0000 Subject: [PATCH 077/120] yed: 3.21.1 -> 3.22 --- pkgs/applications/graphics/yed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index d2873f64142..0385c5db9d8 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yEd"; - version = "3.21.1"; + version = "3.22"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; - sha256 = "1jw28hkd7p0n660gid8yh5y0kdcz6ycn4hsgjlf0pq48x9kv6w0c"; + sha256 = "sha256-GHYdvWie2k9YarS9DaA4bExswV3UQ26O8+7K/6yvtac="; }; nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ]; From a37726b71f552898e87d47462f04acb057a43a77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 08:21:00 +0000 Subject: [PATCH 078/120] python310Packages.graphql-subscription-manager: 0.5.6 -> 0.6.0 --- .../python-modules/graphql-subscription-manager/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/pkgs/development/python-modules/graphql-subscription-manager/default.nix index ab12d350088..40b7b0be687 100644 --- a/pkgs/development/python-modules/graphql-subscription-manager/default.nix +++ b/pkgs/development/python-modules/graphql-subscription-manager/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "graphql-subscription-manager"; - version = "0.5.6"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Danielhiversen"; repo = "PyGraphqlWebsocketManager"; - rev = version; - hash = "sha256-nieKl25yDc3FHnMqwn6FNzWKd8sas3rTlBonYbJc1tg="; + rev = "refs/tags/${version}"; + hash = "sha256-5+KHPm/JuazObvuC2ip6hwQxvjJH/lDgukJMH49cuwg="; }; propagatedBuildInputs = [ From 4ba10af21f3581ac7c8eb59ca2e14e88711fc6f9 Mon Sep 17 00:00:00 2001 From: Anatolii Prylutskyi Date: Sun, 27 Mar 2022 13:24:27 +0300 Subject: [PATCH 079/120] xdragon: refactor After removing duplicate package "dragon-drop" moving xdragon to X11 folder. --- pkgs/{applications/misc => tools/X11}/xdragon/default.nix | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{applications/misc => tools/X11}/xdragon/default.nix (100%) diff --git a/pkgs/applications/misc/xdragon/default.nix b/pkgs/tools/X11/xdragon/default.nix similarity index 100% rename from pkgs/applications/misc/xdragon/default.nix rename to pkgs/tools/X11/xdragon/default.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 174d2c72199..02441bc859b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -273,6 +273,7 @@ mapAliases ({ dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 dotnet-netcore = dotnet-runtime; # Added 2021-10-07 double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22 + dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10; draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14 dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03 dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b29994d3a57..24e7795c28f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2982,8 +2982,6 @@ with pkgs; dpic = callPackage ../tools/graphics/dpic { }; - dragon-drop = throw "'dragon-drop' has been renamed to/replaced by 'xdragon'"; # Converted to throw 2022-03-27; - dstp = callPackage ../development/tools/dstp { }; dsvpn = callPackage ../applications/networking/dsvpn { }; @@ -34066,7 +34064,7 @@ with pkgs; sift = callPackage ../tools/text/sift { }; - xdragon = lowPrio (callPackage ../applications/misc/xdragon { }); + xdragon = lowPrio (callPackage ../tools/X11/xdragon { }); xlockmore = callPackage ../misc/screensavers/xlockmore { }; From a4e4e497dfe8e1f140569d34e1d14b3b96ab2924 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Mar 2022 20:32:17 +0000 Subject: [PATCH 080/120] xdragon: 1.1.1 -> 1.2.0 --- pkgs/tools/X11/xdragon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xdragon/default.nix b/pkgs/tools/X11/xdragon/default.nix index 39f291a8849..7061a8f0a1c 100644 --- a/pkgs/tools/X11/xdragon/default.nix +++ b/pkgs/tools/X11/xdragon/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "xdragon"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "mwh"; repo = "dragon"; rev = "v${version}"; - sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra"; + sha256 = "sha256-wqG6idlVvdN+sPwYgWu3UL0la5ssvymZibiak3KeV7M="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 ]; - installFlags = [ "PREFIX=${placeholder "out"}/bin" ]; + installFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' ln -s $out/bin/dragon $out/bin/xdragon ''; From f4a3848a68841f3497e77ff5da64075dfaed6edd Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 10 Apr 2022 09:40:58 +0000 Subject: [PATCH 081/120] linux: 4.14.274 -> 4.14.275 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 0683e7d6ad4..edf274aa85c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.274"; + version = "4.14.275"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1bbz1w5l7im7dspq6g6iy5vahsxcaa1b2ykrw49m3pw8rf7m6hib"; + sha256 = "1yaq5qhl694ygx17x998syg79yx72l3n9vzfkyf0g3idzdh9j2hh"; }; } // (args.argsOverride or {})) From 46e8fed971b33b0e8cd08d200a23a709fe4a8b71 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 10 Apr 2022 09:41:06 +0000 Subject: [PATCH 082/120] linux: 5.10.109 -> 5.10.110 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 7b5c9cba144..be92811a34c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.109"; + version = "5.10.110"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1p0k46isy2wzzms801lrnb59f1nb9mhywjj7fnkrwrj9nbn25yqq"; + sha256 = "14sn906f1bd87ngq1g2hx458v42d4nlzr36ba4alhcsl6836mvyv"; }; } // (args.argsOverride or {})) From 2827192c14f0be6bb01dded023e44c80a775208e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 10 Apr 2022 09:41:12 +0000 Subject: [PATCH 083/120] linux: 5.15.32 -> 5.15.33 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index dab27c119aa..4cf4fbf8e78 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.32"; + version = "5.15.33"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "11nz2w6hgwy6va6sxf4ic1s4kv24zbpssgjxsq6n321h4bxcsqql"; + sha256 = "1i590npi00w5d1znmamkm3sb293k5k4xd37miwnvz7hg17k1f2n3"; }; } // (args.argsOverride or { })) From 89e6f752db1f3d6d99bcf8d32996652e725f25b7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 10 Apr 2022 09:41:19 +0000 Subject: [PATCH 084/120] linux: 5.16.18 -> 5.16.19 --- pkgs/os-specific/linux/kernel/linux-5.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.16.nix b/pkgs/os-specific/linux/kernel/linux-5.16.nix index 4dcb71c4f5c..dc0f4b14156 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.16.18"; + version = "5.16.19"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "096f80m2czj8khvil7s037pqdf1s6pklqn5d9419jqkz7v70piry"; + sha256 = "0zlvsnbmcx4l8a5cqciwaabm1267q5zn4ah3gfhxi0jvigx2qvfs"; }; } // (args.argsOverride or { })) From cc0d60827924b30fe30572201adafa66d847e044 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 10 Apr 2022 09:41:26 +0000 Subject: [PATCH 085/120] linux: 5.17.1 -> 5.17.2 --- pkgs/os-specific/linux/kernel/linux-5.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.17.nix b/pkgs/os-specific/linux/kernel/linux-5.17.nix index edd5339e103..c1a037283ac 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.17.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.17.1"; + version = "5.17.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "092cx18va108lb27kxx2b00ma3l9g22nmkk81034apx26bacbmbw"; + sha256 = "168b7zzw72k6hxbw0q402vvfir79qki9bjvxxvfi7s6g6y20z8id"; }; } // (args.argsOverride or { })) From 83fdd68cba423b30c64834587ee75d1888ff5040 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 10 Apr 2022 09:41:59 +0000 Subject: [PATCH 086/120] linux-rt_5_10: 5.10.106-rt64 -> 5.10.109-rt65 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index cf0744bce68..7162fe8ac19 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.106-rt64"; # updated by ./update-rt.sh + version = "5.10.109-rt65"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0yjrlghcxw3lhd6nc2m4zy4gk536w3a3w6mxdsml690fqz4531n6"; + sha256 = "1p0k46isy2wzzms801lrnb59f1nb9mhywjj7fnkrwrj9nbn25yqq"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0z5gyi1vyjyd05vyccmk9yfgvm5v1lc8vbfywahx495xzpp9i8xb"; + sha256 = "0w7bs5kmwvbyfy5js218ys42s8i51m8v0mbkfhiynlpm3iph357q"; }; }; in [ rt-patch ] ++ kernelPatches; From 3a47fa6f0a17b9c85072a2902fe64c24ac6b17d7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 10 Apr 2022 09:42:32 +0000 Subject: [PATCH 087/120] linux-rt_5_4: 5.4.182-rt71 -> 5.4.182-rt72 --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 747563e3c01..a7135d83bbd 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.182-rt71"; # updated by ./update-rt.sh + version = "5.4.182-rt72"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -21,7 +21,7 @@ in buildLinux (args // { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1lxj63v37bhdgynr8ffyd5g8vp5a79dnzi6fng7jsjapfriywzqh"; + sha256 = "175ls411yr6c8gvmpfpyl00l0saaz9bdshjdf6ybxbpi9fmamypk"; }; }; in [ rt-patch ] ++ kernelPatches; From 46093e942f8b7189d24e61495e43c47aff2ede71 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 10 Apr 2022 18:05:20 +0800 Subject: [PATCH 088/120] garage: 0.6.1 -> 0.7.0 --- pkgs/tools/filesystems/garage/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 9b96f1c0a8e..9d9f2535a04 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -1,17 +1,19 @@ -{ lib, rustPlatform, fetchFromGitea, testVersion, garage }: +{ lib, rustPlatform, fetchFromGitea, protobuf, testVersion, garage }: rustPlatform.buildRustPackage rec { pname = "garage"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitea { domain = "git.deuxfleurs.fr"; owner = "Deuxfleurs"; repo = "garage"; rev = "v${version}"; - sha256 = "sha256-BEFxPU4yPtctN7H+EcxJpXnf4tyqBseskls0ZA9748k="; + sha256 = "sha256-gs0TW431YUrdsdJ+PYrJgnLiBmDPYnUR0iVnQ/YqIfU="; }; - cargoSha256 = "sha256-/mOH7VOfIHEydnJUUSts44aGb8tS1/Faxiu4pQDeobY="; + cargoSha256 = "sha256-XGSenT2q3VXNcIT1Lg1e5HTOkEdOb1o3H07ahteQM/o="; + + nativeBuildInputs = [ protobuf ]; passthru = { tests.version = testVersion { package = garage; }; From a7849020612b3e1cab94cc59f0480c3c0d9655ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 10:21:13 +0000 Subject: [PATCH 089/120] python310Packages.jsbeautifier: 1.14.2 -> 1.14.3 --- pkgs/development/python-modules/jsbeautifier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index bdd0897acbe..5109f8ffe27 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.14.2"; + version = "1.14.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PskybkfTilQ5W97/h2lWakcnWOcLnhG6fMVs/spqm/Y="; + hash = "sha256-1tV2J8+ezYzZAbnsetSogSeo3t6RAXf6SyGedtAvm9c="; }; propagatedBuildInputs = [ From 53b1013f991c0ded64de1396cd5ae56343ec111e Mon Sep 17 00:00:00 2001 From: Van Tuan Vo Date: Thu, 17 Mar 2022 10:56:01 +0100 Subject: [PATCH 090/120] kotlin-language-server: fix missing JDK in PATH --- .../development/tools/kotlin-language-server/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kotlin-language-server/default.nix b/pkgs/development/tools/kotlin-language-server/default.nix index d48c5ace3e3..ded948d8343 100644 --- a/pkgs/development/tools/kotlin-language-server/default.nix +++ b/pkgs/development/tools/kotlin-language-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, openjdk11, gradle }: +{ lib, stdenv, fetchurl, unzip, openjdk11, gradle, makeWrapper, maven }: stdenv.mkDerivation rec { pname = "kotlin-language-server"; @@ -17,14 +17,19 @@ stdenv.mkDerivation rec { cp -r bin/* $out/bin ''; - nativeBuildInputs = [ unzip gradle ]; + nativeBuildInputs = [ unzip gradle makeWrapper ]; buildInputs = [ openjdk11 gradle ]; + postFixup = '' + wrapProgram "$out/bin/kotlin-language-server" --set JAVA_HOME ${openjdk11} --prefix PATH : ${lib.strings.makeBinPath [ openjdk11 maven ] } + ''; + meta = { description = "kotlin language server"; longDescription = '' About Kotlin code completion, linting and more for any editor/IDE using the Language Server Protocol Topics''; + maintainers = with lib.maintainers; [ vtuan10 ]; homepage = "https://github.com/fwcd/kotlin-language-server"; license = lib.licenses.mit; platforms = lib.platforms.unix; From bc6912323b4125bb2715b68fef4ee969c1c087aa Mon Sep 17 00:00:00 2001 From: Van Tuan Vo Date: Mon, 21 Mar 2022 11:33:13 +0100 Subject: [PATCH 091/120] kotlin-language-server: use fetchzip --- pkgs/development/tools/kotlin-language-server/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/kotlin-language-server/default.nix b/pkgs/development/tools/kotlin-language-server/default.nix index ded948d8343..802763fc67a 100644 --- a/pkgs/development/tools/kotlin-language-server/default.nix +++ b/pkgs/development/tools/kotlin-language-server/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, unzip, openjdk11, gradle, makeWrapper, maven }: +{ lib, stdenv, fetchzip, openjdk11, gradle, makeWrapper, maven }: stdenv.mkDerivation rec { pname = "kotlin-language-server"; version = "1.3.0"; - src = fetchurl { + src = fetchzip { url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip"; - sha256 = "sha256-yyqI+87vtggSeAfb3OEftalknqbTDEQ5gTJwB/EMIlY="; + hash = "sha256-nqrZoSntomNLUMTni/yoiVhDOJFSFmZeGze8IJhITu0="; }; dontBuild = true; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp -r bin/* $out/bin ''; - nativeBuildInputs = [ unzip gradle makeWrapper ]; + nativeBuildInputs = [ gradle makeWrapper ]; buildInputs = [ openjdk11 gradle ]; postFixup = '' From af91ac7b0f2a6f8cd0ba4b96b939c026efaa09eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 10:47:59 +0000 Subject: [PATCH 092/120] clj-kondo: 2022.03.09 -> 2022.04.08 --- pkgs/development/tools/clj-kondo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 0a369bd5f03..0268ad463ff 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2022.03.09"; + version = "2022.04.08"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-gPn3wORb30I/zTXUdxUxMesKFJx6ES7jEjUYuC/DAVI="; + sha256 = "sha256-dZtiwePwgLgKc0WkSnxI2zW9hOWKVW5+rO905LQhgvQ="; }; extraNativeImageBuildArgs = [ From 33823d491d7e9861968bcd8a4df819c0aa4824f5 Mon Sep 17 00:00:00 2001 From: Van Tuan Vo Date: Sun, 10 Apr 2022 12:58:45 +0200 Subject: [PATCH 093/120] klipper: add numpy dependency Numpy is required in klipper to measure resonances via hardware like the adxl345 board. --- pkgs/servers/klipper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 490bb9c9e09..7b2bb8d4df9 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # NB: This is needed for the postBuild step nativeBuildInputs = [ (python2.withPackages ( p: with p; [ cffi ] )) ]; - buildInputs = [ (python2.withPackages (p: with p; [ cffi pyserial greenlet jinja2 ])) ]; + buildInputs = [ (python2.withPackages (p: with p; [ cffi pyserial greenlet jinja2 numpy ])) ]; # we need to run this to prebuild the chelper. postBuild = "python2 ./chelper/__init__.py"; From 6da2a24cc3cc4f0e71b0ee652865503fd9994950 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 11:42:08 +0000 Subject: [PATCH 094/120] checkSSLCert: 2.23.0 -> 2.24.0 --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index b55b47cd7af..dc0aa891bdf 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.23.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "sha256-RGl6Fgm9FVaZQMWHl93RwHvrScz69VgbIyDBqMh3PVo="; + sha256 = "sha256-TZT37W4A09t7okPFfcOJOQEAKAchH1FJ+LRftdHZQsM="; }; nativeBuildInputs = [ From e3f8ca40e91c962e63866a9b3626b2dfd3d1de52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 11:46:40 +0000 Subject: [PATCH 095/120] chamber: 2.10.8 -> 2.10.9 --- pkgs/tools/admin/chamber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index f0d90cde98a..56d4213481c 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chamber"; - version = "2.10.8"; + version = "2.10.9"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rU9xywEa9E1VG1CaRGHzjXTL+0erlgP1thDTYBz+oLM="; + sha256 = "sha256-rOOpwLoEiTS41VIPvqoq8yGP4GOOCOJNFfLLxt9mfvM="; }; CGO_ENABLED = 0; From b3b25b82463bdba6606da3f4e08509735229901a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 10 Apr 2022 12:47:08 +0100 Subject: [PATCH 096/120] clib: remove hardeningDisable fortify --- pkgs/tools/package-management/clib/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index aac1b8d6000..34399a78c5d 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-AzPpGwtZemKX2r/XKyNTJ+lVwU1QUxkB2OywtCwTAWs="; }; - hardeningDisable = [ "fortify" ]; - makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ curl ]; From 24fc4878bcd30929ce6f3964e76cc8746560ec77 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 9 Apr 2022 12:33:50 -0400 Subject: [PATCH 097/120] starship: 1.3.0 -> 1.5.4 --- pkgs/tools/misc/starship/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index a27674290d6..b595cf10294 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -9,22 +9,23 @@ , nixosTests , Security , Foundation +, Cocoa }: rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.3.0"; + version = "1.5.4"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mqUE4JzNBhvtDpT2LM23eHX8q93wtPqA+/zr/PxEDiE="; + sha256 = "sha256-nLzqfSRmA+D310MDvX+g8nNsoaiSixG+j+g87CPzYMs="; }; nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ libgit2 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation ]; + buildInputs = [ libgit2 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation Cocoa ]; postInstall = '' for shell in bash fish zsh; do @@ -33,7 +34,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-hQNDiayVT4UgbxcxdXssi/evPvwgyvG/UOFyEHj7jpo="; + cargoSha256 = "sha256-FXzAvO11NIr6dxF2OeV5XJWHG2kgZiASuBnoC6mSps8="; preCheck = '' HOME=$TMPDIR diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 592ce2e63a7..986ff6589c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24294,7 +24294,7 @@ with pkgs; stdmanpages = callPackage ../data/documentation/std-man-pages { }; starship = callPackage ../tools/misc/starship { - inherit (darwin.apple_sdk.frameworks) Security Foundation; + inherit (darwin.apple_sdk.frameworks) Security Foundation Cocoa; }; stig = callPackage ../applications/networking/p2p/stig { }; From 3db257c3e361ebf75cc3862745d5f09c0c02f656 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 11:49:57 +0000 Subject: [PATCH 098/120] python310Packages.plugwise: 0.17.3 -> 0.17.6 --- pkgs/development/python-modules/plugwise/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index d5e10f32a19..28efe63eb3c 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.17.3"; + version = "0.17.6"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; - rev = "v${version}"; - sha256 = "sha256-1wSVmH7woTR2ebHS5FfWHLqwbY04rxtPx/0A/HY+N8s="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Znhtw4VQ7r26rluLa5I+b3TMJ+Wyog7uaUReHORHOgU="; }; postPatch = '' From 0fc77bcb21f789e6dedcd0804e0a9459211124f5 Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Sun, 10 Apr 2022 13:59:30 +0200 Subject: [PATCH 099/120] qalculate-gtk: 4.1.0 -> 4.1.1 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 4f68eb6ae78..9571588040b 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-EOiExp8JBc3SybSiBVbuRxBqTujzLjysWM0v94goups="; + sha256 = "sha256-itYNKcdWYMoqlvZ7CYJ6WMv7rS/y1SVdt3O7ahkjPOk="; }; hardeningDisable = [ "format" ]; From 3531ed7e06a26dae285036582a2a2f3f73144a2d Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 10 Apr 2022 15:10:16 +0300 Subject: [PATCH 100/120] vial: 0.4.2 -> 0.5 --- pkgs/tools/misc/vial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix index 7bc78803167..2fc816e1ab3 100644 --- a/pkgs/tools/misc/vial/default.nix +++ b/pkgs/tools/misc/vial/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, appimageTools }: let name = "vial-${version}"; - version = "0.4.2"; + version = "0.5"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - sha256 = "sha256-T3aSwv/qTJHR/Fa6qU1fWbp3duvny4lC+9jBwQzpw2w="; + sha256 = "sha256-11IA8WeDFnukm6kskjA6Qu4+rPoLTBjz6NIixAIOH5U="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; From e4c93fb04c24119c40676de01ab08c9346e08a8f Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Sun, 10 Apr 2022 14:19:22 +0200 Subject: [PATCH 101/120] nixos/openconnect: add hardening flags --- nixos/modules/services/networking/openconnect.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/openconnect.nix b/nixos/modules/services/networking/openconnect.nix index 7b2ef48e1c4..de4b505130e 100644 --- a/nixos/modules/services/networking/openconnect.nix +++ b/nixos/modules/services/networking/openconnect.nix @@ -103,6 +103,8 @@ let generateConfig name icfg } ${icfg.gateway}"; StandardInput = "file:${icfg.passwordFile}"; + + ProtectHome = true; }; }; in { From 6ebcd043e2780ac1a7e87c54304d68d4b2fd24b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 12:33:50 +0000 Subject: [PATCH 102/120] calc: 2.14.0.14 -> 2.14.1.0 --- pkgs/applications/science/math/calc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index f9931c7d4c9..41adb1cfbe6 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.14.0.14"; + version = "2.14.1.0"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-93J4NaED2XEsVxlY6STpwlS9FI8I60NIAZvDT45xxV0="; + sha256 = "sha256-C1YWZS4x7htUWF3MhRLQIYChL4rdwJxASdPQjttUr0A="; }; postPatch = '' From b1e76e8447c045891ce21110af284ef09511b35c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 12:47:34 +0000 Subject: [PATCH 103/120] circleci-cli: 0.1.16947 -> 0.1.17087 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 5184f22aecd..c07f1bbcb4c 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.16947"; + version = "0.1.17087"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RGkC1XhrssrX4IBh1OrzEowvbPPUK7jXZxxa+FEV/WE="; + sha256 = "sha256-abXJ91U/qh/bitms1ZLxgAr80swFk8sBGPUHi08+Kcc="; }; vendorSha256 = "sha256-7u2y1yBVpXf+D19tslD4s3B1KmABl4OWNzzLaBNL/2U="; From 80a86975dbf0a781f43a37401d491ca8bc06132b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 12:55:28 +0000 Subject: [PATCH 104/120] buildkit: 0.10.0 -> 0.10.1 --- pkgs/development/tools/buildkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index df644935cf1..9244a80672e 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-Pdnu0zG1LteAob0YUuG/XDh2pfBj5UO2GrkWFlMZeGY="; + sha256 = "sha256-qMSXz4ZJ0po+Qi/K3Q/51MgHBO4tOa+DHw6Ok0yYc+k="; }; vendorSha256 = null; From d23b04495958ec00a60a55d77be9f24922f52ef0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 10 Apr 2022 11:38:42 +0200 Subject: [PATCH 105/120] tests formats: fix due to tomlkit output change --- pkgs/pkgs-lib/tests/formats.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index 99b88d36ec3..6ace13044b4 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -165,9 +165,6 @@ in runBuildTests { [attrs] foo = "foo" - - [level1] - [level1.level2] [level1.level2.level3] level4 = "deep" ''; From 085d0eebb71f4d8d3c371185f0c7e091adb37437 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 14:50:41 +0000 Subject: [PATCH 106/120] python310Packages.pyathena: 2.5.1 -> 2.5.2 --- pkgs/development/python-modules/pyathena/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index fe9d3276e1b..7a44cf995e3 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.5.1"; + version = "2.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyAthena"; inherit version; - sha256 = "sha256-GTcDiDtZGgTpdl6YBgPuztv7heEPZ/ymhup/4JwfELA="; + sha256 = "sha256-vjoK6lEitvd5vqSEE/ael8q00O05lquKIviFK/bPlVQ="; }; propagatedBuildInputs = [ From 81ab3418dcb594f02864120c21af804ba0443999 Mon Sep 17 00:00:00 2001 From: Frido Friedemann Date: Sun, 10 Apr 2022 17:01:03 +0200 Subject: [PATCH 107/120] python3Packages.ipympl: add mpl to buildinputs --- pkgs/development/python-modules/ipympl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index 08b41e62978..922a619a406 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -3,6 +3,7 @@ , fetchPypi , ipykernel , ipywidgets +, matplotlib }: buildPythonPackage rec { @@ -16,7 +17,7 @@ buildPythonPackage rec { }; - propagatedBuildInputs = [ ipykernel ipywidgets ]; + propagatedBuildInputs = [ ipykernel ipywidgets matplotlib ]; # There are no unit tests in repository doCheck = false; From 7f8c513362f84e1763b386f005e6c1f59f3f0679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Mar 2022 01:17:35 +0200 Subject: [PATCH 108/120] python39Packages.pycurl: disable failing tests, add SuperSandro2000 as maintainer (cherry picked from commit c270defab79e46b4c98039b09ab6209d1a69ffb3) --- pkgs/development/python-modules/pycurl/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 5b62b3bb016..3b23d8b95b2 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -71,12 +71,17 @@ buildPythonPackage rec { "test_libcurl_ssl_gnutls" # AssertionError: assert 'crypto' in ['curl'] "test_ssl_in_static_libs" + # pycurl.error: (27, '') + "test_getinfo_raw_certinfo" + "test_request_with_certinfo" + "test_request_with_verifypeer" + "test_request_without_certinfo" ]; meta = with lib; { homepage = "http://pycurl.io/"; description = "Python Interface To The cURL library"; license = with licenses; [ lgpl2Only mit ]; - maintainers = with maintainers; []; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 65c02f8b4cf2a21b264b387cc65a31137d4259bb Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 10 Apr 2022 08:58:49 +0100 Subject: [PATCH 109/120] binutils-unwrapped-all-targets: init at 2.38 It's not exactly a new package: binutils has been exposing `withAllTargets = true;` knob for a while. To give it more official status let's expose it as an `binutils-unwrapped-all-targets` attribute. Note that `binutils-unwrapped.override { withAllTargets = true; }` does not work due to recursive definition of binutils. Closes: https://github.com/NixOS/nixpkgs/issues/82792 --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88a1aa43d99..a071c7d3c91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14561,6 +14561,12 @@ with pkgs; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; }; + binutils-unwrapped-all-targets = callPackage ../development/tools/misc/binutils { + autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook; + # FHS sys dirs presumably only have stuff for the build platform + noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; + withAllTargets = true; + }; binutils = wrapBintoolsWith { bintools = binutils-unwrapped; }; From d49da6386a00c8038cfc9f4258b07781415e6df7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 16:11:31 +0000 Subject: [PATCH 110/120] python310Packages.pynina: 0.1.7 -> 0.1.8 --- pkgs/development/python-modules/pynina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynina/default.nix b/pkgs/development/python-modules/pynina/default.nix index 8227e01edc2..be81bd6e655 100644 --- a/pkgs/development/python-modules/pynina/default.nix +++ b/pkgs/development/python-modules/pynina/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynina"; - version = "0.1.7"; + version = "0.1.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyNINA"; inherit version; - sha256 = "sha256-7sceYmzOmXJMKaIdGmXMuCAum0aJeVTxx1w/jZy5Eig="; + sha256 = "sha256-U8/SzkkZJLRBpTQx8NRpFWUlckn4Jr0n9cHR4/plyb0="; }; propagatedBuildInputs = [ From 510dfffd7567875aed4ab017373895ffeb5c9853 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 7 Apr 2022 11:29:58 +0000 Subject: [PATCH 111/120] yaru-theme: 22.04.3.1 -> unstable-2022-04-07 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: José Romildo Malaquias --- pkgs/data/themes/yaru/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index a27370b9636..e2bc278299d 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,21 +16,18 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "22.04.3.1"; + version = "unstable-2022-04-07"; # 22.04.3.1 is broken src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; - rev = version; - sha256 = "sha256-nNI6Nm3ZpIJRTbIbe/P9cKofcthb6qWKjn81/ZpPo2g="; + rev = "9bdbf66bf3718c6595c7a15ef4698ba471a36526"; + sha256 = "02f6m0jxnsczw3y7v7bqdihxa33sx2z93yn3j8w4z9r9fv2pn06b"; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; - buildInputs = [ gtk3 gnome.gnome-themes-extra ]; - propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; dontDropIconThemeCache = true; From a47e82e7856bbe1d43991927b5f019d8cde6d200 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 14:52:44 +0000 Subject: [PATCH 112/120] elixir: 1.13.3 -> 1.13.4 --- pkgs/development/interpreters/elixir/1.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.13.nix b/pkgs/development/interpreters/elixir/1.13.nix index 0e1ddcc19bf..452c3c5413e 100644 --- a/pkgs/development/interpreters/elixir/1.13.nix +++ b/pkgs/development/interpreters/elixir/1.13.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.13.3"; - sha256 = "sha256-xOIGMpjemPi1xLiYmFpQR4FD6PzeFBxSJP4QpNnEUSE="; + version = "1.13.4"; + sha256 = "sha256-xGKq62wzaIfgZN2j808fL3b8ykizQVPuePWzsy2HKfw="; minimumOTPVersion = "22"; } From e7dd2d60d6d8aab3860ae7630974ee95ee28d87c Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 7 Apr 2022 02:50:06 +0200 Subject: [PATCH 113/120] kvmtool: init at 2021-12-14 --- .../virtualization/kvmtool/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/virtualization/kvmtool/default.nix diff --git a/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/applications/virtualization/kvmtool/default.nix new file mode 100644 index 00000000000..a99a9f64d86 --- /dev/null +++ b/pkgs/applications/virtualization/kvmtool/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, lib }: + +stdenv.mkDerivation { + pname = "kvmtool"; + version = "unstable-2022-04-04"; + + src = fetchgit { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git"; + rev = "5657dd3e48b41bc6db38fa657994bc0e030fd31f"; + sha256 = "1y1j44lk9957f2dmyrscbxl4zncp4ibvvcdj6bwylb8jsvmd5fs2"; + }; + + enableParallelBuilding = true; + makeFlags = [ "prefix=${placeholder "out"}" ]; + + meta = with lib; { + description = "A lightweight tool for hosting KVM guests"; + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/tree/README"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ astro ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 986ff6589c8..f8d01b0fc90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25596,6 +25596,8 @@ with pkgs; kerbrute = callPackage ../tools/security/kerbrute { }; + kvmtool = callPackage ../applications/virtualization/kvmtool { }; + exrdisplay = callPackage ../applications/graphics/exrdisplay { }; exrtools = callPackage ../applications/graphics/exrtools { }; From 13587bb649b323a0e9bae51ac2e9e6ede084070d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 10 Apr 2022 21:26:02 +0200 Subject: [PATCH 114/120] jmusicbot: 0.3.6 -> 0.3.8 --- pkgs/applications/audio/jmusicbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index 60df749a142..94290ada7b3 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "JMusicBot"; - version = "0.3.6"; + version = "0.3.8"; src = fetchurl { url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar"; - sha256 = "sha256-Hc3dsOADC+jVZScY19OYDkHimntMjdw/BoB3EUS/d0k="; + sha256 = "sha256-wzmrh9moY6oo3RqOy9Zl1X70BZlvbJkQmz8BaBIFtIM="; }; dontUnpack = true; From 688d6d243589cc57e326e2b2eca52329db7997aa Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 21 Mar 2022 20:29:10 +0100 Subject: [PATCH 115/120] chromium: get-commit-message.py: Support releases with 0 security fixes Wow, a Chrome release without any (known!) security fixes: https://chromereleases.googleblog.com/2022/03/stable-channel-update-for-desktop_20.html --- .../networking/browsers/chromium/get-commit-message.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 85ebb8a7b93..833b6b8283d 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -38,9 +38,9 @@ for entry in feed.entries: else: print('chromium: TODO -> ' + version + '\n') print(url) - if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0): - zero_days = re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content) - if zero_days: + if fixes := re.search(r'This update includes .+ security fixes\.', content): + fixes = fixes.group(0) + if zero_days := re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content): fixes += " " + zero_days.group(0) print('\n' + '\n'.join(textwrap.wrap(fixes, width=72))) if cve_list := re.findall(r'CVE-[^: ]+', content): From 073c33c3a6f9283e47f59758ac9155b71ed34f71 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 10 Apr 2022 21:44:08 +0200 Subject: [PATCH 116/120] chromiumBeta: 101.0.4951.15 -> 101.0.4951.26 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index b83aae6c34b..a27752bda8a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "101.0.4951.15", - "sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y", - "sha256bin64": "0z2rx7mw9wg5ly8wmxkflk8f9gifq4cxqvi224v9dr11qqj8gwm2", + "version": "101.0.4951.26", + "sha256": "1wpdi5l0bic0z9ydvx5vj35z6fh21b3n8dsxyvcbm0rq4fca5zcg", + "sha256bin64": "13mx2jxq5pjzp6dxvnzkfs83krhvpbw0pim7z4c7hhyphjc4fhzr", "deps": { "gn": { "version": "2022-03-14", From e728cfe252ad1b1a9e4c03f8a33338a3a9fd3c3d Mon Sep 17 00:00:00 2001 From: Ferdinand Bachmann Date: Sun, 10 Apr 2022 21:53:54 +0200 Subject: [PATCH 117/120] wl-mirror: 0.9.2 -> 0.10.0 --- pkgs/tools/wayland/wl-mirror/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index 02c63c55a76..c1d67489829 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -26,13 +26,13 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-W/8DApyd7KtrOrP7Qj6oPKXxLrVzHDuIMOdg+k5ngr4="; + hash = "sha256-ygzSLbzn4P/BdYbqUDduUGwSbRHeU/OBYOX2uznVy1g="; }; patchPhase = '' From 507dc6bae6d1893f7c07782e86c6f3814ca15674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 10 Apr 2022 22:25:03 +0200 Subject: [PATCH 118/120] pngcheck: fix meta.platforms not being flattened, remove zlib overwrite zlib is build with static by default --- pkgs/tools/graphics/pngcheck/default.nix | 2 +- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index a4680dff6f6..cb415a2c53e 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "http://pmt.sourceforge.net/pngcrush"; description = "Verifies the integrity of PNG, JNG and MNG files"; license = licenses.free; - platforms = with platforms; [ unix ]; + platforms = platforms.unix; maintainers = with maintainers; [ starcraft66 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 010848c81c3..e932da6790a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9060,11 +9060,7 @@ with pkgs; pm2 = nodePackages.pm2; - pngcheck = callPackage ../tools/graphics/pngcheck { - zlib = zlib.override { - static = true; - }; - }; + pngcheck = callPackage ../tools/graphics/pngcheck { }; pngcrush = callPackage ../tools/graphics/pngcrush { }; From 711bd6955c5c68b4c58e874f92e78652e81ba37f Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 11 Apr 2022 00:33:56 +0300 Subject: [PATCH 119/120] cudaPackages: fix hash mismatch ... for cuda=10.1 cudnn=7.6.5 --- pkgs/development/libraries/science/math/cudnn/extension.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix index 263310f3d7c..172935fc979 100644 --- a/pkgs/development/libraries/science/math/cudnn/extension.nix +++ b/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -49,7 +49,7 @@ final: prev: let rec { fileVersion = "10.1"; fullVersion = "7.6.5.32"; - hash = "sha256-YAJn8squ0v1Y6yFLpmnY6jXzlqfRm5SCLms2+fcIjCA="; + hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz"; supportedCudaVersions = [ "10.1" ]; } From 7c36b7246b1f429c67f2bac6e3c0dd212d14dea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 3 Apr 2022 02:22:58 +0000 Subject: [PATCH 120/120] kdeltachat: unstable-2022-01-02 -> unstable-2022-03-20 --- .../networking/instant-messengers/kdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index 5fe90d50a31..baa4613b173 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2022-01-02"; + version = "unstable-2022-03-20"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "ec545c8208c870c44312558f91c79e6ffce4444e"; - hash = "sha256-s/dJ2ahdUK7ODKsna+tl81e+VQLkCAELb/iEXf9WlIM="; + rev = "8cce6d20b49e917929521a13caed30e81037c868"; + hash = "sha256-1L45KodOmvy6pBbBzJwGWMAY7y3+lfxjeXtsH1SdipU="; }; nativeBuildInputs = [