From 737f21efae138a49a7644448698a7817b950919d Mon Sep 17 00:00:00 2001 From: arthsmn Date: Wed, 3 Jan 2024 08:04:48 -0300 Subject: [PATCH 001/130] ktls-utils: add passthru.updateScript --- pkgs/by-name/kt/ktls-utils/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/kt/ktls-utils/package.nix b/pkgs/by-name/kt/ktls-utils/package.nix index 226c00373561..5d773a75ab9e 100644 --- a/pkgs/by-name/kt/ktls-utils/package.nix +++ b/pkgs/by-name/kt/ktls-utils/package.nix @@ -9,6 +9,7 @@ , libnl , systemd , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +, nix-update-script }: stdenv.mkDerivation rec { @@ -42,6 +43,8 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.updateScript = nix-update-script {}; + meta = with lib; { description = "TLS handshake utilities for in-kernel TLS consumers"; homepage = "https://github.com/oracle/ktls-utils"; From 0aed5c3b542938a7ddba9f82e9b22d75c5c65794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 13 Jan 2024 06:52:05 -0500 Subject: [PATCH 002/130] {redshift,gammastep}: fix build with `strictDeps = true;` --- pkgs/applications/misc/redshift/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 71be8f8b157d..ff0ba6c0edb7 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -24,6 +24,8 @@ let ./575.patch ]; + strictDeps = true; + nativeBuildInputs = [ autoconf automake @@ -34,6 +36,7 @@ let wrapGAppsHook wrapPython gobject-introspection + python ]; configureFlags = [ @@ -49,7 +52,6 @@ let buildInputs = [ gtk3 - python ] ++ lib.optional withRandr libxcb ++ lib.optional withGeoclue geoclue ++ lib.optional withDrm libdrm From 05d1bac6199a2ab7810c32fb1e15d72a984e45e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 5 Dec 2023 10:47:48 -0500 Subject: [PATCH 003/130] converseen: init at 0.12.1.0 --- pkgs/by-name/co/converseen/package.nix | 49 ++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/co/converseen/package.nix diff --git a/pkgs/by-name/co/converseen/package.nix b/pkgs/by-name/co/converseen/package.nix new file mode 100644 index 000000000000..3fd8cd883b35 --- /dev/null +++ b/pkgs/by-name/co/converseen/package.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, imagemagick +, pkg-config +, qt5 +, nix-update-script +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "converseen"; + version = "0.12.1.0"; + + src = fetchFromGitHub { + owner = "Faster3ck"; + repo = "Converseen"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-WGOmnaO9IAcsOg5W2kJ1dxOk1ndn6InCVVN4FTehKTk="; + }; + + strictDeps = true; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + cmake + pkg-config + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + imagemagick + qt5.qtbase + qt5.qttools + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Batch image converter and resizer"; + homepage = "https://converseen.fasterland.net/"; + changelog = "https://github.com/Faster3ck/Converseen/blob/${finalAttrs.src.rev}/CHANGELOG"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ eclairevoyant ]; + mainProgram = "converseen"; + platforms = lib.platforms.all; + }; +}) From bc42e158a6bd6469d98c2aad7487b7c8a5df6ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 5 Jan 2024 04:43:05 -0500 Subject: [PATCH 004/130] sshesame: init at 0.0.27 --- pkgs/by-name/ss/sshesame/package.nix | 38 ++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/ss/sshesame/package.nix diff --git a/pkgs/by-name/ss/sshesame/package.nix b/pkgs/by-name/ss/sshesame/package.nix new file mode 100644 index 000000000000..f51e8b5af02d --- /dev/null +++ b/pkgs/by-name/ss/sshesame/package.nix @@ -0,0 +1,38 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: + +buildGoModule rec { + pname = "sshesame"; + version = "0.0.27"; + + src = fetchFromGitHub { + owner = "jaksi"; + repo = "sshesame"; + rev = "v${version}"; + hash = "sha256-pDLCOyjvbHM8Cw1AIt7+qTbCmH0tGSmwaTBz5pQ05bc="; + }; + + vendorHash = "sha256-iaINGWpj2gHfwsIOEp5PwlFBohXX591+/FBGyu656qI="; + + ldflags = [ "-s" "-w" ]; + + hardeningEnable = [ "pie" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "An easy to set up and use SSH honeypot"; + longDescription = '' + A fake SSH server that lets anyone in and logs their activity. + sshesame accepts and logs SSH connections and activity (channels, requests), + without doing anything on the host (e.g. executing commands, making network requests). + ''; + homepage = "https://github.com/jaksi/sshesame"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ eclairevoyant ]; + mainProgram = "sshesame"; + }; +} From 4dd5d82e483f03387183803e7d1bd7727b9cbfc2 Mon Sep 17 00:00:00 2001 From: SubhrajyotiSen Date: Sun, 3 Mar 2024 12:55:17 +0530 Subject: [PATCH 005/130] ktlint: 1.1.1 -> 1.2.1 --- pkgs/development/tools/ktlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 83ecedf8a640..89039fabfbe3 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "sha256:01cl4jaa2bq52wii1wkzsy6sw546xh8wa8kyhvnfwp34m9d32r4w"; + sha256 = "sha256:14pbjih8gkh5cp9cqpbciml4ba7nvq5vmvivyrmhff3xq93cya1f"; }; nativeBuildInputs = [ makeWrapper ]; From 777e5f1deb649674ac94df0f907c0fa81188dd9d Mon Sep 17 00:00:00 2001 From: Jakub Skokan Date: Wed, 6 Mar 2024 13:59:24 +0100 Subject: [PATCH 006/130] vpsfree-client: 0.17.1 -> 0.18.0 --- .../virtualization/vpsfree-client/Gemfile | 2 +- .../vpsfree-client/Gemfile.lock | 56 ++++--- .../virtualization/vpsfree-client/gemset.nix | 138 +++++++++++------- 3 files changed, 121 insertions(+), 75 deletions(-) diff --git a/pkgs/tools/virtualization/vpsfree-client/Gemfile b/pkgs/tools/virtualization/vpsfree-client/Gemfile index 6bcacb5ee900..90fce7a5cbd5 100644 --- a/pkgs/tools/virtualization/vpsfree-client/Gemfile +++ b/pkgs/tools/virtualization/vpsfree-client/Gemfile @@ -2,4 +2,4 @@ source "https://rubygems.org" -gem "vpsfree-client", "0.17.1" +gem "vpsfree-client", "0.18.0" diff --git a/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock b/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock index 88d4f92a5b9a..7485c24ce168 100644 --- a/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock +++ b/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock @@ -1,58 +1,66 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.5) + activesupport (7.1.3.2) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - concurrent-ruby (1.2.2) + base64 (0.2.0) + bigdecimal (3.1.6) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) curses (1.4.4) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - haveapi-client (0.16.3) - activesupport (>= 4.0) - highline (~> 2.0.3) + domain_name (0.6.20240107) + drb (2.2.1) + haveapi-client (0.19.3) + activesupport (>= 7.0) + highline (~> 2.1.0) json require_all (~> 2.0.0) rest-client (~> 2.1.0) - ruby-progressbar (~> 1.11.0) - highline (2.0.3) + ruby-progressbar (~> 1.13.0) + highline (2.1.0) http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) - i18n (1.14.1) + i18n (1.14.3) concurrent-ruby (~> 1.0) - json (2.6.3) - mime-types (3.4.1) + racc (~> 1.7) + json (2.7.1) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) - minitest (5.18.0) + mime-types-data (3.2024.0305) + minitest (5.22.2) + mutex_m (0.2.0) netrc (0.11.0) + racc (1.7.3) require_all (2.0.0) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - vpsadmin-client (3.0.0.master.20221118.pre.1.ac358990) + vpsadmin-client (3.0.0.master.20231229.pre.0.51d41b07) curses - haveapi-client (~> 0.16.1) + haveapi-client (~> 0.19.0) json - vpsfree-client (0.17.1) - vpsadmin-client (= 3.0.0.master.20221118.pre.1.ac358990) + vpsfree-client (0.18.0) + vpsadmin-client (= 3.0.0.master.20231229.pre.0.51d41b07) PLATFORMS ruby DEPENDENCIES - vpsfree-client (= 0.17.1) + vpsfree-client (= 0.18.0) BUNDLED WITH - 2.4.13 + 2.4.22 diff --git a/pkgs/tools/virtualization/vpsfree-client/gemset.nix b/pkgs/tools/virtualization/vpsfree-client/gemset.nix index 241fb30149d3..cdc9250b875e 100644 --- a/pkgs/tools/virtualization/vpsfree-client/gemset.nix +++ b/pkgs/tools/virtualization/vpsfree-client/gemset.nix @@ -1,24 +1,54 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7k5i6531z5il4q1jnbrv7x7zcl3bgnxp5fzl71rzigk6zn53ym"; + sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d"; type = "gem"; }; - version = "7.0.5"; + version = "7.1.3.2"; + }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + type = "gem"; + }; + version = "3.1.6"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; + }; + connection_pool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + type = "gem"; + }; + version = "2.4.1"; }; curses = { groups = ["default"]; @@ -31,15 +61,24 @@ version = "1.4.4"; }; domain_name = { - dependencies = ["unf"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + sha256 = "0cyr2xm576gqhqicsyqnhanni47408w2pgvrfi8pd13h2li3nsaz"; type = "gem"; }; - version = "0.5.20190701"; + version = "0.6.20240107"; + }; + drb = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + type = "gem"; + }; + version = "2.2.1"; }; haveapi-client = { dependencies = ["activesupport" "highline" "json" "require_all" "rest-client" "ruby-progressbar"]; @@ -47,20 +86,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iz0k9cwva8icc040k5m9ah0cz08jg6x51h6ahdccw6azy8h93i1"; + sha256 = "0yjcf6yf90sqjsywlcxzfrfrl835ndw96x6bh4grvc75zbb5ijki"; type = "gem"; }; - version = "0.16.3"; + version = "0.19.3"; }; highline = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.0"; }; http-accept = { groups = ["default"]; @@ -84,25 +123,25 @@ version = "1.0.5"; }; i18n = { - dependencies = ["concurrent-ruby"]; + dependencies = ["concurrent-ruby" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "1j9zl6ssshkdjdn21lckdhsfkkw1n4wcynqp8n67afa5qps2gmds"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.3"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; + sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; type = "gem"; }; - version = "2.6.3"; + version = "2.7.1"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -110,30 +149,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.2"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9"; + sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455"; type = "gem"; }; - version = "3.2023.0218.1"; + version = "3.2024.0305"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; + sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5"; type = "gem"; }; - version = "5.18.0"; + version = "5.22.2"; + }; + mutex_m = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; + type = "gem"; + }; + version = "0.2.0"; }; netrc = { groups = ["default"]; @@ -145,6 +194,16 @@ }; version = "0.11.0"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + type = "gem"; + }; + version = "1.7.3"; + }; require_all = { groups = ["default"]; platforms = []; @@ -171,10 +230,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -187,37 +246,16 @@ }; version = "2.0.6"; }; - unf = { - dependencies = ["unf_ext"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; - type = "gem"; - }; - version = "0.0.8.2"; - }; vpsadmin-client = { dependencies = ["curses" "haveapi-client" "json"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rqxvfmcbpi8wcmgwdl34il3a4gg3q3zy8pyyj0kk0v8lly0wb6d"; + sha256 = "0d1bdyda8l42x8csf4ri2cqcr3xf6pcnv7s1k859rb8ysj7y8aqx"; type = "gem"; }; - version = "3.0.0.master.20221118.pre.1.ac358990"; + version = "3.0.0.master.20231229.pre.0.51d41b07"; }; vpsfree-client = { dependencies = ["vpsadmin-client"]; @@ -225,9 +263,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a4fmimzrysjcnvw2jz7f5hdslmy2aaipcgiisjkhqazw6nlbd8w"; + sha256 = "038a57avnp4wmfqdya5a6r4a135nh6crzs6nf0khnhdhb9kkjfjg"; type = "gem"; }; - version = "0.17.1"; + version = "0.18.0"; }; } From 84558a3e378c53170e1960c8e657f07516337e2a Mon Sep 17 00:00:00 2001 From: zendo Date: Sat, 9 Mar 2024 10:18:16 +0800 Subject: [PATCH 007/130] wike: move to by-name --- .../misc/wike/default.nix => by-name/wi/wike/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/wike/default.nix => by-name/wi/wike/package.nix} (100%) diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/by-name/wi/wike/package.nix similarity index 100% rename from pkgs/applications/misc/wike/default.nix rename to pkgs/by-name/wi/wike/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93f7756751dd..300695799f3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41024,8 +41024,6 @@ with pkgs; wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { }; - wike = callPackage ../applications/misc/wike { }; - wikicurses = callPackage ../applications/misc/wikicurses { pythonPackages = python3Packages; }; From f6396255f98c81490f74cb3def841e6eedce7c51 Mon Sep 17 00:00:00 2001 From: zendo Date: Sat, 9 Mar 2024 10:22:01 +0800 Subject: [PATCH 008/130] wike: 2.1.0 -> 3.0.0 --- pkgs/by-name/wi/wike/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wi/wike/package.nix b/pkgs/by-name/wi/wike/package.nix index c1d3dc2f10f2..0afd404e6a79 100644 --- a/pkgs/by-name/wi/wike/package.nix +++ b/pkgs/by-name/wi/wike/package.nix @@ -18,14 +18,14 @@ python3.pkgs.buildPythonApplication rec { pname = "wike"; - version = "2.1.0"; + version = "3.0.0"; format = "other"; src = fetchFromGitHub { owner = "hugolabe"; repo = "Wike"; rev = version; - hash = "sha256-BXmLZhotQK6L4c2D8F8qF3zmOlSuzXycEN2FaC1K6/g="; + hash = "sha256-x6HYlpCj7poKWJWB2CnvN1aoTa7LmqYwbPa62WvSYsQ="; }; nativeBuildInputs = [ From d8f70bf6156f85db515052ac46241ee545a451d2 Mon Sep 17 00:00:00 2001 From: rexxDigital Date: Sun, 10 Mar 2024 14:52:56 +0100 Subject: [PATCH 009/130] reactphysics3d: 0.9.0 -> 0.10.0 --- pkgs/by-name/re/reactphysics3d/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/re/reactphysics3d/package.nix b/pkgs/by-name/re/reactphysics3d/package.nix index 4e69b9b41cb9..2245eeee4214 100644 --- a/pkgs/by-name/re/reactphysics3d/package.nix +++ b/pkgs/by-name/re/reactphysics3d/package.nix @@ -2,25 +2,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "reactphysics3d"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "DanielChappuis"; repo = "reactphysics3d"; rev = "v${finalAttrs.version}"; - hash = "sha256-AUdsUXsygsGfS8H+AHEV1fSrrX7zGmfsaTONYUG3zqk="; + hash = "sha256-LWBnrqDFhpzN/XUEGniZeViDq3R1MtmuU5CMCQ59VOY="; }; - patches = [ - # Fix gcc-13 build failure: - # https://github.com/DanielChappuis/reactphysics3d/pull/371 - (fetchpatch { - name ="gcc-13.patch"; - url = "https://github.com/DanielChappuis/reactphysics3d/commit/9335856664fdc3bd1073209f0b4f6eae24c35848.patch"; - hash = "sha256-pCiAHfv66tbE8+hpVvjS22jLi7I+pPofSy8w7eWEp9o="; - }) - ]; - nativeBuildInputs = [ cmake ]; meta = with lib; { From 73e2b29bef33989d79e219158ed33896d6eb9a73 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Mon, 11 Mar 2024 00:17:35 +0100 Subject: [PATCH 010/130] space-station-14-launcher: 0.25.1 -> 0.26.0 --- .../space-station-14-launcher/space-station-14-launcher.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index d39a0940aa20..6403602b79c5 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -31,7 +31,7 @@ , gdk-pixbuf }: let - version = "0.25.1"; + version = "0.26.0"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -44,7 +44,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; rev = "v${version}"; - hash = "sha256-Hm+ILxFXHaP0Zh96GZLG4h1Y7h1kapbn844NVFiyIjw="; + hash = "sha256-Gh2gQucn3VsfFrPAS/vehfVy5WqlVpvSeISB4/j08MQ="; fetchSubmodules = true; }; From 4e840e807f02fc5965464987ac30a39705f4b63e Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Thu, 14 Mar 2024 22:05:21 +0100 Subject: [PATCH 011/130] nwjs: 0.84.0 -> 0.85.0 --- pkgs/development/tools/nwjs/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 9b1d662ae756..7ada7365ebb5 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -85,7 +85,7 @@ let extraOutputsToInstall = [ "lib" "out" ]; }; - version = "0.84.0"; + version = "0.85.0"; in stdenv.mkDerivation { pname = "nwjs"; @@ -96,10 +96,10 @@ stdenv.mkDerivation { in fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-${flavor}v${version}-linux-${bits}.tar.gz"; hash = { - "sdk-ia32" = "sha256-uy6WZuA5b79yACSe3wiKiEeMb6K/z84cSeQDrKFUUdE="; - "sdk-x64" = "sha256-xI/YMHg5RWYh9XCLskSkuDwemH77U43Fzb8C9+fS9wE="; - "ia32" = "sha256-Sc9geGuwl9TIdLrKr97Wz2h4S+AEgP3DAd12Toyk7b8="; - "x64" = "sha256-VIygMzCPTKzLr47bG1DYy/zj0OxsjGcms0G1BkI/TEI="; + "sdk-ia32" = "sha256-QcFKX+TLRBYAMt5oUYoVMfBgGFZZ/4pdhhtNI0OxF/M="; + "sdk-x64" = "sha256-Wqq0iI5VLa/hJLTNF10YpFTtLRP6okjCC2EzlXxeuWI="; + "ia32" = "sha256-st/J/Zejo3R0dKxxdM7XBvmAlfsO2+2i5lYlAv9A5lY="; + "x64" = "sha256-hxSyzNEH6UJVejUqoG01vpJxb319wrLgp7uyF6Pt5YQ="; }."${flavor + bits}"; }; From 1d2cf1d1abf24e58e729c0f3a850964293a9d2d9 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Thu, 14 Mar 2024 22:23:20 +0100 Subject: [PATCH 012/130] fsautocomplete: 0.69.0 -> 0.71.0 --- .../tools/fsautocomplete/default.nix | 4 +- .../development/tools/fsautocomplete/deps.nix | 74 +++++-------------- 2 files changed, 20 insertions(+), 58 deletions(-) diff --git a/pkgs/development/tools/fsautocomplete/default.nix b/pkgs/development/tools/fsautocomplete/default.nix index a1e846f482f8..0ffb6bcbf399 100644 --- a/pkgs/development/tools/fsautocomplete/default.nix +++ b/pkgs/development/tools/fsautocomplete/default.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "fsautocomplete"; - version = "0.69.0"; + version = "0.71.0"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${version}"; - hash = "sha256-o0aR4yRzRb3y8vARuhP7JnBQ72XBX0whfpC51b2cqF0="; + hash = "sha256-WajKmRDCMJ74qT2/NhUWRq+bytxt49vi98bm1QleEKo="; }; nugetDeps = ./deps.nix; diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/development/tools/fsautocomplete/deps.nix index 26fdb7977bdb..192562146056 100644 --- a/pkgs/development/tools/fsautocomplete/deps.nix +++ b/pkgs/development/tools/fsautocomplete/deps.nix @@ -5,7 +5,6 @@ (fetchNuGet { pname = "altcover"; version = "8.3.838"; sha256 = "0l8b5rwpxxxqn6fj3irxx5lsl18wdm2nlg831lg9anyms91lfifn"; }) (fetchNuGet { pname = "BenchmarkDotNet"; version = "0.13.5"; sha256 = "12z5l6naa711g5a7lsyl3rqc59ybxfphnw74jaz99mc327pzfn0c"; }) (fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.13.5"; sha256 = "15zxj6h6v0a3cl9zc3ywj1q2l83j3f6sagp9vcbrfvlw332z2vy2"; }) - (fetchNuGet { pname = "BlackFox.VsWhere"; version = "1.1.0"; sha256 = "1brk2rv4yjdbyc4x1qhcmii6rjqsyk52galjxir5carzhr72jrs1"; }) (fetchNuGet { pname = "CliWrap"; version = "3.4.4"; sha256 = "1g67sbhqxfl15ilazj64jc0z60ig1x03p2d4jwk6iw64smkp24x8"; }) (fetchNuGet { pname = "CommandLineParser"; version = "2.4.3"; sha256 = "1aca3q25n3dg55v4j3kzlzfzd5k2jpy6zhp8x7g74pdfdqzrhg55"; }) (fetchNuGet { pname = "CommunityToolkit.HighPerformance"; version = "7.0.1"; sha256 = "18xw7fn0nm8aqcah1n2dkx4m45pz464s4p8bpbvnhdbbri62467r"; }) @@ -15,29 +14,17 @@ (fetchNuGet { pname = "DotNet.ReproducibleBuilds"; version = "1.1.1"; sha256 = "0wa0xwbwv1lzjmqwg1vq06vrpb9kkbv3xw5nq50savj0dzhqakzq"; }) (fetchNuGet { pname = "Expecto"; version = "10.1.0"; sha256 = "127yy5i0p2lybhm5xcy2wa6j1rcahk61mb1nbym687b23pgizrq9"; }) (fetchNuGet { pname = "Expecto.Diff"; version = "9.0.4"; sha256 = "06g6nbr5kdr7hyayh24ry6xfghxpcfkqc8kma5qa5lcvhmy56f7j"; }) - (fetchNuGet { pname = "Fake.Api.GitHub"; version = "5.20.4"; sha256 = "1hgzqin7bm5fm0n97w7s9cq3zcxyncjmd6xk2da3p12wi7kghx0v"; }) - (fetchNuGet { pname = "Fake.Core.CommandLineParsing"; version = "5.23.1"; sha256 = "10zlkri6w2xly19v4qqvg9vii5mjwbjqfynn525swzwyna9jws76"; }) - (fetchNuGet { pname = "Fake.Core.Context"; version = "5.23.1"; sha256 = "1z3a77d53f5084sai9r9w9cdnyp4xn3x0262nhsi0znx52vizppl"; }) - (fetchNuGet { pname = "Fake.Core.Environment"; version = "5.23.1"; sha256 = "1cm25clxmpl66fg7bjggi4cziz99f7b9pym7528y94bmpskl3gra"; }) - (fetchNuGet { pname = "Fake.Core.FakeVar"; version = "5.23.1"; sha256 = "11hap2xxz1kw3b16mkxlq0gigfg6k7dacq9l9pxc8jlkpq03pwd9"; }) - (fetchNuGet { pname = "Fake.Core.Process"; version = "5.23.1"; sha256 = "0gpj6bi53hfkwxc7995fz9p1diq57azsl8znwj3cpc751phvg3dh"; }) - (fetchNuGet { pname = "Fake.Core.ReleaseNotes"; version = "5.23.1"; sha256 = "1sxmpl2vp29s276vf8b7l7mxy7vsc8rsnbq5xzg97xgwi2s2k3wd"; }) - (fetchNuGet { pname = "Fake.Core.SemVer"; version = "5.23.1"; sha256 = "0d94hwwmwqcl754wss35x61vbhpgry6gc5sj5ipva9kqhsp3d9a8"; }) - (fetchNuGet { pname = "Fake.Core.String"; version = "5.23.1"; sha256 = "1znk6wzizkbslx8hfbpbr63sg05ilr9nr3vvxirxkmh37gkpwyb7"; }) - (fetchNuGet { pname = "Fake.Core.Target"; version = "5.23.1"; sha256 = "1l51jlqab23yx3nfh46m3xblaqsfdh9sxsn457plxsf705vj9rgj"; }) - (fetchNuGet { pname = "Fake.Core.Tasks"; version = "5.23.1"; sha256 = "1r6b6jma13z2075xpd69nai1wdzgkgbz6vnqbwr476gvlcfy6msl"; }) - (fetchNuGet { pname = "Fake.Core.Trace"; version = "5.23.1"; sha256 = "0ji56f3w2g50rvq57xqcg7b3dcqgba71p9xihq06329bisk4pxca"; }) - (fetchNuGet { pname = "Fake.Core.UserInput"; version = "5.23.1"; sha256 = "1anrmaxipyjbprwarjy57k5f4cghxwr7zb0cb4d61vr7njmdg9y2"; }) - (fetchNuGet { pname = "Fake.Core.Xml"; version = "5.23.1"; sha256 = "1z7gmk3d44pgrzpna27v98wznia479s73f9234zxgrirm8jib5dw"; }) - (fetchNuGet { pname = "Fake.DotNet.AssemblyInfoFile"; version = "5.23.1"; sha256 = "0ysmq83n1wilgl56z5bsrcqipl1i6l63rp807by7pwm2l0jjlazp"; }) - (fetchNuGet { pname = "Fake.DotNet.Cli"; version = "5.23.1"; sha256 = "0m2d725rns19mvgmmcwwq641pygrg7xys8k89z0z721r9p1yfp1z"; }) - (fetchNuGet { pname = "Fake.DotNet.MSBuild"; version = "5.23.1"; sha256 = "0j73cdxk4yzwkx7yk3yn3c7hzf6k60b6zmsjxipdv0h34cljinpp"; }) - (fetchNuGet { pname = "Fake.DotNet.NuGet"; version = "5.23.1"; sha256 = "1mx0hip9pgdw246j80kcrj1m93gy49hlr7wn62cwh4nza845b9fk"; }) - (fetchNuGet { pname = "Fake.DotNet.Paket"; version = "5.23.1"; sha256 = "15c58kpzdxifry9qdvch5aif6x3lildjdvb57gnlmxx4gwv1xcdq"; }) - (fetchNuGet { pname = "Fake.IO.FileSystem"; version = "5.23.1"; sha256 = "0lgxbms4kg0ipfjclfpx9azqgg4rbl3jj97n1mmdzmgcpfhgfwwq"; }) - (fetchNuGet { pname = "Fake.IO.Zip"; version = "5.23.1"; sha256 = "0iac86jlxb5bwgiich3zzvr7bz5aw8xq53ly263mwxhv9lrsd815"; }) - (fetchNuGet { pname = "Fake.Net.Http"; version = "5.23.1"; sha256 = "1g0dpxi5b78qh7myz09pmjxzb0iblj3rqx5mpaammbppbbazvzdk"; }) - (fetchNuGet { pname = "Fake.Tools.Git"; version = "5.23.1"; sha256 = "0cg1sbp7zl1d18cjhbs94ix8580hr6gyaxjw17q246lbaj9bfg8l"; }) + (fetchNuGet { pname = "Fake.Core.CommandLineParsing"; version = "6.0.0"; sha256 = "153m18jzji0rar0k1dqj1h90pfny00jyzbmp6vvlc9dcl89xfgvg"; }) + (fetchNuGet { pname = "Fake.Core.Context"; version = "6.0.0"; sha256 = "1pqgc1zq50icw5j375wy9n7749r2rfqakajmdilyaxzczcxs4m2h"; }) + (fetchNuGet { pname = "Fake.Core.Environment"; version = "6.0.0"; sha256 = "1r509s23djb1m62q0hmdgksrx975ksdanhzxzagh3xhmla49icni"; }) + (fetchNuGet { pname = "Fake.Core.FakeVar"; version = "6.0.0"; sha256 = "0rmq31p6p5837q79nff6fmnwrnq4jkfmbq0sp639nzrcw72p9wql"; }) + (fetchNuGet { pname = "Fake.Core.Process"; version = "6.0.0"; sha256 = "15zwgk6b1nk6a515n46x2cjj61hg9h4zq65z98v8amhasdml7vj1"; }) + (fetchNuGet { pname = "Fake.Core.SemVer"; version = "6.0.0"; sha256 = "0j0w1wbg6zv84qn888ygh96saqpsbml7f3r5a9sfryvglxpzm6s3"; }) + (fetchNuGet { pname = "Fake.Core.String"; version = "6.0.0"; sha256 = "05gyzydzvi9dnyzi7yrw9dy8bszikf3y3ayy7sg2zvwcskw65sma"; }) + (fetchNuGet { pname = "Fake.Core.Target"; version = "6.0.0"; sha256 = "0wrf6vfp5yrm2hijdyb4nn9s4ac460m9kmqfnncrbqwdsg4yggpq"; }) + (fetchNuGet { pname = "Fake.Core.Trace"; version = "6.0.0"; sha256 = "0v2m641d8ic04j9i8wrskqa85gpdaxcldg2d4ck4f0fpgb3py205"; }) + (fetchNuGet { pname = "Fake.IO.FileSystem"; version = "6.0.0"; sha256 = "0kjj9ippsbi138kjipl34cx9pajmj71d205y9h5pmj7djilcvq47"; }) + (fetchNuGet { pname = "Fake.Tools.Git"; version = "6.0.0"; sha256 = "18qj5r769r70bygn2si0d5xb921jxfdw6mg4v75i2fj79581bbcz"; }) (fetchNuGet { pname = "fantomas"; version = "6.2.3"; sha256 = "1x91w4sk402b6ah1y0r0c9rxwbbnjp4x4mr7x4n5zvjhiv97b282"; }) (fetchNuGet { pname = "Fantomas.Client"; version = "0.9.0"; sha256 = "1zixwk61fyk7y9q6f8266kwxi6byr8fmyp1lf57qhbbvhq2waj9d"; }) (fetchNuGet { pname = "Fantomas.Core"; version = "6.2.0"; sha256 = "07yl2hr06zk1nl66scm24di3nf1zbrnd6329prwirnv370rz4q92"; }) @@ -45,12 +32,12 @@ (fetchNuGet { pname = "FParsec"; version = "1.1.1"; sha256 = "01s3zrxl9kfx0264wy0m555pfx0s0z165n4fvpgx63jlqwbd8m04"; }) (fetchNuGet { pname = "fsharp-analyzers"; version = "0.23.0"; sha256 = "115dqscxx02dss9s1shl6c1x6zc2dgrk9w8bj48cyjnwm79icqq9"; }) (fetchNuGet { pname = "FSharp.Analyzers.Build"; version = "0.3.0"; sha256 = "1c9ijc9lvyw4lfnd3m9260c8lwnh6ca91zslr29dpn525z9zgdif"; }) - (fetchNuGet { pname = "FSharp.Analyzers.SDK"; version = "0.23.0"; sha256 = "0q4v03wkwfaf3hacy6jy0lyvmjkrsx5a9p000hx7bw5997vqzx8f"; }) - (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.8.100"; sha256 = "0lk8pqasbxkqp37fsnnidw8556l1k6s8w9qhq51w8zfnp7nw1xwm"; }) + (fetchNuGet { pname = "FSharp.Analyzers.SDK"; version = "0.25.0"; sha256 = "13s2bhizbl2ss9944wk3cka1ri22rs7aqhiiz2i9lyaj9jz863cy"; }) + (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.8.200"; sha256 = "1jcp8by02n7vbs11p0gxmb42837l7q841f71ifmrqw7chmg14zik"; }) (fetchNuGet { pname = "FSharp.Control.AsyncSeq"; version = "3.2.1"; sha256 = "02c8d8snd529rrcj6lsmab3wdq2sjh90j8sanx50ck9acfn9jd3v"; }) (fetchNuGet { pname = "FSharp.Control.Reactive"; version = "5.0.5"; sha256 = "0ahvd3s5wfv610ks3b00ya5r71cqm34ap8ywx0pyrzhlsbk1ybqg"; }) (fetchNuGet { pname = "FSharp.Core"; version = "6.0.5"; sha256 = "07929km96znf6xnqzmxdk3h48kz2rg9msf4c5xxmnjqr0ikfb8c6"; }) - (fetchNuGet { pname = "FSharp.Core"; version = "8.0.100"; sha256 = "06z3vg8yj7i83x6gmnzl2lka1bp4hzc07h6mrydpilxswnmy2a0l"; }) + (fetchNuGet { pname = "FSharp.Core"; version = "8.0.200"; sha256 = "1v0w8n02wshggymckvy9l343yiznjfmif9nfd35f9a32s5wj4dn2"; }) (fetchNuGet { pname = "FSharp.Data.Adaptive"; version = "1.2.13"; sha256 = "16l1h718h110yl2q83hzy1rpalyqlicdaxln7g0bf8kzq9b2v6rz"; }) (fetchNuGet { pname = "FSharp.Formatting"; version = "14.0.1"; sha256 = "0sx4jlxzmrdcmc937arc9v0r90qkpf2gd1m9ngkpg88qvqcx4xsa"; }) (fetchNuGet { pname = "FSharp.UMX"; version = "1.1.0"; sha256 = "1rzf5m38fcpphfhcv359plk2sval16kj00gdfwzpm9gi8wjw8j8k"; }) @@ -73,10 +60,10 @@ (fetchNuGet { pname = "Ionide.Analyzers"; version = "0.7.0"; sha256 = "10s4wznblcdazrvghf64y59j1w4bvwar8iznjl0rncbka09ba4q5"; }) (fetchNuGet { pname = "Ionide.KeepAChangelog.Tasks"; version = "0.1.8"; sha256 = "066zla2rp1sal6by3h3sg6ibpkk52kbhn30bzk58l6ym7q1kqa6b"; }) (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.20"; sha256 = "08ym8lljnkqk638f2djw3c0p6h0nzxycifz1dqhzzd2my5ss46zf"; }) - (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.62.0"; sha256 = "1da6hhca9vd6hxbz9jmwxwx2pc7d5ayd41sp6mzzmbk4n3jk32q2"; }) - (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.62.0"; sha256 = "1mkw4b1sawv1p0c4a1fidkw02bh9iik7fi80ffgqi0msc3ql8lmg"; }) - (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.62.0"; sha256 = "0kj9h5gvvrl720kg5jylx8w1jjmcci7bdhabr57sbq31vbgav74d"; }) - (fetchNuGet { pname = "Ionide.ProjInfo.Sln"; version = "0.62.0"; sha256 = "05yxz0hhpi1b0kdyzbjbb0klmpbaq8i5d0s4y59wr2qbz2318xpa"; }) + (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.63.0"; sha256 = "1nvnckzr6bnzv5zlw7n8f8hv1a0vl31pv0jw2b0zd72qz1bs1dm4"; }) + (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.63.0"; sha256 = "1viccl54v4ls8mhw4lpmblbyw47sblpzq8fscff06lqngbbqk6pr"; }) + (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.63.0"; sha256 = "1pr95x6hfahcwqgkjnm7zaf43qyw7j9fwbqxvly9wpnz5drnk6yv"; }) + (fetchNuGet { pname = "Ionide.ProjInfo.Sln"; version = "0.63.0"; sha256 = "1wpq3fm52zn7c57pkywadgcfrn072q50nnqvvnr41n6r7qj665gi"; }) (fetchNuGet { pname = "LinkDotNet.StringBuilder"; version = "1.18.0"; sha256 = "0lgh4yjnim9qbqkmkgpx5fi2lha1cgcdbddvbsiw9jzp18fndxly"; }) (fetchNuGet { pname = "McMaster.NETCore.Plugins"; version = "1.4.0"; sha256 = "1k2qz0qnf2b1kfwbzcynivy93jm7dcwl866d0fl7qlgq5vql7niy"; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; sha256 = "0cnaz28lhrdmavnxjkakl9q8p2yv8mricvp1b0wxdfnz8v41gwzs"; }) @@ -84,13 +71,11 @@ (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; }) (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "1.1.0"; sha256 = "1ggsadahlp76zcn1plapszd5v5ja8rh479fwrahqd3knql4dfnr0"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.2.0"; sha256 = "09hs74nr0kv83wc1way9x7vq3nmxbr2s4vdy99hx78kj25pylcr7"; }) - (fetchNuGet { pname = "Microsoft.Build"; version = "17.4.0"; sha256 = "0j8rqwl8h2hh4yl4bvsijm0rl8356a8vfvdqj4jk5blmvfcfs7b4"; }) (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.6.3"; sha256 = "0gj182wih2rr90c045a7x1cy04szv83zr21c725h70s7dcshdvn6"; }) (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.5.3"; sha256 = "0km0zafgbm4qjg0azv40aanfn38fplkz057gqhyd76h4zgvwpxg4"; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.4.0"; sha256 = "12d3jg8qpf4k5gknxv728270faiwzb0qb6m8cfjwsqy990v54z2c"; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; sha256 = "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"; }) (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.4.0"; sha256 = "1lzswq96gi3si61n6i3ddla05gpn8myhn4kkfc0wx2bw7y6308y7"; }) - (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.6.3"; sha256 = "1fxhv26rhx5mcrz08k0n3vlsy8wxpvsds44a32bm61wazfqcylhn"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis"; version = "4.5.0"; sha256 = "1v1lk33wvrqh0k1ymyilfs3ic7ag40qkldqszv1pvlf2cg5mcqfx"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0"; sha256 = "0hjzca7v3qq4wqzi9chgxzycbaysnjgj28ps20695x61sia6i3da"; }) @@ -119,7 +104,6 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; }) - (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.6.3"; sha256 = "0g5jdg0jp844a2ygwlm04igsxkrihqcq2rpmfx722nrv3vrk0r0z"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "7.0.4"; sha256 = "0afmivk3m0hmwsiqnl87frzi7g57aiv5fwnjds0icl66djpb6zsm"; }) @@ -134,26 +118,15 @@ (fetchNuGet { pname = "Microsoft.SourceLink.GitLab"; version = "1.1.1"; sha256 = "0fm50cc05fmkz77xnl6qvawkx43asdklzxhz65jnbkjp633zvx41"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; sha256 = "0s68wf9yphm4hni9p6kwfk0mjld85f4hkrs93qbk5lzf6vv3kba1"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.1"; sha256 = "1n9ilq8n5rhyxcri06njkxb0h2818dbmzddwd2rrvav91647m2s4"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "3.6.2115"; sha256 = "0924lvb8i1y1majjph1hczi8p72mxlvkk3b7apdqgv5hmbn9sdxq"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.6.40"; sha256 = "1iv67ndrvls7qa3wrh7mnswqbhx8ggr0w1hi7md1grfm4f0nqyz4"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.6.40"; sha256 = "0ba9r9y3jsx3s3j190mv4gg47ibyl44s58whwvas9c64hhs4n22s"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; sha256 = "0qx4nzsx28galgzzjkgf541254d433dgxcaf7y2y1qyyxgsfjj1f"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.4"; sha256 = "1yxa7mh432s7g7p9r7scqxvxjk5ypwc567qdbf0gmk8fbf0d3f8y"; }) - (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) - (fetchNuGet { pname = "MSBuild.StructuredLogger"; version = "2.1.844"; sha256 = "0fp2gng4gk63ac0wz231zwbnpy6a35mq04gy8fc81gra6px4sy5v"; }) (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.66"; sha256 = "04p4vd2v3mj1g315jj0fcb9ajwdr6clnbnl80mn6nyj3wmjb56nz"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "6.7.0"; sha256 = "0h6k5ywqmnl3mn30d6hhvzzk0344f0cy3ks2rxvjfas1822hbpz9"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "6.7.0"; sha256 = "0bskqxz2b4z1f9m8kak6my9l08ngd8r0cnd7ac1h6pbf39iwfq0a"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.3.0"; sha256 = "05mqbfgkif9qa5hg1sjmcvx69ifdhiqs2xjplqjrvrj9ybmd5i0c"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.7.0"; sha256 = "02sg1qa00dq4hfrj4zrrlccpbrmr1ymac8vcp48q9ffsx5wx6895"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "6.7.0"; sha256 = "0q1q21cl6987f3q73g9549h637gm2qal3x1wy81qbag4aaxfqpb0"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "6.7.0"; sha256 = "1v5ibnq2mp801vw68zyj169hkj3xm7h55824i33n1jxxj2vs3vbk"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "6.7.0"; sha256 = "1k9dzgm3a9ahalykdvjnnd47940py8lqkfrjd1k9lkiczn1bkqmi"; }) - (fetchNuGet { pname = "Octokit"; version = "0.48.0"; sha256 = "17ria1shx04rb6knbaswpqndmwam6v3r3lsfsd486q584798ccn8"; }) (fetchNuGet { pname = "OpenTelemetry"; version = "1.3.2"; sha256 = "1v9ipc75ipwjhhz4mkyjygw85i6ba5flcbhyspmf90vfi2nk7b79"; }) (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.3.2"; sha256 = "0fgl99k6nm3n47vv9mx6y36pnljj2b5g641cs2zsw6l86n57qwv1"; }) (fetchNuGet { pname = "OpenTelemetry.Exporter.OpenTelemetryProtocol"; version = "1.3.2"; sha256 = "14p6rn68mqrch3ani17vwyl4ggjz680nxkw1nf65xmf1ljlkb4iq"; }) @@ -194,14 +167,11 @@ (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; sha256 = "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"; }) (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "7.0.0"; sha256 = "149d9kmakzkbw69cip1ny0wjlgcvnhrr7vz5pavpsip36k2mw02a"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; sha256 = "1h97ikph775gya93qsjjaka87qcygbyh1064rh1hnfcnp5xv0ipi"; }) - (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "7.0.0"; sha256 = "16p8z975dnzmncfifa9gw9n3k9ycpr2qvz7lglpghsvx0fava8k9"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; }) (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "7.0.0"; sha256 = "1a14kgpqz4k7jhi7bs2gpgf67ym5wpj99203zxgwjypj7x47xhbq"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) @@ -220,9 +190,7 @@ (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.7.0"; sha256 = "0l8jpxhpgjlf1nkz5lvp61r4kfdbhr29qi8aapcxn3izd9wd0j8r"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; sha256 = "0fjqifk4qz9lw5gcadpfalpplyr0z2b3p9x7h0ll481a9sqvppc9"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; }) - (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; sha256 = "1h73gps9ffw77vys4zwgm78fgackqw6a7rjrg75mmx79vdw1shgw"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) @@ -239,26 +207,20 @@ (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "7.0.3"; sha256 = "0gw07qhch88jvx393m7ibl4g3dml60s42f3pa8a9f3v88ckkaxws"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.1"; sha256 = "1nq9ngkqha70rv41692c79zq09cx6m85wkp3xj9yc31s62afyl5i"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.1"; sha256 = "15d0np1njvy2ywf0qzdqyjk5sjs4zbfxg917jrvlbfwrqpqxb5dj"; }) (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; sha256 = "0wkm6bj4abknzj41ygkziifx8mzhj4bix92wjvj6lihaw1gniq8c"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.5"; sha256 = "12fg196sdq3gcjcz365kypfkkmdrprpcw2fvjnww9jqa4yn8v99l"; }) (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; sha256 = "0zjrnc9lshagm6kdb9bdh45dmlnkpwcpyssa896sda93ngbmj8k9"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.1"; sha256 = "1hr4qqzrij3y2ayi8jj70yfg0i9imf6fpdam1gr8qgp795kh86qg"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "6.0.0"; sha256 = "1b4vyjdir9kdkiv2fqqm4f76h0df68k8gcd7jb2b38zgr2vpnk3c"; }) (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "7.0.0"; sha256 = "0ham9l8xrmlq2qwin53n82iz1wanci2h695i3cq83jcw4n28qdr9"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; sha256 = "11r9f0v7qp365bdpq5ax023yra4qvygljz18dlqs650d44iay669"; }) From a348c67ea20bc810d0a596b62e1cd3208ac1727f Mon Sep 17 00:00:00 2001 From: Steven Keuchel Date: Thu, 14 Mar 2024 23:51:19 +0100 Subject: [PATCH 013/130] simde: add riscv platforms --- pkgs/by-name/si/simde/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/si/simde/package.nix b/pkgs/by-name/si/simde/package.nix index c79cbf38f7cd..949b7ddf3266 100644 --- a/pkgs/by-name/si/simde/package.nix +++ b/pkgs/by-name/si/simde/package.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { x86 power mips + riscv ]); }; } From e0de8da00a8df7557d3e0b9af963e9ca99715665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Tue, 27 Feb 2024 18:30:56 +0100 Subject: [PATCH 014/130] unison-ucm: 0.5.17 -> 0.5.19 --- pkgs/development/compilers/unison/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index f9f1934bb566..7afdd45c459d 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -11,17 +11,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.17"; + version = "0.5.19"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-ymnioW+phbwIshs8DZupfe14oPUuunxSsT8rmifh914="; + hash = "sha256-//bjpmW45BqBHmBIj2uMahYQYjhNJ8hvGh+O/7oYQOk="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-vaK7dKkjCPCfEb9GvkOiJ3jY/Jxb31sf98de3WTMG/A="; + hash = "sha256-3WyiV6mIuo5GDpDK/KdWMvj22sZ3uph15u3v3TX5YZA="; }; # The tarball is just the prebuilt binary, in the archive root. From cedeb6c36bef2df4897a4d022fdcce433551a0fc Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Sat, 16 Mar 2024 14:24:33 +0100 Subject: [PATCH 015/130] linuxPackages.rtl8821au: unstable-2023-07-23 -> unstable-2024-03-16 This includes a build fix against Linux 6.8. --- pkgs/os-specific/linux/rtl8821au/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index b89cddbfc73b..e8be48cc403c 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8821au"; - version = "${kernel.version}-unstable-2023-07-23"; + version = "${kernel.version}-unstable-2024-03-16"; src = fetchFromGitHub { owner = "morrownr"; repo = "8821au-20210708"; - rev = "0dc022287b0ab534efa885881eaa65c5503291be"; - hash = "sha256-pLRBWdqlv9A39VbCS8dymTCJHcwJooqD8v6mTbOsBz0="; + rev = "168ac48174067e17ffb9f8b15ab802f37447dacc"; + hash = "sha256-eB9RCoU5jg5fgZkfcef9fsQ6tyD8gTPD+wYcR6PbWNw="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; From 6995f312291a1d998b287dffce3616e3ac022baa Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 8 Mar 2024 22:32:24 -0500 Subject: [PATCH 016/130] ovn: fix update script Declaring type on boolean arguments is no longer supported by nushell --- pkgs/by-name/ov/ovn/update.nu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ov/ovn/update.nu b/pkgs/by-name/ov/ovn/update.nu index ba55fce087ea..65dcee1f1b9a 100755 --- a/pkgs/by-name/ov/ovn/update.nu +++ b/pkgs/by-name/ov/ovn/update.nu @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i nu -p nushell common-updater-scripts -def main [--lts: bool = false, --regex: string] { +def main [--lts = false, --regex: string] { let tags = list-git-tags --url=https://github.com/ovn-org/ovn | lines | sort --natural | str replace v '' let latest_tag = if $regex == null { $tags } else { $tags | find --regex $regex } | last From ef2e0986dd4b218edfdd1e684af0f27b0844943e Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 8 Mar 2024 22:48:23 -0500 Subject: [PATCH 017/130] ovn: 23.09.1 -> 24.03.1 Changelog: https://github.com/ovn-org/ovn/blob/refs/tags/v24.03.0/NEWS --- pkgs/by-name/ov/ovn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index 50050d49a088..0fb24a386c70 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "23.09.1"; - hash = "sha256-t4DtV0wW/jQX7/TpsLFoDzzSPROrhUHHG09r9+lsdaQ="; + version = "24.03.1"; + hash = "sha256-BvMbNkNtyIl8xrUUvJhWWXiLaAHFjiwcq8P7/CGGtzA="; } From cc554b249fea794e29a01ec317399c37f452ffd3 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sat, 9 Mar 2024 03:49:52 +0000 Subject: [PATCH 018/130] ovn-lts: 22.03.5 -> 22.03.7 https://github.com/ovn-org/ovn/blob/v22.03.7/NEWS --- pkgs/by-name/ov/ovn/lts.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ov/ovn/lts.nix b/pkgs/by-name/ov/ovn/lts.nix index 5a022fcd9f2d..26ec2fe7a573 100644 --- a/pkgs/by-name/ov/ovn/lts.nix +++ b/pkgs/by-name/ov/ovn/lts.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "22.03.5"; - hash = "sha256-DMDWR7Dbgak0azPcVqDdFHGovTbLX8byp+jQ3rYvvX4="; + version = "22.03.7"; + hash = "sha256-HzVzJN1QnMTlv39I7clzciJD/Owm93jFO4qfaE1k6e4="; updateScriptArgs = "--lts=true --regex '22.03.*'"; } From 7dd3927034cb7625a45a531279830e2b7479b2fa Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 5 Apr 2024 09:47:22 -0400 Subject: [PATCH 019/130] ovn/ovn-lts: disable tests Disable tests that are failing due to networking issues. There doesn't appear to be a way to disable individual tests short of patching them out. This can be revisited at a later time, but let's move the security fix forward. --- pkgs/by-name/ov/ovn/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ov/ovn/generic.nix b/pkgs/by-name/ov/ovn/generic.nix index 0dfe1f80d653..a584a9ce15f3 100644 --- a/pkgs/by-name/ov/ovn/generic.nix +++ b/pkgs/by-name/ov/ovn/generic.nix @@ -60,7 +60,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + # disable tests due to networking issues and because individual tests can't be skipped easily + doCheck = false; nativeCheckInputs = [ gnused From dbb47840223d249d0e8c2da5977f08b67ddc6aa0 Mon Sep 17 00:00:00 2001 From: Kimmo Suominen Date: Sun, 7 Apr 2024 08:23:41 +0300 Subject: [PATCH 020/130] tcsh: 6.24.11 -> 6.24.12 --- pkgs/by-name/tc/tcsh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tc/tcsh/package.nix b/pkgs/by-name/tc/tcsh/package.nix index abc58430f2e6..305048e58092 100644 --- a/pkgs/by-name/tc/tcsh/package.nix +++ b/pkgs/by-name/tc/tcsh/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tcsh"; - version = "6.24.11"; + version = "6.24.12"; src = fetchurl { url = "mirror://tcsh/tcsh-${finalAttrs.version}.tar.gz"; - hash = "sha256-tae2J6uz7y6NOoabtnXQ6SfYUHBER6Gyx3lGwNMkeZ0="; + hash = "sha256-4ycM6WZ/1b0qBGaHZZ/PX9ameBMm+Abr1yTx4cnNQYU="; }; strictDeps = true; From 0ca89abf6a8addee13c943791e8db3e083d055c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 7 Apr 2024 18:55:21 -0400 Subject: [PATCH 021/130] liberation-circuit: general cleanup --- pkgs/games/liberation-circuit/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/games/liberation-circuit/default.nix b/pkgs/games/liberation-circuit/default.nix index 533391082034..8fb81c05d1c2 100644 --- a/pkgs/games/liberation-circuit/default.nix +++ b/pkgs/games/liberation-circuit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "liberation-circuit"; - version = "unstable-2022-01-02"; + version = "1.3-unstable-2022-01-02"; src = fetchFromGitHub { owner = "linleyh"; - repo = pname; + repo = "liberation-circuit"; rev = "19e3363547793e931fd9419b61ebc2cd8e257714"; - sha256 = "zIwjh4CBSmKz7pF7GM5af+VslWho5jHOLsulbW4C8TY="; + hash = "sha256-zIwjh4CBSmKz7pF7GM5af+VslWho5jHOLsulbW4C8TY="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -29,15 +29,18 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Real-time strategy game with programmable units"; mainProgram = "liberation-circuit"; longDescription = '' - Escape from a hostile computer system! Harvest data to create an armada of battle-processes to aid your escape! Take command directly and play the game as an RTS, or use the game's built-in editor and compiler to write your own unit AI in a simplified version of C. + Escape from a hostile computer system! + Harvest data to create an armada of battle-processes to aid your escape! + Take command directly and play the game as an RTS, or use the game's built-in + editor and compiler to write your own unit AI in a simplified version of C. ''; homepage = "https://linleyh.itch.io/liberation-circuit"; - maintainers = with maintainers; [ emilytrau ]; - license = licenses.gpl3Only; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ emilytrau ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; }; } From f68451b18ada0d77fc772b09a0f28f244d2289b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 2 Feb 2024 17:22:31 -0500 Subject: [PATCH 022/130] liberation-circuit: fix wrapper for non-gnome environments --- pkgs/games/liberation-circuit/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/games/liberation-circuit/default.nix b/pkgs/games/liberation-circuit/default.nix index 8fb81c05d1c2..5df48282f26d 100644 --- a/pkgs/games/liberation-circuit/default.nix +++ b/pkgs/games/liberation-circuit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, pkg-config, makeWrapper, allegro5, libGL }: +{ stdenv, lib, fetchFromGitHub, fetchurl, pkg-config, allegro5, libGL, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "liberation-circuit"; @@ -11,16 +11,17 @@ stdenv.mkDerivation rec { hash = "sha256-zIwjh4CBSmKz7pF7GM5af+VslWho5jHOLsulbW4C8TY="; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ allegro5 libGL ]; + dontWrapGApps = true; + installPhase = '' runHook preInstall mkdir -p $out/opt cp -r bin $out/opt/liberation-circuit chmod +x $out/opt/liberation-circuit/launcher.sh - makeWrapper $out/opt/liberation-circuit/launcher.sh $out/bin/liberation-circuit install -D linux-packaging/liberation-circuit.desktop $out/share/applications/liberation-circuit.desktop install -D linux-packaging/liberation-circuit.appdata.xml $out/share/metainfo/liberation-circuit.appdata.xml @@ -29,6 +30,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; + postFixup = '' + makeWrapper $out/opt/liberation-circuit/launcher.sh $out/bin/liberation-circuit \ + "''${gappsWrapperArgs[@]}" + ''; + meta = { description = "Real-time strategy game with programmable units"; mainProgram = "liberation-circuit"; From 5d721fa700d46261a951306413183f9404f9ba82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Apr 2024 02:44:56 +0000 Subject: [PATCH 023/130] rpm-ostree: 2023.7 -> 2024.4 --- pkgs/tools/misc/rpm-ostree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index de0fcdbe6142..60a086bbbedc 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2023.7"; + version = "2024.4"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-OL1PEXGqPbMWFcCTkjRAUk+7zbGTQiwQqmgmkEgfgHE="; + hash = "sha256-7gEHr0niDCjYaZAEB2tUuFVy5wIROCanHyL/HkbZkbw="; }; nativeBuildInputs = [ From 39da9ccb498d8c8a526e706f0c548e6fd5a8d1df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 00:54:19 +0000 Subject: [PATCH 024/130] geoipupdate: 6.1.0 -> 7.0.1 --- pkgs/applications/misc/geoipupdate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 939205017fe7..fd7bed5234c8 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "geoipupdate"; - version = "6.1.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "sha256-/iLWy3yKO34nnn5ygAewR036PzgUGIqdhXNK4fx3Ym8="; + sha256 = "sha256-OWo8puUjzMZXZ80HMpCrvRGUVdclnSxk7rHR5egOU1Y="; }; - vendorHash = "sha256-jW5/09sOUvPZVM1wzL4xg/a14kZ0KsM8e+zEQoADsl4="; + vendorHash = "sha256-MApZUtI9JewMBbImuV3vsNG89UvCfxcBg3TZiuk/nvg="; ldflags = [ "-X main.version=${version}" ]; From 40de613243911feebb204e22ee8df68e9e091ddf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 20:12:26 +0000 Subject: [PATCH 025/130] python311Packages.parfive: 2.0.2 -> 2.1.0 --- pkgs/development/python-modules/parfive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index b6c98c9a2e6c..22f0c1c39eca 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "parfive"; - version = "2.0.2"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kIIR+cXLUtyLJ5YmhyCV88zhXahok/U7QXbezt3PyF0="; + hash = "sha256-zWy0GSQhMHMM9B1M9vKE6/UPGnHObJUI4EZ+yY8X3I4="; }; buildInputs = [ From e0220f20738af90450ffd7baccca301b9f18a4ba Mon Sep 17 00:00:00 2001 From: "Julie B." Date: Tue, 9 Apr 2024 10:02:47 +0200 Subject: [PATCH 026/130] graphicsmagick: include pkg-config among nativeBuildInputs This is necessary in order to enable SVG support. --- pkgs/by-name/gr/graphicsmagick/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix index fb6a9fbd29af..1bed406de757 100644 --- a/pkgs/by-name/gr/graphicsmagick/package.nix +++ b/pkgs/by-name/gr/graphicsmagick/package.nix @@ -15,6 +15,7 @@ , libwebp , libxml2 , nukeReferences +, pkg-config , quantumdepth ? 8 , runCommand , stdenv @@ -50,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nukeReferences + pkg-config xz ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; From 45e438f5ebbff6940537e31b58c0a7746a52de9c Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 10 Apr 2024 17:52:30 +0200 Subject: [PATCH 027/130] nixos/tests/forgejo: remove one of the two clients, offload ssh & git config, refactor We inherited almost all of this test from `nixos/tests/gitea` when we decided to split. This change saves some resources (just 2 instead of 3 VMs) and is (IMHO) easier to follow and improve upon. --- nixos/tests/forgejo.nix | 61 +++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/nixos/tests/forgejo.nix b/nixos/tests/forgejo.nix index b14df0a2c74f..2343686e8ac8 100644 --- a/nixos/tests/forgejo.nix +++ b/nixos/tests/forgejo.nix @@ -23,7 +23,7 @@ let signingPrivateKeyId = "4D642DE8B678C79D"; supportedDbTypes = [ "mysql" "postgres" "sqlite3" ]; - makeGForgejoTest = type: nameValuePair type (makeTest { + makeForgejoTest = type: nameValuePair type (makeTest { name = "forgejo-${type}"; meta.maintainers = with maintainers; [ bendlas emilylange ]; @@ -62,11 +62,20 @@ let }; }; }; - client1 = { config, pkgs, ... }: { - environment.systemPackages = [ pkgs.git ]; - }; - client2 = { config, pkgs, ... }: { - environment.systemPackages = [ pkgs.git ]; + client = { ... }: { + programs.git = { + enable = true; + config = { + user.email = "test@localhost"; + user.name = "test"; + init.defaultBranch = "main"; + }; + }; + programs.ssh.extraConfig = '' + Host * + StrictHostKeyChecking no + IdentityFile ~/.ssh/privk + ''; }; }; @@ -75,26 +84,22 @@ let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; serverSystem = nodes.server.system.build.toplevel; dumpFile = with nodes.server.specialisation.dump.configuration.services.forgejo.dump; "${backupDir}/${file}"; + remoteUri = "forgejo@server:test/repo"; in '' import json - GIT_SSH_COMMAND = "ssh -i $HOME/.ssh/privk -o StrictHostKeyChecking=no" - REPO = "forgejo@server:test/repo" - PRIVK = "${snakeOilPrivateKey}" start_all() - client1.succeed("mkdir /tmp/repo") - client1.succeed("mkdir -p $HOME/.ssh") - client1.succeed(f"cat {PRIVK} > $HOME/.ssh/privk") - client1.succeed("chmod 0400 $HOME/.ssh/privk") - client1.succeed("git -C /tmp/repo init") - client1.succeed("echo hello world > /tmp/repo/testfile") - client1.succeed("git -C /tmp/repo add .") - client1.succeed("git config --global user.email test@localhost") - client1.succeed("git config --global user.name test") - client1.succeed("git -C /tmp/repo commit -m 'Initial import'") - client1.succeed(f"git -C /tmp/repo remote add origin {REPO}") + client.succeed("mkdir -p ~/.ssh") + client.succeed("(umask 0077; cat ${snakeOilPrivateKey} > ~/.ssh/privk)") + + client.succeed("mkdir /tmp/repo") + client.succeed("git -C /tmp/repo init") + client.succeed("echo 'hello world' > /tmp/repo/testfile") + client.succeed("git -C /tmp/repo add .") + client.succeed("git -C /tmp/repo commit -m 'Initial import'") + client.succeed("git -C /tmp/repo remote add origin ${remoteUri}") server.wait_for_unit("forgejo.service") server.wait_for_open_port(3000) @@ -143,18 +148,14 @@ let + ' -d \'{"key":"${snakeOilPublicKey}","read_only":true,"title":"SSH"}\''' ) - client1.succeed( - f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' git -C /tmp/repo push origin master" - ) + client.succeed("git -C /tmp/repo push origin main") - client2.succeed("mkdir -p $HOME/.ssh") - client2.succeed(f"cat {PRIVK} > $HOME/.ssh/privk") - client2.succeed("chmod 0400 $HOME/.ssh/privk") - client2.succeed(f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' git clone {REPO}") - client2.succeed('test "$(cat repo/testfile | xargs echo -n)" = "hello world"') + client.succeed("git clone ${remoteUri} /tmp/repo-clone") + print(client.succeed("ls -lash /tmp/repo-clone")) + assert "hello world" == client.succeed("cat /tmp/repo-clone/testfile").strip() with subtest("Testing git protocol version=2 over ssh"): - git_protocol = client2.succeed(f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' GIT_TRACE2_EVENT=true git -C repo fetch |& grep negotiated-version") + git_protocol = client.succeed("GIT_TRACE2_EVENT=true git -C /tmp/repo-clone fetch |& grep negotiated-version") version = json.loads(git_protocol).get("value") assert version == "2", f"git did not negotiate protocol version 2, but version {version} instead." @@ -181,4 +182,4 @@ let }); in -listToAttrs (map makeGForgejoTest supportedDbTypes) +listToAttrs (map makeForgejoTest supportedDbTypes) From 2cd2419baffeb8360c81f1c571d2a1340ff651d4 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 10 Apr 2024 17:52:49 +0200 Subject: [PATCH 028/130] nixos/gitea-actions-runner: set the `$HOME` environment variable This fixes an issue where running the official `actions/checkout` action from GitHub on a runner with label `:host`, would fail with incredibly unhelpful error messages. Turns out, this is due to `$HOME` not being set. --- .../services/continuous-integration/gitea-actions-runner.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix index fa26ab3ecd22..25523b058795 100644 --- a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix +++ b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix @@ -203,6 +203,8 @@ in TOKEN = "${instance.token}"; } // optionalAttrs (wantsPodman) { DOCKER_HOST = "unix:///run/podman/podman.sock"; + } // { + HOME = "/var/lib/gitea-runner/${name}"; }; path = with pkgs; [ coreutils From 117a1a6a2cbfec20f16c997f48b0abd277477429 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 10 Apr 2024 17:52:51 +0200 Subject: [PATCH 029/130] nixos/tests/forgejo: test Forgejo Runner registration and workflow Instead of only testing the runner registration, which doesn't tell us all that much, we now test a (very simple) but actual workflow directly runner on the host (type `:host`). For this to work, we cache the official `actions/checkout` action from GitHub as FOD and essentially mirror one version of it to Forgejo as part of the test. Since Forgejo does not yet provide an API endpoint for the workflow status (whether a workflow is running, failed or successful), we have to resort to parsing html for now. It has some rather over the top poll logic, but I feel like will work for quite some time without issues going unnoticed or whatever (TM). This is essentially a response to a bug I found in `services.gitea-actions-runner`, because we had no way to test that module besides the runner registration (which, again, doesn't really tell us all that much). --- nixos/tests/forgejo.nix | 95 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 84 insertions(+), 11 deletions(-) diff --git a/nixos/tests/forgejo.nix b/nixos/tests/forgejo.nix index 2343686e8ac8..8b9ee46ff5d3 100644 --- a/nixos/tests/forgejo.nix +++ b/nixos/tests/forgejo.nix @@ -22,6 +22,25 @@ let ''; signingPrivateKeyId = "4D642DE8B678C79D"; + actionsWorkflowYaml = '' + run-name: dummy workflow + on: + push: + jobs: + cat: + runs-on: native + steps: + - uses: http://localhost:3000/test/checkout@main + - run: cat testfile + ''; + # https://github.com/actions/checkout/releases + checkoutActionSource = pkgs.fetchFromGitHub { + owner = "actions"; + repo = "checkout"; + rev = "v4.1.1"; + hash = "sha256-h2/UIp8IjPo3eE4Gzx52Fb7pcgG/Ww7u31w5fdKVMos="; + }; + supportedDbTypes = [ "mysql" "postgres" "sqlite3" ]; makeForgejoTest = type: nameValuePair type (makeTest { name = "forgejo-${type}"; @@ -36,21 +55,28 @@ let settings.service.DISABLE_REGISTRATION = true; settings."repository.signing".SIGNING_KEY = signingPrivateKeyId; settings.actions.ENABLED = true; + settings.repository = { + ENABLE_PUSH_CREATE_USER = true; + DEFAULT_PUSH_CREATE_PRIVATE = false; + }; }; - environment.systemPackages = [ config.services.forgejo.package pkgs.gnupg pkgs.jq pkgs.file ]; + environment.systemPackages = [ config.services.forgejo.package pkgs.gnupg pkgs.jq pkgs.file pkgs.htmlq ]; services.openssh.enable = true; specialisation.runner = { inheritParentConfig = true; - configuration.services.gitea-actions-runner.instances."test" = { - enable = true; - name = "ci"; - url = "http://localhost:3000"; - labels = [ - # don't require docker/podman - "native:host" - ]; - tokenFile = "/var/lib/forgejo/runner_token"; + configuration.services.gitea-actions-runner = { + package = pkgs.forgejo-runner; + instances."test" = { + enable = true; + name = "ci"; + url = "http://localhost:3000"; + labels = [ + # type ":host" does not depend on docker/podman/lxc + "native:host" + ]; + tokenFile = "/var/lib/forgejo/runner_token"; + }; }; }; specialisation.dump = { @@ -85,6 +111,7 @@ let serverSystem = nodes.server.system.build.toplevel; dumpFile = with nodes.server.specialisation.dump.configuration.services.forgejo.dump; "${backupDir}/${file}"; remoteUri = "forgejo@server:test/repo"; + remoteUriCheckoutAction = "forgejo@server:test/checkout"; in '' import json @@ -165,7 +192,7 @@ let timeout=10 ) - with subtest("Testing runner registration"): + with subtest("Testing runner registration and action workflow"): server.succeed( "su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo gitea actions generate-runner-token' | sed 's/^/TOKEN=/' | tee /var/lib/forgejo/runner_token" ) @@ -173,6 +200,52 @@ let server.wait_for_unit("gitea-runner-test.service") server.succeed("journalctl -o cat -u gitea-runner-test.service | grep -q 'Runner registered successfully'") + # enable actions feature for this repository, defaults to disabled + server.succeed( + "curl --fail -X PATCH http://localhost:3000/api/v1/repos/test/repo " + + "-H 'Accept: application/json' -H 'Content-Type: application/json' " + + f"-H 'Authorization: token {api_token}'" + + ' -d \'{"has_actions":true}\''' + ) + + # mirror "actions/checkout" action + client.succeed("cp -R ${checkoutActionSource}/ /tmp/checkout") + client.succeed("git -C /tmp/checkout init") + client.succeed("git -C /tmp/checkout add .") + client.succeed("git -C /tmp/checkout commit -m 'Initial import'") + client.succeed("git -C /tmp/checkout remote add origin ${remoteUriCheckoutAction}") + client.succeed("git -C /tmp/checkout push origin main") + + # push workflow to initial repo + client.succeed("mkdir -p /tmp/repo/.forgejo/workflows") + client.succeed("cp ${pkgs.writeText "dummy-workflow.yml" actionsWorkflowYaml} /tmp/repo/.forgejo/workflows/") + client.succeed("git -C /tmp/repo add .") + client.succeed("git -C /tmp/repo commit -m 'Add dummy workflow'") + client.succeed("git -C /tmp/repo push origin main") + + def poll_workflow_action_status(_) -> bool: + output = server.succeed( + "curl --fail http://localhost:3000/test/repo/actions | " + + 'htmlq ".flex-item-leading span" --attribute "data-tooltip-content"' + ).strip() + + # values taken from https://codeberg.org/forgejo/forgejo/src/commit/af47c583b4fb3190fa4c4c414500f9941cc02389/options/locale/locale_en-US.ini#L3649-L3661 + if output in [ "Failure", "Canceled", "Skipped", "Blocked" ]: + raise Exception(f"Workflow status is '{output}', which we consider failed.") + server.log(f"Command returned '{output}', which we consider failed.") + + elif output in [ "Unknown", "Waiting", "Running", "" ]: + server.log(f"Workflow status is '{output}'. Waiting some more...") + return False + + elif output in [ "Success" ]: + return True + + raise Exception(f"Workflow status is '{output}', which we don't know. Value mappings likely need updating.") + + with server.nested("Waiting for the workflow run to be successful"): + retry(poll_workflow_action_status) + with subtest("Testing backup service"): server.succeed("${serverSystem}/specialisation/dump/bin/switch-to-configuration test") server.systemctl("start forgejo-dump") From 1ec3a5a4d560ca163fb0d7cbcfeae4f2b4717ef3 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 10 Apr 2024 17:52:52 +0200 Subject: [PATCH 030/130] forgejo-runner: add `nixos/forgejo` VM test to `passthru.tests` `nixos/forgejo` tests both the runner registration and a simple workflow now :). --- pkgs/by-name/fo/forgejo-runner/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 10914f4d637f..983a19455c4f 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -3,6 +3,7 @@ , fetchFromGitea , testers , forgejo-runner +, nixosTests }: buildGoModule rec { @@ -27,9 +28,12 @@ buildGoModule rec { doCheck = false; # Test try to lookup code.forgejo.org. - passthru.tests.version = testers.testVersion { - package = forgejo-runner; - version = src.rev; + passthru.tests = { + inherit (nixosTests.forgejo) sqlite3; + version = testers.testVersion { + package = forgejo-runner; + version = src.rev; + }; }; meta = with lib; { From 01c51532f701623708c42d77a39346540202fa76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Apr 2024 13:40:09 +0000 Subject: [PATCH 031/130] opentelemetry-collector-contrib: 0.97.0 -> 0.98.0 --- pkgs/tools/misc/opentelemetry-collector/contrib.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index a7c8eb79af57..6a0fafc7815c 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.97.0"; + version = "0.98.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-tUvjNxjPLU5GbWbm4ZbU5oJv8VvAxz4+1n++H8hDqI0="; + sha256 = "sha256-YdaAP/o8WhiGOggF2Xo66TzE7PCJDkvbiCFPLVG4SHQ="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-raTqiNCb0bXK2vE/3yBo40Um5SY+XZEbzdeIPRyFoQk="; + vendorHash = "sha256-4hQcHUX/UgeG/ojljq4eJCqZIYp1unNsngprr/3C9q0="; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcontribcol"; From e9985efdbcf4e57738d6c48a86319f1540dd9aa4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Apr 2024 05:22:45 +0000 Subject: [PATCH 032/130] python312Packages.ratarmount: 0.14.2 -> 0.15.0 --- pkgs/development/python-modules/ratarmount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ratarmount/default.nix b/pkgs/development/python-modules/ratarmount/default.nix index 6cfadadc8c1b..64c11f7f3fe7 100644 --- a/pkgs/development/python-modules/ratarmount/default.nix +++ b/pkgs/development/python-modules/ratarmount/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ratarmount"; - version = "0.14.2"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-CZh27X5EmUiRYfeV0KOnpMrFDfa+qDFHr2pInD90UO8="; + hash = "sha256-2slLshH07O+4PIU3dF9vX2ZcXjaUVyTFYc59LL2J5iY="; }; propagatedBuildInputs = [ ratarmountcore fusepy ]; From b94a76f48ec1302e46cc9e9099d2d61a3d2388ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Apr 2024 00:30:47 +0000 Subject: [PATCH 033/130] clipman: 1.6.2 -> 1.6.3 --- pkgs/tools/wayland/clipman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/clipman/default.nix b/pkgs/tools/wayland/clipman/default.nix index 05eab08da9b6..b1641d16051a 100644 --- a/pkgs/tools/wayland/clipman/default.nix +++ b/pkgs/tools/wayland/clipman/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "clipman"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "chmouel"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lahya0w1bgcTnpxANxNT2MIWu5yVUdqQl19kQzwUdAw="; + sha256 = "sha256-htMApyGuDCjQR+2pgi6KPk+K+GbO63fJWFxl9GW8yfg="; }; vendorHash = "sha256-Z/sVCJz/igPDdeczC6pemLub6X6z4ZGlBwBmRsEnXKI="; From 58c5e326e1c860a6daf3c5a3ac48a43e13efdfaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Apr 2024 06:11:58 +0000 Subject: [PATCH 034/130] python311Packages.hg-evolve: 11.1.2 -> 11.1.3 --- pkgs/development/python-modules/hg-evolve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 92235b6ce58a..8a1e07c574f8 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "11.1.2"; + version = "11.1.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ug+T1sRSB+J5FyqzdTR7xZtvybhdzBZYI7g4rX14DHo="; + hash = "sha256-WUPOok/tpZJSookzCIEHRKAlTzeZ6RJY0IiclgQUOs8="; }; nativeCheckInputs = [ From 68841a2805be5a772e52bbeb1908edbbe66b6b53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Apr 2024 08:01:08 +0000 Subject: [PATCH 035/130] python311Packages.testrepository: 0.0.20 -> 0.0.21 --- pkgs/development/python-modules/testrepository/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix index 27caf08a9104..751292ab5be7 100644 --- a/pkgs/development/python-modules/testrepository/default.nix +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "testrepository"; - version = "0.0.20"; + version = "0.0.21"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m"; + sha256 = "sha256-Nor89+CQs8aIvddUol9kvDFOUSuBb4xxufn8F9w3o9k="; }; nativeCheckInputs = [ testresources ]; From 61d4ab72d5672d21a1e8288c2d1a19b9df29fd5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Apr 2024 10:23:21 +0000 Subject: [PATCH 036/130] sublime-merge-dev: 2092 -> 2094 --- .../version-management/sublime-merge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 6a1cc1e5575e..07da8f64a6f7 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -11,9 +11,9 @@ in } { }; sublime-merge-dev = common { - buildVersion = "2092"; + buildVersion = "2094"; dev = true; - aarch64sha256 = "3QMDynXMVB4QVtM8EPbZ8I4m+5sEjzs8XN+jEoMaktM="; - x64sha256 = "S9E+wRvO41Eq+PLA/J+sjBIAn6yz715Wg9bKRW2Eobg="; + aarch64sha256 = "ZJgq971EPzq+BWxTQAoX6TgUmTfpf9sI4CHPcvgPTfI="; + x64sha256 = "6FLfszhP+BGHX5FrycMlznREmGDLyDyo6rgmqxhtCak="; } { }; } From a0d914263c75f3d614a3e472bc13da3829aceca5 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Fri, 12 Apr 2024 21:33:07 +0200 Subject: [PATCH 037/130] storcli: 7.2309.00 -> 7.2904.00 https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_nvme_12g_p30/README_STORCLI_SAS3.5_P30.txt --- .../st/storcli/package.nix} | 23 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 16 insertions(+), 9 deletions(-) rename pkgs/{tools/misc/storcli/default.nix => by-name/st/storcli/package.nix} (57%) diff --git a/pkgs/tools/misc/storcli/default.nix b/pkgs/by-name/st/storcli/package.nix similarity index 57% rename from pkgs/tools/misc/storcli/default.nix rename to pkgs/by-name/st/storcli/package.nix index e5f01b6926c2..bb1e92247663 100644 --- a/pkgs/tools/misc/storcli/default.nix +++ b/pkgs/by-name/st/storcli/package.nix @@ -2,15 +2,17 @@ , stdenvNoCC , fetchzip , rpmextract +, testers }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "storcli"; - version = "7.2309.00"; + version = "7.2904.00"; + phase = "30"; src = fetchzip { - url = "https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/Unified_storcli_all_os_${version}00.0000.zip"; - sha256 = "sha256-n2MzT2LHLHWMWhshWXJ/Q28w9EnLrW6t7hLNveltxLo="; + url = "https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_nvme_12g_p${finalAttrs.phase}/STORCLI_SAS3.5_P${finalAttrs.phase}.zip"; + hash = "sha256-VfK71eiDonzWdR6g5zkXgRRi25vwoI4DDL6xy3zsfak="; }; nativeBuildInputs = [ rpmextract ]; @@ -23,7 +25,7 @@ stdenvNoCC.mkDerivation rec { }; platform = platforms.${system} or (throw "unsupported system: ${system}"); in '' - rpmextract $src/${platform}/storcli-00${version}00.0000-1.*.rpm + rpmextract $src/univ_viva_cli_rel/Unified_storcli_all_os/${platform}/storcli-00${finalAttrs.version}00.0000-1.*.rpm ''; dontPatch = true; @@ -38,15 +40,22 @@ stdenvNoCC.mkDerivation rec { # Not needed because the binary is statically linked dontFixup = true; + passthru.tests = testers.testVersion { + package = finalAttrs.finalPackage; + command = "${finalAttrs.meta.mainProgram} -v"; + version = "00${finalAttrs.version}00.0000"; + }; + meta = with lib; { # Unfortunately there is no better page for this. # Filter for downloads, set 100 items per page. Sort by newest does not work. # Then search manually for the latest version. - homepage = "https://www.broadcom.com/site-search?q=storcli"; + homepage = "https://www.broadcom.com/support/download-search?pg=&pf=Host+Bus+Adapters&pn=&pa=&po=&dk=storcli&pl=&l=false"; description = "Storage Command Line Tool"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ panicgh ]; + mainProgram = "storcli"; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88470c6c005c..817dc5e941b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13297,8 +13297,6 @@ with pkgs; stm32loader = with python3Packages; toPythonApplication stm32loader; - storcli = callPackage ../tools/misc/storcli { }; - stremio = qt5.callPackage ../applications/video/stremio { }; sunwait = callPackage ../applications/misc/sunwait { }; From 14cd8d352e02dd7bbdd7bb0c28637af0c5840bae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Apr 2024 13:40:15 +0000 Subject: [PATCH 038/130] python311Packages.hiyapyco: 0.5.4 -> 0.5.5 --- pkgs/development/python-modules/hiyapyco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hiyapyco/default.nix b/pkgs/development/python-modules/hiyapyco/default.nix index 9dc8ae08c724..96baf1790b04 100644 --- a/pkgs/development/python-modules/hiyapyco/default.nix +++ b/pkgs/development/python-modules/hiyapyco/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "hiyapyco"; - version = "0.5.4"; + version = "0.5.5"; pyproject = true; src = fetchFromGitHub { owner = "zerwes"; repo = pname; rev = "refs/tags/release-${version}"; - hash = "sha256-hKTqdclWMKTGeRtQuNj0gYdiGFovFh5FQ2rRjCgbvBM="; + hash = "sha256-LuENNwVB/1GyPLsfMRwHjz87c7+3/7U82m1MnHfRHdU="; }; nativeBuildInputs = [ From 89557316cc0664b7b4f944bb1e2d7a286caf7d0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Apr 2024 16:49:18 +0000 Subject: [PATCH 039/130] dart-sass: 1.74.1 -> 1.75.0 --- .../tools/misc/dart-sass/default.nix | 4 ++-- .../tools/misc/dart-sass/pubspec.lock.json | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix index cfd31c63ddef..6ca7e8f43987 100644 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ b/pkgs/development/tools/misc/dart-sass/default.nix @@ -21,13 +21,13 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.74.1"; + version = "1.75.0"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-5S+z8ig1t4d3QdIitTkbLNFLLeqbN9zj9QfziAGsVOw="; + hash = "sha256-nj1CCg/eID5dmW/omIGQYNP/uOKNvMzgo3RLBGLULKI="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json b/pkgs/development/tools/misc/dart-sass/pubspec.lock.json index 32d462feccda..dc96a67bd282 100644 --- a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json +++ b/pkgs/development/tools/misc/dart-sass/pubspec.lock.json @@ -34,11 +34,11 @@ "dependency": "direct main", "description": { "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.5.0" }, "async": { "dependency": "direct main", @@ -684,31 +684,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073", + "sha256": "d87214d19fb311997d8128ec501a980f77cb240ac4e7e219accf452813ff473c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.2" + "version": "1.25.3" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f", + "sha256": "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.0" + "version": "0.7.1" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4", + "sha256": "2236f70be1e5ab405c675e88c36935a87dad9e05a506b57dd5c0f617f5aebcb2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.0" + "version": "0.6.1" }, "test_descriptor": { "dependency": "direct dev", @@ -794,11 +794,11 @@ "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2", + "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.4" + "version": "2.4.5" }, "webkit_inspection_protocol": { "dependency": "transitive", From e0f9929a6940eaaf9b30a2201c3c4afe7c6c50a8 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Sat, 13 Apr 2024 12:34:27 -0500 Subject: [PATCH 040/130] resholve: patch test breaks coming in bats 1.11 I'm preparing to update bats to 1.11.0, but a change it includes will require updating 3 of resholve's tests. Since a full resholve source bump would need to go through staging now, I'm just patching the tests in the separate test derivation. --- pkgs/development/misc/resholve/test.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index d9862bef7cf5..e9551b5be2a9 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -18,6 +18,7 @@ , gettext , rSrc , runDemo ? false +, fetchpatch , binlore , sqlite , unixtools @@ -122,6 +123,21 @@ rec { name = "resholve-test"; src = rSrc; + # TODO: should be removable on next resholve update--just + # temporarily work around test breaks caused by changes in + # bats 1.10.0. Since this is just about fixing tests, I'm + # patching test source to avoid going through staging. + patches = [ + (fetchpatch { + url = "https://github.com/abathur/resholve/commit/e1d6ccbc9cd5ec26122997610954dcb7d826f652.patch"; + hash = "sha256-XA9KUc/OAD2S8Vpt+C7KcjTP44rnZ4FLdgnnRqVWdWY="; + }) + (fetchpatch { + url = "https://github.com/abathur/resholve/commit/50db1a6a97baa7d7543a8abe33dddda62b487c65.patch"; + hash = "sha256-m1dKaLI02Wag7uacG4BkcdCXw30Kn6J4ydTqPd7bsak="; + }) + ]; + dontBuild = true; installPhase = '' From bb0331762d4c08afe762708dc706cc5ead98a459 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Sat, 13 Apr 2024 12:51:13 -0500 Subject: [PATCH 041/130] bats: reformat passthru.tests Upcoming commit will add packages that use bats to passthru.tests, which is a little more clear when this is one attrset. Splitting this format-only change out for easier review. --- .../development/interpreters/bats/default.nix | 122 +++++++++--------- 1 file changed, 62 insertions(+), 60 deletions(-) diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index afffef1d1f68..3828ed8a0968 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -134,78 +134,80 @@ resholve.mkDerivation rec { ''; }; - passthru.tests.libraries = runCommand "${bats.name}-with-libraries-test" { - testScript = '' - setup() { - bats_load_library bats-support - bats_load_library bats-assert - bats_load_library bats-file - bats_load_library bats-detik/detik.bash + passthru.tests = { + libraries = runCommand "${bats.name}-with-libraries-test" { + testScript = '' + setup() { + bats_load_library bats-support + bats_load_library bats-assert + bats_load_library bats-file + bats_load_library bats-detik/detik.bash - bats_require_minimum_version 1.5.0 + bats_require_minimum_version 1.5.0 - TEST_TEMP_DIR="$(temp_make --prefix 'nixpkgs-bats-test')" - } + TEST_TEMP_DIR="$(temp_make --prefix 'nixpkgs-bats-test')" + } - teardown() { - temp_del "$TEST_TEMP_DIR" - } + teardown() { + temp_del "$TEST_TEMP_DIR" + } - @test echo_hi { - run -0 echo hi - assert_output "hi" - } + @test echo_hi { + run -0 echo hi + assert_output "hi" + } - @test cp_failure { - run ! cp - assert_line --index 0 "cp: missing file operand" - assert_line --index 1 "Try 'cp --help' for more information." - } + @test cp_failure { + run ! cp + assert_line --index 0 "cp: missing file operand" + assert_line --index 1 "Try 'cp --help' for more information." + } - @test file_exists { - echo "hi" > "$TEST_TEMP_DIR/hello.txt" - assert_file_exist "$TEST_TEMP_DIR/hello.txt" - run cat "$TEST_TEMP_DIR/hello.txt" - assert_output "hi" - } + @test file_exists { + echo "hi" > "$TEST_TEMP_DIR/hello.txt" + assert_file_exist "$TEST_TEMP_DIR/hello.txt" + run cat "$TEST_TEMP_DIR/hello.txt" + assert_output "hi" + } + ''; + passAsFile = [ "testScript" ]; + } '' + ${bats.withLibraries (p: [ p.bats-support p.bats-assert p.bats-file p.bats-detik ])}/bin/bats "$testScriptPath" + touch "$out" ''; - passAsFile = [ "testScript" ]; - } '' - ${bats.withLibraries (p: [ p.bats-support p.bats-assert p.bats-file p.bats-detik ])}/bin/bats "$testScriptPath" - touch "$out" - ''; - passthru.tests.upstream = bats.unresholved.overrideAttrs (old: { - name = "${bats.name}-tests"; - dontInstall = true; # just need the build directory - nativeInstallCheckInputs = [ - ncurses - parallel # skips some tests if it can't detect - flock # skips some tests if it can't detect - procps - ] ++ lib.optionals stdenv.isDarwin [ lsof ]; - inherit doInstallCheck; - installCheckPhase = '' - # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows - sed -i '/test works even if PATH is reset/a skip "disabled for nix build"' test/bats.bats + upstream = bats.unresholved.overrideAttrs (old: { + name = "${bats.name}-tests"; + dontInstall = true; # just need the build directory + nativeInstallCheckInputs = [ + ncurses + parallel # skips some tests if it can't detect + flock # skips some tests if it can't detect + procps + ] ++ lib.optionals stdenv.isDarwin [ lsof ]; + inherit doInstallCheck; + installCheckPhase = '' + # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows + sed -i '/test works even if PATH is reset/a skip "disabled for nix build"' test/bats.bats - # skip tests that assume bats `install.sh` will be in BATS_ROOT - rm test/root.bats + # skip tests that assume bats `install.sh` will be in BATS_ROOT + rm test/root.bats - '' + (lib.optionalString stdenv.hostPlatform.isDarwin '' - # skip new timeout tests which are failing on macOS for unclear reasons - # This might relate to procps not having a pkill? - rm test/timeout.bats - '') + '' + '' + (lib.optionalString stdenv.hostPlatform.isDarwin '' + # skip new timeout tests which are failing on macOS for unclear reasons + # This might relate to procps not having a pkill? + rm test/timeout.bats + '') + '' - # test generates file with absolute shebang dynamically - substituteInPlace test/install.bats --replace \ - "/usr/bin/env bash" "${bash}/bin/bash" + # test generates file with absolute shebang dynamically + substituteInPlace test/install.bats --replace \ + "/usr/bin/env bash" "${bash}/bin/bash" - ${bats}/bin/bats test - touch $out - ''; - }); + ${bats}/bin/bats test + touch $out + ''; + }); + }; meta = with lib; { homepage = "https://github.com/bats-core/bats-core"; From 7fb2aab0151067b4df1d374707d158254c63c6ec Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Sat, 13 Apr 2024 12:58:44 -0500 Subject: [PATCH 042/130] bats: add bats-tested packages to passthru.tests It would have been ~easy for someone to update bats without noticing whether the update broke any packages that depend directly on the nixpkgs-packaged bats for their tests. (I'm phrasing this tediously because there are also some packages that vendor a copy of bats.) Hopefully this will make it easier to confirm future updates. --- pkgs/development/interpreters/bats/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 3828ed8a0968..8591552d45dd 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -18,6 +18,11 @@ , makeWrapper , runCommand , doInstallCheck ? true +# packages that use bats (for update testing) +, bash-preexec +, kikit +, locate-dominating-file +, packcc }: resholve.mkDerivation rec { @@ -207,6 +212,16 @@ resholve.mkDerivation rec { touch $out ''; }); + + # to see when updates would break things, include packages + # that use nixpkgs' bats for testing (as long as they + # aren't massive builds) + inherit bash-preexec locate-dominating-file packcc; + resholve = resholve.tests.cli; + } // lib.optionalAttrs (!stdenv.isDarwin) { + # TODO: kikit's kicad dependency is marked broken on darwin atm + # may be able to fold this up if that resolves. + inherit kikit; }; meta = with lib; { From e110d56d8108b3d0add0864d41ae4172133ae18a Mon Sep 17 00:00:00 2001 From: antares Date: Sun, 14 Apr 2024 03:15:54 +0800 Subject: [PATCH 043/130] qq: add commandLineArgs --- pkgs/applications/networking/instant-messengers/qq/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index 31db4b979e8a..d0a7bbf2a1a9 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -21,6 +21,7 @@ , autoPatchelfHook , makeShellWrapper , wrapGAppsHook +, commandLineArgs ? "" }: let @@ -83,6 +84,7 @@ stdenv.mkDerivation { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} \ "''${gappsWrapperArgs[@]}" # Remove bundled libraries From 00f16079296a81b488f7d2bfeab1a4012fd60d87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Apr 2024 00:52:47 +0000 Subject: [PATCH 044/130] freedv: 1.9.8 -> 1.9.9.1 --- pkgs/applications/radio/freedv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index f02337ff71be..8c108af5f82e 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.9.8"; + version = "1.9.9.1"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-JbLP65fC6uHrHXpSUwtgYHB+VLfheo5RU3C44lx8QlQ="; + hash = "sha256-i0SVu3txC+JUp0P6cFlmn/66lOmii7JMGIvc43nZoOE="; }; postPatch = lib.optionalString stdenv.isDarwin '' From 5970fe1c49973072fe2d9a9b76a11d221b947cd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Apr 2024 01:58:51 +0000 Subject: [PATCH 045/130] python312Packages.annexremote: 1.6.4 -> 1.6.5 --- pkgs/development/python-modules/annexremote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index 02067d4ebaa9..562014f06789 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "annexremote"; - version = "1.6.4"; + version = "1.6.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Lykos153"; repo = "AnnexRemote"; rev = "refs/tags/v${version}"; - hash = "sha256-eBq1nZnNuzTLvc11G/XaenZlVEUke3kpWlZ7P5g4kc8="; + hash = "sha256-8WAa5EO5n/dccNW0TUwFgcRjvDFt8QfpHIX2arM4HGc="; }; nativeBuildInputs = [ From 9c9836c4dcd10311e18db25f6d95840d685faa0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Apr 2024 13:06:46 +0000 Subject: [PATCH 046/130] kubeswitch: 0.8.1 -> 0.9.0 --- pkgs/development/tools/kubeswitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kubeswitch/default.nix b/pkgs/development/tools/kubeswitch/default.nix index aad4fb5318c7..64701124a159 100644 --- a/pkgs/development/tools/kubeswitch/default.nix +++ b/pkgs/development/tools/kubeswitch/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kubeswitch"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "danielfoehrKn"; repo = "kubeswitch"; rev = version; - hash = "sha256-zf7o41YYAppRge0EMXgIN8rI5Kco4/n7BJ90b/X6L1M="; + hash = "sha256-0SY7JLFkhLEFcE1veqac9I9DZstXfxtnmSYIdDiVieg="; }; vendorHash = null; From 0e7f0b7173aaafdbd44d6b6669305990d9f27b1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Apr 2024 13:07:17 +0000 Subject: [PATCH 047/130] kubevpn: 2.2.4 -> 2.2.5 --- pkgs/applications/networking/cluster/kubevpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/applications/networking/cluster/kubevpn/default.nix index b2204b533f85..13b45f748ab7 100644 --- a/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-taeCOmjZqULxQf4dgLzSYgN43fFYH04Ev4O/SHHG+xI="; + hash = "sha256-I4szQNRBW3M+QNwsfkJZlrZL3jJXcXmD2KnFF/E+jaE="; }; vendorHash = null; From 43bb69f3f57d3a25a3de1757f6423781c525ade0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Apr 2024 22:59:46 +0000 Subject: [PATCH 048/130] icloudpd: 1.17.3 -> 1.17.4 --- pkgs/by-name/ic/icloudpd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index 6e03bf9ef62c..01f30919e273 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "icloudpd"; - version = "1.17.3"; + version = "1.17.4"; pyproject = true; src = fetchFromGitHub { owner = "icloud-photos-downloader"; repo = "icloud_photos_downloader"; rev = "v${version}"; - hash = "sha256-GS6GqlZfj5kfjKLImkOTDAgQDGJQHl74uTqbZHVpbac="; + hash = "sha256-xsUayewn6c+TFqQnvDWe+1y4o76Quq8sK1WkSFFgPkc="; }; pythonRelaxDeps = true; From 037368082f4b6144375701eef0d23a8264840905 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Apr 2024 00:24:23 +0000 Subject: [PATCH 049/130] carapace: 1.0.0 -> 1.0.1 --- pkgs/shells/carapace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 0e462149e67a..dc142be4769e 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-lc+oU9adFbtQyb4wKLgbf5i6UwxsKUJo3giquDTO6qg="; + hash = "sha256-pyuehQZVg+f51r/oEH+FIpUUDTCKu4R9DmMaOffRfXA="; }; - vendorHash = "sha256-XAdTLfMnOAcOiRYZGrom2Q+qp+epfg6Y9Jv0V0T12/8="; + vendorHash = "sha256-HWczvkItE9SVGGQkddnb7/PBkTWrDAdKHjMOztlYV9M="; ldflags = [ "-s" From 347c8314539671332b8de79b4de04f801b1aa3e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Apr 2024 02:41:32 +0000 Subject: [PATCH 050/130] vassal: 3.7.9 -> 3.7.10 --- pkgs/games/vassal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 216fda688284..31996a30c1fe 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.7.9"; + version = "3.7.10"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-RvP0HhndYRrRX7ag2nwmsOoNPKXXWJXfmfZqAWSZuv8="; + sha256 = "sha256-cQ2tLd3KU46qe/PrMPh3I3+KQxNGBB4WbRfPHpT9IVA="; }; buildInputs = [ From 4edce5344779d2528c2abfaf31959ea34b7573b9 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 15 Apr 2024 17:07:18 +0800 Subject: [PATCH 051/130] apksigner: 33.0.1 -> 34.0.5-unstable-2024-03-06 --- pkgs/development/tools/apksigner/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/development/tools/apksigner/default.nix index 7b2017c4d9da..1df733c183b4 100644 --- a/pkgs/development/tools/apksigner/default.nix +++ b/pkgs/development/tools/apksigner/default.nix @@ -1,24 +1,22 @@ { lib , stdenv , fetchgit -, openjdk17_headless -, gradle_7 +, jdk_headless +, gradle , perl , makeWrapper }: -let - gradle = gradle_7; -in + stdenv.mkDerivation rec { pname = "apksigner"; - version = "33.0.1"; + version = "34.0.5-unstable-2024-03-06"; src = fetchgit { # use pname here because the final jar uses this as the filename name = pname; url = "https://android.googlesource.com/platform/tools/apksig"; - rev = "platform-tools-${version}"; - hash = "sha256-CKvwB9Bb12QvkL/HBOwT6DhA1PI45+QnTNfwnvReGUQ="; + rev = "ac5cbb07d87cc342fcf07715857a812305d69888"; + hash = "sha256-sLAs7XEkhNkQjB/nhBODxI3QzxFvLWM1SBKDuXp6gvw="; }; postPatch = '' @@ -36,6 +34,7 @@ stdenv.mkDerivation rec { include 'com/android/apksigner/*.txt' } } + tasks.named("processTestResources") { dependsOn("extractTestProto") } EOF sed -i -e '/conscrypt/s/testImplementation/implementation/' build.gradle ''; @@ -80,10 +79,12 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm444 build/libs/apksigner.jar -t $out/lib - makeWrapper "${openjdk17_headless}/bin/java" "$out/bin/apksigner" \ + makeWrapper "${jdk_headless}/bin/java" "$out/bin/apksigner" \ --add-flags "-jar $out/lib/apksigner.jar" ''; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Command line tool to sign and verify Android APKs"; mainProgram = "apksigner"; From 4426a996457fe676748e6de9a497608dffe9983e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Apr 2024 12:22:24 +0000 Subject: [PATCH 052/130] argocd: 2.10.6 -> 2.10.7 --- pkgs/applications/networking/cluster/argocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index a273d008e662..7f3265cbd8bf 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.10.6"; + version = "2.10.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-tKZQVI2WiqsPIMHCBGJHcZYk4gOoshiGA0WPyeoxvok="; + hash = "sha256-0C8lVQrFxrk9ym4aCz0PhUS2iByx9rj5Id0xFIq4Efc="; }; proxyVendor = true; # darwin/linux hash mismatch From a7bdebe6da87516986c3cde27289d9c6b986467f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Apr 2024 14:30:52 +0000 Subject: [PATCH 053/130] python312Packages.outlines: 0.0.37 -> 0.0.38 --- pkgs/development/python-modules/outlines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix index f45a7f5d6180..5e33127f3e0c 100644 --- a/pkgs/development/python-modules/outlines/default.nix +++ b/pkgs/development/python-modules/outlines/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "outlines"; - version = "0.0.37"; + version = "0.0.38"; pyproject = true; src = fetchFromGitHub { owner = "outlines-dev"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AnTK2YFdVgppYQ5C0/kMQRLopDkuGS2n0ZZEbltcPR4="; + hash = "sha256-kOd2J6PV2idWaltkGUVNXfB+1dNU1f8vbnHQ5i1WxG8="; }; nativeBuildInputs = [ From 5ed75465267472590b1ed765dc7752ff18a792dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Apr 2024 14:42:49 +0000 Subject: [PATCH 054/130] python312Packages.yamlloader: 1.3.2 -> 1.4.1 --- pkgs/development/python-modules/yamlloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix index d838233a7234..69019ab75e06 100644 --- a/pkgs/development/python-modules/yamlloader/default.nix +++ b/pkgs/development/python-modules/yamlloader/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "yamlloader"; - version = "1.3.2"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fb2YQh2AkMUhZV8bBsoDAGfynfUlOoh4EmvOOpD1aBc="; + hash = "sha256-tv5A7PWvWW2EDpIGcO00dfmBNJK/blWyTyrUUMISurU="; }; propagatedBuildInputs = [ From 5ceb5cedb1c01e9ce5ab31b0869c1ad8e02569f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Apr 2024 15:03:31 +0000 Subject: [PATCH 055/130] xf86_input_wacom: 1.2.1 -> 1.2.2 --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index eb5a5eae8032..1a872b758aca 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xf86-input-wacom"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "linuxwacom"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-ldPNGa1ACjLivs2CVtkvKLsBZSzRuOM8Q7bvMdx0EWA="; + sha256 = "sha256-3w12OjjMdu03BhUVEjkyj1ngDFnp0Cp66L0nn3LuU8Q="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From c48e90fd63eda72eb1aa08d90e8ed751d1884a3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 00:22:42 +0000 Subject: [PATCH 056/130] bcftools: 1.19 -> 1.20 --- pkgs/applications/science/biology/bcftools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 19e5f99fe2f6..cafc952dec4c 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.19"; + version = "1.20"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-eCtfG8aQQVGSIx6CITs0k7BH9F5jDcjvbxVNYSarPmg="; + sha256 = "sha256-MSuDKd5RMN06N2eMcSlR5h5XcVV8cSmnCjJ6MA/ahiA="; }; nativeBuildInputs = [ From 2413c03a8951329142ecf07e4ecaacf4fa7d33ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 01:32:59 +0000 Subject: [PATCH 057/130] ex_doc: 0.32.0 -> 0.32.1 --- pkgs/development/beam-modules/ex_doc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix index 0bbb71dcd6f5..7693364c2fc3 100644 --- a/pkgs/development/beam-modules/ex_doc/default.nix +++ b/pkgs/development/beam-modules/ex_doc/default.nix @@ -3,12 +3,12 @@ let pname = "ex_doc"; - version = "0.32.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "${pname}"; rev = "v${version}"; - hash = "sha256-JLtMoPuXFKcjXaeVv1PdMzb6rZItTkXDAs4hXqTY/vw="; + hash = "sha256-nNUSx2Ywj04vgT/7BQEwoNtTl1NGmbvuIS4KbvUFYzs="; }; in mixRelease { From a1f51a5fee39a3e90c1e13b881ab82d4987d7fc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 02:06:20 +0000 Subject: [PATCH 058/130] vivaldi: 6.6.3271.57 -> 6.6.3271.61 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 7abf83219bec..442f899920c1 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.6.3271.57"; + version = "6.6.3271.61"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-v/UG4eL/66i/0sSqN8JmJJIEjHzJjTTDZLRzLMJpJMA="; - x86_64-linux = "sha256-uVrEVf9mePqalU2OJRMj0Zy9d7jDXwsdMwEQhn9uUh8="; + aarch64-linux = "sha256-Rcc/pufINOQJlkQI6KkWVZtnh3KvKLS6jRWQNTxPFmU="; + x86_64-linux = "sha256-Xt4pLB23VZ/j9g/QCOQTrrhQduxs1nB4wyYkBefFPIQ="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 6d69a6fdb38398035476e26b84401e2f2955057c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 03:40:07 +0000 Subject: [PATCH 059/130] kapp: 0.60.0 -> 0.61.0 --- pkgs/tools/networking/kapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix index c74a0a8cd47b..7a91d2fb4446 100644 --- a/pkgs/tools/networking/kapp/default.nix +++ b/pkgs/tools/networking/kapp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kapp"; - version = "0.60.0"; + version = "0.61.0"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "kapp"; rev = "v${version}"; - sha256 = "sha256-o1MFbyjgOvhgcrlkbYGn0+nHENL2STFiD9CUkCdB56E="; + sha256 = "sha256-/HINk9an1wfiKo2xj4x2Ienc2/acZZHjQRIjcCtUQjI="; }; vendorHash = null; From ad2586fa9a7518c50d6ff47f357f51ba1dad432b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 16 Apr 2024 04:20:00 +0000 Subject: [PATCH 060/130] whistle: 2.9.67 -> 2.9.68 Diff: https://github.com/avwo/whistle/compare/v2.9.67...v2.9.68 Changelog: https://github.com/avwo/whistle/blob/v2.9.68/CHANGELOG.md --- pkgs/by-name/wh/whistle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix index 4e423177551c..da86bd7dfba9 100644 --- a/pkgs/by-name/wh/whistle/package.nix +++ b/pkgs/by-name/wh/whistle/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.67"; + version = "2.9.68"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-wGfKgVbjVrR/GNVLqZtIydsolz14J8YsUU5Oyb7NDL0="; + hash = "sha256-8UWYh2pm0UX6tb/7DT5ZaHvmHdxk6hwE7fFHKY6pGOs="; }; - npmDepsHash = "sha256-+7xdvWS92dij4fpQLnp1pjVN+uQNok205EAXGnD/wxY="; + npmDepsHash = "sha256-/WnrhtVr972Na8rpZ7dzH3998WDPsS5X6jCPkCj3hyc="; dontNpmBuild = true; From 4f683916db67d7ce882bd79109d275dbb2463f61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 04:34:39 +0000 Subject: [PATCH 061/130] samply: 0.11.0 -> 0.12.0 --- pkgs/development/tools/misc/samply/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/samply/default.nix b/pkgs/development/tools/misc/samply/default.nix index 9109de361779..44f711066be6 100644 --- a/pkgs/development/tools/misc/samply/default.nix +++ b/pkgs/development/tools/misc/samply/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "samply"; - version = "0.11.0"; + version = "0.12.0"; src = fetchCrate { inherit pname version; - hash = "sha256-V0uAS7Oo7wv0yU5CgqqYhltwM5PXJ3GP/TLVZV2GkkI="; + hash = "sha256-7bf1lDIZGhRpvnn8rHNwzH2GBY8CwtYCjuRAUTQgbsA="; }; - cargoHash = "sha256-jsuICNVY3noZi/+mgVj9uUu53z+5bW9Vi5CBKcHOqSI="; + cargoHash = "sha256-QGvtKx+l6+UxdlziHnF63geAvW55RRlatK2/J8LR0Ck="; # the dependencies linux-perf-data and linux-perf-event-reader contains both README.md and Readme.md, # which causes a hash mismatch on systems with a case-insensitive filesystem From b5b5eb9d94ddac2d9656e69176303ca24eb87b40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 05:42:23 +0000 Subject: [PATCH 062/130] nco: 5.2.3 -> 5.2.4 --- pkgs/development/libraries/nco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 3ac017b22c14..cb4a38cded27 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nco"; - version = "5.2.3"; + version = "5.2.4"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-a1Q1oK546F1itCtugpbh9fc+asokuXGMS51OgZ59bnY="; + hash = "sha256-1+nC5Io459T/Czr6bTfdGy2GB5MMrhK+EBLQIPIX5QM="; }; nativeBuildInputs = [ From 70009ba197a25b2d77208917ad188405c0557c2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 05:59:17 +0000 Subject: [PATCH 063/130] python312Packages.marimo: 0.3.12 -> 0.4.0 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 871ba7bffbf0..4031b10f55d0 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.3.12"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-4OwTY4OFkTQcQqHntjcfwPTx4w+2GPEUBy/XgW/nATU="; + hash = "sha256-IiM7iJs3CIl6WjstgvtJzIylVL49jRG246GU5G5GEG0="; }; build-system = [ From 8537079657ff7246cbbb6df9e4bc48f4327785e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 06:03:48 +0000 Subject: [PATCH 064/130] ibus-engines.typing-booster-unwrapped: 2.25.6 -> 2.25.7 --- .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index a27c9082f7f0..4be1726095ca 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.25.6"; + version = "2.25.7"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-HFC6VhlA3Kt1oZd1R5bOHRMQrNiNu4J0Op1uCKOXj9w="; + hash = "sha256-CZqtjiBTvnTvTf1AUd0IWINSQo4iOaJkBFT2YFsqTvI="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; From 88995c141ed5ef09a4b9ff996086982dd9d3735c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 16 Apr 2024 09:30:25 +0200 Subject: [PATCH 065/130] gitea: 1.21.10 -> 1.21.11 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.21.11 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index ef0902443c8f..4b2105fda93c 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -20,12 +20,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.21.10"; + version = "1.21.11"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-g/aDRIAKaPi8AWWJL4N8CZt2N4HBEWK7xSBvjrcPDD8="; + hash = "sha256-TxysXw3lVdV/hlILztM+D7wIpeqXfglAy7Ak2AxnlEM="; }; vendorHash = null; From a8508b0bd2469c9bb950deb5f6c624a82ecb5b2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 09:23:34 +0000 Subject: [PATCH 066/130] python312Packages.pyemvue: 0.18.4 -> 0.18.5 --- pkgs/development/python-modules/pyemvue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyemvue/default.nix b/pkgs/development/python-modules/pyemvue/default.nix index 22e7e667929d..b6f42daac620 100644 --- a/pkgs/development/python-modules/pyemvue/default.nix +++ b/pkgs/development/python-modules/pyemvue/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pyemvue"; - version = "0.18.4"; + version = "0.18.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-PTRVabYbT7Xwjkm+Oz56YjNb5Xwcgxn+IvXeazKsHyY="; + hash = "sha256-cgQARaGM6Jb2kEcG7HqPStRPkhHldJ7UbxQpxN6JbZE="; }; nativeBuildInputs = [ From 2362352122e0dceabd0fc575f96acfa7626e6225 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 09:36:45 +0000 Subject: [PATCH 067/130] kodiPackages.netflix: 1.23.2 -> 1.23.3 --- pkgs/applications/video/kodi/addons/netflix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix index 2bff3b6d19b3..3b3aa97d5343 100644 --- a/pkgs/applications/video/kodi/addons/netflix/default.nix +++ b/pkgs/applications/video/kodi/addons/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.23.2"; + version = "1.23.3"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - hash = "sha256-/wHKwFZbuxK0iwlqvZpyfi0lnRkjm/HSn221IgCN7VQ="; + hash = "sha256-tve7E7dK60BIHETdwt9hD3/5eEdJB6c6rhw4oDoLAKM="; }; propagatedBuildInputs = [ From cb4d1f74032689503cee85c6e44f1ecc37e157e6 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Apr 2024 14:57:55 +0100 Subject: [PATCH 068/130] python3Packages.macaroonbakery: init at 1.3.4 --- .../python-modules/macaroonbakery/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/macaroonbakery/default.nix diff --git a/pkgs/development/python-modules/macaroonbakery/default.nix b/pkgs/development/python-modules/macaroonbakery/default.nix new file mode 100644 index 000000000000..eb1b50eb4a9b --- /dev/null +++ b/pkgs/development/python-modules/macaroonbakery/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + nix-update-script, + protobuf3, + pymacaroons, + pynacl, + pyrfc3339, + requests, + setuptools, + httmock, + fixtures, + pytestCheckHook, + mock, +}: + +buildPythonPackage rec { + pname = "macaroonbakery"; + version = "1.3.4"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "go-macaroon-bakery"; + repo = "py-macaroon-bakery"; + rev = "refs/tags/${version}"; + hash = "sha256-NEhr8zkrHceeLbAyuUvc7U6dyQxkpkj0m5LlnBMafA0="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + protobuf3 + pymacaroons + pynacl + pyrfc3339 + requests + ]; + + pythonImportsCheck = [ "macaroonbakery" ]; + + nativeCheckInputs = [ + fixtures + httmock + mock + pytestCheckHook + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A Python library for working with macaroons"; + homepage = "https://github.com/go-macaroon-bakery/py-macaroon-bakery"; + changelog = "https://github.com/go-macaroon-bakery/py-macaroon-bakery/releases/tag/${version}"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ jnsgruk ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9a6001945e9..adf7602d0611 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7053,6 +7053,8 @@ self: super: with self; { regress = callPackage ../development/python-modules/regress { }; + macaroonbakery = callPackage ../development/python-modules/macaroonbakery { }; + mail-parser = callPackage ../development/python-modules/mail-parser { }; makefun = callPackage ../development/python-modules/makefun { }; From 1877c3c0aa204e14d104342f4644ed40542de875 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Apr 2024 14:58:20 +0100 Subject: [PATCH 069/130] python3Packages.craft-store: init at 2.6.0 --- .../python-modules/craft-store/default.nix | 76 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/development/python-modules/craft-store/default.nix diff --git a/pkgs/development/python-modules/craft-store/default.nix b/pkgs/development/python-modules/craft-store/default.nix new file mode 100644 index 000000000000..637e7ed26a9d --- /dev/null +++ b/pkgs/development/python-modules/craft-store/default.nix @@ -0,0 +1,76 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + nix-update-script, + setuptools, + setuptools-scm, + pytest-check, + pytest-mock, + pydantic_1, + pyyaml, + pytestCheckHook, + keyring, + macaroonbakery, + overrides, + pyxdg, + requests, + requests-toolbelt, +}: + +buildPythonPackage rec { + pname = "craft-store"; + version = "2.6.0"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "canonical"; + repo = "craft-store"; + rev = "refs/tags/${version}"; + hash = "sha256-VtKOe3IrvGcNWfp1/tg1cO94xtfkP7AbIHh0WTdlfbQ="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools==67.7.2" "setuptools" + ''; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + keyring + macaroonbakery + overrides + pydantic_1 + pyxdg + requests + requests-toolbelt + ]; + + pythonImportsCheck = [ "craft_store" ]; + + nativeCheckInputs = [ + pydantic_1 + pytest-check + pytest-mock + pytestCheckHook + pyyaml + ]; + + pytestFlagsArray = [ "tests/unit" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Interfaces for communicating with Canonical Stores (e.g. Snap Store)"; + homepage = "https://github.com/canonical/craft-store"; + changelog = "https://github.com/canonical/craft-store/releases/tag/${version}"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ jnsgruk ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index adf7602d0611..a54e1af6d863 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2486,6 +2486,8 @@ self: super: with self; { craft-providers = callPackage ../development/python-modules/craft-providers { }; + craft-store = callPackage ../development/python-modules/craft-store { }; + cram = callPackage ../development/python-modules/cram { }; cramjam = callPackage ../development/python-modules/cramjam { }; From f6e8d5fa8755d65b1f62606c28b519ad42774515 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Apr 2024 14:58:30 +0100 Subject: [PATCH 070/130] charmcraft: init at 2.6.0 --- pkgs/by-name/ch/charmcraft/package.nix | 88 ++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 pkgs/by-name/ch/charmcraft/package.nix diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix new file mode 100644 index 000000000000..c837563a61c8 --- /dev/null +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -0,0 +1,88 @@ +{ + lib, + git, + python3Packages, + fetchFromGitHub, + nix-update-script, +}: + +python3Packages.buildPythonApplication rec { + pname = "charmcraft"; + version = "2.6.0"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "canonical"; + repo = "charmcraft"; + rev = "refs/tags/${version}"; + hash = "sha256-B0ZcOORW6yaSIpisPLnq5/S/CcqqvHNTXcfP1sKW2KQ="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'version=determine_version()' 'version="${version}"' + ''; + + propagatedBuildInputs = with python3Packages; [ + craft-cli + craft-parts + craft-providers + craft-store + distro + humanize + jinja2 + jsonschema + pydantic_1 + python-dateutil + pyyaml + requests + requests-toolbelt + requests-unixsocket + snap-helpers + tabulate + urllib3 + ]; + + nativeBuildInputs = with python3Packages; [ + pythonRelaxDepsHook + setuptools + ]; + + pythonRelaxDeps = [ + "urllib3" + ]; + + nativeCheckInputs = with python3Packages; [ + pyfakefs + pytest-check + pytest-mock + pytest-subprocess + pytestCheckHook + responses + ] ++ [ git ]; + + preCheck = '' + mkdir -p check-phase + export HOME="$(pwd)/check-phase" + ''; + + pytestFlagsArray = [ "tests/unit" ]; + + disabledTests = [ + # Relies upon the `charm` tool being installed + "test_validate_missing_charm" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + mainProgram = "charmcraft"; + description = "Build and publish Charmed Operators for deployment with Juju"; + homepage = "https://github.com/canonical/charmcraft"; + changelog = "https://github.com/canonical/charmcraft/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jnsgruk ]; + platforms = lib.platforms.linux; + }; +} From 6922c8caa358d45019b08cb8055f454cbd8ea5ee Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Apr 2024 15:05:53 +0100 Subject: [PATCH 071/130] python3Packages.craft-providers: 1.23.0 -> 1.23.1 --- pkgs/development/python-modules/craft-providers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index d1b824716d6d..e3c384f455ba 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "craft-providers"; - version = "1.23.0"; + version = "1.23.1"; pyproject = true; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-providers"; rev = "refs/tags/${version}"; - hash = "sha256-9ZoNgpuGytwozRsw0wnS3d2UBOIsh3VI/uzB1RD2Zac="; + hash = "sha256-opVgOtbwZD+uQJ10Q8QlgQaS9KjRFnQ4h98Ak7Ze5qQ="; }; patches = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { # The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69 # This is already patched in nixpkgs. substituteInPlace pyproject.toml \ - --replace-fail "setuptools==67.8.0" "setuptools" \ + --replace-fail "setuptools==69.1.1" "setuptools" \ --replace-fail "urllib3<2" "urllib3" ''; From 5ed8afee5e35636edfaef493e84c34247ae8fe3b Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 16 Apr 2024 12:17:03 +0100 Subject: [PATCH 072/130] python3Packages.pydantic-yaml-0: disable nix-update-script --- pkgs/development/python-modules/pydantic-yaml-0/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/pydantic-yaml-0/default.nix b/pkgs/development/python-modules/pydantic-yaml-0/default.nix index 57a4f72ba1f9..bc842e5dc532 100644 --- a/pkgs/development/python-modules/pydantic-yaml-0/default.nix +++ b/pkgs/development/python-modules/pydantic-yaml-0/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, nix-update-script , deprecated , importlib-metadata , pydantic_1 @@ -55,8 +54,6 @@ buildPythonPackage rec { pytestCheckHook ]; - passthru.updateScript = nix-update-script { }; - meta = { description = "A small helper library that adds some YAML capabilities to pydantic"; homepage = "https://github.com/NowanIlfideme/pydantic-yaml"; From 92415267c6b14799e654c89104370abe13a4229b Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Tue, 16 Apr 2024 13:42:02 +0200 Subject: [PATCH 073/130] profiles/demo: rename services.xserver.displayManager --- nixos/modules/profiles/demo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix index 4e8c74deedba..52ba40902e87 100644 --- a/nixos/modules/profiles/demo.nix +++ b/nixos/modules/profiles/demo.nix @@ -11,7 +11,7 @@ uid = 1000; }; - services.xserver.displayManager = { + services.displayManager = { autoLogin = { enable = true; user = "demo"; From 1f977157679661b2cf58774be632f3ca023ce1b6 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Tue, 16 Apr 2024 13:42:29 +0200 Subject: [PATCH 074/130] profiles/graphical:rename services.xserver.displayManager --- nixos/modules/profiles/graphical.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index d80456cede56..8cc31652f807 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/nixos/modules/profiles/graphical.nix @@ -6,13 +6,12 @@ { services.xserver = { enable = true; - displayManager.sddm.enable = true; - desktopManager.plasma5 = { - enable = true; - }; + desktopManager.plasma5.enable = true; libinput.enable = true; # for touchpad support on many laptops }; + services.displayManager.sddm.enable = true; + # Enable sound in virtualbox appliances. hardware.pulseaudio.enable = true; From 71da1e1b96fb34692e00e3a22f8fba61f12cced7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 12:39:41 +0000 Subject: [PATCH 075/130] cnquery: 10.11.1 -> 10.12.2 --- pkgs/tools/security/cnquery/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index a2f9cd1c4dc4..f8f1467074be 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "10.11.1"; + version = "10.12.2"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "refs/tags/v${version}"; - hash = "sha256-0poDqU4R6sr1Fkpq0snFZ5gEUU2Es8V9NRcZpxQb/xU="; + hash = "sha256-TqbE94JmewkYxulF8ePKxQLb2NvQ6FNpfqqedtYM4aY="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-5jbxZVSmqZ7VFDsBcgf1HIlVRUvewENT0k+YWgbnnrQ="; + vendorHash = "sha256-dS62XJFdL3Js2i6JwksvU8hEme6+6NojfjdzUZnY1wI="; ldflags = [ "-w" From 0d788b04690c7534da8253cb1c1d0e122f639b27 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Mon, 4 Mar 2024 17:55:46 +0100 Subject: [PATCH 076/130] linux: Enable P2P DMA, NVMe Target Passthrough, Fabrics In-Band Auth and TCP TLS. --- pkgs/os-specific/linux/kernel/common-config.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0f1b314df6bd..1ea2c3bc42c0 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1053,6 +1053,17 @@ let NVME_MULTIPATH = yes; + NVME_AUTH = whenAtLeast "6.0" yes; + NVME_HOST_AUTH = whenAtLeast "6.7" yes; + NVME_TCP_TLS = whenAtLeast "6.7" yes; + + NVME_TARGET = module; + NVME_TARGET_PASSTHROUGH = whenAtLeast "5.1" yes; + NVME_TARGET_AUTH = whenAtLeast "6.0" yes; + NVME_TARGET_TCP_TLS = whenAtLeast "6.7" yes; + + PCI_P2PDMA = mkIf stdenv.hostPlatform.is64bit yes; + PSI = whenAtLeast "4.20" yes; MOUSE_ELAN_I2C_SMBUS = yes; From 3813d8a5341bfc0145d434bb5a184fbdbac6ff37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 13:19:20 +0000 Subject: [PATCH 077/130] oelint-adv: 5.1.2 -> 5.1.3 --- pkgs/by-name/oe/oelint-adv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index 06894e166efe..480d92a161eb 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "oelint-adv"; - version = "5.1.2"; + version = "5.1.3"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_adv"; - hash = "sha256-7lrjytvcOnZZ8ezhWKng7OahqwsW95VkDt8B6NMriR0="; + hash = "sha256-Jo3Z5hhZH0tzu4+RL+ElaenlWCRoIYANWGx5U2u9xy8="; }; propagatedBuildInputs = with python3.pkgs; [ From f54620d0891d943a09d9767a6bd3771daea52b9a Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 11 Apr 2024 19:58:32 -0400 Subject: [PATCH 078/130] kodi: 20.5 -> 21.0 --- .../addons/addon-update-script/default.nix | 2 +- .../video/kodi/addons/arrow/default.nix | 4 +- .../kodi/addons/arteplussept/default.nix | 4 +- .../video/kodi/addons/certifi/default.nix | 4 +- .../video/kodi/addons/chardet/default.nix | 4 +- .../controller-topology-project/default.nix | 2 + .../video/kodi/addons/dateutil/default.nix | 4 +- .../video/kodi/addons/defusedxml/default.nix | 4 +- .../video/kodi/addons/future/default.nix | 4 +- .../video/kodi/addons/idna/default.nix | 4 +- .../addons/inputstream-adaptive/default.nix | 12 +-- .../inputstream-ffmpegdirect/default.nix | 6 +- .../kodi/addons/inputstream-rtmp/default.nix | 4 +- .../kodi/addons/inputstreamhelper/default.nix | 4 +- .../video/kodi/addons/invidious/default.nix | 4 +- .../video/kodi/addons/keymap/default.nix | 4 +- .../video/kodi/addons/kodi-six/default.nix | 4 +- .../video/kodi/addons/mediacccde/default.nix | 4 +- .../video/kodi/addons/myconnpy/default.nix | 4 +- .../video/kodi/addons/osmc-skin/default.nix | 2 + .../kodi/addons/radioparadise/default.nix | 4 +- .../kodi/addons/requests-cache/default.nix | 4 +- .../video/kodi/addons/requests/default.nix | 4 +- .../video/kodi/addons/routing/default.nix | 4 +- .../video/kodi/addons/signals/default.nix | 4 +- .../video/kodi/addons/simplejson/default.nix | 4 +- .../video/kodi/addons/six/default.nix | 4 +- .../video/kodi/addons/somafm/default.nix | 4 +- .../video/kodi/addons/svtplay/default.nix | 2 + .../kodi/addons/trakt-module/default.nix | 4 +- .../video/kodi/addons/trakt/default.nix | 4 +- .../kodi/addons/typing_extensions/default.nix | 4 +- .../video/kodi/addons/urllib3/default.nix | 4 +- .../video/kodi/addons/websocket/default.nix | 4 +- pkgs/applications/video/kodi/unwrapped.nix | 86 ++++++++----------- pkgs/top-level/all-packages.nix | 3 + pkgs/top-level/kodi-packages.nix | 2 +- 37 files changed, 110 insertions(+), 119 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/addon-update-script/default.nix b/pkgs/applications/video/kodi/addons/addon-update-script/default.nix index abcdefaf02dd..f3b363dca0f8 100644 --- a/pkgs/applications/video/kodi/addons/addon-update-script/default.nix +++ b/pkgs/applications/video/kodi/addons/addon-update-script/default.nix @@ -9,7 +9,7 @@ { attrPath }: let - url = "http://mirrors.kodi.tv/addons/nexus/addons.xml.gz"; + url = "http://mirrors.kodi.tv/addons/omega/addons.xml.gz"; updateScript = writeShellScript "update.sh" '' set -ex diff --git a/pkgs/applications/video/kodi/addons/arrow/default.nix b/pkgs/applications/video/kodi/addons/arrow/default.nix index 363b41035e00..2515ce7853fc 100644 --- a/pkgs/applications/video/kodi/addons/arrow/default.nix +++ b/pkgs/applications/video/kodi/addons/arrow/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, dateutil, typing_extensions }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, dateutil, typing_extensions }: buildKodiAddon rec { pname = "arrow"; namespace = "script.module.arrow"; version = "1.2.3"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/script.module.arrow/script.module.arrow-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/script.module.arrow/script.module.arrow-${version}.zip"; sha256 = "sha256-Et+9FJT1dRE1dFOrAQ70HJJcfylyLsiyay9wPJcSOXs="; }; diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix index 287735d246e7..8311a5068021 100644 --- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, dateutil, requests, xbmcswift2 }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, dateutil, requests, xbmcswift2 }: buildKodiAddon rec { pname = "arteplussept"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "1.4.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; hash = "sha256-dqxGKaOnEYOI33Aw76zbjma5z7MqOUh367dFsV87olU="; }; diff --git a/pkgs/applications/video/kodi/addons/certifi/default.nix b/pkgs/applications/video/kodi/addons/certifi/default.nix index 13ed0c1e4585..ecab49746a27 100644 --- a/pkgs/applications/video/kodi/addons/certifi/default.nix +++ b/pkgs/applications/video/kodi/addons/certifi/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, cacert }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, cacert }: buildKodiAddon rec { pname = "certifi"; namespace = "script.module.certifi"; version = "2023.5.7"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-NQbjx+k9fnQMYLLMR5+N5NSuDcXEzZjlhGPA3qSmjfI="; }; diff --git a/pkgs/applications/video/kodi/addons/chardet/default.nix b/pkgs/applications/video/kodi/addons/chardet/default.nix index 5d3fd8421db9..8d385e717b8a 100644 --- a/pkgs/applications/video/kodi/addons/chardet/default.nix +++ b/pkgs/applications/video/kodi/addons/chardet/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "chardet"; namespace = "script.module.chardet"; version = "5.1.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-cIQIX6LVAoGf1sBRKWonXJd3XYqGOa5WIUttabV0HeU="; }; diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix index 30b54c2adae2..cfaef2bb7f98 100644 --- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -14,6 +14,8 @@ let postPatch = '' # remove addons already included in the base kodi package rm -r addons/game.controller.default + rm -r addons/game.controller.keyboard + rm -r addons/game.controller.mouse rm -r addons/game.controller.snes ''; diff --git a/pkgs/applications/video/kodi/addons/dateutil/default.nix b/pkgs/applications/video/kodi/addons/dateutil/default.nix index 9adcf3303bb5..b0fadcf8a862 100644 --- a/pkgs/applications/video/kodi/addons/dateutil/default.nix +++ b/pkgs/applications/video/kodi/addons/dateutil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, six }: buildKodiAddon rec { pname = "dateutil"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "2.8.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-iQnyS0GjYcPbnBDUxmMrmDxHOA3K8RbTVke/HF4d5u4="; }; diff --git a/pkgs/applications/video/kodi/addons/defusedxml/default.nix b/pkgs/applications/video/kodi/addons/defusedxml/default.nix index 12a9f82e3f6e..1c6a844e0a30 100644 --- a/pkgs/applications/video/kodi/addons/defusedxml/default.nix +++ b/pkgs/applications/video/kodi/addons/defusedxml/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "defusedxml"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.6.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-jSl7lbFqR6hjZhHzxY69hDbs84LY3B5RYKzXnHou0Qg="; }; diff --git a/pkgs/applications/video/kodi/addons/future/default.nix b/pkgs/applications/video/kodi/addons/future/default.nix index c8078ff36d5a..8812fbd8f5b3 100644 --- a/pkgs/applications/video/kodi/addons/future/default.nix +++ b/pkgs/applications/video/kodi/addons/future/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "future"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.18.3+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-jKO2Qxi54z6UiCmMkxU+2pog40K2yb8/KYbNPFYuSsQ="; }; diff --git a/pkgs/applications/video/kodi/addons/idna/default.nix b/pkgs/applications/video/kodi/addons/idna/default.nix index d752cb93b01a..76a6e81b0072 100644 --- a/pkgs/applications/video/kodi/addons/idna/default.nix +++ b/pkgs/applications/video/kodi/addons/idna/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "idna"; namespace = "script.module.idna"; version = "3.4.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk="; }; diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index cb85df276412..677467d34396 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -1,22 +1,22 @@ -{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, expat, glib, nspr, nss, gtest }: +{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, pugixml, glib, nspr, nss, gtest }: let bento4 = fetchFromGitHub { owner = "xbmc"; repo = "Bento4"; - rev = "1.6.0-639-7-Omega"; - sha256 = "sha256-d3znV88dLMbA4oUWsTZ7vS6WHOWzN7lIHgWPkR5Aixo="; + rev = "1.6.0-641-${rel}"; + sha256 = "sha256-vsFMDzH8JJecYw0qWKGCxnd/m5wn62mCKE2g2HwQhwI="; }; in buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "20.3.18"; + version = "21.4.4"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-cjlUKrus4Dv48dCk6AlOgY2iZYTwT39tj2u7aq1P104="; + sha256 = "sha256-Nzlm1AW/nW9chQAourKF0o2FSQmsr1MNhJ4gEO0/9sM="; }; extraCMakeFlags = [ @@ -26,7 +26,7 @@ buildKodiBinaryAddon rec { extraNativeBuildInputs = [ gtest ]; - extraBuildInputs = [ expat ]; + extraBuildInputs = [ pugixml ]; extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; diff --git a/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix b/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix index fc3256855917..ffb0a0cf83a7 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-ffmpegdirect"; namespace = "inputstream.ffmpegdirect"; - version = "unstable-20.5.0"; + version = "21.3.5"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.ffmpegdirect"; - rev = rel; - sha256 = "sha256-+u28Wzp2TonL5jaa5WJUr9igR6KiaxizZAX9jqqBUns="; + rev = "${version}-${rel}"; + sha256 = "sha256-pPufkDPHq5EsvC6YTsRX9TjqjIczOL/6Vc5HGDIe9Gk="; }; extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ]; diff --git a/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix b/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix index 561ef2cc5577..960c50ce09e7 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-rtmp"; namespace = "inputstream.rtmp"; - version = "20.3.0"; + version = "21.1.0"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.rtmp"; rev = "${version}-${rel}"; - sha256 = "sha256-VF2DpQXXU+rj76e/de5YB1T7dzeOjmO0dpsPVqEnMy4="; + sha256 = "sha256-M6LFokWQRzBZ7inzRsMxyWzkV0XsGHh4d0CPhv1NCfI="; }; extraBuildInputs = [ openssl rtmpdump zlib ]; diff --git a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix index ceafe3b9c5ff..97cc417e6bf1 100644 --- a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "inputstreamhelper"; namespace = "script.module.inputstreamhelper"; version = "0.6.1+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-v5fRikswmP+KVbxYibD0NbCK8leUnFbya5EtF1FmS0I="; }; diff --git a/pkgs/applications/video/kodi/addons/invidious/default.nix b/pkgs/applications/video/kodi/addons/invidious/default.nix index e5d26ef4a64c..36ae8608837d 100644 --- a/pkgs/applications/video/kodi/addons/invidious/default.nix +++ b/pkgs/applications/video/kodi/addons/invidious/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: buildKodiAddon rec { pname = "invidious"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.2.6"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/plugin.video.invidious/plugin.video.invidious-${version}+nexus.0.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/plugin.video.invidious/plugin.video.invidious-${version}+nexus.0.zip"; sha256 = "sha256-XnlnhvtHMh4uQTupW/SSOmaEV8xZrL61/6GoRpyKR0o="; }; diff --git a/pkgs/applications/video/kodi/addons/keymap/default.nix b/pkgs/applications/video/kodi/addons/keymap/default.nix index ff710cdedef3..154bbd6b3c1e 100644 --- a/pkgs/applications/video/kodi/addons/keymap/default.nix +++ b/pkgs/applications/video/kodi/addons/keymap/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, defusedxml, kodi-six }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, defusedxml, kodi-six }: buildKodiAddon rec { pname = "keymap"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "1.1.5"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-wSztipTEGIqw1icsz+ziNxYuRZOFt3C66T1Ifap/ta0="; }; diff --git a/pkgs/applications/video/kodi/addons/kodi-six/default.nix b/pkgs/applications/video/kodi/addons/kodi-six/default.nix index 638b7c3b500b..a9c7547aa371 100644 --- a/pkgs/applications/video/kodi/addons/kodi-six/default.nix +++ b/pkgs/applications/video/kodi/addons/kodi-six/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "kodi-six"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.1.3.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-nWz5CPoE0uVsZvWjI4q6y4ZKUnraTjTXLSJ1mK4YopI="; }; diff --git a/pkgs/applications/video/kodi/addons/mediacccde/default.nix b/pkgs/applications/video/kodi/addons/mediacccde/default.nix index 9c09078557ed..a0d334633fe1 100644 --- a/pkgs/applications/video/kodi/addons/mediacccde/default.nix +++ b/pkgs/applications/video/kodi/addons/mediacccde/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, routing }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests, routing }: buildKodiAddon rec { pname = "media.ccc.de"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.3.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/plugin.video.media-ccc-de/plugin.video.media-ccc-de-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/plugin.video.media-ccc-de/plugin.video.media-ccc-de-${version}.zip"; hash = "sha256-T8J2HtPVDfaPU0gZEa0xVBzwjNInxkRFCCSxS53QhmU="; }; diff --git a/pkgs/applications/video/kodi/addons/myconnpy/default.nix b/pkgs/applications/video/kodi/addons/myconnpy/default.nix index dac308ab5837..a162e844ed55 100644 --- a/pkgs/applications/video/kodi/addons/myconnpy/default.nix +++ b/pkgs/applications/video/kodi/addons/myconnpy/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "myconnpy"; namespace = "script.module.myconnpy"; version = "8.0.33"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-NlLMq9RAdWu8rVsMc0FDe1HmQiVp5T7iBXbIH7HB5bI="; }; diff --git a/pkgs/applications/video/kodi/addons/osmc-skin/default.nix b/pkgs/applications/video/kodi/addons/osmc-skin/default.nix index 901d1d65716c..71e0e1744b78 100644 --- a/pkgs/applications/video/kodi/addons/osmc-skin/default.nix +++ b/pkgs/applications/video/kodi/addons/osmc-skin/default.nix @@ -17,5 +17,7 @@ buildKodiAddon rec { platforms = platforms.all; maintainers = with maintainers; [ ]; license = licenses.cc-by-nc-sa-30; + + broken = true; # no release for kodi 21 }; } diff --git a/pkgs/applications/video/kodi/addons/radioparadise/default.nix b/pkgs/applications/video/kodi/addons/radioparadise/default.nix index bb556e9ec822..45e0e845acb7 100644 --- a/pkgs/applications/video/kodi/addons/radioparadise/default.nix +++ b/pkgs/applications/video/kodi/addons/radioparadise/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests }: buildKodiAddon rec { pname = "radioparadise"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "2.0.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/script.radioparadise/script.radioparadise-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/script.radioparadise/script.radioparadise-${version}.zip"; sha256 = "sha256-eRCP0XMQHmyDrZ8Y6RGFfxQ1r26/bWbE/PJz4PET7D8="; }; diff --git a/pkgs/applications/video/kodi/addons/requests-cache/default.nix b/pkgs/applications/video/kodi/addons/requests-cache/default.nix index 6800ecde832a..3a71019d9ccb 100644 --- a/pkgs/applications/video/kodi/addons/requests-cache/default.nix +++ b/pkgs/applications/video/kodi/addons/requests-cache/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests }: buildKodiAddon rec { pname = "requests-cache"; namespace = "script.module.requests-cache"; version = "0.5.2+matrix.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-6M/v/ghS2TnSZhG8bREjxfEfcfLOmvA6hgsa7JUk9Dk="; }; diff --git a/pkgs/applications/video/kodi/addons/requests/default.nix b/pkgs/applications/video/kodi/addons/requests/default.nix index e21dac1ef3a0..4950d63608eb 100644 --- a/pkgs/applications/video/kodi/addons/requests/default.nix +++ b/pkgs/applications/video/kodi/addons/requests/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, certifi, chardet, idna, urllib3 }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, certifi, chardet, idna, urllib3 }: buildKodiAddon rec { pname = "requests"; namespace = "script.module.requests"; version = "2.31.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-05BSD5aoN2CTnjqaSKYMb93j5nIfLvpJHyeQsK++sTw="; }; diff --git a/pkgs/applications/video/kodi/addons/routing/default.nix b/pkgs/applications/video/kodi/addons/routing/default.nix index a96c16b8629c..9c87c69e9912 100644 --- a/pkgs/applications/video/kodi/addons/routing/default.nix +++ b/pkgs/applications/video/kodi/addons/routing/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "routing"; namespace = "script.module.routing"; version = "0.2.3+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-piPmY8Q3NyIeImmkYhDwmQhBiwwcV0X532xV1DogF+I="; }; diff --git a/pkgs/applications/video/kodi/addons/signals/default.nix b/pkgs/applications/video/kodi/addons/signals/default.nix index 4d84bcafeeef..9f7496f3c4ca 100644 --- a/pkgs/applications/video/kodi/addons/signals/default.nix +++ b/pkgs/applications/video/kodi/addons/signals/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "signals"; namespace = "script.module.addon.signals"; version = "0.0.6+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-WsLR7iUh5F+LXMISBpWx71dLAtg/AMYF6BsiyKZakuE="; }; diff --git a/pkgs/applications/video/kodi/addons/simplejson/default.nix b/pkgs/applications/video/kodi/addons/simplejson/default.nix index b0a04402d3b1..2889e38e960f 100644 --- a/pkgs/applications/video/kodi/addons/simplejson/default.nix +++ b/pkgs/applications/video/kodi/addons/simplejson/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "simplejson"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "3.19.1+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-RJy75WAr0XmXnSrPjqKhFjWJnWo3c5IEtUGumcE/mRo="; }; diff --git a/pkgs/applications/video/kodi/addons/six/default.nix b/pkgs/applications/video/kodi/addons/six/default.nix index 5ce4817eae3b..80bbefe39a11 100644 --- a/pkgs/applications/video/kodi/addons/six/default.nix +++ b/pkgs/applications/video/kodi/addons/six/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "six"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "1.16.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-d6BNpnTg6K7NPX3uWp5X0rog33C+B7YoAtLH/CrUYno="; }; diff --git a/pkgs/applications/video/kodi/addons/somafm/default.nix b/pkgs/applications/video/kodi/addons/somafm/default.nix index 4ffc69791298..e2d5ca38bf44 100644 --- a/pkgs/applications/video/kodi/addons/somafm/default.nix +++ b/pkgs/applications/video/kodi/addons/somafm/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "somafm"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "2.0.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/plugin.audio.somafm/plugin.audio.somafm-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/plugin.audio.somafm/plugin.audio.somafm-${version}.zip"; sha256 = "sha256-auPLm7QFabU4tXJPjTl17KpE+lqWM2Edbd2HrXPRx40="; }; diff --git a/pkgs/applications/video/kodi/addons/svtplay/default.nix b/pkgs/applications/video/kodi/addons/svtplay/default.nix index 7cc94bc435a5..8c12ac47ca3f 100644 --- a/pkgs/applications/video/kodi/addons/svtplay/default.nix +++ b/pkgs/applications/video/kodi/addons/svtplay/default.nix @@ -23,5 +23,7 @@ buildKodiAddon rec { platforms = platforms.all; license = licenses.gpl3Plus; maintainers = teams.kodi.members; + + broken = true; # no release for kodi 21 }; } diff --git a/pkgs/applications/video/kodi/addons/trakt-module/default.nix b/pkgs/applications/video/kodi/addons/trakt-module/default.nix index 1c9680147cb5..37816f89e363 100644 --- a/pkgs/applications/video/kodi/addons/trakt-module/default.nix +++ b/pkgs/applications/video/kodi/addons/trakt-module/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, six, arrow }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests, six, arrow }: buildKodiAddon rec { pname = "trakt-module"; namespace = "script.module.trakt"; version = "4.4.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-6JIAQwot5VZ36gvQym88BD/e/mSyS8WO8VqkPn2GcqY="; }; diff --git a/pkgs/applications/video/kodi/addons/trakt/default.nix b/pkgs/applications/video/kodi/addons/trakt/default.nix index 4967a5cd8fba..bf360072becc 100644 --- a/pkgs/applications/video/kodi/addons/trakt/default.nix +++ b/pkgs/applications/video/kodi/addons/trakt/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, trakt-module, dateutil }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, trakt-module, dateutil }: buildKodiAddon rec { pname = "trakt"; namespace = "script.trakt"; version = "3.6.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-ZlBucYYRA1cL5c0H1jhXeKE1itReZe2gAJYFFxuUebo="; }; diff --git a/pkgs/applications/video/kodi/addons/typing_extensions/default.nix b/pkgs/applications/video/kodi/addons/typing_extensions/default.nix index fd52528b7ca0..d2fc31c99bcd 100644 --- a/pkgs/applications/video/kodi/addons/typing_extensions/default.nix +++ b/pkgs/applications/video/kodi/addons/typing_extensions/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "typing_extensions"; namespace = "script.module.typing_extensions"; version = "4.7.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-bCGPl5fGVyptCenpNXP/Msi7hu+UdtZd2ms7MfzbsbM="; }; diff --git a/pkgs/applications/video/kodi/addons/urllib3/default.nix b/pkgs/applications/video/kodi/addons/urllib3/default.nix index 8d13052b950e..9cfc54797e87 100644 --- a/pkgs/applications/video/kodi/addons/urllib3/default.nix +++ b/pkgs/applications/video/kodi/addons/urllib3/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "urllib3"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "2.1.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-UCvkeguxytPoP1gIIt8N79TVs98ATzsfrRSabtbgnGc="; }; diff --git a/pkgs/applications/video/kodi/addons/websocket/default.nix b/pkgs/applications/video/kodi/addons/websocket/default.nix index c2bbe9de09b6..6d0ecc55aa05 100644 --- a/pkgs/applications/video/kodi/addons/websocket/default.nix +++ b/pkgs/applications/video/kodi/addons/websocket/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, addonDir }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, six, addonDir }: buildKodiAddon rec { pname = "websocket"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "1.6.4"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-1Wy+hxB059UoZnQlncytVT3sQ07dYAhNRnW3/QVD4ZE="; }; diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index f97b53b60937..f1e11c1d80e6 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -1,14 +1,13 @@ -{ stdenv, lib, fetchFromGitHub -, fetchpatch +{ stdenv, lib, fetchFromGitHub, fetchzip , autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring , boost, avahi, lame , gettext, pcre-cpp, yajl, fribidi, which -, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless +, openssl, gperf, tinyxml2, tinyxml-2, taglib, libssh, swig, jre_headless , gtest, ncurses, spdlog , libxml2, systemd -, alsa-lib, libGLU, libGL, fontconfig, freetype, ftgl +, alsa-lib, libGLU, libGL, ffmpeg, fontconfig, freetype, ftgl , libjpeg, libpng, libtiff , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt @@ -33,7 +32,7 @@ , vdpauSupport ? true, libvdpau , waylandSupport ? false, wayland, wayland-protocols , waylandpp ? null, libxkbcommon -, gbmSupport ? false, mesa, libinput +, gbmSupport ? false, mesa, libinput, libdisplay-info , buildPackages }: @@ -41,54 +40,12 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20240302"; - kodiVersion = "20.5"; - rel = "Nexus"; - - kodi_src = fetchFromGitHub { - owner = "xbmc"; - repo = "xbmc"; - rev = "${kodiVersion}-${rel}"; - hash = "sha256-R/tzk3ZarJ4BTR312p2lTLezeCEsqdQH54ROsNIoJZA="; - }; + kodiReleaseDate = "20240405"; + kodiVersion = "21.0"; + rel = "Omega"; # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies - # kodi 20.0 moved to ffmpeg 5, *but* there is a bug making the compilation fail which will - # only been fixed in kodi 21, so stick to ffmpeg 4 for now - ffmpeg = stdenv.mkDerivation rec { - pname = "kodi-ffmpeg"; - version = "4.4.1"; - src = fetchFromGitHub { - owner = "xbmc"; - repo = "FFmpeg"; - rev = "${version}-${rel}-Alpha1"; - sha256 = "sha256-EQHmmWnDw+/udKYq7Nrf00nL7I5XWUtmzdauDryfTII="; - }; - patches = [ - # Backport fix for binutils-2.41. - (fetchpatch { - name = "binutils-2.41.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb"; - hash = "sha256-vlBUMJ1bORQHRNpuzc5iXsTWwS/CN5BmGIA8g7H7mJE="; - }) - ]; - preConfigure = '' - cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . - sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt - sed -i 's/--strip=''${CMAKE_STRIP}/--strip=''${CMAKE_STRIP} --ranlib=''${CMAKE_RANLIB}/' CMakeLists.txt - ''; - cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DCROSSCOMPILING=ON" - "-DCPU=${stdenv.hostPlatform.parsed.cpu.name}" - "-DOS=${stdenv.hostPlatform.parsed.kernel.name}" - "-DPKG_CONFIG_EXECUTABLE=pkg-config" - ]; - buildInputs = [ libidn2 libtasn1 p11-kit zlib libva ] - ++ lib.optional vdpauSupport libvdpau; - nativeBuildInputs = [ cmake nasm pkg-config gnutls ]; - }; - # We can build these externally but FindLibDvd.cmake forces us to build it # them, so we currently just use them for the src. libdvdcss = fetchFromGitHub { @@ -112,6 +69,21 @@ let sha256 = "sha256-AphBQhXud+a6wm52zjzC5biz53NnqWdgpL2QDt2ZuXc="; }; + groovy = fetchzip { + url = "https://archive.apache.org/dist/groovy/4.0.16/distribution/apache-groovy-binary-4.0.16.zip"; + sha256 = "sha256-OfZBiMVrhw6VqHRHCSC7ZV3FiZ26n4+F8hsskk+L6yU="; + }; + + apache_commons_lang = fetchzip { + url = "https://dlcdn.apache.org//commons/lang/binaries/commons-lang3-3.14.0-bin.zip"; + sha512 = "sha512-eKF1IQ6PDtifb4pMHWQ2SYHIh0HbMi3qpc92lfbOo3uSsFJVR3n7JD0AdzrG17tLJQA4z5PGDhwyYw0rLeLsXw=="; + }; + + apache_commons_text = fetchzip { + url = "https://dlcdn.apache.org//commons/text/binaries/commons-text-1.11.0-bin.zip"; + sha512 = "sha512-P2IvnrHSYRF70LllTMI8aev43h2oe8lq6rrMYw450PEhEa7OuuCjh1Krnc/A4OqENUcidVAAX5dK1RAsZHh8Dg=="; + }; + kodi_platforms = lib.optional gbmSupport "gbm" ++ lib.optional waylandSupport "wayland" ++ lib.optional x11Support "x11"; @@ -120,13 +92,19 @@ in stdenv.mkDerivation { pname = "kodi"; version = kodiVersion; - src = kodi_src; + src = fetchFromGitHub { + owner = "xbmc"; + repo = "xbmc"; + rev = "${kodiVersion}-${rel}"; + hash = "sha256-xrFWqgwTkurEwt3/+/e4SCM6Uk9nxuW62SrCFWWqZO0="; + }; + buildInputs = [ gnutls libidn2 libtasn1 nasm p11-kit libxml2 python3Packages.python boost libmicrohttpd gettext pcre-cpp yajl fribidi libva libdrm - openssl gperf tinyxml2 taglib libssh + openssl gperf tinyxml2 tinyxml-2 taglib libssh gtest ncurses spdlog alsa-lib libGL libGLU fontconfig freetype ftgl libjpeg libpng libtiff @@ -168,6 +146,7 @@ in stdenv.mkDerivation { libxkbcommon.dev mesa.dev libinput.dev + libdisplay-info ]; nativeBuildInputs = [ @@ -192,6 +171,9 @@ in stdenv.mkDerivation { "-Dlibdvdcss_URL=${libdvdcss}" "-Dlibdvdnav_URL=${libdvdnav}" "-Dlibdvdread_URL=${libdvdread}" + "-Dgroovy_SOURCE_DIR=${groovy}" + "-Dapache-commons-lang_SOURCE_DIR=${apache_commons_lang}" + "-Dapache-commons-text_SOURCE_DIR=${apache_commons_text}" "-DGIT_VERSION=${kodiReleaseDate}" "-DENABLE_EVENTCLIENTS=ON" "-DENABLE_INTERNAL_CROSSGUID=OFF" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 151530685e71..c953e0dac375 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35902,15 +35902,18 @@ with pkgs; kodiPackages = recurseIntoAttrs (kodi.packages); kodi = callPackage ../applications/video/kodi { + ffmpeg = ffmpeg_6; jre_headless = jdk11_headless; }; kodi-wayland = callPackage ../applications/video/kodi { + ffmpeg = ffmpeg_6; jre_headless = jdk11_headless; waylandSupport = true; }; kodi-gbm = callPackage ../applications/video/kodi { + ffmpeg = ffmpeg_6; jre_headless = jdk11_headless; gbmSupport = true; }; diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 634b02917b55..74fb0bffc497 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -26,7 +26,7 @@ let self = { addonDir = "/share/kodi/addons"; - rel = "Nexus"; + rel = "Omega"; inherit callPackage kodi hasKodiAddon requiredKodiAddons; From 816a5a59abfcb3b75dd2ade73ad6c75943352ab7 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 11 Apr 2024 20:03:03 -0400 Subject: [PATCH 079/130] kodi.packages.jellyfin: 0.7.12 -> 1.0.1 --- pkgs/applications/video/kodi/addons/jellyfin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 1e570ab51131..63cac3e7261c 100644 --- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -5,13 +5,13 @@ in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "0.7.12"; + version = "1.0.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "sha256-m8msTBim4Ss8XaYqIn6GWXxoCio5ABbqhhgyb1T/Yhg="; + sha256 = "sha256-i9lRPMHniUmKTeNSzgp6dF11uYOcjH3PgJEa+Jasx68="; }; nativeBuildInputs = [ From 0056deee0cffbc59e0f3caf5169c592335684ee4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 14:07:47 +0000 Subject: [PATCH 080/130] lite-xl: 2.1.3 -> 2.1.4 --- pkgs/applications/editors/lite-xl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index 51b82f266d7a..33c0c2926fa8 100644 --- a/pkgs/applications/editors/lite-xl/default.nix +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "lite-xl"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "lite-xl"; repo = "lite-xl"; rev = "v${version}"; - hash = "sha256-4ykUdcNwJ4r/4u9H+c8pgupY3BaPi2y69X6yaDjCjac="; + hash = "sha256-TqrFI5TFb2hnnlHYUjLDUTDK3/Wgg1gOxIP8owLi/yo="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From c5166e8b52cbaebcbb1fc3cb2551ff07488722d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 14:14:02 +0000 Subject: [PATCH 081/130] opcr-policy: 0.2.9 -> 0.2.12 --- pkgs/development/tools/opcr-policy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix index e8d4e9a599ab..568b6a172c4c 100644 --- a/pkgs/development/tools/opcr-policy/default.nix +++ b/pkgs/development/tools/opcr-policy/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.2.9"; + version = "0.2.12"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-3ubbCPliBFe+sOQxAkQr4bJJiMvbDwDaJO/hOa88P5w="; + sha256 = "sha256-3rMSk4oRqPWqJh4o+oGtfqpEz4zkr4CVaIyMvBopN/o="; }; - vendorHash = "sha256-oxcyKVdiTJYypgrBmH1poWc21xDyTBHk781TbA7i2gc="; + vendorHash = "sha256-ZP4EM7NZwfTLx0e47DikgMI7Y+IYmREdLL/r/CC9P7c="; ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; From 6194c65f1d1a7ee89cf119dcb7f594d68c9c56a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 14:31:17 +0000 Subject: [PATCH 082/130] python312Packages.oci: 2.125.2 -> 2.125.3 --- pkgs/development/python-modules/oci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index ebb27d0dfe7e..6ef9bbd0d512 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.125.2"; + version = "2.125.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-tpWaH/uiUm0wmJrSyxiy9H8I/c44KmGjWEecBk6Yq40="; + hash = "sha256-Y36x65O6XHNju/tWN0Qd3HyJ/YXTNe/VO+Z4XDtPPos="; }; pythonRelaxDeps = [ From 2d95dfe90d92edf39ca075edcda1f7cced14d499 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 16:24:54 +0000 Subject: [PATCH 083/130] faas-cli: 0.16.25 -> 0.16.26 --- pkgs/development/tools/faas-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index bd6b56e932be..2149eb50c278 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.16.25"; + version = "0.16.26"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-6HX+n3OXSA2gJ0LW5zlH3FboM5RNaOI72EmnEI9wbFE="; + sha256 = "sha256-eyQpeud0rW07eb6wtcTYem10LWf/g2dxRwQEMH29wL8="; }; vendorHash = null; From e7897467939c6fb0265157ab0be0b3e7145ebd7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 16:54:51 +0000 Subject: [PATCH 084/130] python311Packages.py-synologydsm-api: 2.4.1 -> 2.4.2 --- .../development/python-modules/py-synologydsm-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 3bf3e8c67d1d..415d95f8b324 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.4.1"; + version = "2.4.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mib1185"; repo = "py-synologydsm-api"; rev = "refs/tags/v${version}"; - hash = "sha256-EeUJOdGmYGy75/3RR5AeTu4oImnZGesve5pE+5YsTCI="; + hash = "sha256-uqQY0vt+3JGjciG0t9eh8zK5dnq1QhU6FkzWkKX/+DM="; }; nativeBuildInputs = [ From 6104b639b6a34e33f9331a5d953eb5948df77b67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 18:21:14 +0000 Subject: [PATCH 085/130] cloudlog: 2.6.8 -> 2.6.9 --- pkgs/applications/radio/cloudlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index c7154e8fd3d6..2e9393dfedae 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.6.8"; + version = "2.6.9"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-8D8owjONUMpRpFqKvmxKERCprvHQ1DCavNfqW9VTKAE="; + hash = "sha256-DyBo56NS15s+t9Dl8xCC7MQAqMmZ91FYUYOV4vyJ/Yo="; }; postPatch = '' From 8244df7e3a6e02c03454d478b886d30281893f19 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 16 Apr 2024 12:36:40 +0530 Subject: [PATCH 086/130] ananicy-rules-cachyos: unstable-2024-04-10 -> unstable-2024-04-16 cleanup install phase use stdenvNoCC as there is no need for CC compilers Improve description --- pkgs/misc/ananicy-rules-cachyos/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/ananicy-rules-cachyos/default.nix b/pkgs/misc/ananicy-rules-cachyos/default.nix index d987d40f3cb5..b7970eff2ef9 100644 --- a/pkgs/misc/ananicy-rules-cachyos/default.nix +++ b/pkgs/misc/ananicy-rules-cachyos/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "unstable-2024-04-10"; + version = "unstable-2024-04-16"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "de55e2f55e6adf559bf4990aa433f5c202dc073d"; - sha256 = "sha256-TWaOMVEeTLI67eG5BPyb+OSnz31QvTueQD2yfEEbTEo="; + rev = "7abaddd5cac23d9fd7a0f0aeccb7a0287456802b"; + hash = "sha256-06q9dYLdg+AhT8L2OeoDsG7hHlmx/uf/RIwblODiSnE="; }; dontConfigure = true; @@ -16,15 +16,15 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - mkdir -p $out - cp -r * $out - rm $out/README.md + mkdir -p $out/etc/ananicy.d + rm README.md LICENSE + cp -r * $out/etc/ananicy.d runHook postInstall ''; meta = with lib; { homepage = "https://github.com/CachyOS/ananicy-rules"; - description = "ananicy-cpp-rules for CachyOS "; + description = "CachyOS' ananicy-rules meant to be used with ananicy-cpp"; license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ artturin johnrtitor diniamo ]; From 23eb2d6a0050fdb144aa545e1b4ba2be68e20a59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 19:03:49 +0000 Subject: [PATCH 087/130] sqlite3-to-mysql: 2.1.7 -> 2.1.8 --- pkgs/tools/misc/sqlite3-to-mysql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix index a4947eb6c8bd..ece36f82f325 100644 --- a/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "sqlite3-to-mysql"; - version = "2.1.7"; + version = "2.1.8"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.8"; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { owner = "techouse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TglHny0HgVth3o73GQYddh9sdyQ0L+4J4dJBAeJToiM="; + hash = "sha256-j9AjgLwEqt+PI4LKc3gPjXW95zAKmRjIzPFnOB0n6MM="; }; nativeBuildInputs = with python3Packages; [ From 949698f65bbe1eca4af0a367c94e25a716d204d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 19:08:40 +0000 Subject: [PATCH 088/130] golden-cheetah: 3.6 -> 3.7-DEV2404 --- pkgs/applications/misc/golden-cheetah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 9cc9b3bf6d47..ce8a0888ffc9 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -16,13 +16,13 @@ let }; in mkDerivation rec { pname = "golden-cheetah"; - version = "3.6"; + version = "3.7-DEV2404"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; rev = "refs/tags/v${version}"; - hash = "sha256-Ntim1/ZPaTPCHQ5p8xF5LWpqq8+OgkPfaQqqysv9j/c="; + hash = "sha256-u2igcnOulgJGZT46/Z3vSsce9mr3VsxkD3mTeQPvUOg="; }; buildInputs = [ From 1f213b554ffc929f9e3a571902483adaf5b25623 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 20:08:39 +0000 Subject: [PATCH 089/130] python311Packages.clickhouse-connect: 0.7.7 -> 0.7.8 --- .../development/python-modules/clickhouse-connect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index 93568adafee2..a3768c8e577b 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -23,7 +23,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.7.7"; + version = "0.7.8"; format = "setuptools"; @@ -33,7 +33,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; rev = "refs/tags/v${version}"; - hash = "sha256-EnASrc4yUxSQ5kgaY5xcjZG7y8ZWLabUFAcdF5ZZNBQ="; + hash = "sha256-tdf9aYKAFpRyaqGGNxXs4bzmY6mdhKZ5toFBJRmD2VY="; }; nativeBuildInputs = [ cython_3 ]; From 1f9a9252a7f268cc05066d5ee2e2793ecf2ebdb4 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Sat, 13 Apr 2024 13:09:17 -0500 Subject: [PATCH 090/130] bats: 0.10.0 -> 0.11.0 Also conditionally excludes pkill from resolution on macOS, since the procps package should contain pkill on other platforms. --- pkgs/development/interpreters/bats/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 8591552d45dd..cbb490615b7d 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -27,13 +27,13 @@ resholve.mkDerivation rec { pname = "bats"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-core"; rev = "v${version}"; - sha256 = "sha256-gy4dyoKRlf2WFmH1/mSNwhVR3df92BgpT4TjTpV4FyQ="; + hash = "sha256-goHIhbBoCf1eb1N8xIHdVvAURofvLDgEDXofhDHrr7Y="; }; patchPhase = '' @@ -69,11 +69,13 @@ resholve.mkDerivation rec { external = [ "greadlink" "shlock" + ] ++ lib.optionals stdenv.isDarwin [ "pkill" # procps doesn't supply this on darwin ]; }; fix = { "$BATS_ROOT" = [ "${placeholder "out"}" ]; + "$BATS_LIBDIR" = [ "lib" ]; "$BATS_LIBEXEC" = [ "${placeholder "out"}/libexec/bats-core" ]; }; keep = { @@ -99,6 +101,7 @@ resholve.mkDerivation rec { "$BATS_LINE_REFERENCE_FORMAT" = "comma_line"; "$BATS_LOCKING_IMPLEMENTATION" = "${flock}/bin/flock"; "$parallel_binary_name" = "${parallel}/bin/parallel"; + "${placeholder "out"}/libexec/bats-core/bats-preprocess" = true; }; execer = [ /* @@ -115,6 +118,10 @@ resholve.mkDerivation rec { # these do exec, but other internal files "cannot:libexec/bats-core/bats-exec-file" "cannot:libexec/bats-core/bats-exec-suite" + "cannot:libexec/bats-core/bats-gather-tests" + ] ++ lib.optionals (!stdenv.isDarwin) [ + # checked invocations for exec + "cannot:${procps}/bin/pkill" ]; }; }; From 3616548db50e293fe742d92a321fffc5b3ad73ac Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 16 Apr 2024 18:58:48 -0400 Subject: [PATCH 091/130] telegram-desktop: 4.16.7 -> 4.16.8 Diff: https://github.com/telegramdesktop/tdesktop/compare/v4.16.7...v4.16.8 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v4.16.8 --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index a7d12206720e..906736be4977 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.16.7"; + version = "4.16.8"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-+BXuFHXGOgpmAX7wsGLxZxfzvNsntFLtd+Obhb339Yc="; + hash = "sha256-M8wFhuTTEJippgvS93LNRqREV2TGF04ccps5oOmSr+0="; }; patches = [ From d4447030c567945c238bbad9588bc9c0757a050b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Apr 2024 22:59:10 +0000 Subject: [PATCH 092/130] python311Packages.zodbpickle: 3.2 -> 3.3 --- pkgs/development/python-modules/zodbpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 6d3c6ad0a5ce..6fd93b922621 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "3.2"; + version = "3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-65wO44mzJmqo9BlFtiqZgV0mH2nR9Cl3FQkSqmeWqww="; + hash = "sha256-dcF5Kse9W89JUFggYqw2hOMiqhOrmEIOO/7EWCJzo2g="; }; # fails.. From b4481e53021fb9602aecdee87161c60df31e996b Mon Sep 17 00:00:00 2001 From: hexchen Date: Tue, 16 Apr 2024 23:33:05 +0000 Subject: [PATCH 093/130] python311Packages.ionoscloud: 6.1.8 -> 6.1.9 --- pkgs/development/python-modules/ionoscloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ionoscloud/default.nix b/pkgs/development/python-modules/ionoscloud/default.nix index 2d98144e90a8..02e01f194c39 100644 --- a/pkgs/development/python-modules/ionoscloud/default.nix +++ b/pkgs/development/python-modules/ionoscloud/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "ionoscloud"; - version = "6.1.8"; + version = "6.1.9"; pyproject = true; src = fetchPypi { inherit pname version; - hash= "sha256-QQNDqKZ+X+w5vHFXr793QqRjShNBZ182DyD3fUUxqkc="; + hash= "sha256-IpDhuZ8KrqT8g3UKgdEmjzKRlK1SXq1fgrTDFy/fvpU="; }; nativeBuildInputs = [ setuptools ]; From 92a9b54db14e3dbbad0085e37a75fc9f5823d20b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 17 Apr 2024 02:41:57 +0200 Subject: [PATCH 094/130] Revert "rocmPackages.composable_kernel: compress output" --- ...compression-to-clang-offload-bundler.patch | 1191 ----------------- pkgs/development/rocm-modules/6/llvm/base.nix | 4 +- .../6/llvm/stage-1/clang-unwrapped.nix | 9 +- 3 files changed, 2 insertions(+), 1202 deletions(-) delete mode 100644 pkgs/development/rocm-modules/6/llvm/add-compression-to-clang-offload-bundler.patch diff --git a/pkgs/development/rocm-modules/6/llvm/add-compression-to-clang-offload-bundler.patch b/pkgs/development/rocm-modules/6/llvm/add-compression-to-clang-offload-bundler.patch deleted file mode 100644 index 8589ac527dcb..000000000000 --- a/pkgs/development/rocm-modules/6/llvm/add-compression-to-clang-offload-bundler.patch +++ /dev/null @@ -1,1191 +0,0 @@ -From 058d9ba2f54a8c7c47b6522db808db87fed82e78 Mon Sep 17 00:00:00 2001 -From: "Yaxun (Sam) Liu" -Date: Thu, 4 Apr 2024 03:25:28 +0200 -Subject: [PATCH] backport 7e2823438e920d25364ff92b62ad90020c31bb59 - -Reland "[HIP] Support compressing device binary" - -Original PR: https://github.com/llvm/llvm-project/pull/67162 - -The commit was reverted due to UB detected by santizer: - -https://lab.llvm.org/buildbot/#/builders/238/builds/5955 - -clang/lib/Driver/OffloadBundler.cpp:1012:25: runtime error: - load of misaligned address 0xaaaae2d90e7c for type - 'const uint64_t' (aka 'const unsigned long'), which - requires 8 byte alignment - -It was fixed by using memcpy instead of dereferencing int* -casted from unaligned char*. - -Co-Authored-By: Martin Schwaighofer -(only did the backport) ---- - clang/docs/ClangOffloadBundler.rst | 27 ++ - clang/include/clang/Driver/OffloadBundler.h | 37 ++ - clang/include/clang/Driver/Options.td | 5 + - clang/lib/Driver/OffloadBundler.cpp | 346 +++++++++++++++--- - clang/lib/Driver/ToolChains/Clang.cpp | 7 + - clang/lib/Driver/ToolChains/HIPUtility.cpp | 6 + - .../test/Driver/clang-offload-bundler-zlib.c | 75 ++++ - .../test/Driver/clang-offload-bundler-zstd.c | 72 ++++ - .../test/Driver/hip-offload-compress-zlib.hip | 45 +++ - .../test/Driver/hip-offload-compress-zstd.hip | 45 +++ - .../clang-offload-bundler/CMakeLists.txt | 1 + - .../ClangOffloadBundler.cpp | 10 + - llvm/include/llvm/BinaryFormat/Magic.h | 28 +- - llvm/lib/BinaryFormat/Magic.cpp | 11 + - llvm/lib/Object/Binary.cpp | 2 + - llvm/lib/Object/ObjectFile.cpp | 2 + - 16 files changed, 659 insertions(+), 60 deletions(-) - create mode 100644 clang/test/Driver/clang-offload-bundler-zlib.c - create mode 100644 clang/test/Driver/clang-offload-bundler-zstd.c - create mode 100644 clang/test/Driver/hip-offload-compress-zlib.hip - create mode 100644 clang/test/Driver/hip-offload-compress-zstd.hip - -diff --git a/clang/docs/ClangOffloadBundler.rst b/clang/docs/ClangOffloadBundler.rst -index 432da787249b..d47997bf718d 100644 ---- a/clang/docs/ClangOffloadBundler.rst -+++ b/clang/docs/ClangOffloadBundler.rst -@@ -498,3 +498,30 @@ target by comparing bundle ID's. Two bundle ID's are considered compatible if: - Verbose printing of matched/unmatched comparisons between bundle entry id of - a device binary from HDA and bundle entry ID of a given target processor - (see :ref:`compatibility-bundle-entry-id`). -+ -+Compression and Decompression -+============================= -+ -+``clang-offload-bundler`` provides features to compress and decompress the full -+bundle, leveraging inherent redundancies within the bundle entries. Use the -+`-compress` command-line option to enable this compression capability. -+ -+The compressed offload bundle begins with a header followed by the compressed binary data: -+ -+- **Magic Number (4 bytes)**: -+ This is a unique identifier to distinguish compressed offload bundles. The value is the string 'CCOB' (Compressed Clang Offload Bundle). -+ -+- **Version Number (16-bit unsigned int)**: -+ This denotes the version of the compressed offload bundle format. The current version is `1`. -+ -+- **Compression Method (16-bit unsigned int)**: -+ This field indicates the compression method used. The value corresponds to either `zlib` or `zstd`, represented as a 16-bit unsigned integer cast from the LLVM compression enumeration. -+ -+- **Uncompressed Binary Size (32-bit unsigned int)**: -+ This is the size (in bytes) of the binary data before it was compressed. -+ -+- **Hash (64-bit unsigned int)**: -+ This is a 64-bit truncated MD5 hash of the uncompressed binary data. It serves for verification and caching purposes. -+ -+- **Compressed Data**: -+ The actual compressed binary data follows the header. Its size can be inferred from the total size of the file minus the header size. -diff --git a/clang/include/clang/Driver/OffloadBundler.h b/clang/include/clang/Driver/OffloadBundler.h -index fe263f0540b9..fc96f200414d 100644 ---- a/clang/include/clang/Driver/OffloadBundler.h -+++ b/clang/include/clang/Driver/OffloadBundler.h -@@ -19,6 +19,7 @@ - - #include "llvm/Support/Error.h" - #include "llvm/TargetParser/Triple.h" -+#include - #include - #include - -@@ -26,11 +27,15 @@ namespace clang { - - class OffloadBundlerConfig { - public: -+ OffloadBundlerConfig(); -+ - bool AllowNoHost = false; - bool AllowMissingBundles = false; - bool CheckInputArchive = false; - bool PrintExternalCommands = false; - bool HipOpenmpCompatible = false; -+ bool Compress = false; -+ bool Verbose = false; - - unsigned BundleAlignment = 1; - unsigned HostInputIndex = ~0u; -@@ -82,6 +87,38 @@ struct OffloadTargetInfo { - std::string str() const; - }; - -+// CompressedOffloadBundle represents the format for the compressed offload -+// bundles. -+// -+// The format is as follows: -+// - Magic Number (4 bytes) - A constant "CCOB". -+// - Version (2 bytes) -+// - Compression Method (2 bytes) - Uses the values from -+// llvm::compression::Format. -+// - Uncompressed Size (4 bytes). -+// - Truncated MD5 Hash (8 bytes). -+// - Compressed Data (variable length). -+ -+class CompressedOffloadBundle { -+private: -+ static inline const size_t MagicSize = 4; -+ static inline const size_t VersionFieldSize = sizeof(uint16_t); -+ static inline const size_t MethodFieldSize = sizeof(uint16_t); -+ static inline const size_t SizeFieldSize = sizeof(uint32_t); -+ static inline const size_t HashFieldSize = 8; -+ static inline const size_t HeaderSize = MagicSize + VersionFieldSize + -+ MethodFieldSize + SizeFieldSize + -+ HashFieldSize; -+ static inline const llvm::StringRef MagicNumber = "CCOB"; -+ static inline const uint16_t Version = 1; -+ -+public: -+ static llvm::Expected> -+ compress(const llvm::MemoryBuffer &Input, bool Verbose = false); -+ static llvm::Expected> -+ decompress(const llvm::MemoryBuffer &Input, bool Verbose = false); -+}; -+ - } // namespace clang - - #endif // LLVM_CLANG_DRIVER_OFFLOADBUNDLER_H -diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td -index c206ab84508f..f8df98678396 100644 ---- a/clang/include/clang/Driver/Options.td -+++ b/clang/include/clang/Driver/Options.td -@@ -984,6 +984,11 @@ def fconvergent_functions : Flag<["-"], "fconvergent-functions">, Group - def gpu_use_aux_triple_only : Flag<["--"], "gpu-use-aux-triple-only">, - InternalDriverOpt, HelpText<"Prepare '-aux-triple' only without populating " - "'-aux-target-cpu' and '-aux-target-feature'.">; -+ -+def offload_compress : Flag<["--"], "offload-compress">, -+ HelpText<"Compress offload device binaries (HIP only)">; -+def no_offload_compress : Flag<["--"], "no-offload-compress">; -+ - def cuda_include_ptx_EQ : Joined<["--"], "cuda-include-ptx=">, Flags<[NoXarchOption]>, - HelpText<"Include PTX for the following GPU architecture (e.g. sm_35) or 'all'. May be specified more than once.">; - def no_cuda_include_ptx_EQ : Joined<["--"], "no-cuda-include-ptx=">, Flags<[NoXarchOption]>, -diff --git a/clang/lib/Driver/OffloadBundler.cpp b/clang/lib/Driver/OffloadBundler.cpp -index 29250c49eb0c..69e14679da1c 100644 ---- a/clang/lib/Driver/OffloadBundler.cpp -+++ b/clang/lib/Driver/OffloadBundler.cpp -@@ -21,24 +21,29 @@ - #include "llvm/ADT/ArrayRef.h" - #include "llvm/ADT/SmallString.h" - #include "llvm/ADT/SmallVector.h" -+#include "llvm/ADT/StringExtras.h" - #include "llvm/ADT/StringMap.h" - #include "llvm/ADT/StringRef.h" -+#include "llvm/BinaryFormat/Magic.h" - #include "llvm/Object/Archive.h" - #include "llvm/Object/ArchiveWriter.h" - #include "llvm/Object/Binary.h" - #include "llvm/Object/ObjectFile.h" - #include "llvm/Support/Casting.h" -+#include "llvm/Support/Compression.h" - #include "llvm/Support/Debug.h" - #include "llvm/Support/EndianStream.h" - #include "llvm/Support/Errc.h" - #include "llvm/Support/Error.h" - #include "llvm/Support/ErrorOr.h" - #include "llvm/Support/FileSystem.h" -+#include "llvm/Support/MD5.h" - #include "llvm/Support/MemoryBuffer.h" - #include "llvm/Support/Path.h" - #include "llvm/Support/Program.h" - #include "llvm/Support/Signals.h" - #include "llvm/Support/StringSaver.h" -+#include "llvm/Support/Timer.h" - #include "llvm/Support/WithColor.h" - #include "llvm/Support/raw_ostream.h" - #include "llvm/TargetParser/Host.h" -@@ -48,6 +53,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -58,6 +64,10 @@ using namespace llvm; - using namespace llvm::object; - using namespace clang; - -+static llvm::TimerGroup -+ ClangOffloadBundlerTimerGroup("Clang Offload Bundler Timer Group", -+ "Timer group for clang offload bundler"); -+ - /// Magic string that marks the existence of offloading data. - #define OFFLOAD_BUNDLER_MAGIC_STR "__CLANG_OFFLOAD_BUNDLE__" - -@@ -229,20 +239,22 @@ public: - - /// Write the header of the bundled file to \a OS based on the information - /// gathered from \a Inputs. -- virtual Error WriteHeader(raw_fd_ostream &OS, -+ virtual Error WriteHeader(raw_ostream &OS, - ArrayRef> Inputs) = 0; - - /// Write the marker that initiates a bundle for the triple \a TargetTriple to - /// \a OS. -- virtual Error WriteBundleStart(raw_fd_ostream &OS, -- StringRef TargetTriple) = 0; -+ virtual Error WriteBundleStart(raw_ostream &OS, StringRef TargetTriple) = 0; - - /// Write the marker that closes a bundle for the triple \a TargetTriple to \a - /// OS. -- virtual Error WriteBundleEnd(raw_fd_ostream &OS, StringRef TargetTriple) = 0; -+ virtual Error WriteBundleEnd(raw_ostream &OS, StringRef TargetTriple) = 0; - - /// Write the bundle from \a Input into \a OS. -- virtual Error WriteBundle(raw_fd_ostream &OS, MemoryBuffer &Input) = 0; -+ virtual Error WriteBundle(raw_ostream &OS, MemoryBuffer &Input) = 0; -+ -+ /// Finalize output file. -+ virtual Error finalizeOutputFile() { return Error::success(); } - - /// List bundle IDs in \a Input. - virtual Error listBundleIDs(MemoryBuffer &Input) { -@@ -330,7 +342,7 @@ static uint64_t Read8byteIntegerFromBuffer(StringRef Buffer, size_t pos) { - } - - /// Write 8-byte integers to a buffer in little-endian format. --static void Write8byteIntegerToBuffer(raw_fd_ostream &OS, uint64_t Val) { -+static void Write8byteIntegerToBuffer(raw_ostream &OS, uint64_t Val) { - llvm::support::endian::write(OS, Val, llvm::support::little); - } - -@@ -378,8 +390,7 @@ public: - return Error::success(); - - // Check if no magic was found. -- StringRef Magic(FC.data(), sizeof(OFFLOAD_BUNDLER_MAGIC_STR) - 1); -- if (!Magic.equals(OFFLOAD_BUNDLER_MAGIC_STR)) -+ if (llvm::identify_magic(FC) != llvm::file_magic::offload_bundle) - return Error::success(); - - // Read number of bundles. -@@ -454,7 +465,7 @@ public: - return Error::success(); - } - -- Error WriteHeader(raw_fd_ostream &OS, -+ Error WriteHeader(raw_ostream &OS, - ArrayRef> Inputs) final { - - // Compute size of the header. -@@ -491,19 +502,27 @@ public: - return Error::success(); - } - -- Error WriteBundleStart(raw_fd_ostream &OS, StringRef TargetTriple) final { -+ Error WriteBundleStart(raw_ostream &OS, StringRef TargetTriple) final { - CurWriteBundleTarget = TargetTriple.str(); - return Error::success(); - } - -- Error WriteBundleEnd(raw_fd_ostream &OS, StringRef TargetTriple) final { -+ Error WriteBundleEnd(raw_ostream &OS, StringRef TargetTriple) final { - return Error::success(); - } - -- Error WriteBundle(raw_fd_ostream &OS, MemoryBuffer &Input) final { -+ Error WriteBundle(raw_ostream &OS, MemoryBuffer &Input) final { - auto BI = BundlesInfo[CurWriteBundleTarget]; -- OS.seek(BI.Offset); -+ -+ // Pad with 0 to reach specified offset. -+ size_t CurrentPos = OS.tell(); -+ size_t PaddingSize = BI.Offset > CurrentPos ? BI.Offset - CurrentPos : 0; -+ for (size_t I = 0; I < PaddingSize; ++I) -+ OS.write('\0'); -+ assert(OS.tell() == BI.Offset); -+ - OS.write(Input.getBufferStart(), Input.getBufferSize()); -+ - return Error::success(); - } - }; -@@ -560,7 +579,7 @@ class ObjectFileHandler final : public FileHandler { - return NameOrErr.takeError(); - - // If it does not start with the reserved suffix, just skip this section. -- if (!NameOrErr->startswith(OFFLOAD_BUNDLER_MAGIC_STR)) -+ if (llvm::identify_magic(*NameOrErr) != llvm::file_magic::offload_bundle) - return std::nullopt; - - // Return the triple that is right after the reserved prefix. -@@ -625,7 +644,7 @@ public: - return Error::success(); - } - -- Error WriteHeader(raw_fd_ostream &OS, -+ Error WriteHeader(raw_ostream &OS, - ArrayRef> Inputs) final { - assert(BundlerConfig.HostInputIndex != ~0u && - "Host input index not defined."); -@@ -635,12 +654,16 @@ public: - return Error::success(); - } - -- Error WriteBundleStart(raw_fd_ostream &OS, StringRef TargetTriple) final { -+ Error WriteBundleStart(raw_ostream &OS, StringRef TargetTriple) final { - ++NumberOfProcessedInputs; - return Error::success(); - } - -- Error WriteBundleEnd(raw_fd_ostream &OS, StringRef TargetTriple) final { -+ Error WriteBundleEnd(raw_ostream &OS, StringRef TargetTriple) final { -+ return Error::success(); -+ } -+ -+ Error finalizeOutputFile() final { - assert(NumberOfProcessedInputs <= NumberOfInputs && - "Processing more inputs that actually exist!"); - assert(BundlerConfig.HostInputIndex != ~0u && -@@ -658,10 +681,6 @@ public: - assert(BundlerConfig.ObjcopyPath != "" && - "llvm-objcopy path not specified"); - -- // We write to the output file directly. So, we close it and use the name -- // to pass down to llvm-objcopy. -- OS.close(); -- - // Temporary files that need to be removed. - TempFileHandlerRAII TempFiles; - -@@ -702,7 +721,7 @@ public: - return Error::success(); - } - -- Error WriteBundle(raw_fd_ostream &OS, MemoryBuffer &Input) final { -+ Error WriteBundle(raw_ostream &OS, MemoryBuffer &Input) final { - return Error::success(); - } - -@@ -799,22 +818,22 @@ protected: - return Error::success(); - } - -- Error WriteHeader(raw_fd_ostream &OS, -+ Error WriteHeader(raw_ostream &OS, - ArrayRef> Inputs) final { - return Error::success(); - } - -- Error WriteBundleStart(raw_fd_ostream &OS, StringRef TargetTriple) final { -+ Error WriteBundleStart(raw_ostream &OS, StringRef TargetTriple) final { - OS << BundleStartString << TargetTriple << "\n"; - return Error::success(); - } - -- Error WriteBundleEnd(raw_fd_ostream &OS, StringRef TargetTriple) final { -+ Error WriteBundleEnd(raw_ostream &OS, StringRef TargetTriple) final { - OS << BundleEndString << TargetTriple << "\n"; - return Error::success(); - } - -- Error WriteBundle(raw_fd_ostream &OS, MemoryBuffer &Input) final { -+ Error WriteBundle(raw_ostream &OS, MemoryBuffer &Input) final { - OS << Input.getBuffer(); - return Error::success(); - } -@@ -899,6 +918,187 @@ CreateFileHandler(MemoryBuffer &FirstInput, - "'" + FilesType + "': invalid file type specified"); - } - -+OffloadBundlerConfig::OffloadBundlerConfig() { -+ auto IgnoreEnvVarOpt = -+ llvm::sys::Process::GetEnv("OFFLOAD_BUNDLER_IGNORE_ENV_VAR"); -+ if (IgnoreEnvVarOpt.has_value() && IgnoreEnvVarOpt.value() == "1") -+ return; -+ -+ auto VerboseEnvVarOpt = llvm::sys::Process::GetEnv("OFFLOAD_BUNDLER_VERBOSE"); -+ if (VerboseEnvVarOpt.has_value()) -+ Verbose = VerboseEnvVarOpt.value() == "1"; -+ -+ auto CompressEnvVarOpt = -+ llvm::sys::Process::GetEnv("OFFLOAD_BUNDLER_COMPRESS"); -+ if (CompressEnvVarOpt.has_value()) -+ Compress = CompressEnvVarOpt.value() == "1"; -+} -+ -+llvm::Expected> -+CompressedOffloadBundle::compress(const llvm::MemoryBuffer &Input, -+ bool Verbose) { -+ llvm::Timer HashTimer("Hash Calculation Timer", "Hash calculation time", -+ ClangOffloadBundlerTimerGroup); -+ if (Verbose) -+ HashTimer.startTimer(); -+ llvm::MD5 Hash; -+ llvm::MD5::MD5Result Result; -+ Hash.update(Input.getBuffer()); -+ Hash.final(Result); -+ uint64_t TruncatedHash = Result.low(); -+ if (Verbose) -+ HashTimer.stopTimer(); -+ -+ SmallVector CompressedBuffer; -+ auto BufferUint8 = llvm::ArrayRef( -+ reinterpret_cast(Input.getBuffer().data()), -+ Input.getBuffer().size()); -+ -+ llvm::compression::Format CompressionFormat; -+ -+ if (llvm::compression::zstd::isAvailable()) -+ CompressionFormat = llvm::compression::Format::Zstd; -+ else if (llvm::compression::zlib::isAvailable()) -+ CompressionFormat = llvm::compression::Format::Zlib; -+ else -+ return createStringError(llvm::inconvertibleErrorCode(), -+ "Compression not supported"); -+ -+ llvm::Timer CompressTimer("Compression Timer", "Compression time", -+ ClangOffloadBundlerTimerGroup); -+ if (Verbose) -+ CompressTimer.startTimer(); -+ llvm::compression::compress(CompressionFormat, BufferUint8, CompressedBuffer); -+ if (Verbose) -+ CompressTimer.stopTimer(); -+ -+ uint16_t CompressionMethod = static_cast(CompressionFormat); -+ uint32_t UncompressedSize = Input.getBuffer().size(); -+ -+ SmallVector FinalBuffer; -+ llvm::raw_svector_ostream OS(FinalBuffer); -+ OS << MagicNumber; -+ OS.write(reinterpret_cast(&Version), sizeof(Version)); -+ OS.write(reinterpret_cast(&CompressionMethod), -+ sizeof(CompressionMethod)); -+ OS.write(reinterpret_cast(&UncompressedSize), -+ sizeof(UncompressedSize)); -+ OS.write(reinterpret_cast(&TruncatedHash), -+ sizeof(TruncatedHash)); -+ OS.write(reinterpret_cast(CompressedBuffer.data()), -+ CompressedBuffer.size()); -+ -+ if (Verbose) { -+ auto MethodUsed = -+ CompressionFormat == llvm::compression::Format::Zstd ? "zstd" : "zlib"; -+ llvm::errs() << "Compressed bundle format version: " << Version << "\n" -+ << "Compression method used: " << MethodUsed << "\n" -+ << "Binary size before compression: " << UncompressedSize -+ << " bytes\n" -+ << "Binary size after compression: " << CompressedBuffer.size() -+ << " bytes\n" -+ << "Truncated MD5 hash: " -+ << llvm::format_hex(TruncatedHash, 16) << "\n"; -+ } -+ -+ return llvm::MemoryBuffer::getMemBufferCopy( -+ llvm::StringRef(FinalBuffer.data(), FinalBuffer.size())); -+} -+ -+llvm::Expected> -+CompressedOffloadBundle::decompress(const llvm::MemoryBuffer &Input, -+ bool Verbose) { -+ -+ StringRef Blob = Input.getBuffer(); -+ -+ if (Blob.size() < HeaderSize) { -+ return llvm::MemoryBuffer::getMemBufferCopy(Blob); -+ } -+ if (llvm::identify_magic(Blob) != -+ llvm::file_magic::offload_bundle_compressed) { -+ if (Verbose) -+ llvm::errs() << "Uncompressed bundle.\n"; -+ return llvm::MemoryBuffer::getMemBufferCopy(Blob); -+ } -+ -+ uint16_t ThisVersion; -+ uint16_t CompressionMethod; -+ uint32_t UncompressedSize; -+ uint64_t StoredHash; -+ memcpy(&ThisVersion, Input.getBuffer().data() + MagicNumber.size(), -+ sizeof(uint16_t)); -+ memcpy(&CompressionMethod, Blob.data() + MagicSize + VersionFieldSize, -+ sizeof(uint16_t)); -+ memcpy(&UncompressedSize, -+ Blob.data() + MagicSize + VersionFieldSize + MethodFieldSize, -+ sizeof(uint32_t)); -+ memcpy(&StoredHash, -+ Blob.data() + MagicSize + VersionFieldSize + MethodFieldSize + -+ SizeFieldSize, -+ sizeof(uint64_t)); -+ -+ llvm::compression::Format CompressionFormat; -+ if (CompressionMethod == -+ static_cast(llvm::compression::Format::Zlib)) -+ CompressionFormat = llvm::compression::Format::Zlib; -+ else if (CompressionMethod == -+ static_cast(llvm::compression::Format::Zstd)) -+ CompressionFormat = llvm::compression::Format::Zstd; -+ else -+ return createStringError(inconvertibleErrorCode(), -+ "Unknown compressing method"); -+ -+ llvm::Timer DecompressTimer("Decompression Timer", "Decompression time", -+ ClangOffloadBundlerTimerGroup); -+ if (Verbose) -+ DecompressTimer.startTimer(); -+ -+ SmallVector DecompressedData; -+ StringRef CompressedData = Blob.substr(HeaderSize); -+ if (llvm::Error DecompressionError = llvm::compression::decompress( -+ CompressionFormat, llvm::arrayRefFromStringRef(CompressedData), -+ DecompressedData, UncompressedSize)) -+ return createStringError(inconvertibleErrorCode(), -+ "Could not decompress embedded file contents: " + -+ llvm::toString(std::move(DecompressionError))); -+ -+ if (Verbose) { -+ DecompressTimer.stopTimer(); -+ -+ // Recalculate MD5 hash -+ llvm::Timer HashRecalcTimer("Hash Recalculation Timer", -+ "Hash recalculation time", -+ ClangOffloadBundlerTimerGroup); -+ HashRecalcTimer.startTimer(); -+ llvm::MD5 Hash; -+ llvm::MD5::MD5Result Result; -+ Hash.update(llvm::ArrayRef(DecompressedData.data(), -+ DecompressedData.size())); -+ Hash.final(Result); -+ uint64_t RecalculatedHash = Result.low(); -+ HashRecalcTimer.stopTimer(); -+ bool HashMatch = (StoredHash == RecalculatedHash); -+ -+ llvm::errs() << "Compressed bundle format version: " << ThisVersion << "\n" -+ << "Decompression method: " -+ << (CompressionFormat == llvm::compression::Format::Zlib -+ ? "zlib" -+ : "zstd") -+ << "\n" -+ << "Size before decompression: " << CompressedData.size() -+ << " bytes\n" -+ << "Size after decompression: " << UncompressedSize -+ << " bytes\n" -+ << "Stored hash: " << llvm::format_hex(StoredHash, 16) << "\n" -+ << "Recalculated hash: " -+ << llvm::format_hex(RecalculatedHash, 16) << "\n" -+ << "Hashes match: " << (HashMatch ? "Yes" : "No") << "\n"; -+ } -+ -+ return llvm::MemoryBuffer::getMemBufferCopy( -+ llvm::toStringRef(DecompressedData)); -+} -+ - // List bundle IDs. Return true if an error was found. - Error OffloadBundler::ListBundleIDsInFile( - StringRef InputFileName, const OffloadBundlerConfig &BundlerConfig) { -@@ -908,28 +1108,35 @@ Error OffloadBundler::ListBundleIDsInFile( - if (std::error_code EC = CodeOrErr.getError()) - return createFileError(InputFileName, EC); - -- MemoryBuffer &Input = **CodeOrErr; -+ // Decompress the input if necessary. -+ Expected> DecompressedBufferOrErr = -+ CompressedOffloadBundle::decompress(**CodeOrErr, BundlerConfig.Verbose); -+ if (!DecompressedBufferOrErr) -+ return createStringError( -+ inconvertibleErrorCode(), -+ "Failed to decompress input: " + -+ llvm::toString(DecompressedBufferOrErr.takeError())); -+ -+ MemoryBuffer &DecompressedInput = **DecompressedBufferOrErr; - - // Select the right files handler. - Expected> FileHandlerOrErr = -- CreateFileHandler(Input, BundlerConfig); -+ CreateFileHandler(DecompressedInput, BundlerConfig); - if (!FileHandlerOrErr) - return FileHandlerOrErr.takeError(); - - std::unique_ptr &FH = *FileHandlerOrErr; - assert(FH); -- return FH->listBundleIDs(Input); -+ return FH->listBundleIDs(DecompressedInput); - } - - /// Bundle the files. Return true if an error was found. - Error OffloadBundler::BundleFiles() { - std::error_code EC; - -- // Create output file. -- raw_fd_ostream OutputFile(BundlerConfig.OutputFileNames.front(), EC, -- sys::fs::OF_None); -- if (EC) -- return createFileError(BundlerConfig.OutputFileNames.front(), EC); -+ // Create a buffer to hold the content before compressing. -+ SmallVector Buffer; -+ llvm::raw_svector_ostream BufferStream(Buffer); - - // Open input files. - SmallVector, 8u> InputBuffers; -@@ -956,22 +1163,46 @@ Error OffloadBundler::BundleFiles() { - assert(FH); - - // Write header. -- if (Error Err = FH->WriteHeader(OutputFile, InputBuffers)) -+ if (Error Err = FH->WriteHeader(BufferStream, InputBuffers)) - return Err; - - // Write all bundles along with the start/end markers. If an error was found - // writing the end of the bundle component, abort the bundle writing. - auto Input = InputBuffers.begin(); - for (auto &Triple : BundlerConfig.TargetNames) { -- if (Error Err = FH->WriteBundleStart(OutputFile, Triple)) -+ if (Error Err = FH->WriteBundleStart(BufferStream, Triple)) - return Err; -- if (Error Err = FH->WriteBundle(OutputFile, **Input)) -+ if (Error Err = FH->WriteBundle(BufferStream, **Input)) - return Err; -- if (Error Err = FH->WriteBundleEnd(OutputFile, Triple)) -+ if (Error Err = FH->WriteBundleEnd(BufferStream, Triple)) - return Err; - ++Input; - } -- return Error::success(); -+ -+ raw_fd_ostream OutputFile(BundlerConfig.OutputFileNames.front(), EC, -+ sys::fs::OF_None); -+ if (EC) -+ return createFileError(BundlerConfig.OutputFileNames.front(), EC); -+ -+ SmallVector CompressedBuffer; -+ if (BundlerConfig.Compress) { -+ std::unique_ptr BufferMemory = -+ llvm::MemoryBuffer::getMemBufferCopy( -+ llvm::StringRef(Buffer.data(), Buffer.size())); -+ auto CompressionResult = -+ CompressedOffloadBundle::compress(*BufferMemory, BundlerConfig.Verbose); -+ if (auto Error = CompressionResult.takeError()) -+ return Error; -+ -+ auto CompressedMemBuffer = std::move(CompressionResult.get()); -+ CompressedBuffer.assign(CompressedMemBuffer->getBufferStart(), -+ CompressedMemBuffer->getBufferEnd()); -+ } else -+ CompressedBuffer = Buffer; -+ -+ OutputFile.write(CompressedBuffer.data(), CompressedBuffer.size()); -+ -+ return FH->finalizeOutputFile(); - } - - // Unbundle the files. Return true if an error was found. -@@ -982,7 +1213,16 @@ Error OffloadBundler::UnbundleFiles() { - if (std::error_code EC = CodeOrErr.getError()) - return createFileError(BundlerConfig.InputFileNames.front(), EC); - -- MemoryBuffer &Input = **CodeOrErr; -+ // Decompress the input if necessary. -+ Expected> DecompressedBufferOrErr = -+ CompressedOffloadBundle::decompress(**CodeOrErr, BundlerConfig.Verbose); -+ if (!DecompressedBufferOrErr) -+ return createStringError( -+ inconvertibleErrorCode(), -+ "Failed to decompress input: " + -+ llvm::toString(DecompressedBufferOrErr.takeError())); -+ -+ MemoryBuffer &Input = **DecompressedBufferOrErr; - - // Select the right files handler. - Expected> FileHandlerOrErr = -@@ -1357,22 +1597,34 @@ Error OffloadBundler::UnbundleArchive() { - if (!CodeObjectBufferRefOrErr) - return CodeObjectBufferRefOrErr.takeError(); - -- auto CodeObjectBuffer = -+ auto TempCodeObjectBuffer = - MemoryBuffer::getMemBuffer(*CodeObjectBufferRefOrErr, false); - -+ // Decompress the buffer if necessary. -+ Expected> DecompressedBufferOrErr = -+ CompressedOffloadBundle::decompress(*TempCodeObjectBuffer, -+ BundlerConfig.Verbose); -+ if (!DecompressedBufferOrErr) -+ return createStringError( -+ inconvertibleErrorCode(), -+ "Failed to decompress code object: " + -+ llvm::toString(DecompressedBufferOrErr.takeError())); -+ -+ MemoryBuffer &CodeObjectBuffer = **DecompressedBufferOrErr; -+ - Expected> FileHandlerOrErr = -- CreateFileHandler(*CodeObjectBuffer, BundlerConfig); -+ CreateFileHandler(CodeObjectBuffer, BundlerConfig); - if (!FileHandlerOrErr) - return FileHandlerOrErr.takeError(); - - std::unique_ptr &FileHandler = *FileHandlerOrErr; - assert(FileHandler); - -- if (Error ReadErr = FileHandler->ReadHeader(*CodeObjectBuffer)) -+ if (Error ReadErr = FileHandler->ReadHeader(CodeObjectBuffer)) - return ReadErr; - - Expected> CurBundleIDOrErr = -- FileHandler->ReadBundleStart(*CodeObjectBuffer); -+ FileHandler->ReadBundleStart(CodeObjectBuffer); - if (!CurBundleIDOrErr) - return CurBundleIDOrErr.takeError(); - -@@ -1393,7 +1645,7 @@ Error OffloadBundler::UnbundleArchive() { - BundlerConfig)) { - std::string BundleData; - raw_string_ostream DataStream(BundleData); -- if (Error Err = FileHandler->ReadBundle(DataStream, *CodeObjectBuffer)) -+ if (Error Err = FileHandler->ReadBundle(DataStream, CodeObjectBuffer)) - return Err; - - for (auto &CompatibleTarget : CompatibleTargets) { -@@ -1431,11 +1683,11 @@ Error OffloadBundler::UnbundleArchive() { - } - } - -- if (Error Err = FileHandler->ReadBundleEnd(*CodeObjectBuffer)) -+ if (Error Err = FileHandler->ReadBundleEnd(CodeObjectBuffer)) - return Err; - - Expected> NextTripleOrErr = -- FileHandler->ReadBundleStart(*CodeObjectBuffer); -+ FileHandler->ReadBundleStart(CodeObjectBuffer); - if (!NextTripleOrErr) - return NextTripleOrErr.takeError(); - -diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp -index 9e1f07d78bf1..274875c631c5 100644 ---- a/clang/lib/Driver/ToolChains/Clang.cpp -+++ b/clang/lib/Driver/ToolChains/Clang.cpp -@@ -8400,6 +8400,11 @@ void OffloadBundler::ConstructJob(Compilation &C, const JobAction &JA, - } - CmdArgs.push_back(TCArgs.MakeArgString(UB)); - } -+ if (TCArgs.hasFlag(options::OPT_offload_compress, -+ options::OPT_no_offload_compress, false)) -+ CmdArgs.push_back("-compress"); -+ if (TCArgs.hasArg(options::OPT_v)) -+ CmdArgs.push_back("-verbose"); - // All the inputs are encoded as commands. - C.addCommand(std::make_unique( - JA, *this, ResponseFileSupport::None(), -@@ -8494,6 +8499,8 @@ void OffloadBundler::ConstructJobMultipleOutputs( - } - CmdArgs.push_back("-unbundle"); - CmdArgs.push_back("-allow-missing-bundles"); -+ if (TCArgs.hasArg(options::OPT_v)) -+ CmdArgs.push_back("-verbose"); - - // All the inputs are encoded as commands. - C.addCommand(std::make_unique( -diff --git a/clang/lib/Driver/ToolChains/HIPUtility.cpp b/clang/lib/Driver/ToolChains/HIPUtility.cpp -index 8b9d8db90ffa..04efdcba20ea 100644 ---- a/clang/lib/Driver/ToolChains/HIPUtility.cpp -+++ b/clang/lib/Driver/ToolChains/HIPUtility.cpp -@@ -84,6 +84,12 @@ void HIP::constructHIPFatbinCommand(Compilation &C, const JobAction &JA, - Args.MakeArgString(std::string("-output=").append(Output)); - BundlerArgs.push_back(BundlerOutputArg); - -+ if (Args.hasFlag(options::OPT_offload_compress, -+ options::OPT_no_offload_compress, false)) -+ BundlerArgs.push_back("-compress"); -+ if (Args.hasArg(options::OPT_v)) -+ BundlerArgs.push_back("-verbose"); -+ - const char *Bundler = Args.MakeArgString( - T.getToolChain().GetProgramPath("clang-offload-bundler")); - C.addCommand(std::make_unique( -diff --git a/clang/test/Driver/clang-offload-bundler-zlib.c b/clang/test/Driver/clang-offload-bundler-zlib.c -new file mode 100644 -index 000000000000..c46c32a4a053 ---- /dev/null -+++ b/clang/test/Driver/clang-offload-bundler-zlib.c -@@ -0,0 +1,75 @@ -+// REQUIRES: zlib -+// REQUIRES: x86-registered-target -+// UNSUPPORTED: target={{.*}}-darwin{{.*}}, target={{.*}}-aix{{.*}} -+ -+// -+// Generate the host binary to be bundled. -+// -+// RUN: %clang -O0 -target %itanium_abi_triple %s -c -emit-llvm -o %t.bc -+ -+// -+// Generate an empty file to help with the checks of empty files. -+// -+// RUN: touch %t.empty -+ -+// -+// Generate device binaries to be bundled. -+// -+// RUN: echo 'Content of device file 1' > %t.tgt1 -+// RUN: echo 'Content of device file 2' > %t.tgt2 -+ -+// -+// Check compression/decompression of offload bundle. -+// -+// RUN: env OFFLOAD_BUNDLER_COMPRESS=1 OFFLOAD_BUNDLER_VERBOSE=1 \ -+// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ -+// RUN: -input=%t.tgt1 -input=%t.tgt2 -output=%t.hip.bundle.bc 2>&1 | \ -+// RUN: FileCheck -check-prefix=COMPRESS %s -+// RUN: clang-offload-bundler -type=bc -list -input=%t.hip.bundle.bc | FileCheck -check-prefix=NOHOST %s -+// RUN: env OFFLOAD_BUNDLER_VERBOSE=1 \ -+// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ -+// RUN: -output=%t.res.tgt1 -output=%t.res.tgt2 -input=%t.hip.bundle.bc -unbundle 2>&1 | \ -+// RUN: FileCheck -check-prefix=DECOMPRESS %s -+// RUN: diff %t.tgt1 %t.res.tgt1 -+// RUN: diff %t.tgt2 %t.res.tgt2 -+ -+// -+// COMPRESS: Compression method used: -+// DECOMPRESS: Decompression method: -+// NOHOST-NOT: host- -+// NOHOST-DAG: hip-amdgcn-amd-amdhsa--gfx900 -+// NOHOST-DAG: hip-amdgcn-amd-amdhsa--gfx906 -+// -+ -+// -+// Check -bundle-align option. -+// -+ -+// RUN: clang-offload-bundler -bundle-align=4096 -type=bc -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -input=%t.bc -input=%t.tgt1 -input=%t.tgt2 -output=%t.bundle3.bc -compress -+// RUN: clang-offload-bundler -type=bc -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -output=%t.res.bc -output=%t.res.tgt1 -output=%t.res.tgt2 -input=%t.bundle3.bc -unbundle -+// RUN: diff %t.bc %t.res.bc -+// RUN: diff %t.tgt1 %t.res.tgt1 -+// RUN: diff %t.tgt2 %t.res.tgt2 -+ -+// -+// Check unbundling archive. -+// -+// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ -+// RUN: -input=%t.tgt1 -input=%t.tgt2 -output=%T/hip_bundle1.bc -compress -+// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ -+// RUN: -input=%t.tgt1 -input=%t.tgt2 -output=%T/hip_bundle2.bc -compress -+// RUN: llvm-ar cr %T/hip_archive.a %T/hip_bundle1.bc %T/hip_bundle2.bc -+// RUN: clang-offload-bundler -unbundle -type=a -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ -+// RUN: -output=%T/hip_900.a -output=%T/hip_906.a -input=%T/hip_archive.a -+// RUN: llvm-ar t %T/hip_900.a | FileCheck -check-prefix=HIP-AR-900 %s -+// RUN: llvm-ar t %T/hip_906.a | FileCheck -check-prefix=HIP-AR-906 %s -+// HIP-AR-900-DAG: hip_bundle1-hip-amdgcn-amd-amdhsa--gfx900 -+// HIP-AR-900-DAG: hip_bundle2-hip-amdgcn-amd-amdhsa--gfx900 -+// HIP-AR-906-DAG: hip_bundle1-hip-amdgcn-amd-amdhsa--gfx906 -+// HIP-AR-906-DAG: hip_bundle2-hip-amdgcn-amd-amdhsa--gfx906 -+ -+// Some code so that we can create a binary out of this file. -+int A = 0; -+void test_func(void) { -+ ++A; -+} -diff --git a/clang/test/Driver/clang-offload-bundler-zstd.c b/clang/test/Driver/clang-offload-bundler-zstd.c -new file mode 100644 -index 000000000000..b2b588b72d4d ---- /dev/null -+++ b/clang/test/Driver/clang-offload-bundler-zstd.c -@@ -0,0 +1,72 @@ -+// REQUIRES: zstd -+// REQUIRES: x86-registered-target -+// UNSUPPORTED: target={{.*}}-darwin{{.*}}, target={{.*}}-aix{{.*}} -+ -+// -+// Generate the host binary to be bundled. -+// -+// RUN: %clang -O0 -target %itanium_abi_triple %s -c -emit-llvm -o %t.bc -+ -+// -+// Generate an empty file to help with the checks of empty files. -+// -+// RUN: touch %t.empty -+ -+// -+// Generate device binaries to be bundled. -+// -+// RUN: echo 'Content of device file 1' > %t.tgt1 -+// RUN: echo 'Content of device file 2' > %t.tgt2 -+ -+// -+// Check compression/decompression of offload bundle. -+// -+// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ -+// RUN: -input=%t.tgt1 -input=%t.tgt2 -output=%t.hip.bundle.bc -compress -verbose 2>&1 | \ -+// RUN: FileCheck -check-prefix=COMPRESS %s -+// RUN: clang-offload-bundler -type=bc -list -input=%t.hip.bundle.bc | FileCheck -check-prefix=NOHOST %s -+// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ -+// RUN: -output=%t.res.tgt1 -output=%t.res.tgt2 -input=%t.hip.bundle.bc -unbundle -verbose 2>&1 | \ -+// RUN: FileCheck -check-prefix=DECOMPRESS %s -+// RUN: diff %t.tgt1 %t.res.tgt1 -+// RUN: diff %t.tgt2 %t.res.tgt2 -+// -+// COMPRESS: Compression method used -+// DECOMPRESS: Decompression method -+// NOHOST-NOT: host- -+// NOHOST-DAG: hip-amdgcn-amd-amdhsa--gfx900 -+// NOHOST-DAG: hip-amdgcn-amd-amdhsa--gfx906 -+// -+ -+// -+// Check -bundle-align option. -+// -+ -+// RUN: clang-offload-bundler -bundle-align=4096 -type=bc -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -input=%t.bc -input=%t.tgt1 -input=%t.tgt2 -output=%t.bundle3.bc -compress -+// RUN: clang-offload-bundler -type=bc -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -output=%t.res.bc -output=%t.res.tgt1 -output=%t.res.tgt2 -input=%t.bundle3.bc -unbundle -+// RUN: diff %t.bc %t.res.bc -+// RUN: diff %t.tgt1 %t.res.tgt1 -+// RUN: diff %t.tgt2 %t.res.tgt2 -+ -+// -+// Check unbundling archive. -+// -+// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ -+// RUN: -input=%t.tgt1 -input=%t.tgt2 -output=%T/hip_bundle1.bc -compress -+// RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ -+// RUN: -input=%t.tgt1 -input=%t.tgt2 -output=%T/hip_bundle2.bc -compress -+// RUN: llvm-ar cr %T/hip_archive.a %T/hip_bundle1.bc %T/hip_bundle2.bc -+// RUN: clang-offload-bundler -unbundle -type=a -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \ -+// RUN: -output=%T/hip_900.a -output=%T/hip_906.a -input=%T/hip_archive.a -+// RUN: llvm-ar t %T/hip_900.a | FileCheck -check-prefix=HIP-AR-900 %s -+// RUN: llvm-ar t %T/hip_906.a | FileCheck -check-prefix=HIP-AR-906 %s -+// HIP-AR-900-DAG: hip_bundle1-hip-amdgcn-amd-amdhsa--gfx900 -+// HIP-AR-900-DAG: hip_bundle2-hip-amdgcn-amd-amdhsa--gfx900 -+// HIP-AR-906-DAG: hip_bundle1-hip-amdgcn-amd-amdhsa--gfx906 -+// HIP-AR-906-DAG: hip_bundle2-hip-amdgcn-amd-amdhsa--gfx906 -+ -+// Some code so that we can create a binary out of this file. -+int A = 0; -+void test_func(void) { -+ ++A; -+} -diff --git a/clang/test/Driver/hip-offload-compress-zlib.hip b/clang/test/Driver/hip-offload-compress-zlib.hip -new file mode 100644 -index 000000000000..a29b6d037350 ---- /dev/null -+++ b/clang/test/Driver/hip-offload-compress-zlib.hip -@@ -0,0 +1,45 @@ -+// REQUIRES: zlib -+// REQUIRES: x86-registered-target -+// REQUIRES: amdgpu-registered-target -+ -+// Test compress bundled bitcode. -+ -+// RUN: rm -rf %T/a.bc -+// RUN: %clang -c -v --target=x86_64-linux-gnu \ -+// RUN: -x hip --offload-arch=gfx1100 --offload-arch=gfx1101 \ -+// RUN: -fgpu-rdc -nogpuinc -nogpulib \ -+// RUN: %S/Inputs/hip_multiple_inputs/a.cu \ -+// RUN: --offload-compress --offload-device-only --gpu-bundle-output \ -+// RUN: -o %T/a.bc \ -+// RUN: 2>&1 | FileCheck %s -+ -+// CHECK: clang-offload-bundler{{.*}} -type=bc -+// CHECK-SAME: -targets={{.*}}hip-amdgcn-amd-amdhsa-gfx1100,hip-amdgcn-amd-amdhsa-gfx1101 -+// CHECK-SAME: -compress -verbose -+// CHECK: Compressed bundle format -+ -+// Test uncompress of bundled bitcode. -+ -+// RUN: %clang --hip-link -### -v --target=x86_64-linux-gnu \ -+// RUN: --offload-arch=gfx1100 --offload-arch=gfx1101 \ -+// RUN: -fgpu-rdc -nogpulib \ -+// RUN: %T/a.bc --offload-device-only \ -+// RUN: 2>&1 | FileCheck -check-prefix=UNBUNDLE %s -+ -+// UNBUNDLE: clang-offload-bundler{{.*}} "-type=bc" -+// UNBUNDLE-SAME: -targets={{.*}}hip-amdgcn-amd-amdhsa-gfx1100,hip-amdgcn-amd-amdhsa-gfx1101 -+// UNBUNDLE-SAME: -unbundle -+// UNBUNDLE-SAME: -verbose -+ -+// Test compress bundled code objects. -+ -+// RUN: %clang -c -### -v --target=x86_64-linux-gnu \ -+// RUN: -x hip --offload-arch=gfx1100 --offload-arch=gfx1101 \ -+// RUN: -nogpuinc -nogpulib \ -+// RUN: %S/Inputs/hip_multiple_inputs/a.cu \ -+// RUN: --offload-compress \ -+// RUN: 2>&1 | FileCheck -check-prefix=CO %s -+ -+// CO: clang-offload-bundler{{.*}} "-type=o" -+// CO-SAME: -targets={{.*}}hipv4-amdgcn-amd-amdhsa--gfx1100,hipv4-amdgcn-amd-amdhsa--gfx1101 -+// CO-SAME: "-compress" "-verbose" -diff --git a/clang/test/Driver/hip-offload-compress-zstd.hip b/clang/test/Driver/hip-offload-compress-zstd.hip -new file mode 100644 -index 000000000000..688c2c85329c ---- /dev/null -+++ b/clang/test/Driver/hip-offload-compress-zstd.hip -@@ -0,0 +1,45 @@ -+// REQUIRES: zstd -+// REQUIRES: x86-registered-target -+// REQUIRES: amdgpu-registered-target -+ -+// Test compress bundled bitcode. -+ -+// RUN: rm -rf %T/a.bc -+// RUN: %clang -c -v --target=x86_64-linux-gnu \ -+// RUN: -x hip --offload-arch=gfx1100 --offload-arch=gfx1101 \ -+// RUN: -fgpu-rdc -nogpuinc -nogpulib \ -+// RUN: %S/Inputs/hip_multiple_inputs/a.cu \ -+// RUN: --offload-compress --offload-device-only --gpu-bundle-output \ -+// RUN: -o %T/a.bc \ -+// RUN: 2>&1 | FileCheck %s -+ -+// CHECK: clang-offload-bundler{{.*}} -type=bc -+// CHECK-SAME: -targets={{.*}}hip-amdgcn-amd-amdhsa-gfx1100,hip-amdgcn-amd-amdhsa-gfx1101 -+// CHECK-SAME: -compress -verbose -+// CHECK: Compressed bundle format -+ -+// Test uncompress of bundled bitcode. -+ -+// RUN: %clang --hip-link -### -v --target=x86_64-linux-gnu \ -+// RUN: --offload-arch=gfx1100 --offload-arch=gfx1101 \ -+// RUN: -fgpu-rdc -nogpulib \ -+// RUN: %T/a.bc --offload-device-only \ -+// RUN: 2>&1 | FileCheck -check-prefix=UNBUNDLE %s -+ -+// UNBUNDLE: clang-offload-bundler{{.*}} "-type=bc" -+// UNBUNDLE-SAME: -targets={{.*}}hip-amdgcn-amd-amdhsa-gfx1100,hip-amdgcn-amd-amdhsa-gfx1101 -+// UNBUNDLE-SAME: -unbundle -+// UNBUNDLE-SAME: -verbose -+ -+// Test compress bundled code objects. -+ -+// RUN: %clang -c -### -v --target=x86_64-linux-gnu \ -+// RUN: -x hip --offload-arch=gfx1100 --offload-arch=gfx1101 \ -+// RUN: -nogpuinc -nogpulib \ -+// RUN: %S/Inputs/hip_multiple_inputs/a.cu \ -+// RUN: --offload-compress \ -+// RUN: 2>&1 | FileCheck -check-prefix=CO %s -+ -+// CO: clang-offload-bundler{{.*}} "-type=o" -+// CO-SAME: -targets={{.*}}hipv4-amdgcn-amd-amdhsa--gfx1100,hipv4-amdgcn-amd-amdhsa--gfx1101 -+// CO-SAME: "-compress" "-verbose" -diff --git a/clang/tools/clang-offload-bundler/CMakeLists.txt b/clang/tools/clang-offload-bundler/CMakeLists.txt -index dabd82382cdf..dec2881589a5 100644 ---- a/clang/tools/clang-offload-bundler/CMakeLists.txt -+++ b/clang/tools/clang-offload-bundler/CMakeLists.txt -@@ -1,4 +1,5 @@ - set(LLVM_LINK_COMPONENTS -+ BinaryFormat - Object - Support - TargetParser -diff --git a/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp b/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp -index c02b5854bded..68f29807b219 100644 ---- a/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp -+++ b/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp -@@ -141,6 +141,11 @@ int main(int argc, const char **argv) { - cl::desc("Treat hip and hipv4 offload kinds as " - "compatible with openmp kind, and vice versa.\n"), - cl::init(false), cl::cat(ClangOffloadBundlerCategory)); -+ cl::opt Compress("compress", -+ cl::desc("Compress output file when bundling.\n"), -+ cl::init(false), cl::cat(ClangOffloadBundlerCategory)); -+ cl::opt Verbose("verbose", cl::desc("Print debug information.\n"), -+ cl::init(false), cl::cat(ClangOffloadBundlerCategory)); - - // Process commandline options and report errors - sys::PrintStackTraceOnErrorSignal(argv[0]); -@@ -169,6 +174,11 @@ int main(int argc, const char **argv) { - BundlerConfig.BundleAlignment = BundleAlignment; - BundlerConfig.FilesType = FilesType; - BundlerConfig.ObjcopyPath = ""; -+ // Do not override the default value Compress and Verbose in BundlerConfig. -+ if (Compress.getNumOccurrences() > 0) -+ BundlerConfig.Compress = Compress; -+ if (Verbose.getNumOccurrences() > 0) -+ BundlerConfig.Verbose = Verbose; - - BundlerConfig.TargetNames = TargetNames; - BundlerConfig.InputFileNames = InputFileNames; -diff --git a/llvm/include/llvm/BinaryFormat/Magic.h b/llvm/include/llvm/BinaryFormat/Magic.h -index 329c96f5c14c..a28710dcdfaf 100644 ---- a/llvm/include/llvm/BinaryFormat/Magic.h -+++ b/llvm/include/llvm/BinaryFormat/Magic.h -@@ -42,19 +42,21 @@ struct file_magic { - macho_universal_binary, ///< Mach-O universal binary - macho_file_set, ///< Mach-O file set binary - minidump, ///< Windows minidump file -- coff_cl_gl_object, ///< Microsoft cl.exe's intermediate code file -- coff_object, ///< COFF object file -- coff_import_library, ///< COFF import library -- pecoff_executable, ///< PECOFF executable file -- windows_resource, ///< Windows compiled resource file (.res) -- xcoff_object_32, ///< 32-bit XCOFF object file -- xcoff_object_64, ///< 64-bit XCOFF object file -- wasm_object, ///< WebAssembly Object file -- pdb, ///< Windows PDB debug info file -- tapi_file, ///< Text-based Dynamic Library Stub file -- cuda_fatbinary, ///< CUDA Fatbinary object file -- offload_binary, ///< LLVM offload object file -- dxcontainer_object, ///< DirectX container file -+ coff_cl_gl_object, ///< Microsoft cl.exe's intermediate code file -+ coff_object, ///< COFF object file -+ coff_import_library, ///< COFF import library -+ pecoff_executable, ///< PECOFF executable file -+ windows_resource, ///< Windows compiled resource file (.res) -+ xcoff_object_32, ///< 32-bit XCOFF object file -+ xcoff_object_64, ///< 64-bit XCOFF object file -+ wasm_object, ///< WebAssembly Object file -+ pdb, ///< Windows PDB debug info file -+ tapi_file, ///< Text-based Dynamic Library Stub file -+ cuda_fatbinary, ///< CUDA Fatbinary object file -+ offload_binary, ///< LLVM offload object file -+ dxcontainer_object, ///< DirectX container file -+ offload_bundle, ///< Clang offload bundle file -+ offload_bundle_compressed, ///< Compressed clang offload bundle file - }; - - bool is_object() const { return V != unknown; } -diff --git a/llvm/lib/BinaryFormat/Magic.cpp b/llvm/lib/BinaryFormat/Magic.cpp -index aa84bc36bfde..76aa1a602aa8 100644 ---- a/llvm/lib/BinaryFormat/Magic.cpp -+++ b/llvm/lib/BinaryFormat/Magic.cpp -@@ -87,6 +87,10 @@ file_magic llvm::identify_magic(StringRef Magic) { - if (startswith(Magic, "BC\xC0\xDE")) - return file_magic::bitcode; - break; -+ case 'C': -+ if (startswith(Magic, "CCOB")) -+ return file_magic::offload_bundle_compressed; -+ break; - case '!': - if (startswith(Magic, "!\n") || startswith(Magic, "!\n")) - return file_magic::archive; -@@ -246,6 +250,13 @@ file_magic llvm::identify_magic(StringRef Magic) { - return file_magic::coff_object; - break; - -+ case '_': { -+ const char OBMagic[] = "__CLANG_OFFLOAD_BUNDLE__"; -+ if (Magic.size() >= sizeof(OBMagic) && startswith(Magic, OBMagic)) -+ return file_magic::offload_bundle; -+ break; -+ } -+ - default: - break; - } -diff --git a/llvm/lib/Object/Binary.cpp b/llvm/lib/Object/Binary.cpp -index d18aed8b3b8c..0ee9f7fac448 100644 ---- a/llvm/lib/Object/Binary.cpp -+++ b/llvm/lib/Object/Binary.cpp -@@ -87,6 +87,8 @@ Expected> object::createBinary(MemoryBufferRef Buffer, - case file_magic::cuda_fatbinary: - case file_magic::coff_cl_gl_object: - case file_magic::dxcontainer_object: -+ case file_magic::offload_bundle: -+ case file_magic::offload_bundle_compressed: - // Unrecognized object file format. - return errorCodeToError(object_error::invalid_file_type); - case file_magic::offload_binary: -diff --git a/llvm/lib/Object/ObjectFile.cpp b/llvm/lib/Object/ObjectFile.cpp -index 56a1d09097d4..4cc95ea32f60 100644 ---- a/llvm/lib/Object/ObjectFile.cpp -+++ b/llvm/lib/Object/ObjectFile.cpp -@@ -154,6 +154,8 @@ ObjectFile::createObjectFile(MemoryBufferRef Object, file_magic Type, - case file_magic::cuda_fatbinary: - case file_magic::offload_binary: - case file_magic::dxcontainer_object: -+ case file_magic::offload_bundle: -+ case file_magic::offload_bundle_compressed: - return errorCodeToError(object_error::invalid_file_type); - case file_magic::tapi_file: - return errorCodeToError(object_error::invalid_file_type); --- -2.43.0 - diff --git a/pkgs/development/rocm-modules/6/llvm/base.nix b/pkgs/development/rocm-modules/6/llvm/base.nix index 88b384b43d8e..caa2ebe42823 100644 --- a/pkgs/development/rocm-modules/6/llvm/base.nix +++ b/pkgs/development/rocm-modules/6/llvm/base.nix @@ -72,9 +72,7 @@ in stdenv.mkDerivation (finalAttrs: { "info" # Avoid `attribute 'info' missing` when using with wrapCC ]; - patches = [ - ./add-compression-to-clang-offload-bundler.patch - ] ++ extraPatches; + patches = extraPatches; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/6/llvm/stage-1/clang-unwrapped.nix b/pkgs/development/rocm-modules/6/llvm/stage-1/clang-unwrapped.nix index 0d982299ec6e..1cf60223def6 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-1/clang-unwrapped.nix +++ b/pkgs/development/rocm-modules/6/llvm/stage-1/clang-unwrapped.nix @@ -2,14 +2,13 @@ , callPackage , rocmUpdateScript , llvm -, makeWrapper }: callPackage ../base.nix rec { inherit stdenv rocmUpdateScript; targetName = "clang-unwrapped"; targetDir = "clang"; - extraBuildInputs = [ llvm makeWrapper ]; + extraBuildInputs = [ llvm ]; extraCMakeFlags = [ "-DCLANG_INCLUDE_DOCS=ON" @@ -42,12 +41,6 @@ callPackage ../base.nix rec { extraPostInstall = '' mv bin/clang-tblgen $out/bin - # add wrapper to compress embedded accelerator-specific code - # this makes the output of composable_kernel significantly smaller right now - # TODO: remove this once ROCm does it out of the box - mv $out/bin/clang-offload-bundler $out/bin/clang-offload-bundler-unwrapped - makeWrapper $out/bin/clang-offload-bundler-unwrapped $out/bin/clang-offload-bundler \ - --add-flags '-compress' ''; requiredSystemFeatures = [ "big-parallel" ]; From 8f82a1f0d5e01c17419b9b88fc276104a109380c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 00:52:50 +0000 Subject: [PATCH 095/130] expr: 1.16.4 -> 1.16.5 --- pkgs/development/interpreters/expr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/expr/default.nix b/pkgs/development/interpreters/expr/default.nix index 5f7fa8da80c6..2652c6b2a5af 100644 --- a/pkgs/development/interpreters/expr/default.nix +++ b/pkgs/development/interpreters/expr/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "expr"; - version = "1.16.4"; + version = "1.16.5"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-evPzHLetmCqGnFNydbjUcVIBdcOWrhqaeBIwWB2G6hk="; + hash = "sha256-tvOqIkekG4GaH6A5XhvpjZxFySrpZxmuhx4aXH77Q+0="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-GEFLIvshlnCk8pYIf9ZoNV5NBC1R52x12aIOdsAqwFI="; + vendorHash = "sha256-AKxQe8hh3SuFtxrskCOx/5LjUO+fUJPQ6edUZRfq2oo="; ldflags = [ "-s" "-w" ]; From 16fbf5311458b0c4785f0c50eb21fec0a0db2b84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 00:53:33 +0000 Subject: [PATCH 096/130] waylock: 0.6.5 -> 1.0.0 --- pkgs/applications/misc/waylock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix index e07c2b7ed53c..9ed2cc12131e 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/applications/misc/waylock/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "waylock"; - version = "0.6.5"; + version = "1.0.0"; src = fetchFromGitea { domain = "codeberg.org"; @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "waylock"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-wvZrRPZobDh+rB3RSaRrz0xDHuYwT2eoQEu3AbYKn8Y="; + hash = "sha256-Z5YNaR+jocJ4hS7NT8oAlrMnqNfD8KRzOyyqdVGDSl0="; }; nativeBuildInputs = [ From dbb83ec44db794e7a917211460bd9cee2048eb82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 01:05:08 +0000 Subject: [PATCH 097/130] juicity: 0.4.0 -> 0.4.1 --- pkgs/tools/networking/juicity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/juicity/default.nix b/pkgs/tools/networking/juicity/default.nix index 4581b4f4a7b7..3278a5a45b60 100644 --- a/pkgs/tools/networking/juicity/default.nix +++ b/pkgs/tools/networking/juicity/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "juicity"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "juicity"; repo = pname; rev = "v${version}"; - hash = "sha256-SUZ5E2GRLyUI/Z5ekJPNypVJXfJFzIz3qr9kCeXN7Gk="; + hash = "sha256-rwGtAystB9rUE2jVij4YdBr4T8bVlVLtNaBmSZQ/39A="; }; - vendorHash = "sha256-13U3B9VKspSlpD1hYPtyCuPAZvAYc/d/UKcjXMURxyo="; + vendorHash = "sha256-SM5ZrTtuqenPsGjphkCM9JHzucw0/qBmevD+3/kyF6k="; proxyVendor = true; From 7a6a2708daeb52af16f7bae18a81b26054668d5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 02:03:31 +0000 Subject: [PATCH 098/130] python312Packages.apsw: 3.45.2.0 -> 3.45.3.0 --- pkgs/development/python-modules/apsw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 327a67d0e3fb..4d8d9649682c 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.45.2.0"; + version = "3.45.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-tTi3/10W4OoGH6PQVhvPWc5o09on5BZrWoAvrfh4C/E="; + hash = "sha256-7z9JXJn2a6RJAc+7KrkzzScrNmbb06ud6L1rBinzkP8="; }; build-system = [ setuptools ]; From b5f809bb334dbd5182a1ff4f092010d095d8c854 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 02:07:26 +0000 Subject: [PATCH 099/130] python312Packages.dbt-core: 1.7.11 -> 1.7.12 --- pkgs/development/python-modules/dbt-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 9a165b4925ca..e440fb6919b1 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.7.11"; + version = "1.7.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-core"; rev = "refs/tags/v${version}"; - hash = "sha256-r51aki1fuHfp6gWkzOMA92xFeM0MXFPrNq77aKTYYWA="; + hash = "sha256-mkqtlItr6oRsF5S+CPw4fAP/INJ2yw3vcKxEYeB3ItI="; }; sourceRoot = "${src.name}/core"; From df5dd95472f9ebc6e4b936fb85e5e7d191aebd19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 02:34:12 +0000 Subject: [PATCH 100/130] python312Packages.pydiscourse: 1.6.1 -> 1.7.0 --- pkgs/development/python-modules/pydiscourse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydiscourse/default.nix b/pkgs/development/python-modules/pydiscourse/default.nix index faffa9e619ee..01bce5630233 100644 --- a/pkgs/development/python-modules/pydiscourse/default.nix +++ b/pkgs/development/python-modules/pydiscourse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydiscourse"; - version = "1.6.1"; + version = "1.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pydiscourse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BvVKOfc/PiAnkEnH5jsd8/0owr+ZvJIz/tpZx6K0fP0="; + hash = "sha256-KqJ6ag4owG7US5Q4Ygjq263ds1o/JhEJ3bNa8YecYtE="; }; propagatedBuildInputs = [ From 2ba2244fdde0bad5898f1ce24296351691bed58a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 03:23:34 +0000 Subject: [PATCH 101/130] vendir: 0.40.0 -> 0.40.1 --- pkgs/development/tools/vendir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index d7be7022a9d8..638ebdb0cb7d 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.40.0"; + version = "0.40.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-Hyx33/j9spZEEkKB5R2vUmEq8tjzoQiI2EKdyXymQR8="; + sha256 = "sha256-v+p3I0PJc+7vgZqQA/dClv/GqOQTniwWHxXQamM+8oo="; }; vendorHash = null; From 5b4f016c805b9c281868e1f73c98b3b44626d87f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 03:43:01 +0000 Subject: [PATCH 102/130] python312Packages.dbt-redshift: 1.7.5 -> 1.7.6 --- pkgs/development/python-modules/dbt-redshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index 86c3e53e9d49..7d7f2e3765c6 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.7.5"; + version = "1.7.6"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-redshift"; rev = "refs/tags/v${version}"; - hash = "sha256-wFNPXUU2EuDEiPpEAzjRIRdR27PHLVcOvgQ9E/bpgwM="; + hash = "sha256-p75WEozbkPXBThuW8i1tpJmca1nxBXTlGQR9U976mOs="; }; pythonRelaxDeps = [ From 6fc8210c0ea7d47f209187f4cb77f3b17ab47372 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 06:51:10 +0000 Subject: [PATCH 103/130] vscode-extensions.timonwong.shellcheck: 0.37.0 -> 0.37.1 --- .../vscode/extensions/timonwong.shellcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix index 6e93e51bf1e4..469d04dbebb4 100644 --- a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix +++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.37.0"; - sha256 = "1d0blynn6c2hz4y9fk7b5wsa3x168gxyycr5d05zqp0rx520m5wc"; + version = "0.37.1"; + sha256 = "sha256-JSS0GY76+C5xmkQ0PNjt2Nu/uTUkfiUqmPL51r64tl0="; }; nativeBuildInputs = [ jq From b4aab7ced4f7f565f9cddd578b8a5ac78571d819 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Apr 2024 08:57:22 +0200 Subject: [PATCH 104/130] python312Packages.jsonargparse: 4.27.7 -> 4.28.0 Diff: https://github.com/omni-us/jsonargparse/compare/refs/tags/v4.27.7...v4.28.0 Changelog: https://github.com/omni-us/jsonargparse/blob/4.28.0/CHANGELOG.rst --- pkgs/development/python-modules/jsonargparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index 55cf2a95d773..5fd6fff1ab99 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "jsonargparse"; - version = "4.27.7"; + version = "4.28.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "omni-us"; repo = "jsonargparse"; rev = "refs/tags/v${version}"; - hash = "sha256-JWa08jCdtP9xwLaTYw0024DogDC0WQvKZ8xRDTEhsvE="; + hash = "sha256-iw6ntzFkvMg5baOgeUzf3qV1eGGqywINd7e6N781llQ="; }; nativeBuildInputs = [ From 737fb5a5aeb3119ae8ce4a43f32d7921fe33846f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Apr 2024 08:58:11 +0200 Subject: [PATCH 105/130] python312Packages.jsonargparse: refactor --- pkgs/development/python-modules/jsonargparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index 5fd6fff1ab99..8074e1e9bbdc 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -37,11 +37,11 @@ buildPythonPackage rec { hash = "sha256-iw6ntzFkvMg5baOgeUzf3qV1eGGqywINd7e6N781llQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyyaml ]; From 92bd0da0a11c1382347fa77c2fb902bfc1426519 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Apr 2024 08:58:37 +0200 Subject: [PATCH 106/130] python312Packages.jsonargparse: format with nixfmt --- .../python-modules/jsonargparse/default.nix | 87 ++++++++----------- 1 file changed, 34 insertions(+), 53 deletions(-) diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index 8074e1e9bbdc..dfe1e12df900 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -1,26 +1,27 @@ -{ lib -, argcomplete -, attrs -, buildPythonPackage -, docstring-parser -, fetchFromGitHub -, fsspec -, jsonnet -, jsonschema -, omegaconf -, pydantic -, pytest-subtests -, pytestCheckHook -, pythonOlder -, pyyaml -, reconplogger -, requests -, responses -, ruyaml -, setuptools -, types-pyyaml -, types-requests -, typeshed-client +{ + lib, + argcomplete, + attrs, + buildPythonPackage, + docstring-parser, + fetchFromGitHub, + fsspec, + jsonnet, + jsonschema, + omegaconf, + pydantic, + pytest-subtests, + pytestCheckHook, + pythonOlder, + pyyaml, + reconplogger, + requests, + responses, + ruyaml, + setuptools, + types-pyyaml, + types-requests, + typeshed-client, }: buildPythonPackage rec { @@ -37,13 +38,9 @@ buildPythonPackage rec { hash = "sha256-iw6ntzFkvMg5baOgeUzf3qV1eGGqywINd7e6N781llQ="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - pyyaml - ]; + dependencies = [ pyyaml ]; passthru.optional-dependencies = { all = [ @@ -57,35 +54,21 @@ buildPythonPackage rec { typeshed-client requests ]; - argcomplete = [ - argcomplete - ]; - fsspec = [ - fsspec - ]; + argcomplete = [ argcomplete ]; + fsspec = [ fsspec ]; jsonnet = [ jsonnet # jsonnet-binary ]; - jsonschema = [ - jsonschema - ]; - omegaconf = [ - omegaconf - ]; - reconplogger = [ - reconplogger - ]; - ruyaml = [ - ruyaml - ]; + jsonschema = [ jsonschema ]; + omegaconf = [ omegaconf ]; + reconplogger = [ reconplogger ]; + ruyaml = [ ruyaml ]; signatures = [ docstring-parser typeshed-client ]; - urls = [ - requests - ]; + urls = [ requests ]; }; nativeCheckInputs = [ @@ -95,9 +78,7 @@ buildPythonPackage rec { types-requests ]; - pythonImportsCheck = [ - "jsonargparse" - ]; + pythonImportsCheck = [ "jsonargparse" ]; meta = with lib; { description = "Module to mplement minimal boilerplate CLIs derived from various sources"; From 1ddecd7cd42ee6e8d3e7e804eebe4b0d4998aff1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 07:53:50 +0000 Subject: [PATCH 107/130] renode-dts2repl: unstable-2024-03-24 -> unstable-2024-04-16 --- pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 191cf5422e87..2472831eac22 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "unstable-2024-03-24"; + version = "unstable-2024-04-16"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "b581d3b7e68f7822110bc4895f7826f3505be21c"; - hash = "sha256-Syu5DC8FP9Lyc7CVmUp38Vr3K7FK2Pv/jodzgnSB3cE="; + rev = "83e2d743202684eb1f89a1b93e859c69cd736455"; + hash = "sha256-iD+59mrFNVRu6g58XXLR2Pg8oDpNIiI/+TyCdbRbjtM="; }; nativeBuildInputs = [ From 44f73650e88128cb3d62ae58a4b4cc4c88143edb Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 17 Apr 2024 10:32:49 +0100 Subject: [PATCH 108/130] craft-parts: skip failing tests on aarch64 --- pkgs/development/python-modules/craft-parts/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index f252a82062bd..d340f784b431 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -21,6 +21,7 @@ , squashfsTools , setuptools , setuptools-scm +, stdenv }: buildPythonPackage rec { @@ -103,6 +104,10 @@ buildPythonPackage rec { "tests/unit/packages/test_apt_cache.py" "tests/unit/packages/test_deb.py" "tests/unit/packages/test_chisel.py" + ] ++ lib.optionals stdenv.isAarch64 [ + # These tests have hardcoded "amd64" strings which fail on aarch64 + "tests/unit/executor/test_environment.py" + "tests/unit/features/overlay/test_executor_environment.py" ]; passthru.updateScript = nix-update-script { }; From 6bb6c845457ab20ffd468e96205e3bc6db5824f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Apr 2024 12:10:45 +0200 Subject: [PATCH 109/130] checkov: 3.2.68 -> 3.2.69 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.68...3.2.69 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.69 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index ad4669290b33..543c5f2db195 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.68"; + version = "3.2.69"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-6nOIVcPlVp49kqoH7EPI1VVTC85S4wqwx+aU+5wy758="; + hash = "sha256-q2hiIceWxQXwJWLXBuA3V3weqcr634yKbc6/VgQFkcQ="; }; patches = [ ./flake8-compat-5.x.patch ]; From 1175703bd2f9f61fd84d8766d10b0c00b069e792 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 17 Apr 2024 12:20:17 +0100 Subject: [PATCH 110/130] bitcoin: 26.1 -> 27.0 --- pkgs/applications/blockchains/bitcoin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 5167d44469c9..0a2ea1937ad9 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; - version = "26.1"; + version = "27.0"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "9164ee5d717b4a20cb09f0496544d9d32f365734814fe399f5cdb4552a9b35ee"; + sha256 = "9c1ee651d3b157baccc3388be28b8cf3bfcefcd2493b943725ad6040ca6b146b"; }; nativeBuildInputs = From 5430291c3996159bdb1488f78dd5474a90693960 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 12:21:58 +0000 Subject: [PATCH 111/130] atac: 0.11.3 -> 0.12.0 --- pkgs/by-name/at/atac/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index 89d02729f434..5ea7cbf56d2e 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-nYPqj3Wa5itw83s08qsEu30v/2NwkLwGE0LlNY9Msok="; + hash = "sha256-yR+w6zrX7XHrK6XGWM7J74XPxGEmy8Gf6guOH/Du6rc="; }; - cargoHash = "sha256-Beh5out4Ess+FP+Dg601ZqyXotEfujqNX16Vupp5WRc="; + cargoHash = "sha256-Ez8d1tb0Xi91e3+U1/LDmj5u/oORQzelEQPFAC96yEI="; nativeBuildInputs = [ pkg-config From be2429339c817010689927352ec31826029ff373 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 12:30:29 +0000 Subject: [PATCH 112/130] kraft: 0.8.2 -> 0.8.3 --- pkgs/applications/virtualization/kraft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/kraft/default.nix b/pkgs/applications/virtualization/kraft/default.nix index d77a228b7528..4d52565bcdb2 100644 --- a/pkgs/applications/virtualization/kraft/default.nix +++ b/pkgs/applications/virtualization/kraft/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kraftkit"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-IGOD4AItfiGrVRwoPV4rAzhTUbyHvm3LMpMDjWgXh6g="; + hash = "sha256-or1UstxYbj3QvgnoQPT2vyQTVZDIKPMDMxRGtN0n0lk="; }; - vendorHash = "sha256-0i2HUQ/+Ql1ma7bX7DVC0Pw78CR7gUvnGYFWGB1wt7s="; + vendorHash = "sha256-UyDaEwXTMbyAUghvHS/LcT2Yzz7CJ2xGelF19kgRNec="; ldflags = [ "-s" From 036cfda40d303074bac166e46dad352830a62437 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 13:30:49 +0000 Subject: [PATCH 113/130] flix: 0.45.0 -> 0.46.0 --- pkgs/development/compilers/flix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix index c0f32438db14..926c98d68043 100644 --- a/pkgs/development/compilers/flix/default.nix +++ b/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.45.0"; + version = "0.46.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-h7smcfV7heJtTVXCGSlUmk1RNZ4AWFe2fPPOWLcJz/M="; + sha256 = "sha256-jj8h30QsIF5HlunrqUktHY6bCUq9gMNVlAVsAH0F0U0="; }; dontUnpack = true; From 745cafd0b1db00332a550860aaf9ed6316616974 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 13:33:51 +0000 Subject: [PATCH 114/130] gh: 2.47.0 -> 2.48.0 --- pkgs/applications/version-management/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 20dc1287c69c..a5f0fc2cb2ba 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.47.0"; + version = "2.48.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-vLnz0VDp8mTYBWPPidqw9SUvkn7S1jMTLN1RQyU9YnE="; + hash = "sha256-8vQQzLGb1cHeNJC/aUZbROfRoUtuujEKoLWBgLZnhls="; }; - vendorHash = "sha256-5GjU6A2QLDxrTMxaBCOniSX56Undfcu+dhfC5tc16V0="; + vendorHash = "sha256-rQtRBXhG5fF+3cIIv9i5r8Kd9YeIq/aDLAw8Rqxn6ww="; nativeBuildInputs = [ installShellFiles ]; From d91bfb279d8adce0b7e389746260e1bd9c0c7625 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 13:35:25 +0000 Subject: [PATCH 115/130] git-instafix: 0.2.1 -> 0.2.2 --- pkgs/by-name/gi/git-instafix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-instafix/package.nix b/pkgs/by-name/gi/git-instafix/package.nix index b44411570091..a0792af8ac70 100644 --- a/pkgs/by-name/gi/git-instafix/package.nix +++ b/pkgs/by-name/gi/git-instafix/package.nix @@ -13,7 +13,7 @@ let maintainers ; - version = "0.2.1"; + version = "0.2.2"; in rustPlatform.buildRustPackage { pname = "git-instafix"; @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage { owner = "quodlibetor"; repo = "git-instafix"; rev = "v${version}"; - hash = "sha256-rWHiaZji3GECsiMqvEGC/tF+K29ZLlY6+TCNxtixHQo="; + hash = "sha256-cwScEEijhMgBdTeYuOOxW13x4ZpyrUouZvAiD17dOog="; }; - cargoHash = "sha256-t5vlr3YxjRPqMHwPqVjWul4RdSg0hiTWUQxcJmGKiTQ="; + cargoHash = "sha256-o4oIDqr+vRvfICtZbIuD2kBEneLJrvyPVr5FPLlYGv8="; buildInputs = [ libgit2 ]; nativeCheckInputs = [ git ]; From 57fa33ad54295a28999c99a88de437dfc9fef873 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 13:37:13 +0000 Subject: [PATCH 116/130] go-judge: 1.8.2 -> 1.8.3 --- pkgs/by-name/go/go-judge/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix index e182474fc78f..f46a0d0a4120 100644 --- a/pkgs/by-name/go/go-judge/package.nix +++ b/pkgs/by-name/go/go-judge/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-judge"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "criyle"; repo = pname; rev = "v${version}"; - hash = "sha256-8WaQbif23+KFPdB6TG7SLPt+TbrYLkh5Hu44Jj06hl4="; + hash = "sha256-i6c7uKnnyO+tyQwrEFvyPaw3N9VfFB+L7xYHsUPy6RM="; }; - vendorHash = "sha256-7uu3vTnEodmJf7yKxSntwbaocuEYmi9RVknjUT9oU2U="; + vendorHash = "sha256-WAO7nMDm7/KuDOIZSopRVKUVWmjDl30d95NWBuebiE4="; tags = [ "nomsgpack" ]; From 586726d3e1a13435671de034bd0af75f455cb9a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 13:44:06 +0000 Subject: [PATCH 117/130] grandorgue: 3.14.0-1 -> 3.14.1-1 --- pkgs/applications/audio/grandorgue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index b2e5acd5e829..54bd0cad3593 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.14.0-1"; + version = "3.14.1-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - hash = "sha256-bzGfc0kWlQSjvZsFlRERPjdLtemcZmsa6DsQGgBPoFo="; + hash = "sha256-EyMTWsaqJX7H7aCbu5ww9tQBMwJ7BzobWMWg5Y/ZgJE="; }; postPatch = '' From cdf2f46541241ecdec0c98e37c980e971b9d40ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 13:49:15 +0000 Subject: [PATCH 118/130] fm-go: 1.0.0 -> 1.1.0 --- pkgs/by-name/fm/fm-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fm/fm-go/package.nix b/pkgs/by-name/fm/fm-go/package.nix index d0d891bd78b4..bff5c914474a 100644 --- a/pkgs/by-name/fm/fm-go/package.nix +++ b/pkgs/by-name/fm/fm-go/package.nix @@ -7,16 +7,16 @@ let finalAttrs = { pname = "fm"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "mistakenelf"; repo = "fm"; rev = "v${finalAttrs.version}"; - hash = "sha256-j92xf75JTLBaVr8GjAwlqgrieZCifVaIBy9ZMoDIaEY="; + hash = "sha256-m0hjLXgaScJydwiV00b8W7f1y1Ka7bbYqcMPAOw1j+c="; }; - vendorHash = "sha256-iDKDUpxaV/ZGKvTeNu4m5X/tqQA311Nb+2gvrehpdpw="; + vendorHash = "sha256-/tUL08Vo3W7PMPAnJA9RPdMl0AwZj8BzclYs2257nqM="; meta = { homepage = "https://github.com/mistakenelf/fm"; From 4dcd08c9d4c84e2f5d94bc0344bdfd55f876ce0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:06:51 +0000 Subject: [PATCH 119/130] plasmahud: fix runtime errors and other cleanup (#271479) * plasma-hud: fix runtime errors * plasma-hud: clean up installPhase * plasma-hud: fix scoping for `propagatedBuildInputs` * plasma-hud: formatting * plasma-hud: clean up src * plasma-hud: remove `with lib;` * plasma-hud: fix potential splicing issue (see #211340) --- pkgs/misc/plasma-hud/default.nix | 48 ++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/pkgs/misc/plasma-hud/default.nix b/pkgs/misc/plasma-hud/default.nix index c0cf771da849..b0adf0e1efc6 100644 --- a/pkgs/misc/plasma-hud/default.nix +++ b/pkgs/misc/plasma-hud/default.nix @@ -1,42 +1,54 @@ -{ lib, python3, fetchFromGitHub, rofi, gobject-introspection }: +{ wrapGAppsHook +, lib +, python3Packages +, fetchFromGitHub +, rofi +, gobject-introspection +}: -python3.pkgs.buildPythonApplication rec{ +python3Packages.buildPythonApplication rec { pname = "plasma-hud"; version = "19.10.1"; + format = "other"; src = fetchFromGitHub { owner = "Zren"; - repo = pname; + repo = "plasma-hud"; rev = version; - sha256 = "19vlc156jfdamw7q1pc78fmlf0h3sff5ar3di9j316vbb60js16l"; + hash = "sha256-1AQtgVlrmzBkim1kVZzTAwJHq0OH3YAPr6o5aUpgdKc="; }; - propagatedBuildInputs = with python3.pkgs; [ - rofi + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + propagatedBuildInputs = (with python3Packages; [ dbus-python + pygobject3 setproctitle xlib - pygobject3 - gobject-introspection - ]; - format = "other"; + ]) ++ [ rofi ]; + postPatch = '' sed -i "s:/usr/lib/plasma-hud:$out/bin:" etc/xdg/autostart/plasma-hud.desktop ''; installPhase = '' - patchShebangs $out/bin/plasma-hud - mkdir -p $out/bin $out/etc/xdg/autostart - cp -r $src/usr/lib/plasma-hud/plasma-hud $out/bin/plasma-hud - cp -r $src/etc $out/etc + runHook preInstall + + install -Dm555 usr/lib/plasma-hud/plasma-hud -t $out/bin + cp -r etc -t $out + + runHook postInstall ''; - meta = with lib;{ - license = licenses.gpl2Only; + meta = { + license = lib.licenses.gpl2Only; homepage = "https://github.com/Zren/plasma-hud"; - platforms = platforms.unix; + platforms = lib.platforms.unix; description = "Run menubar commands, much like the Unity 7 Heads-Up Display (HUD)"; - maintainers = with maintainers; [ pasqui23 ]; + maintainers = with lib.maintainers; [ pasqui23 ]; mainProgram = "plasma-hud"; }; } From 9b8fb7115df504cb9364f78d0bb03a47e820a754 Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 17 Apr 2024 16:25:31 +0200 Subject: [PATCH 120/130] syncstorage-rs: 0.15.1 -> 0.15.2 changlog: https://github.com/mozilla-services/syncstorage-rs/releases/tag/0.15.2 not sure how relevant these are for nixos-centric use; the security fix definitely is not (as it affects only windows). --- pkgs/by-name/sy/syncstorage-rs/Cargo.lock | 511 ++++++++++----------- pkgs/by-name/sy/syncstorage-rs/package.nix | 4 +- 2 files changed, 256 insertions(+), 259 deletions(-) diff --git a/pkgs/by-name/sy/syncstorage-rs/Cargo.lock b/pkgs/by-name/sy/syncstorage-rs/Cargo.lock index 976088819edb..e0b2cb8d34b8 100644 --- a/pkgs/by-name/sy/syncstorage-rs/Cargo.lock +++ b/pkgs/by-name/sy/syncstorage-rs/Cargo.lock @@ -8,7 +8,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "bytes", "futures-core", "futures-sink", @@ -46,7 +46,7 @@ dependencies = [ "actix-utils", "ahash", "base64", - "bitflags 2.4.2", + "bitflags 2.5.0", "brotli", "bytes", "bytestring", @@ -80,7 +80,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -92,7 +92,7 @@ dependencies = [ "bytestring", "http", "regex", - "serde 1.0.196", + "serde 1.0.197", "tracing", ] @@ -176,7 +176,7 @@ dependencies = [ "once_cell", "pin-project-lite", "regex", - "serde 1.0.196", + "serde 1.0.197", "serde_json", "serde_urlencoded", "smallvec", @@ -194,7 +194,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -214,9 +214,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", @@ -227,9 +227,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -275,15 +275,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayvec" @@ -297,19 +297,19 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" dependencies = [ - "serde 1.0.196", + "serde 1.0.197", "serde_json", ] [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -325,15 +325,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -381,9 +381,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block-buffer" @@ -405,9 +405,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -426,9 +426,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -438,9 +438,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bytestring" @@ -462,9 +462,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" dependencies = [ "jobserver", "libc", @@ -487,16 +487,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits 0.2.18", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -552,7 +552,7 @@ checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" dependencies = [ "lazy_static", "nom 5.1.3", - "serde 1.0.196", + "serde 1.0.197", ] [[package]] @@ -564,7 +564,7 @@ dependencies = [ "lazy_static", "nom 5.1.3", "rust-ini", - "serde 1.0.196", + "serde 1.0.197", "serde-hjson", "serde_json", "toml", @@ -624,9 +624,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ "crossbeam-utils", ] @@ -695,7 +695,7 @@ dependencies = [ "config 0.10.1", "crossbeam-queue", "num_cpus", - "serde 1.0.196", + "serde 1.0.197", "tokio", ] @@ -705,7 +705,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ - "serde 1.0.196", + "serde 1.0.197", "uuid", ] @@ -821,15 +821,15 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.196", + "serde 1.0.197", "strsim 0.10.0", ] [[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "either" @@ -884,7 +884,7 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ - "serde 1.0.196", + "serde 1.0.197", ] [[package]] @@ -996,7 +996,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1042,9 +1042,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", @@ -1109,9 +1109,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1164,9 +1164,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1214,9 +1214,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1352,9 +1352,9 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "indexmap" -version = "2.2.3" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -1362,9 +1362,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "ipnet" @@ -1378,16 +1378,16 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.6", + "hermit-abi 0.3.9", "libc", "windows-sys 0.52.0", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" @@ -1400,23 +1400,23 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonwebtoken" -version = "9.2.0" +version = "9.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" dependencies = [ "base64", "js-sys", "ring", - "serde 1.0.196", + "serde 1.0.197", "serde_json", ] @@ -1459,30 +1459,29 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.4", ] [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", - "redox_syscall", ] [[package]] name = "libz-sys" -version = "1.1.15" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" +checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" dependencies = [ "cc", "libc", @@ -1531,9 +1530,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "match_cfg" @@ -1549,15 +1548,15 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -1606,9 +1605,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -1695,16 +1694,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.6", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ + "hermit-abi 0.3.9", "libc", ] @@ -1731,9 +1721,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -1743,13 +1733,13 @@ dependencies = [ [[package]] name = "os_info" -version = "3.7.0" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", - "serde 1.0.196", - "winapi", + "serde 1.0.197", + "windows-sys 0.52.0", ] [[package]] @@ -1801,9 +1791,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1813,9 +1803,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "powerfmt" @@ -1855,9 +1851,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -1870,15 +1866,16 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "pyo3" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" dependencies = [ "cfg-if", "indoc", "libc", "memoffset", "parking_lot", + "portable-atomic", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", @@ -1887,9 +1884,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" dependencies = [ "once_cell", "target-lexicon", @@ -1897,9 +1894,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" dependencies = [ "libc", "pyo3-build-config", @@ -1907,26 +1904,27 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] name = "pyo3-macros-backend" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" dependencies = [ "heck", "proc-macro2", + "pyo3-build-config", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1990,9 +1988,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -2001,9 +1999,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -2013,9 +2011,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -2024,15 +2022,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.11.24" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64", "bytes", @@ -2053,7 +2051,7 @@ dependencies = [ "pin-project-lite", "rustls", "rustls-pemfile", - "serde 1.0.196", + "serde 1.0.197", "serde_json", "serde_urlencoded", "sync_wrapper", @@ -2071,16 +2069,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2112,11 +2111,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -2156,15 +2155,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -2211,9 +2210,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "sentry" @@ -2265,7 +2264,7 @@ dependencies = [ "once_cell", "rand", "sentry-types", - "serde 1.0.196", + "serde 1.0.197", "serde_json", ] @@ -2301,7 +2300,7 @@ dependencies = [ "debugid", "hex", "rand", - "serde 1.0.196", + "serde 1.0.197", "serde_json", "thiserror", "time", @@ -2317,9 +2316,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -2338,24 +2337,24 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", - "serde 1.0.196", + "serde 1.0.197", ] [[package]] @@ -2367,7 +2366,7 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.196", + "serde 1.0.197", ] [[package]] @@ -2459,7 +2458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f400f1c5db96f1f52065e8931ca0c524cceb029f7537c9e6d5424488ca137ca0" dependencies = [ "chrono", - "serde 1.0.196", + "serde 1.0.197", "serde_json", "slog", ] @@ -2488,11 +2487,11 @@ dependencies = [ [[package]] name = "slog-term" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87d29185c55b7b258b4f120eab00f48557d4d9bc814f41713f449d35b0f8977c" +checksum = "b6e022d0b998abfe5c3782c1f03551a596269450ccd677ea51c56f8b214610e8" dependencies = [ - "atty", + "is-terminal", "slog", "term", "thread_local", @@ -2501,18 +2500,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2558,9 +2557,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -2575,7 +2574,7 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "syncserver" -version = "0.15.1" +version = "0.15.2" dependencies = [ "actix-cors", "actix-http", @@ -2599,7 +2598,7 @@ dependencies = [ "regex", "sentry", "sentry-backtrace", - "serde 1.0.196", + "serde 1.0.197", "serde_derive", "serde_json", "sha2", @@ -2630,13 +2629,13 @@ dependencies = [ [[package]] name = "syncserver-common" -version = "0.15.1" +version = "0.15.2" dependencies = [ "actix-web", "cadence", "futures 0.3.30", "hkdf", - "serde 1.0.196", + "serde 1.0.197", "serde_json", "sha2", "slog", @@ -2645,7 +2644,7 @@ dependencies = [ [[package]] name = "syncserver-db-common" -version = "0.15.1" +version = "0.15.2" dependencies = [ "backtrace", "deadpool", @@ -2659,11 +2658,11 @@ dependencies = [ [[package]] name = "syncserver-settings" -version = "0.15.1" +version = "0.15.2" dependencies = [ "config 0.11.0", "num_cpus", - "serde 1.0.196", + "serde 1.0.197", "slog-scope", "syncserver-common", "syncstorage-settings", @@ -2673,7 +2672,7 @@ dependencies = [ [[package]] name = "syncstorage-db" -version = "0.15.1" +version = "0.15.2" dependencies = [ "async-trait", "cadence", @@ -2696,7 +2695,7 @@ dependencies = [ [[package]] name = "syncstorage-db-common" -version = "0.15.1" +version = "0.15.2" dependencies = [ "async-trait", "backtrace", @@ -2706,7 +2705,7 @@ dependencies = [ "futures 0.3.30", "http", "lazy_static", - "serde 1.0.196", + "serde 1.0.197", "serde_json", "syncserver-common", "syncserver-db-common", @@ -2715,7 +2714,7 @@ dependencies = [ [[package]] name = "syncstorage-mysql" -version = "0.15.1" +version = "0.15.2" dependencies = [ "async-trait", "backtrace", @@ -2738,17 +2737,17 @@ dependencies = [ [[package]] name = "syncstorage-settings" -version = "0.15.1" +version = "0.15.2" dependencies = [ "rand", - "serde 1.0.196", + "serde 1.0.197", "syncserver-common", "time", ] [[package]] name = "syncstorage-spanner" -version = "0.15.1" +version = "0.15.2" dependencies = [ "async-trait", "backtrace", @@ -2802,9 +2801,9 @@ checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" [[package]] name = "target-lexicon" -version = "0.12.13" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "term" @@ -2837,29 +2836,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -2873,11 +2872,9 @@ checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", - "libc", "num-conv", - "num_threads", "powerfmt", - "serde 1.0.196", + "serde 1.0.197", "time-core", "time-macros", ] @@ -2915,7 +2912,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokenserver-auth" -version = "0.15.1" +version = "0.15.2" dependencies = [ "async-trait", "base64", @@ -2929,7 +2926,7 @@ dependencies = [ "pyo3", "reqwest", "ring", - "serde 1.0.196", + "serde 1.0.197", "serde_json", "sha2", "slog-scope", @@ -2942,12 +2939,12 @@ dependencies = [ [[package]] name = "tokenserver-common" -version = "0.15.1" +version = "0.15.2" dependencies = [ "actix-web", "backtrace", "jsonwebtoken", - "serde 1.0.196", + "serde 1.0.197", "serde_json", "syncserver-common", "thiserror", @@ -2955,7 +2952,7 @@ dependencies = [ [[package]] name = "tokenserver-db" -version = "0.15.1" +version = "0.15.2" dependencies = [ "async-trait", "backtrace", @@ -2965,7 +2962,7 @@ dependencies = [ "env_logger 0.10.2", "futures 0.3.30", "http", - "serde 1.0.196", + "serde 1.0.197", "serde_derive", "serde_json", "slog-scope", @@ -2980,18 +2977,18 @@ dependencies = [ [[package]] name = "tokenserver-settings" -version = "0.15.1" +version = "0.15.2" dependencies = [ "jsonwebtoken", - "serde 1.0.196", + "serde 1.0.197", "tokenserver-common", ] [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -3013,7 +3010,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3046,7 +3043,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.196", + "serde 1.0.197", ] [[package]] @@ -3120,9 +3117,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -3165,7 +3162,7 @@ dependencies = [ "form_urlencoded", "idna 0.5.0", "percent-encoding 2.3.1", - "serde 1.0.196", + "serde 1.0.197", ] [[package]] @@ -3176,12 +3173,12 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "uuid" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", - "serde 1.0.196", + "serde 1.0.197", ] [[package]] @@ -3193,7 +3190,7 @@ dependencies = [ "idna 0.4.0", "lazy_static", "regex", - "serde 1.0.196", + "serde 1.0.197", "serde_derive", "serde_json", "url 2.5.0", @@ -3251,9 +3248,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -3276,9 +3273,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3286,24 +3283,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -3313,9 +3310,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3323,28 +3320,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -3405,7 +3402,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -3423,7 +3420,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -3443,17 +3440,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -3464,9 +3461,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -3476,9 +3473,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -3488,9 +3485,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -3500,9 +3497,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -3512,9 +3509,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -3524,9 +3521,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -3536,9 +3533,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winreg" @@ -3586,32 +3583,32 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] name = "zstd" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.0.0" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix index 097ada49f33c..47619e2c6156 100644 --- a/pkgs/by-name/sy/syncstorage-rs/package.nix +++ b/pkgs/by-name/sy/syncstorage-rs/package.nix @@ -20,13 +20,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-uQaiBxK+dV/AgMlKbFUvHV7bUUGX6gpypImCat7H4S8="; + hash = "sha256-YKWXr10cVOqQm6XvugwarE3I1gtAyLOlUqPGbLDhHxY="; }; nativeBuildInputs = [ From b101fcd01b2b1b2e8afc9caab901aef829c7f53a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 17 Apr 2024 09:51:34 -0500 Subject: [PATCH 121/130] terraform: 1.8.0 -> 1.8.1 (#304763) Diff: https://github.com/hashicorp/terraform/compare/v1.8.0...v1.8.1 Changelog: https://github.com/hashicorp/terraform/blob/v1.8.1/CHANGELOG.md --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 73d1a8525131..f9e1dff0a8f7 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -167,8 +167,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.8.0"; - hash = "sha256-An/ElR1tXQSb9x26R5o9gcb4XKTeVxlv+72Whcrdeoc="; + version = "1.8.1"; + hash = "sha256-q/r1KK0svdK/5Za4bqU6bGgTcWmG+YZFJUFRKqPAWSw="; vendorHash = "sha256-xpgGceAA+kvwUp4T0m9rnbPoZ3uJHU2KIRsrcGr8dRo="; patches = [ ./provider-path-0_15.patch ]; passthru = { From 4c5b0237a435d4946dd64dec77bee606ccbf3297 Mon Sep 17 00:00:00 2001 From: jackyliu16 <18922251299@163.com> Date: Sun, 14 Apr 2024 23:29:05 +0800 Subject: [PATCH 122/130] realvnc-vnc-viewer: replace fetchurl by requireFile to fix captcha --- pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix | 16 ++++++++++++---- pkgs/tools/admin/realvnc-vnc-viewer/default.nix | 1 + pkgs/tools/admin/realvnc-vnc-viewer/linux.nix | 14 +++++++++++--- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix b/pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix index 0a27e2733b51..b55ff360c75e 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix +++ b/pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix @@ -1,6 +1,6 @@ { lib , stdenvNoCC -, fetchurl +, requireFile , undmg , pname , version @@ -9,9 +9,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit pname version meta; - src = fetchurl { - url = "https://downloads.realvnc.com/download/file/viewer.files/VNC-Viewer-${finalAttrs.version}-MacOSX-universal.dmg"; - sha256 = "0k72fdnx1zmyi9z5n3lazc7s70gcddxq0s73akp0al0y9hzq9prh"; + src = requireFile rec { + name = "VNC-Viewer-${finalAttrs.version}-MacOSX-universal.dmg"; + url = "https://downloads.realvnc.com/download/file/viewer.files/${name}"; + sha256 = "0k72fdnx1zmyi9z5n3lazc7s70gcddxq0s73akp0al0y9hzq9prh"; + message= '' + vnc-viewer can be downloaded from ${url}, + but the download link require captcha, thus if you wish to use this application, + you need to download it manually and use follow command to add downloaded files into nix-store + + $ nix-prefetch-url --type sha256 file:///path/to/${name} + ''; }; sourceRoot = "."; diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix index 9776ececcfd2..38f3986b6a5b 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -17,6 +17,7 @@ let }; maintainers = with maintainers; [ emilytrau onedragon ]; platforms = [ "x86_64-linux" ] ++ platforms.darwin; + hydraPlatforms = []; mainProgram = "vncviewer"; }; in diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/linux.nix b/pkgs/tools/admin/realvnc-vnc-viewer/linux.nix index 63060e48625c..164fe67b6804 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/linux.nix +++ b/pkgs/tools/admin/realvnc-vnc-viewer/linux.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, requireFile , autoPatchelfHook , rpmextract , libX11 @@ -14,9 +14,17 @@ stdenv.mkDerivation (finalAttrs: { inherit pname version; src = { - "x86_64-linux" = fetchurl { - url = "https://downloads.realvnc.com/download/file/viewer.files/VNC-Viewer-${finalAttrs.version}-Linux-x64.rpm"; + "x86_64-linux" = requireFile rec { + name = "VNC-Viewer-${finalAttrs.version}-Linux-x64.rpm"; + url = "https://downloads.realvnc.com/download/file/viewer.files/${name}"; sha256 = "sha256-Ull9iNi8NxB12YwEThWE0P9k1xOV2LZnebuRrVH/zwI="; + message= '' + vnc-viewer can be downloaded from ${url}, + but the download link require captcha, thus if you wish to use this application, + you need to download it manually and use follow command to add downloaded files into nix-store + + $ nix-prefetch-url --type sha256 file:///path/to/${name} + ''; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From c45b36bc45eb3fdde7164decf4ef9fd01a3e959e Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Apr 2024 19:02:54 +0300 Subject: [PATCH 123/130] linux_testing: 6.9-rc3 -> 6.9-rc4 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 04e1fe87908b..418e53899d16 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.9-rc3", - "hash": "sha256:0xavyh3xg23il3bm2x6fjji3s26z05cyv1lry6h5yd7jjj3qm7cc" + "version": "6.9-rc4", + "hash": "sha256:11wpak03nv9cg00jiyfrk21p7mzka553ih2c2dxr0ridig6mj8b3" }, "6.1": { "version": "6.1.86", From 0e44a84db511c8afeeebd88350af01a459f226d6 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Apr 2024 19:02:57 +0300 Subject: [PATCH 124/130] linux_6_8: 6.8.6 -> 6.8.7 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 418e53899d16..bf835b0db85e 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,7 +28,7 @@ "hash": "sha256:14c229mcrd2rd2vjp0c3apzqifn6mkz0rcbw07nj73rw1q3517k3" }, "6.8": { - "version": "6.8.6", - "hash": "sha256:158rb8x4qaig8ywbr6n2jnqpl9wgqha4ghs3y3mlbaq3sqr34wly" + "version": "6.8.7", + "hash": "sha256:1bigq9my88d9xh647hgsy8gzval7p06hhacpxaqb71sfmwgil799" } } From f1fc24e92188d911b8a09a71348faa98ad43bd18 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Apr 2024 19:03:00 +0300 Subject: [PATCH 125/130] linux_6_6: 6.6.27 -> 6.6.28 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index bf835b0db85e..506e617e8aa4 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:0jppa4p73pssd7m3jpc7i6rgnj9gawjcgk4wmqyy87ijzrgzm553" }, "6.6": { - "version": "6.6.27", - "hash": "sha256:14c229mcrd2rd2vjp0c3apzqifn6mkz0rcbw07nj73rw1q3517k3" + "version": "6.6.28", + "hash": "sha256:151kdpp25fcl5qki138jxl90h9iyk5rk0kp2xamadnz72gnid1w1" }, "6.8": { "version": "6.8.7", From a943f8ebc090c12af0aa4b3b407661c2ca7b5430 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Apr 2024 19:03:05 +0300 Subject: [PATCH 126/130] linux_6_1: 6.1.86 -> 6.1.87 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 506e617e8aa4..1a6dba0550c9 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:11wpak03nv9cg00jiyfrk21p7mzka553ih2c2dxr0ridig6mj8b3" }, "6.1": { - "version": "6.1.86", - "hash": "sha256:0nqiwcaln36drkcaav96dymd2y8rv7wj6a5xjl58f2hg9z2cilyk" + "version": "6.1.87", + "hash": "sha256:092iv5w5d6kwgiyzs7zajmhdxc1w03sinvvr1dwy9bp8f9mg2ypw" }, "5.15": { "version": "5.15.155", From 2234f0fa7849671e4885e1af489ebec477828f9d Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Apr 2024 19:03:07 +0300 Subject: [PATCH 127/130] linux_5_15: 5.15.155 -> 5.15.156 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 1a6dba0550c9..50e6512b15e6 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -8,8 +8,8 @@ "hash": "sha256:092iv5w5d6kwgiyzs7zajmhdxc1w03sinvvr1dwy9bp8f9mg2ypw" }, "5.15": { - "version": "5.15.155", - "hash": "sha256:1r16j5asd8v5hr5b0sb8z2wmp6say928pgm13k4iyv9fdnw5jn68" + "version": "5.15.156", + "hash": "sha256:0y3p7sqr8hsn0v9ybqlcmn1z150zc13yckgrymb10sck9k8na14z" }, "5.10": { "version": "5.10.215", From 23e6179e7d06c4c8bfd95678b0f6dabccd2d0849 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Apr 2024 19:03:25 +0300 Subject: [PATCH 128/130] linux_latest-libre: 19527 -> 19536 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 90a4935fef64..92f71e6496ab 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19527"; - sha256 = "0sb1qxc25g7f3v6qym9iwi3xjwmxzrf7w33yfmvv3k09rlfndijy"; + rev = "19536"; + sha256 = "1lwg4340nga0sn5jcsqrmqskf2cf4vvjhkbdl0h54bj3lcnbxaw4"; } , ... }: From 72bd0d6b1a6274f7ee40c2b57c127c69f533d26e Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Apr 2024 20:36:14 +0300 Subject: [PATCH 129/130] linux/common-config: fix fallout from #293302 - NVME_AUTH must be module if NVME_CORE is module on 6.7+ - NVME_TARGET_PASSTHRU is spelled differently, and does not exist before 5.9 - PCI_P2PDMA does not exist before 4.20 --- pkgs/os-specific/linux/kernel/common-config.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1ea2c3bc42c0..c213bd4e6ffe 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1053,16 +1053,20 @@ let NVME_MULTIPATH = yes; - NVME_AUTH = whenAtLeast "6.0" yes; + NVME_AUTH = mkMerge [ + (whenBetween "6.0" "6.7" yes) + (whenAtLeast "6.7" module) + ]; + NVME_HOST_AUTH = whenAtLeast "6.7" yes; NVME_TCP_TLS = whenAtLeast "6.7" yes; NVME_TARGET = module; - NVME_TARGET_PASSTHROUGH = whenAtLeast "5.1" yes; + NVME_TARGET_PASSTHRU = whenAtLeast "5.9" yes; NVME_TARGET_AUTH = whenAtLeast "6.0" yes; NVME_TARGET_TCP_TLS = whenAtLeast "6.7" yes; - PCI_P2PDMA = mkIf stdenv.hostPlatform.is64bit yes; + PCI_P2PDMA = mkIf (stdenv.hostPlatform.is64bit && versionAtLeast version "4.20") yes; PSI = whenAtLeast "4.20" yes; From 5784e9decf4105efb4d2a72150c441b356848b5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 09:31:41 +0000 Subject: [PATCH 130/130] python311Packages.snakemake-interface-storage-plugins: 3.2.0 -> 3.2.1 --- .../snakemake-interface-storage-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix index 8831dd8c17b9..f620cd0c044d 100644 --- a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "snakemake-interface-storage-plugins"; - version = "3.2.0"; + version = "3.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IxsD8+arv6jLyFxzZJgeRXadsjSKH14KIEdd89/bo1w="; + hash = "sha256-hOZIdYL9YcKmZCTnKA4GbvvvPJ6pUcMLGvU5uYQHokw="; }; nativeBuildInputs = [