From 3362afaee0d57477b147fc438cf399980ac3ef9b Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 15 Aug 2024 14:21:38 +0200 Subject: [PATCH 01/63] libkazv: init at 0.7.0 --- pkgs/by-name/li/libkazv/package.nix | 65 +++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 pkgs/by-name/li/libkazv/package.nix diff --git a/pkgs/by-name/li/libkazv/package.nix b/pkgs/by-name/li/libkazv/package.nix new file mode 100644 index 000000000000..f4d2afa5a317 --- /dev/null +++ b/pkgs/by-name/li/libkazv/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchFromGitLab, + boost, + catch2_3, + cmake, + cryptopp, + immer, + lager, + libcpr, + libhttpserver, + libmicrohttpd, + nlohmann_json, + olm, + pkg-config, + zug, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libkazv"; + version = "0.7.0"; + + src = fetchFromGitLab { + domain = "lily-is.land"; + owner = "kazv"; + repo = "libkazv"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-bKujiuAR5otF7nc/BdVWVaEW9fSxdh2bcAgsQ5UO1Aw="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + boost + cryptopp + immer + lager + libcpr + libhttpserver + libmicrohttpd + olm + nlohmann_json + zug + ]; + + strictDeps = true; + + cmakeFlags = [ (lib.cmakeBool "libkazv_BUILD_TESTS" finalAttrs.doCheck) ]; + + doCheck = true; + + checkInputs = [ catch2_3 ]; + + meta = { + description = "Matrix client sdk built upon lager and the value-oriented design it enables"; + homepage = "https://lily-is.land/kazv/libkazv"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; + }; +}) From cd79c54b93e96280f63cb139c6ff3ccea357f22b Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 15 Aug 2024 14:21:59 +0200 Subject: [PATCH 02/63] kazv: init at 0.5.0 --- pkgs/by-name/ka/kazv/package.nix | 70 ++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 pkgs/by-name/ka/kazv/package.nix diff --git a/pkgs/by-name/ka/kazv/package.nix b/pkgs/by-name/ka/kazv/package.nix new file mode 100644 index 000000000000..048bc2c837cd --- /dev/null +++ b/pkgs/by-name/ka/kazv/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitLab, + boost, + cmake, + cmark, + cryptopp, + extra-cmake-modules, + immer, + kdePackages, + lager, + libkazv, + nlohmann_json, + olm, + pkg-config, + qt6, + zug, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kazv"; + version = "0.5.0"; + + src = fetchFromGitLab { + domain = "lily-is.land"; + owner = "kazv"; + repo = "kazv"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-WBS7TJJw0t57V4+NxsG8V8q4UKQXB8kRpWocvNy1Eto="; + }; + + nativeBuildInputs = [ + cmake + kdePackages.extra-cmake-modules + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + boost + cmark + cryptopp + immer + kdePackages.kio + kdePackages.kirigami + kdePackages.kirigami-addons + kdePackages.knotifications + lager + libkazv + nlohmann_json + olm + qt6.qtbase + qt6.qtimageformats + qt6.qtmultimedia + qt6.qtwayland + zug + ]; + + strictDeps = true; + + meta = { + description = "Convergent matrix client and instant messaging app"; + homepage = "https://kazv.chat/"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ fgaz ]; + mainProgram = "kazv"; + platforms = lib.platforms.all; + }; +}) From e96dc9afa16a8d2e84b0078e4bde752999e1d550 Mon Sep 17 00:00:00 2001 From: Rabindra Dhakal Date: Sat, 24 Aug 2024 08:26:20 +0545 Subject: [PATCH 03/63] maintainers: add qaidvoid --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 07ca0ab81436..62abde39d5cf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16874,6 +16874,12 @@ githubId = 315234; name = "Serge Bazanski"; }; + qaidvoid = { + email = "contact@qaidvoid.dev"; + github = "qaidvoid"; + githubId = 12017109; + name = "Rabindra Dhakal"; + }; qbit = { name = "Aaron Bieber"; email = "aaron@bolddaemon.com"; From 2b7b439e9f756f6fedb75ffa69cd890b089366dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Aug 2024 10:05:05 +0000 Subject: [PATCH 04/63] vue-language-server: 2.0.29 -> 2.1.2 --- .../vu/vue-language-server/package-lock.json | 256 +++++++++--------- .../vu/vue-language-server/package.nix | 6 +- 2 files changed, 132 insertions(+), 130 deletions(-) diff --git a/pkgs/by-name/vu/vue-language-server/package-lock.json b/pkgs/by-name/vu/vue-language-server/package-lock.json index 3ce33bea69f5..5dbabf868747 100644 --- a/pkgs/by-name/vu/vue-language-server/package-lock.json +++ b/pkgs/by-name/vu/vue-language-server/package-lock.json @@ -1,19 +1,20 @@ { "name": "@vue/language-server", - "version": "2.0.29", + "version": "2.1.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@vue/language-server", - "version": "2.0.29", + "version": "2.1.2", "license": "MIT", "dependencies": { - "@volar/language-core": "~2.4.0-alpha.18", - "@volar/language-server": "~2.4.0-alpha.18", - "@vue/language-core": "2.0.29", - "@vue/language-service": "2.0.29", - "@vue/typescript-plugin": "2.0.29", + "@volar/language-core": "~2.4.1", + "@volar/language-server": "~2.4.1", + "@volar/test-utils": "~2.4.1", + "@vue/language-core": "2.1.2", + "@vue/language-service": "2.1.2", + "@vue/typescript-plugin": "2.1.2", "vscode-languageserver-protocol": "^3.17.5", "vscode-uri": "^3.0.8" }, @@ -38,11 +39,11 @@ } }, "node_modules/@babel/parser": { - "version": "7.25.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.3.tgz", - "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", + "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", "dependencies": { - "@babel/types": "^7.25.2" + "@babel/types": "^7.25.6" }, "bin": { "parser": "bin/babel-parser.js" @@ -52,9 +53,9 @@ } }, "node_modules/@babel/types": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.2.tgz", - "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", + "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", "dependencies": { "@babel/helper-string-parser": "^7.24.8", "@babel/helper-validator-identifier": "^7.24.7", @@ -118,22 +119,21 @@ "integrity": "sha512-qqNS/YD0Nck5wtQLCPHAfGVgWbbGafxSPjNh0ekYPFSNNqnDH2kamnduzYly8IiADmeVx/MfAE1njMEjVeHTMA==" }, "node_modules/@volar/language-core": { - "version": "2.4.0-alpha.18", - "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.0-alpha.18.tgz", - "integrity": "sha512-JAYeJvYQQROmVRtSBIczaPjP3DX4QW1fOqW1Ebs0d3Y3EwSNRglz03dSv0Dm61dzd0Yx3WgTW3hndDnTQqgmyg==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.1.tgz", + "integrity": "sha512-9AKhC7Qn2mQYxj7Dz3bVxeOk7gGJladhWixUYKef/o0o7Bm4an+A3XvmcTHVqZ8stE6lBVH++g050tBtJ4TZPQ==", "dependencies": { - "@volar/source-map": "2.4.0-alpha.18" + "@volar/source-map": "2.4.1" } }, "node_modules/@volar/language-server": { - "version": "2.4.0-alpha.18", - "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.0-alpha.18.tgz", - "integrity": "sha512-dciHEE/R5kzI0bY71QfkoCVQ3cQI6g9MHfA4oIP6UhnJy0CdleUalWSygOXoD3Nq7Yk6wn2BRrb1PP5MsadY/Q==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.1.tgz", + "integrity": "sha512-aVaUjuQEPFJZckNwziCqrmiirsVnV3LK9Kbl1Hq5C4G6RTyof2xSdYKwyL2Azv41DkgkW85lJ2F6zVX3cpQfzw==", "dependencies": { - "@volar/language-core": "2.4.0-alpha.18", - "@volar/language-service": "2.4.0-alpha.18", - "@volar/snapshot-document": "2.4.0-alpha.18", - "@volar/typescript": "2.4.0-alpha.18", + "@volar/language-core": "2.4.1", + "@volar/language-service": "2.4.1", + "@volar/typescript": "2.4.1", "path-browserify": "^1.0.1", "request-light": "^0.7.0", "vscode-languageserver": "^9.0.1", @@ -143,36 +143,38 @@ } }, "node_modules/@volar/language-service": { - "version": "2.4.0-alpha.18", - "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.0-alpha.18.tgz", - "integrity": "sha512-EuetrtbEtudi9buinWAG5U3Jam5dY27zXd/7GYnx542kBwanWOBM8i4DAQd0z7M11fOxXgybxPA933uaSyaOog==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.1.tgz", + "integrity": "sha512-Q3NVjZTAz0Vnco70Rgcryq2eDPWkFBdpzr84aYqOGvVC4SBjq1Wsx0d9NyA4seQHfHWwbZyzyviKRm+htyRlKg==", "dependencies": { - "@volar/language-core": "2.4.0-alpha.18", + "@volar/language-core": "2.4.1", "vscode-languageserver-protocol": "^3.17.5", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" } }, - "node_modules/@volar/snapshot-document": { - "version": "2.4.0-alpha.18", - "resolved": "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.4.0-alpha.18.tgz", - "integrity": "sha512-JAeclEly/wnILhR4Pu9MpgBLInZJH49O1zoy8fU+pk5I+zpv7JIEby5z2UFAS60+sIDnxBdAGd7rZ5VibE70vg==", + "node_modules/@volar/source-map": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.1.tgz", + "integrity": "sha512-Xq6ep3OZg9xUqN90jEgB9ztX5SsTz1yiV8wiQbcYNjWkek+Ie3dc8l7AVt3EhDm9mSIR58oWczHkzM2H6HIsmQ==" + }, + "node_modules/@volar/test-utils": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@volar/test-utils/-/test-utils-2.4.1.tgz", + "integrity": "sha512-lKgNSIm62GITGlyh5aS6PLV8kDaJC3/l8/JxmQVJjUuPY060jckNftqPXwQQ7RwwVioDFa6KL+ffNOS2Pb76cw==", "dependencies": { - "vscode-languageserver-protocol": "^3.17.5", - "vscode-languageserver-textdocument": "^1.0.11" + "@volar/language-core": "2.4.1", + "@volar/language-server": "2.4.1", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-uri": "^3.0.8" } }, - "node_modules/@volar/source-map": { - "version": "2.4.0-alpha.18", - "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.18.tgz", - "integrity": "sha512-MTeCV9MUwwsH0sNFiZwKtFrrVZUK6p8ioZs3xFzHc2cvDXHWlYN3bChdQtwKX+FY2HG6H3CfAu1pKijolzIQ8g==" - }, "node_modules/@volar/typescript": { - "version": "2.4.0-alpha.18", - "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.0-alpha.18.tgz", - "integrity": "sha512-sXh5Y8sqGUkgxpMWUGvRXggxYHAVxg0Pa1C42lQZuPDrW6vHJPR0VCK8Sr7WJsAW530HuNQT/ZIskmXtxjybMQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.1.tgz", + "integrity": "sha512-UoRzC0PXcwajFQTu8XxKSYNsWNBtVja6Y9gC8eLv7kYm+UEKJCcZ8g7dialsOYA0HKs3Vpg57MeCsawFLC6m9Q==", "dependencies": { - "@volar/language-core": "2.4.0-alpha.18", + "@volar/language-core": "2.4.1", "path-browserify": "^1.0.1", "vscode-uri": "^3.0.8" } @@ -200,24 +202,24 @@ "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==" }, "node_modules/@vue/compiler-core": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.35.tgz", - "integrity": "sha512-gKp0zGoLnMYtw4uS/SJRRO7rsVggLjvot3mcctlMXunYNsX+aRJDqqw/lV5/gHK91nvaAAlWFgdVl020AW1Prg==", + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.38.tgz", + "integrity": "sha512-8IQOTCWnLFqfHzOGm9+P8OPSEDukgg3Huc92qSG49if/xI2SAwLHQO2qaPQbjCWPBcQoO1WYfXfTACUrWV3c5A==", "dependencies": { "@babel/parser": "^7.24.7", - "@vue/shared": "3.4.35", + "@vue/shared": "3.4.38", "entities": "^4.5.0", "estree-walker": "^2.0.2", "source-map-js": "^1.2.0" } }, "node_modules/@vue/compiler-dom": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.35.tgz", - "integrity": "sha512-pWIZRL76/oE/VMhdv/ovZfmuooEni6JPG1BFe7oLk5DZRo/ImydXijoZl/4kh2406boRQ7lxTYzbZEEXEhj9NQ==", + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.38.tgz", + "integrity": "sha512-Osc/c7ABsHXTsETLgykcOwIxFktHfGSUDkb05V61rocEfsFDcjDLH/IHJSNJP+/Sv9KeN2Lx1V6McZzlSb9EhQ==", "dependencies": { - "@vue/compiler-core": "3.4.35", - "@vue/shared": "3.4.35" + "@vue/compiler-core": "3.4.38", + "@vue/shared": "3.4.38" } }, "node_modules/@vue/compiler-vue2": { @@ -230,11 +232,11 @@ } }, "node_modules/@vue/language-core": { - "version": "2.0.29", - "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.29.tgz", - "integrity": "sha512-o2qz9JPjhdoVj8D2+9bDXbaI4q2uZTHQA/dbyZT4Bj1FR9viZxDJnLcKVHfxdn6wsOzRgpqIzJEEmSSvgMvDTQ==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.1.2.tgz", + "integrity": "sha512-tt2J7C+l0J/T5PaLhJ0jvCCi0JNwu3e8azWTYxW3jmAW5B/dac0g5UxmI7l59CQgCGFotqUqI3tXjfZgoWNtog==", "dependencies": { - "@volar/language-core": "~2.4.0-alpha.18", + "@volar/language-core": "~2.4.1", "@vue/compiler-dom": "^3.4.0", "@vue/compiler-vue2": "^2.7.16", "@vue/shared": "^3.4.0", @@ -253,44 +255,44 @@ } }, "node_modules/@vue/language-service": { - "version": "2.0.29", - "resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.0.29.tgz", - "integrity": "sha512-lY54t7KNp1WKXfYccTj9PizwE8zrswTZbYzYdLyoeLyLwcO/JlkMssTrt1G+64TLBwBptvV9PwvNw5Bp2YxJHg==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.1.2.tgz", + "integrity": "sha512-jCSPnMXYtBTa3Tba9xZqsXkYZHPVIjY2H6K6yj9BKcO1PwXzMLTZLJRECzRbQIlJY4vHj+b69AJkxNGuJJtkAw==", "dependencies": { - "@volar/language-core": "~2.4.0-alpha.18", - "@volar/language-service": "~2.4.0-alpha.18", - "@volar/typescript": "~2.4.0-alpha.18", + "@volar/language-core": "~2.4.1", + "@volar/language-service": "~2.4.1", + "@volar/typescript": "~2.4.1", "@vue/compiler-dom": "^3.4.0", - "@vue/language-core": "2.0.29", + "@vue/language-core": "2.1.2", "@vue/shared": "^3.4.0", - "@vue/typescript-plugin": "2.0.29", + "@vue/typescript-plugin": "2.1.2", "computeds": "^0.0.1", "path-browserify": "^1.0.1", - "volar-service-css": "0.0.59", - "volar-service-emmet": "0.0.59", - "volar-service-html": "0.0.59", - "volar-service-json": "0.0.59", - "volar-service-pug": "0.0.59", - "volar-service-pug-beautify": "0.0.59", - "volar-service-typescript": "0.0.59", - "volar-service-typescript-twoslash-queries": "0.0.59", + "volar-service-css": "0.0.62", + "volar-service-emmet": "0.0.62", + "volar-service-html": "0.0.62", + "volar-service-json": "0.0.62", + "volar-service-pug": "0.0.62", + "volar-service-pug-beautify": "0.0.62", + "volar-service-typescript": "0.0.62", + "volar-service-typescript-twoslash-queries": "0.0.62", "vscode-html-languageservice": "^5.2.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" } }, "node_modules/@vue/shared": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.35.tgz", - "integrity": "sha512-hvuhBYYDe+b1G8KHxsQ0diDqDMA8D9laxWZhNAjE83VZb5UDaXl9Xnz7cGdDSyiHM90qqI/CyGMcpBpiDy6VVQ==" + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.38.tgz", + "integrity": "sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==" }, "node_modules/@vue/typescript-plugin": { - "version": "2.0.29", - "resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.0.29.tgz", - "integrity": "sha512-cO/cP467bGONkm/imEVvcRg77/VmoWpLyO94jSwLAt8QV0X9l414SwsRdsae+wGMPV+6k7rweer0SP16A0HYdw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.1.2.tgz", + "integrity": "sha512-F96IB5biZJQ7QckSts62VtKy6YY3FnZTlhkph0p8MyJnngcmQpOI8HwgigIiQcOI0uC6L2TqBdrFHOpG2SMn3Q==", "dependencies": { - "@volar/typescript": "~2.4.0-alpha.18", - "@vue/language-core": "2.0.29", + "@volar/typescript": "~2.4.1", + "@vue/language-core": "2.1.2", "@vue/shared": "^3.4.0" } }, @@ -670,16 +672,16 @@ } }, "node_modules/volar-service-css": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.59.tgz", - "integrity": "sha512-gLNjJnECbalPvQB7qeJjhkDN8sR5M3ItbVYjnyio61aHaWptIiXm/HfDahcQ2ApwmvWidkMWWegjGq5L0BENDA==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.62.tgz", + "integrity": "sha512-JwNyKsH3F8PuzZYuqPf+2e+4CTU8YoyUHEHVnoXNlrLe7wy9U3biomZ56llN69Ris7TTy/+DEX41yVxQpM4qvg==", "dependencies": { "vscode-css-languageservice": "^6.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.12" + "@volar/language-service": "~2.4.0" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -688,9 +690,9 @@ } }, "node_modules/volar-service-emmet": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.59.tgz", - "integrity": "sha512-6EynHcuMwMBETpK29TbZvIMmvzdVG+Tkokk9VWfZeI+SwDptk2tgdhEqiXXvIkqYNgbuu73Itp66lpH76cAU+Q==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.62.tgz", + "integrity": "sha512-U4dxWDBWz7Pi4plpbXf4J4Z/ss6kBO3TYrACxWNsE29abu75QzVS0paxDDhI6bhqpbDFXlpsDhZ9aXVFpnfGRQ==", "dependencies": { "@emmetio/css-parser": "^0.4.0", "@emmetio/html-matcher": "^1.3.0", @@ -698,7 +700,7 @@ "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.12" + "@volar/language-service": "~2.4.0" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -707,16 +709,16 @@ } }, "node_modules/volar-service-html": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.59.tgz", - "integrity": "sha512-hEXOsYpILDlITZxnqRLV9OepVWD63GZBsyjMxszwdzlxvGZjzbGcBBinJGGJRwFIV8djdJwnt91bkdg1V5tj6Q==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.62.tgz", + "integrity": "sha512-Zw01aJsZRh4GTGUjveyfEzEqpULQUdQH79KNEiKVYHZyuGtdBRYCHlrus1sueSNMxwwkuF5WnOHfvBzafs8yyQ==", "dependencies": { "vscode-html-languageservice": "^5.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.12" + "@volar/language-service": "~2.4.0" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -725,15 +727,15 @@ } }, "node_modules/volar-service-json": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-json/-/volar-service-json-0.0.59.tgz", - "integrity": "sha512-LfDOQhCvUpDBjA6CP9EogO0dn1yEFbInvV3Yk4OsEdyxwWUEYPLVjDacPlVUYcjCIKQN6NcTOWbVwpg4vYjw6A==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-json/-/volar-service-json-0.0.62.tgz", + "integrity": "sha512-Ot+jP+/LzKcaGF7nzrn+gwpzAleb4ej5buO05M8KxfwfODte7o1blARKRoJ3Nv7ls0DBM38Dd5vjzvA9c/9Jtg==", "dependencies": { "vscode-json-languageservice": "^5.4.0", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.12" + "@volar/language-service": "~2.4.0" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -742,28 +744,28 @@ } }, "node_modules/volar-service-pug": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-pug/-/volar-service-pug-0.0.59.tgz", - "integrity": "sha512-kmch7yoqeGNlJuDzpw/YL2b89ilzBmWDd0lJbpG412/RXc3PJVA4usUK+SQHdVoF+qi5IcZL6IDxlvRiIrDgWg==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-pug/-/volar-service-pug-0.0.62.tgz", + "integrity": "sha512-C0/O8uGnRfijWKE0zFXxJ/o7BbLebzretsEaiMkvBDIxm5oe7HRDzQr6CgknV/WVgiohZ74v+0CwBPl2YmcPUQ==", "dependencies": { - "@volar/language-service": "~2.4.0-alpha.12", + "@volar/language-service": "~2.4.0", "muggle-string": "^0.4.1", "pug-lexer": "^5.0.1", "pug-parser": "^6.0.0", - "volar-service-html": "0.0.59", + "volar-service-html": "0.0.62", "vscode-html-languageservice": "^5.3.0", "vscode-languageserver-textdocument": "^1.0.11" } }, "node_modules/volar-service-pug-beautify": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-pug-beautify/-/volar-service-pug-beautify-0.0.59.tgz", - "integrity": "sha512-SCLWHpBdgvWww3a9Vp8FX80ookozhnHx10gkKBTYW4wp7/rzEoVAPSyO7JKBwTdXmdKQv7YXfxLMVUGv0sYUKg==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-pug-beautify/-/volar-service-pug-beautify-0.0.62.tgz", + "integrity": "sha512-dAFNuNEwTnnVthYoNJhoStwhf/PojzglwCrdhOb2nBegTG3xXMWRFmQzb0JfIlt2wq2wfUq5j+JJswgSD3KluQ==", "dependencies": { "@johnsoncodehk/pug-beautify": "^0.2.2" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.12" + "@volar/language-service": "~2.4.0" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -772,9 +774,9 @@ } }, "node_modules/volar-service-typescript": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.59.tgz", - "integrity": "sha512-VCOpfiu+lUo5lapWLB5L5vmQGtwzmNWn5MueV915eku7blpphmE+Z7hCNcL1NApn7AetXWhiblv8ZhmUx/dGIA==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.62.tgz", + "integrity": "sha512-p7MPi71q7KOsH0eAbZwPBiKPp9B2+qrdHAd6VY5oTo9BUXatsOAdakTm9Yf0DUj6uWBAaOT01BSeVOPwucMV1g==", "dependencies": { "path-browserify": "^1.0.1", "semver": "^7.6.2", @@ -784,7 +786,7 @@ "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.12" + "@volar/language-service": "~2.4.0" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -793,14 +795,14 @@ } }, "node_modules/volar-service-typescript-twoslash-queries": { - "version": "0.0.59", - "resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.59.tgz", - "integrity": "sha512-skm8e6yhCIkqLwJB6S9MqT5lO9LNFuMD3dYxKpmOZs1CKbXmCZZTmLfEaD5VkJae1xdleEDZFFTHl2O5HLjOGQ==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.62.tgz", + "integrity": "sha512-KxFt4zydyJYYI0kFAcWPTh4u0Ha36TASPZkAnNY784GtgajerUqM80nX/W1d0wVhmcOFfAxkVsf/Ed+tiYU7ng==", "dependencies": { "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.12" + "@volar/language-service": "~2.4.0" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -809,35 +811,35 @@ } }, "node_modules/vscode-css-languageservice": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.0.tgz", - "integrity": "sha512-nU92imtkgzpCL0xikrIb8WvedV553F2BENzgz23wFuok/HLN5BeQmroMy26pUwFxV2eV8oNRmYCUv8iO7kSMhw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.1.tgz", + "integrity": "sha512-1BzTBuJfwMc3A0uX4JBdJgoxp74cjj4q2mDJdp49yD/GuAq4X0k5WtK6fNcMYr+FfJ9nqgR6lpfCSZDkARJ5qQ==", "dependencies": { "@vscode/l10n": "^0.0.18", - "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "3.17.5", "vscode-uri": "^3.0.8" } }, "node_modules/vscode-html-languageservice": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.0.tgz", - "integrity": "sha512-C4Z3KsP5Ih+fjHpiBc5jxmvCl+4iEwvXegIrzu2F5pktbWvQaBT3YkVPk8N+QlSSMk8oCG6PKtZ/Sq2YHb5e8g==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.1.tgz", + "integrity": "sha512-ysUh4hFeW/WOWz/TO9gm08xigiSsV/FOAZ+DolgJfeLftna54YdmZ4A+lIn46RbdO3/Qv5QHTn1ZGqmrXQhZyA==", "dependencies": { "@vscode/l10n": "^0.0.18", - "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "^3.17.5", "vscode-uri": "^3.0.8" } }, "node_modules/vscode-json-languageservice": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.4.0.tgz", - "integrity": "sha512-NCkkCr63OHVkE4lcb0xlUAaix6vE5gHQW4NrswbLEh3ArXj81lrGuFTsGEYEUXlNHdnc53vWPcjeSy/nMTrfXg==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.4.1.tgz", + "integrity": "sha512-5czFGNyVPxz3ZJYl8R3a3SuIj5gjhmGF4Wv05MRPvD4DEnHK6b8km4VbNMJNHBlTCh7A0aHzUbPVzo+0C18mCA==", "dependencies": { "@vscode/l10n": "^0.0.18", - "jsonc-parser": "^3.3.0", - "vscode-languageserver-textdocument": "^1.0.11", + "jsonc-parser": "^3.3.1", + "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "^3.17.5", "vscode-uri": "^3.0.8" } diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index 584bc15c7a31..8a0b8d28e648 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "vue-language-server"; - version = "2.0.29"; + version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/@vue/language-server/-/language-server-${version}.tgz"; - hash = "sha256-8NUtwBXVktsuNl9CBoInvbuM0GlO0UfIfGTQBsNATAo="; + hash = "sha256-dCCFkNumN25dHVgrdj2FwycYEq5pEY7Vr/kq78/AWQE="; }; - npmDepsHash = "sha256-0CLH8iUcaUeTL5lYXK/FKoAXgROMO3/owwVRy8EhWj8="; + npmDepsHash = "sha256-648jkCxseRaDj7Zix/5zd+3r+qsV+VbYvDOn0nagHEY="; postPatch = '' ln -s ${./package-lock.json} package-lock.json From fb6458be9e440fb3b046f9e92726279e27af5c60 Mon Sep 17 00:00:00 2001 From: eyjhb Date: Sun, 1 Sep 2024 11:13:53 +0200 Subject: [PATCH 05/63] mautrix-meta: add eyjhb as maintainer --- pkgs/by-name/ma/mautrix-meta/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 17639dc432e3..0f9d67727f2a 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -35,7 +35,7 @@ buildGoModule rec { homepage = "https://github.com/mautrix/meta"; description = "Matrix <-> Facebook and Mautrix <-> Instagram hybrid puppeting/relaybot bridge"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ rutherther ]; + maintainers = with lib.maintainers; [ rutherther eyjhb ]; mainProgram = "mautrix-meta"; }; } From 028458abf49799c9e55cbc393a03893fa3c73da1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Sep 2024 13:34:36 +0000 Subject: [PATCH 06/63] floorp-unwrapped: 11.17.7 -> 11.17.8 --- pkgs/applications/networking/browsers/floorp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 4bf93acdac26..2cbd81d7ab57 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -11,7 +11,7 @@ ( (buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.17.7"; + packageVersion = "11.17.8"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -26,7 +26,7 @@ repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-IAzPt696AWBEyfxR5U5/Isd6urPoi3fHshT+Fl+o/Bg="; + hash = "sha256-1hHp8LZxGJmLSoe8NNzmx2QxPosrIcLqggeGhf+iMPI="; }; extraConfigureFlags = [ From 46e1ee990c97ba2ed37914291a6a8c5e1a8e8115 Mon Sep 17 00:00:00 2001 From: Rabindra Dhakal Date: Sat, 24 Aug 2024 08:30:40 +0545 Subject: [PATCH 07/63] sig: init at 0.1.3 --- pkgs/by-name/si/sig/package.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/si/sig/package.nix diff --git a/pkgs/by-name/si/sig/package.nix b/pkgs/by-name/si/sig/package.nix new file mode 100644 index 000000000000..c3f053ae53a4 --- /dev/null +++ b/pkgs/by-name/si/sig/package.nix @@ -0,0 +1,27 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "sig"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "ynqa"; + repo = "sig"; + rev = "v${version}"; + hash = "sha256-nt/KV4ohFNZTJTwbNoSxb5v9zQwp+7ypvfMthL1yMus="; + }; + + cargoHash = "sha256-gZZ2aOsqVqGN3gCBZnBXzlFicMssNIEyRT688OuNMJc="; + + meta = { + description = "Interactive grep (for streaming)"; + homepage = "https://github.com/ynqa/sig"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qaidvoid ]; + mainProgram = "sig"; + }; +} From ed4a701cdb0024196275b535916f0c25feb832da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 04:17:21 +0000 Subject: [PATCH 08/63] trivy: 0.54.1 -> 0.55.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 1447b497784a..cd0e01644f7f 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -11,19 +11,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.54.1"; + version = "0.55.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-lzLwIa+JCqQQSpA0AFyikpODb6u9oSaEqGGx0ckL+V8="; + hash = "sha256-YbQdTtw2/cEuGspDQAEmPv//zQY+qbHt94yGs3/+6YU="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-TSnwCulL4aI/SgL+WKoLwAnmKrUAfXgl+EV/HFt4j1U="; + vendorHash = "sha256-Q5XqnwMBVJoaA+TjqO4InLEjevBHIkwveJDFOoEtPmY="; subPackages = [ "cmd/trivy" ]; From af3fb9d61b705c19527a4356e57b8aa52eb5fc3c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Sep 2024 08:11:12 +0200 Subject: [PATCH 09/63] python312Packages.fiona: 1.9.6 -> 1.10.0 Diff: https://github.com/Toblerity/Fiona/compare/refs/tags/1.9.6...1.10.0 Changelog: https://github.com/Toblerity/Fiona/blob/refs/tags/1.10.0/CHANGES.txt --- .../python-modules/fiona/default.nix | 48 +++++++++++-------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 753bcc32278c..49076c4e5b4b 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,67 +1,75 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system cython, gdal, - oldest-supported-numpy, setuptools, - wheel, + + # dependencies attrs, certifi, click, click-plugins, cligj, - munch, + + # optional-dependencies + pyparsing, shapely, boto3, + + # tests + fsspec, pytestCheckHook, pytz, + snuggs, }: buildPythonPackage rec { pname = "fiona"; - version = "1.9.6"; + version = "1.10.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "Toblerity"; repo = "Fiona"; rev = "refs/tags/${version}"; - hash = "sha256-MboM3IwGF8cuz+jMQ3QVZFAHjpspQ6kVJincq7OEkCM="; + hash = "sha256-0Jiyq9x9YLDN1a1LBlCK2ac6kLZ5X2rOPusUQH5OPrQ="; }; - nativeBuildInputs = [ + build-system = [ cython gdal # for gdal-config - oldest-supported-numpy setuptools - wheel ]; buildInputs = [ gdal ]; - propagatedBuildInputs = [ + dependencies = [ attrs certifi click - cligj click-plugins - munch + cligj ]; - passthru.optional-dependencies = { - calc = [ shapely ]; + optional-dependencies = { + calc = [ + pyparsing + shapely + ]; s3 = [ boto3 ]; }; nativeCheckInputs = [ + fsspec pytestCheckHook pytz - ] ++ passthru.optional-dependencies.s3; + shapely + snuggs + ] ++ optional-dependencies.s3; preCheck = '' rm -r fiona # prevent importing local fiona @@ -87,12 +95,12 @@ buildPythonPackage rec { doInstallCheck = true; - meta = with lib; { + meta = { changelog = "https://github.com/Toblerity/Fiona/blob/${src.rev}/CHANGES.txt"; description = "OGR's neat, nimble, no-nonsense API for Python"; mainProgram = "fio"; homepage = "https://fiona.readthedocs.io/"; - license = licenses.bsd3; - maintainers = teams.geospatial.members; + license = lib.licenses.bsd3; + maintainers = lib.teams.geospatial.members; }; } From 4cc4221e41b8a421a1e4ff6a66db7fff4423551c Mon Sep 17 00:00:00 2001 From: fqidz Date: Thu, 29 Aug 2024 01:21:58 +0300 Subject: [PATCH 10/63] sfcgal: init at 1.5.2 --- maintainers/maintainer-list.nix | 6 ++++ pkgs/by-name/sf/sfcgal/cmake-fix.patch | 37 +++++++++++++++++++++++ pkgs/by-name/sf/sfcgal/package.nix | 42 ++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 pkgs/by-name/sf/sfcgal/cmake-fix.patch create mode 100644 pkgs/by-name/sf/sfcgal/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bfe5e59b86dd..82b1bdf62f91 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6994,6 +6994,12 @@ githubId = 1202014; name = "Falco Peijnenburg"; }; + fqidz = { + email = "faidz.arante@gmail.com"; + github = "fqidz"; + githubId = 82884264; + name = "Faidz Arante"; + }; fragamus = { email = "innovative.engineer@gmail.com"; github = "fragamus"; diff --git a/pkgs/by-name/sf/sfcgal/cmake-fix.patch b/pkgs/by-name/sf/sfcgal/cmake-fix.patch new file mode 100644 index 000000000000..7ba92b0cf1c4 --- /dev/null +++ b/pkgs/by-name/sf/sfcgal/cmake-fix.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3babfae..11ea637c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -209,7 +209,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})") + endif() + +-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") ++SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + #SET(CMAKE_MACOSX_RPATH ON) + +diff --git a/sfcgal-config.in b/sfcgal-config.in +index a0e992c5..49615c13 100755 +--- a/sfcgal-config.in ++++ b/sfcgal-config.in +@@ -1,6 +1,6 @@ + #!/bin/sh + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + + usage() + { +diff --git a/sfcgal.pc.in b/sfcgal.pc.in +index 968cb407..bf517d02 100644 +--- a/sfcgal.pc.in ++++ b/sfcgal.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + includedir=${prefix}/include + + Name: sfcgal diff --git a/pkgs/by-name/sf/sfcgal/package.nix b/pkgs/by-name/sf/sfcgal/package.nix new file mode 100644 index 000000000000..50efa9ac749e --- /dev/null +++ b/pkgs/by-name/sf/sfcgal/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitLab, + cmake, + cgal, + boost, + mpfr, + gmp, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sfcgal"; + version = "1.5.2"; + + src = fetchFromGitLab { + owner = "sfcgal"; + repo = "SFCGAL"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-fK1PfLm6n05PhH/sT6N/hQtH5Z6+Xc1nUCS1NYpLDcY="; + }; + + buildInputs = [ + cgal + boost + mpfr + gmp + ]; + + nativeBuildInputs = [ cmake ]; + + patches = [ ./cmake-fix.patch ]; + + meta = { + description = "C++ wrapper library around CGAL with the aim of supporting ISO 191007:2013 and OGC Simple Features for 3D operations"; + homepage = "https://sfcgal.gitlab.io/SFCGAL/"; + changelog = "https://gitlab.com/sfcgal/SFCGAL/-/releases/v${finalAttrs.version}"; + license = lib.licenses.lgpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.fqidz ]; + }; +}) From 3643aa2162025051d8c0ef77d771fe84b3bfee31 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Fri, 30 Aug 2024 16:35:29 +0530 Subject: [PATCH 11/63] wush: init at 0.1.2 --- pkgs/by-name/wu/wush/package.nix | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/wu/wush/package.nix diff --git a/pkgs/by-name/wu/wush/package.nix b/pkgs/by-name/wu/wush/package.nix new file mode 100644 index 000000000000..07d9ff880277 --- /dev/null +++ b/pkgs/by-name/wu/wush/package.nix @@ -0,0 +1,36 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, +}: +let + version = "0.1.2"; +in +buildGoModule { + pname = "wush"; + inherit version; + + src = fetchFromGitHub { + owner = "coder"; + repo = "wush"; + rev = "v${version}"; + hash = "sha256-r6LKEL9GxyiyQgM4AuLU/FcmYKOCg7EZDmAZQznCx8E="; + }; + + vendorHash = "sha256-e1XcoiJ55UoSNFUto6QM8HrQkkrBf8sv4L9J+7Lnu2I="; + + ldflags = [ + "-s -w -X main.version=${version}" + ]; + + CGO_ENABLED = 0; + + meta = with lib; { + homepage = "https://github.com/coder/wush"; + description = "Transfer files between computers via WireGuard"; + changelog = "https://github.com/coder/wush/releases/tag/v${version}"; + license = licenses.cc0; + mainProgram = "wush"; + maintainers = with maintainers; [ abbe ]; + }; +} From fec686e486eca5b6687f4c2d2ef97b68b55b7d42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 04:12:34 +0000 Subject: [PATCH 12/63] outline: 0.78.0 -> 0.79.0 --- pkgs/servers/web-apps/outline/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index fa66487758f8..a3c48e2b441f 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.78.0"; + version = "0.79.0"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-I0ngEJfHWywJSYOloJbtuKzu95yJibo7hLFgkyT2Wz8="; + hash = "sha256-uu0HlQ3LaVBjSharROKv+mS8/qONV5qND/5kMTsaGeQ="; }; nativeBuildInputs = [ makeWrapper prefetch-yarn-deps fixup-yarn-lock ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-TKAV49VJmR/SWTd2T2vHMnYq2j9fwimzYq1CCfRXk0Q="; + hash = "sha256-S2vKYVIFsSlPqFbpLhBH9S43Invo3hsNLvfLX98922Y="; }; configurePhase = '' From 74ab57e0d6760b5e77c8e04c042b0f5a36d31ef4 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 5 Sep 2024 10:33:47 +0200 Subject: [PATCH 13/63] python3Packages.rasterio: 1.3.10 -> 1.3.11 --- .../python-modules/rasterio/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index d7ab45fd4732..8536f1bc981c 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.3.10"; + version = "1.3.11"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "rasterio"; repo = "rasterio"; rev = "refs/tags/${version}"; - hash = "sha256-FidUaSpbTR8X1/Cqy/IwApkOOl2RRtPqYJaSISRPThI="; + hash = "sha256-Yh3n2oyARf7LAtJU8Oa3WWc+oscl7e2N7jpW0v1uTVk="; }; postPatch = '' @@ -49,9 +49,9 @@ buildPythonPackage rec { substituteInPlace rasterio/rio/calc.py \ --replace-fail "from distutils.version import LooseVersion" "" - # relax dependency on yet non-packaged, RC version of numpy + # relax numpy dependency substituteInPlace pyproject.toml \ - --replace-fail "numpy==2.0.0rc1" "numpy" + --replace-fail "numpy>=2.0.0,<3.0" "numpy" ''; nativeBuildInputs = [ @@ -99,12 +99,6 @@ buildPythonPackage rec { disabledTests = [ # flaky "test_outer_boundless_pixel_fidelity" - - # Failing with GDAL 3.9. - # Fixed in https://github.com/rasterio/rasterio/commit/24d0845e576158217f6541c3c81b163d873a994d - # Re-enable in next rasterio update. - "test_create_sidecar_mask" - "test_update_tags" ] ++ lib.optionals stdenv.isDarwin [ "test_reproject_error_propagation" ]; pythonImportsCheck = [ "rasterio" ]; From 941bb6bf9b15a7542d2f1ac27d757024f4845b0c Mon Sep 17 00:00:00 2001 From: eyjhb Date: Sun, 1 Sep 2024 11:14:07 +0200 Subject: [PATCH 14/63] mautrix-meta: add updateScript --- pkgs/by-name/ma/mautrix-meta/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 0f9d67727f2a..8e2737fcc4f1 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -1,5 +1,6 @@ { buildGoModule , fetchFromGitHub +, nix-update-script , lib , nixosTests , olm @@ -29,8 +30,11 @@ buildGoModule rec { mautrix-meta-sqlite ; }; + + updateScript = nix-update-script { }; }; + meta = { homepage = "https://github.com/mautrix/meta"; description = "Matrix <-> Facebook and Mautrix <-> Instagram hybrid puppeting/relaybot bridge"; From 5fb520389bcf859e9a73d30653acd4364c701ea7 Mon Sep 17 00:00:00 2001 From: eyjhb Date: Sun, 1 Sep 2024 12:14:02 +0200 Subject: [PATCH 15/63] mautrix-meta: fixed typo in description --- pkgs/by-name/ma/mautrix-meta/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 8e2737fcc4f1..64deb37d6bb5 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -37,7 +37,7 @@ buildGoModule rec { meta = { homepage = "https://github.com/mautrix/meta"; - description = "Matrix <-> Facebook and Mautrix <-> Instagram hybrid puppeting/relaybot bridge"; + description = "Matrix <-> Facebook and Matrix <-> Instagram hybrid puppeting/relaybot bridge"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ rutherther eyjhb ]; mainProgram = "mautrix-meta"; From 05509c7da079584f656369c5f1bb3776c1b069dc Mon Sep 17 00:00:00 2001 From: Gavin John Date: Thu, 5 Sep 2024 08:04:01 -0700 Subject: [PATCH 16/63] python312Packages.aiomultiprocess: Fix for python 3.12 --- pkgs/development/python-modules/aiomultiprocess/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/aiomultiprocess/default.nix b/pkgs/development/python-modules/aiomultiprocess/default.nix index f07b225890a5..b1fc1479b7f3 100644 --- a/pkgs/development/python-modules/aiomultiprocess/default.nix +++ b/pkgs/development/python-modules/aiomultiprocess/default.nix @@ -32,6 +32,8 @@ buildPythonPackage rec { "test_pool_worker_exceptions" "test_pool_worker_max_tasks" "test_pool_worker_stop" + # error message changed with python 3.12 + "test_spawn_method" ]; pythonImportsCheck = [ "aiomultiprocess" ]; From b412bc98bac129b43a98bb506fe5dc308bc38ccb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 15:42:36 +0000 Subject: [PATCH 17/63] python312Packages.msgraph-sdk: 1.5.4 -> 1.6.0 --- pkgs/development/python-modules/msgraph-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 2f676433386c..cbd0d770deb1 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.5.4"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Ty9e+xJ3+h4d0hmwtiZA9k5WMeuvT4iwNpR06KRpnfI="; + hash = "sha256-Mrw77ln/7P/nNOGlxkqsoBH39ghp1Pc/a17ggbKuaUA="; }; build-system = [ flit-core ]; From 06587a2e691aed442d4383a06838af883d7ee021 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 5 Sep 2024 16:59:07 +0100 Subject: [PATCH 18/63] nixVersions.nix_2_24: 2.24.4 -> 2.24.5 Fixes an [annoying macOS regression]. [annoying macOS regression]: https://github.com/NixOS/nix/issues/11387 Diff: https://github.com/NixOS/nix/compare/2.24.4...2.24.5 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5f1cd3f48eda..35edaf2bef46 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -185,8 +185,8 @@ in lib.makeExtensible (self: ({ }; nix_2_24 = (common { - version = "2.24.4"; - hash = "sha256-oYu/9u8ht34JOTV+G/l3CCFJokPiUA2D8CiLZFX61PA="; + version = "2.24.5"; + hash = "sha256-mYvdPwl4gcc17UAomkbbOJEgxBQpowmJDrRMWtlYzFY="; self_attribute_name = "nix_2_24"; }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { # Fix the following error with the default x86_64-darwin SDK: From 992bcdbecaf9036981d395266bd51ad7ab3565bc Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 5 Sep 2024 18:45:01 +0200 Subject: [PATCH 19/63] zed-editor: add fhs passthru --- pkgs/by-name/ze/zed-editor/package.nix | 49 ++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index f999227661c8..def65b1b0de2 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -30,12 +30,59 @@ cargo-about, testers, zed-editor, + buildFHSEnv, withGLES ? false, }: assert withGLES -> stdenv.isLinux; +let + executableName = "zed"; + # Based on vscode.fhs + # Zed allows for users to download and use extensions + # which often include the usage of pre-built binaries. + # See #309662 + # + # buildFHSEnv allows for users to use the existing Zed + # extension tooling without significant pain. + fhs = + { + additionalPkgs ? pkgs: [ ], + }: + buildFHSEnv { + # also determines the name of the wrapped command + name = executableName; + + # additional libraries which are commonly needed for extensions + targetPkgs = + pkgs: + (with pkgs; [ + # ld-linux-x86-64-linux.so.2 and others + glibc + ]) + ++ additionalPkgs pkgs; + + # symlink shared assets, including icons and desktop entries + extraInstallCommands = '' + ln -s "${zed-editor}/share" "$out/" + ''; + + runScript = "${zed-editor}/bin/${executableName}"; + + passthru = { + inherit executableName; + inherit (zed-editor) pname version; + }; + + meta = zed-editor.meta // { + description = '' + Wrapped variant of ${zed-editor.pname} which launches in a FHS compatible environment. + Should allow for easy usage of extensions without nix-specific modifications. + ''; + }; + }; +in rustPlatform.buildRustPackage rec { pname = "zed"; version = "0.151.1"; @@ -202,6 +249,8 @@ rustPlatform.buildRustPackage rec { inherit version; package = zed-editor; }; + fhs = fhs { }; + fhsWithPackages = f: fhs { additionalPkgs = f; }; }; meta = { From 8fb18a4d35dd74b51be5e1966c244379c10f48b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 17:27:39 +0000 Subject: [PATCH 20/63] uplosi: 0.2.1 -> 0.3.0 --- pkgs/by-name/up/uplosi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/up/uplosi/package.nix b/pkgs/by-name/up/uplosi/package.nix index f58db5625ac2..0470054f0f22 100644 --- a/pkgs/by-name/up/uplosi/package.nix +++ b/pkgs/by-name/up/uplosi/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "uplosi"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "edgelesssys"; repo = pname; rev = "v${version}"; - hash = "sha256-i/RVCoeQLeOaPaEtJS/l+42CVohMucA6cBBt0mdJ4uE="; + hash = "sha256-AtsFZ92WkVkH8fd0Xa0D6/PR84/dtOH6gpM4mtn32Hk="; }; - vendorHash = "sha256-f8Yz99qlN0S0Ybewifc0VQanYXKinb1togBkUwDPSvw="; + vendorHash = "sha256-o7PPgW3JL47G6Na5n9h3RasRMfU25FD1U/wCMaydRmc="; CGO_ENABLED = "0"; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From 513dcf4078c32f1b3430af6ed3f1ac8219fe8211 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 21:41:03 +0200 Subject: [PATCH 21/63] python312Packages.msgraph-sdk: update chagnelog entry --- pkgs/development/python-modules/msgraph-sdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index cbd0d770deb1..375f11c1a67e 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Graph SDK for Python"; homepage = "https://github.com/microsoftgraph/msgraph-sdk-python"; - changelog = "https://github.com/microsoftgraph/msgraph-sdk-python/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/microsoftgraph/msgraph-sdk-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 746d9c2d30246a1b99321ac0bf6e8c638b99dc96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 21:51:06 +0200 Subject: [PATCH 22/63] python312Packages.mailchecker: 6.0.5 -> 6.0.8 Changelog: https://github.com/FGRibreau/mailchecker/blob/v6.0.8/CHANGELOG.md --- pkgs/development/python-modules/mailchecker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 2216aa7937cd..1ade04030dc1 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "6.0.5"; + version = "6.0.8"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jdcewXJO8I83zvAKb4UbKmuQC4SUbtS5H+RmFDTNwcI="; + hash = "sha256-3Og42v2DAquCPvzL6sRnKbs5nZuAO2AWa+UkltWR43Y="; }; build-system = [ setuptools ]; From 1a369b6532e5641f8a993ab61aff3b37bbb15342 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 22:04:29 +0200 Subject: [PATCH 23/63] python312Packages.mkdocstrings-python: 1.10.9 -> 1.11.1 Diff: https://github.com/mkdocstrings/python/compare/refs/tags/1.10.9...1.11.1 Changelog: https://github.com/mkdocstrings/python/blob/1.11.1/CHANGELOG.md --- .../python-modules/mkdocstrings-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index c9c79e52b1b4..1b741ff73315 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.10.9"; + version = "1.11.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-ClIWH3JixDI7SMOaDKELeYlX7HqhzJ3JNO8FW/eCpuA="; + hash = "sha256-g6F6xIFKLzNqgbWGZXdJeoqQz/GIlC3XmrG9Kjkr1rU="; }; build-system = [ pdm-backend ]; From b89e44743edbbb4e1c45d226ac96d976aa53c8e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 22:05:17 +0200 Subject: [PATCH 24/63] python312Packages.frigidaire: 0.18.21 -> 0.18.23 Diff: https://github.com/bm1549/frigidaire/compare/refs/tags/0.18.21...0.18.23 Changelog: https://github.com/bm1549/frigidaire/releases/tag/0.18.23 --- pkgs/development/python-modules/frigidaire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index 7bf6d5a6d2a7..4914314384b8 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "frigidaire"; - version = "0.18.21"; + version = "0.18.23"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = "frigidaire"; rev = "refs/tags/${version}"; - hash = "sha256-7fpVFKhLXBD0ec2mGfbFHygaH8BtOIOd5NoYz03IKp8="; + hash = "sha256-RzwTQRo5cIh6I8VQAJNcLg5TBiF6dAnZICGfvwCvx5Y="; }; postPatch = '' From 377125557339aebe4f964992fff3d36e8ca14cf8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 22:05:59 +0200 Subject: [PATCH 25/63] python312Packages.angrop: 9.2.9 -> 9.2.10 Diff: https://github.com/angr/angrop/compare/refs/tags/v9.2.9...v9.2.10 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 939517887e40..d822f66800d5 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.2.9"; + version = "9.2.10"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angrop"; rev = "refs/tags/v${version}"; - hash = "sha256-T07Y23UDp9eL2DK5gakV8kPNGsXf+4EofZJDSW/JS1Q="; + hash = "sha256-+epX+tCSv5Kit4lncDNtjokehCSl+tO7rbi3L+RrI+E="; }; build-system = [ setuptools ]; From be9d2cbe07ff2c7da09aa256778c1c9a8efe59cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 22:21:53 +0200 Subject: [PATCH 26/63] python312Packages.asysocks: 0.2.12 -> 0.2.13 Changelog: https://github.com/skelsec/asysocks/releases/tag/0.2.13 --- pkgs/development/python-modules/asysocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index d0df75b17dd5..c57ae001443a 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.2.12"; + version = "0.2.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uilvJjuZrvdC2m4zhXCkbzLjwtbC1liWEZ20Ya7FYJ0="; + hash = "sha256-RBhbLEceY7cpMXOWfu87D15g7VzBt2UKMKlWnkn/Jfg="; }; propagatedBuildInputs = [ asn1crypto ]; From 827bb05129873b2d13f9a3982305f113492c1711 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 22:23:43 +0200 Subject: [PATCH 27/63] python312Packages.asysocks: refactor --- .../development/python-modules/asysocks/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index c57ae001443a..97ad3303da4c 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -2,14 +2,17 @@ lib, asn1crypto, buildPythonPackage, + cryptography, fetchPypi, + h11, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "asysocks"; version = "0.2.13"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +21,13 @@ buildPythonPackage rec { hash = "sha256-RBhbLEceY7cpMXOWfu87D15g7VzBt2UKMKlWnkn/Jfg="; }; - propagatedBuildInputs = [ asn1crypto ]; + build-system = [ setuptools ]; + + dependencies = [ + asn1crypto + cryptography + h11 + ]; # Upstream hasn't release the tests yet doCheck = false; From 63c3178ca9fcdfc5f04830f5288e7206dff360ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 22:26:06 +0200 Subject: [PATCH 28/63] python312Packages.publicsuffixlist: 1.0.2.20240903 -> 1.0.2.20240905 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20240905-gha/CHANGES.md --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 2073b2dd233c..56d1bd69c4f6 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20240903"; + version = "1.0.2.20240905"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mcfzWXTvMKXb5Xc5c2pweOFuME8KUgtyNPoRssxf7EA="; + hash = "sha256-qDT+ksSwJkgyeVJl3hqc2p4uPux8Gjsq6cnW/SQ4NDE="; }; build-system = [ setuptools ]; From 2fd4c2f2a15afcb33a09cd372282521b33764430 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 22:27:40 +0200 Subject: [PATCH 29/63] python312Packages.tencentcloud-sdk-python: 3.0.1225 -> 3.0.1226 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1225...3.0.1226 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1226/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index a05a4eb06ab4..d05673462cbe 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1225"; + version = "3.0.1226"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-Fckkv5Oq8JqTqAqw4aOYqxELfk3+TMVOF5eTsGIRjLY="; + hash = "sha256-tqLAt8WTsIgQnBuQQfQuXwG1thOA0IKjOjxVpGBeVs8="; }; build-system = [ setuptools ]; From 1464c2ed16d6b27d59d6b2f18df53dd71a269b28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 22:28:12 +0200 Subject: [PATCH 30/63] python312Packages.types-requests: 2.32.0.20240712 -> 2.32.0.20240905 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 0e2954f89525..a58435471d7d 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.32.0.20240712"; + version = "2.32.0.20240905"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-kMB5/wXlSfa/UOAukQIQuYuP8evdGOGchzzSN3N8E1g="; + hash = "sha256-6X/QFaXtmCyd3NFMxK+6nREeDga3l8j3dtFGAnNem9Y="; }; build-system = [ setuptools ]; From 65bcf0b0058299fa38c9048f93859cb62c84c13c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 22:30:26 +0200 Subject: [PATCH 31/63] python312Packages.asyauth: 0.0.20 -> 0.0.21 Changelog: https://github.com/skelsec/asyauth/releases/tag/0.0.21 --- pkgs/development/python-modules/asyauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index 786bfc4c7fe7..5a3d31e53fb5 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.20"; + version = "0.0.21"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QQVgIPdonPXwpVl1nH8Cps4nGb2oTfeDvRBY1XgeUUs="; + hash = "sha256-NMwQxfhij/LiW1EW3JjvxcpFUy8WPM0/kUej4C3YEOs="; }; propagatedBuildInputs = [ From 6e42fcd9833d83edda39d0ef48d471a9de557a59 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 22:31:30 +0200 Subject: [PATCH 32/63] python312Packages.asyauth: refactor --- pkgs/development/python-modules/asyauth/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index 5a3d31e53fb5..56b1ad8712bc 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -6,13 +6,14 @@ fetchPypi, minikerberos, pythonOlder, + setuptools, unicrypto, }: buildPythonPackage rec { pname = "asyauth"; version = "0.0.21"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +22,9 @@ buildPythonPackage rec { hash = "sha256-NMwQxfhij/LiW1EW3JjvxcpFUy8WPM0/kUej4C3YEOs="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ asn1crypto asysocks minikerberos From c427110f0a4cbe953887a6ba534dd8b341365c86 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 22:35:19 +0200 Subject: [PATCH 33/63] python312Packages.commoncode: 31.2.1 -> 32.0.0 Diff: https://github.com/nexB/commoncode/compare/refs/tags/v31.2.1...v32.0.0 Changelog: https://github.com/nexB/commoncode/blob/v32.0.0/CHANGELOG.rst --- .../python-modules/commoncode/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 7cc96f4d856f..359f1935f2fc 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -6,7 +6,6 @@ buildPythonPackage, click, fetchFromGitHub, - fetchpatch2, pytest-xdist, pytestCheckHook, pythonOlder, @@ -18,26 +17,18 @@ buildPythonPackage rec { pname = "commoncode"; - version = "31.2.1"; + version = "32.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "nexB"; repo = "commoncode"; rev = "refs/tags/v${version}"; - hash = "sha256-4ZgyNlMj1i1fRru4wgDOyP3qzbne8D2eH/tFI60kgrE="; + hash = "sha256-yqvsBJHrxVkSqp3QnYmHDJr3sef/g4pkSlkSioYuOc4="; }; - patches = [ - # https://github.com/nexB/commoncode/pull/66 - (fetchpatch2 { - url = "https://github.com/nexB/commoncode/commit/4f87b3c9272dcf209b9c4b997e98b58e0edaf570.patch"; - hash = "sha256-loUtAww+SK7kMt5uqZmLQ8Wg/OqB7LWVA4BiztnwHsA="; - }) - ]; - dontConfigure = true; build-system = [ setuptools-scm ]; From 331aee3effeefe5d26593a9a1f13200d199a3ee3 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 5 Sep 2024 17:33:45 -0400 Subject: [PATCH 34/63] restic: 0.17.0 -> 0.17.1 --- pkgs/tools/backup/restic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 5f802f487903..11498abb458a 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-fd67ZehmgHHd+R/V4hJCREWoY3lFKSTfvbLRgJ0PSAM="; + hash = "sha256-/kgZgHmIxZkkmLyR246CcU+8wAekuK8SruY5GBLxJXI="; }; patches = [ From 64d36bf11cd037ee89a8e1023a5337e837d20ab8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 00:25:44 +0000 Subject: [PATCH 35/63] agkozak-zsh-prompt: 3.11.3 -> 3.11.4 --- pkgs/shells/zsh/agkozak-zsh-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix b/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix index 9d87f3b7385f..899cda1a5ea5 100644 --- a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix +++ b/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "agkozak-zsh-prompt"; - version = "3.11.3"; + version = "3.11.4"; src = fetchFromGitHub { owner = "agkozak"; repo = "agkozak-zsh-prompt"; rev = "v${version}"; - sha256 = "sha256-YBqFA/DK2K1effniwjPSe5VMx9tZGbmxyJp92TiingU="; + sha256 = "sha256-FC9LIZaS6fV20qq6cJC/xQvfsM3DHXatVleH7yBgoNg="; }; strictDeps = true; From c83a915d4724255a1e29918a856db55ec68bd7a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 01:28:27 +0000 Subject: [PATCH 36/63] okteto: 2.30.2 -> 2.31.0 --- pkgs/by-name/ok/okteto/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index a90c465f2c5d..32c8c0c77519 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.30.2"; + version = "2.31.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-6t9lkn2voxE6rbBtD7AcO9aRLcLVe2JDFPIj8XR86KU="; + hash = "sha256-YY8PWBEd8MV/k0wvXqyFTuNi3mvUnFNm2GrmrFF7TKQ="; }; vendorHash = "sha256-7XZImCS9hv8ILYfGcoY3tMk0grswWbfpQrBKhghTfsY="; From 30f35b1560f5079053a8714a61d3dfb566e2dc34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 02:07:55 +0000 Subject: [PATCH 37/63] python312Packages.craft-cli: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/craft-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-cli/default.nix b/pkgs/development/python-modules/craft-cli/default.nix index 193616f1583e..16fdbf181583 100644 --- a/pkgs/development/python-modules/craft-cli/default.nix +++ b/pkgs/development/python-modules/craft-cli/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "craft-cli"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-cli"; rev = "refs/tags/${version}"; - hash = "sha256-8+dyFOEW0F4t2issRlOqdbzf0Avg0NsADgk96mZFpEQ="; + hash = "sha256-PNurNP0ghG/R0rcUc5GfuPM5PTt+9FbJRjs61YJ1ytc="; }; postPatch = '' From fd9fd8a7e1c04d1a0d9edfa66dbebea931190272 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 03:14:41 +0000 Subject: [PATCH 38/63] python312Packages.meshtastic: 2.4.0 -> 2.4.1 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 3616351622c6..5c09306398e3 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.4.0"; + version = "2.4.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-qEjwlIkgZGsnvKCSL4jcJl472HIlQDynwPWRCNE/EQE="; + hash = "sha256-j5J/cWZwayt9RZFeMkTgzhRJznfxNUhXzV5lBLZNBhM="; }; pythonRelaxDeps = [ From b0a5797c24b35d67cfb447818435c854e935dfcb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 03:21:52 +0000 Subject: [PATCH 39/63] wizer: 7.0.4 -> 7.0.5 --- pkgs/by-name/wi/wizer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wi/wizer/package.nix b/pkgs/by-name/wi/wizer/package.nix index aaa7d5f28ff1..4aaad29db566 100644 --- a/pkgs/by-name/wi/wizer/package.nix +++ b/pkgs/by-name/wi/wizer/package.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { pname = "wizer"; - version = "7.0.4"; + version = "7.0.5"; # the crate does not contain files which are necessary for the tests # see https://github.com/bytecodealliance/wizer/commit/3a95e27ce42f1fdaef07b52988e4699eaa221e04 @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec { owner = "bytecodealliance"; repo = "wizer"; rev = "refs/tags/v${version}"; - hash = "sha256-KIYgmKZ81oKHu25Iz1iVRZV/xcLnkkD1a5vpV1a38FQ="; + hash = "sha256-bx8V/jaKDpJdWRwYm6GrjsdXQpDyTulRMKVnQZlqLNE="; }; - cargoHash = "sha256-vAHBg1Ogqr8QTfvBhLaIGGsdZ3HjobSwMoJJXfqrcCY="; + cargoHash = "sha256-8iQ6ULdle8tJDPgIoPT9R3jfS32tBBfs4vZNQcV8vfs="; cargoBuildFlags = [ "--bin" pname ]; From a0a77227b5a10e0a5b5b4200cc3628c1d514767d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 03:32:30 +0000 Subject: [PATCH 40/63] stripe-cli: 1.21.3 -> 1.21.5 --- pkgs/tools/admin/stripe-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 7cb7cf78ddb8..e83ff967b96d 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.21.3"; + version = "1.21.5"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-iCr7RJ3dF0DetuIyfGshU4/VRNEhYxFOQlugl2oTZPM="; + hash = "sha256-Zv5hHDqjfpKiXYhM8CTXVJxqFE8dZ5mFDNnq6k0GWwM="; }; vendorHash = "sha256-TuxYJ3u4/5PJYRoRgom+M1au9XerZ+vj9X3jUWTPM58="; From 9dca8ad0d237264948f5150bc34ede9dcaee7aa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 04:58:14 +0000 Subject: [PATCH 41/63] llama-cpp: 3645 -> 3672 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 454f4b704399..3b943a83cb65 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -69,13 +69,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "3645"; + version = "3672"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-Vev4X9wXyTksHop4q9ysym0zEaMBt51CIOqIf5jymK0="; + hash = "sha256-m9mMmvIasoJkj0DAx/6TLdt5Qflbe1JqaU1VQ/8bEG0="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT From 115a8ef037f549f4663943306fdbbd3864170c9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 05:02:27 +0000 Subject: [PATCH 42/63] files-cli: 2.13.128 -> 2.13.133 --- pkgs/by-name/fi/files-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 82aaa4af8a44..fb298300347d 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.128"; + version = "2.13.133"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-oQ+mESm7/VkfX+8Yf3l7x7VSfUK2flndSthlhNpvjh0="; + hash = "sha256-noIMO+xQaFV8hzSUjWMASLbRtiZb6wNeuRaCYsLQxsE="; }; - vendorHash = "sha256-h0dADEkiVNBudIh64Waqf9LtLa+I6dwAkmtYjuspEBs="; + vendorHash = "sha256-eMxhi+zKf8rDBCKb8/OvDQApHUc2ymt0EkDsvdStED8="; ldflags = [ "-s" From c264bc681c7833ac1223f879956179de8a0cfb67 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 6 Sep 2024 08:34:59 +0300 Subject: [PATCH 43/63] home-assistant-custom-lovelace-modules.universal-remote-card: 4.0.0 -> 4.0.1 Diff: https://github.com/Nerwyn/android-tv-card/compare/4.0.0...4.0.1 --- .../custom-lovelace-modules/universal-remote-card/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix index 97ef82f9cf9a..712c366f9f99 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix @@ -5,13 +5,13 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-vQfXsEMYPga816X8eGYdjgpou38KfMtLcKjIGkT25xU="; + hash = "sha256-AmBbc6nKSHbbkOGsk8z0IsrGfcf5gh6rrXhC8bPFhUM="; }; patches = [ ./dont-call-git.patch ]; From d4bfb852a93b8cb85b778c959609430956d3c089 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 05:43:51 +0000 Subject: [PATCH 44/63] nh: 3.5.21 -> 3.5.25 --- pkgs/by-name/nh/nh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index 5a2de242e3e1..de0e44c984a3 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -10,7 +10,7 @@ , nix-output-monitor }: let - version = "3.5.21"; + version = "3.5.25"; runtimeDeps = [ nvd nix-output-monitor ]; in rustPlatform.buildRustPackage { @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "viperML"; repo = "nh"; rev = "refs/tags/v${version}"; - hash = "sha256-Ujo6MQvwolE1eWSkPXCC9WFJeLtRfnMpvxoeAGNcbFI="; + hash = "sha256-dCfl8q5dg8euqD6NzsN4CLyY6KxmglCU9yJtSKYk+KU="; }; strictDeps = true; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; - cargoHash = "sha256-UFWw59puUWgs8/oHuMqwmjS7ZZQ/WIC1/p8odEtUzVU="; + cargoHash = "sha256-vCJ8Y1wXrgd4tft+VVguDI9RO+Wb6QRqIeQL3qbrRdI="; passthru.updateScript = nix-update-script { }; From 3732e94603adee495be0bc455fb3b5e38893398a Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Fri, 6 Sep 2024 06:48:24 +0100 Subject: [PATCH 45/63] maintainers: remove kierdavis --- maintainers/maintainer-list.nix | 6 ------ nixos/modules/services/computing/boinc/client.nix | 2 +- pkgs/applications/graphics/unigine-valley/default.nix | 2 +- pkgs/development/tools/modd/default.nix | 2 +- pkgs/games/freesweep/default.nix | 2 +- pkgs/games/pysolfc/default.nix | 2 +- pkgs/os-specific/linux/intel-ocl/default.nix | 2 +- pkgs/tools/security/hashcat/default.nix | 2 +- pkgs/tools/security/pius/default.nix | 2 +- 9 files changed, 8 insertions(+), 14 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 958948d62b19..36238b2d3581 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10868,12 +10868,6 @@ githubId = 8798449; name = "kidsan"; }; - kierdavis = { - email = "kierdavis@gmail.com"; - github = "kierdavis"; - githubId = 845652; - name = "Kier Davis"; - }; kiike = { email = "me@enric.me"; github = "kiike"; diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix index f5d7ab8d8cb2..f22e6360e0fd 100644 --- a/nixos/modules/services/computing/boinc/client.nix +++ b/nixos/modules/services/computing/boinc/client.nix @@ -108,6 +108,6 @@ in }; meta = { - maintainers = with lib.maintainers; [kierdavis]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index ff6f30b6c5e9..b64f136629ed 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { homepage = "https://unigine.com/products/benchmarks/valley/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf - maintainers = [ lib.maintainers.kierdavis ]; + maintainers = [ ]; platforms = [ "x86_64-linux" "i686-linux" ]; mainProgram = "valley"; }; diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/development/tools/modd/default.nix index af05842a252d..23116255c0de 100644 --- a/pkgs/development/tools/modd/default.nix +++ b/pkgs/development/tools/modd/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { mainProgram = "modd"; homepage = "https://github.com/cortesi/modd"; license = licenses.mit; - maintainers = with maintainers; [ kierdavis ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix index 6013f17a03a7..5e658947e803 100644 --- a/pkgs/games/freesweep/default.nix +++ b/pkgs/games/freesweep/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mainProgram = "freesweep"; homepage = "https://github.com/rwestlund/freesweep"; license = licenses.gpl2Only; - maintainers = with maintainers; [ kierdavis ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index cff2915093e5..8d63aaed9488 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -106,6 +106,6 @@ python311Packages.buildPythonApplication rec { mainProgram = "pysol.py"; homepage = "https://pysolfc.sourceforge.io"; license = licenses.gpl3; - maintainers = with maintainers; [ kierdavis ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index b1451421d69b..3b83b16cb09e 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://software.intel.com/en-us/articles/opencl-drivers"; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = [ lib.maintainers.kierdavis ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index dc3a5390da3c..55201b3d8483 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { homepage = "https://hashcat.net/hashcat/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ felixalbrigtsen kierdavis zimbatm ]; + maintainers = with maintainers; [ felixalbrigtsen zimbatm ]; }; } diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index aa9687ba3a41..4fedf054a387 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -36,6 +36,6 @@ python3Packages.buildPythonApplication { license = lib.licenses.gpl2Only; platforms = lib.platforms.gnu ++ lib.platforms.linux; - maintainers = with lib.maintainers; [ kierdavis ]; + maintainers = with lib.maintainers; [ ]; }; } From 4da4c9c55b0fce1b078f881b5345ac7f80ca620e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 06:24:14 +0000 Subject: [PATCH 46/63] qq: 3.2.12-2024.8.19 -> 3.2.12-2024.9.2 --- pkgs/by-name/qq/qq/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index c9ba6f38208b..d3bfb154a3e5 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-09-01 +# Last updated: 2024-09-06 { - version = "3.2.12-2024.8.19"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240819_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240819_arm64_01.deb"; - arm64_hash = "sha256-iPi7RwAHSWnRBl2U+D1acghFjjF+vCH+Nz1Wf1bQFJY="; - amd64_hash = "sha256-yuMHl/PIxAYUBXKNiI7u2upEc32mixAjjgLjO9xooVI="; + version = "3.2.12-2024.9.2"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240902_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240902_arm64_01.deb"; + arm64_hash = "sha256-V+lsBgwhpvVNYGm1d0DD9x/wD7/+bIDON8DAAABA42c="; + amd64_hash = "sha256-NHK50KR2WuUm+HO//sFBUkhJPk6F45j5ShuaWksV1O4="; } From 63c1a4d62c3073a127f176d68508d3572527bb30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 06:50:07 +0000 Subject: [PATCH 47/63] androidStudioPackages.canary: 2024.2.1.4 -> 2024.2.1.5 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 68c5b6799f6d..a394baced75d 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -17,8 +17,8 @@ let sha256Hash = "sha256-Qn5NNW2Rt6f9QiEUamIumme45uUVeTiMJ/9niAC6ilM="; }; latestVersion = { - version = "2024.2.1.4"; # "Android Studio Ladybug | 2024.2.1 Canary 8" - sha256Hash = "sha256-H2NN6/ywQCMunX1mk0gbgEoY75gHV+fpru+mZNe9fpk="; + version = "2024.2.1.5"; # "Android Studio Ladybug | 2024.2.1 Canary 9" + sha256Hash = "sha256-0F07jcsutarm464ahgo9hDh1jHo2aDEpIz5r9bxmNZw="; }; in { # Attributes are named by their corresponding release channels From 56dea6da87acccf04f94374ef464a0359ee5883d Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 5 Sep 2024 06:47:55 +0100 Subject: [PATCH 48/63] nixos: switch to `switch-to-configuration-ng` by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Rust `switch-to-configuration-ng` rewrite was carefully written to be compatible with the original Perl script, has been checked against NixOS VM tests, and has been available on an opt‐in basis for testing for the 24.05 release cycle. The next step towards replacing the Perl script entirely is to switch it on by default so that we can get real‐world testing from a much greater number of users. Maintaining two implementations in parallel is becoming a burden; we are having to adjust the systemd service activation behaviour slightly to fix a long‐standing bug, and backporting the changes to the Perl script is an unpleasant process. We will do it anyway to ensure that the Rust and Perl implementations keep parity with each other throughout the 24.11 release cycle, but we think the time has come to flip the switch. Taking this step now will give us two to three months to test this in the wild before the 24.11 release and gain confidence that there are no regressions. If any non‐trivial problems arise before the final release, we will revert to the Perl implementation by default. Doing this switch ASAP will help to disentangle any problems that might arise from the Rust implementation from problems that arise from the systemd service activation changes, or the upcoming switch to using systemd in stage 1 by default. The main concern that was raised about replacing the Perl script in the PR that added `switch-to-configuration-ng` was that it is currently possible to run NixOS on systems that cannot natively host a Rust compiler. This does not apply to any platforms that have official support from NixOS, and as far as I know we do not know of any such systems with users that are not cross‐compiling anyway. My understanding is that these systems are already broken by default anyway, as `systemd.shutdownRamfs.enable` is on by default and uses `make-initrd-ng`, which is also written in Rust. Switching the default while keeping the Perl implementation around will give us at least an entire release cycle to find out if there are any users that will be affected by this and decide what to do about it if so. There is currently one known inconsistency between the Perl and Rust implementations, as documented in ; the Rust implementation has more accurate handling of failed systemd units. We slightly adjust the semantics of `system.switch.enable{,Ng}` to not conflict with each other, so that `system.switch.enableNg` is on by default, but turning off `system.switch.enable` still results in no `switch-to-configuration` implementation being used. This won’t break the configuration of anyone who already opted in to `system.switch.enableNg` and is probably how the option should have worked to begin with. --- .../manual/release-notes/rl-2411.section.md | 4 +++ .../system/activation/switchable-system.nix | 32 +++++++------------ 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 1720dfea3525..2450b3d6e43a 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -34,6 +34,10 @@ Users that want to keep PulseAudio will want to set `services.pipewire.enable = false;` and `hardware.pulseaudio.enable = true;`. There is currently no plan to fully deprecate and remove PulseAudio, however, PipeWire should generally be preferred for new installs. +- The Rust rewrite of the `switch-to-configuration` program is now used for system activation by default. + If you experience any issues, please report them. + The original Perl script can still be used for now by setting `system.switch.enableNg` to `false`. + ## New Modules {#sec-release-24.11-new-modules} - [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwariror 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver). diff --git a/nixos/modules/system/activation/switchable-system.nix b/nixos/modules/system/activation/switchable-system.nix index d70fefd0920b..883584a32ce2 100644 --- a/nixos/modules/system/activation/switchable-system.nix +++ b/nixos/modules/system/activation/switchable-system.nix @@ -4,14 +4,6 @@ let perlWrapped = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]); - description = extra: '' - Whether to include the capability to switch configurations. - - Disabling this makes the system unable to be reconfigured via `nixos-rebuild`. - - ${extra} - ''; - in { @@ -20,7 +12,11 @@ in enable = lib.mkOption { type = lib.types.bool; default = true; - description = description '' + description = '' + Whether to include the capability to switch configurations. + + Disabling this makes the system unable to be reconfigured via `nixos-rebuild`. + This is good for image based appliances where updates are handled outside the image. Reducing features makes the image lighter and slightly more secure. @@ -29,23 +25,17 @@ in enableNg = lib.mkOption { type = lib.types.bool; - default = false; - description = description '' - Whether to use `switch-to-configuration-ng`, an experimental - re-implementation of `switch-to-configuration` with the goal of - replacing the original. + default = config.system.switch.enable; + defaultText = lib.literalExpression "config.system.switch.enable"; + description = '' + Whether to use `switch-to-configuration-ng`, the Rust-based + re-implementation of the original Perl `switch-to-configuration`. ''; }; }; config = lib.mkMerge [ - { - assertions = [{ - assertion = with config.system.switch; enable -> !enableNg; - message = "Only one of system.switch.enable and system.switch.enableNg may be enabled at a time"; - }]; - } - (lib.mkIf config.system.switch.enable { + (lib.mkIf (config.system.switch.enable && !config.system.switch.enableNg) { system.activatableSystemBuilderCommands = '' mkdir $out/bin substitute ${./switch-to-configuration.pl} $out/bin/switch-to-configuration \ From 73f34448ca92e639620fa2ec9b9b0e092f4de443 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 5 Sep 2024 06:49:53 +0100 Subject: [PATCH 49/63] nixos/tests/switch-test: simplify `enableNg` setting --- nixos/tests/switch-test.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index d90e5bb088ce..462f4247789e 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -48,10 +48,7 @@ in { nodes = { machine = { pkgs, lib, ... }: { - system.switch = { - enable = !ng; - enableNg = ng; - }; + system.switch.enableNg = ng; environment.systemPackages = [ pkgs.socat ]; # for the socket activation stuff users.mutableUsers = false; From 866a8e220c20d46cfd25417dd2645de44464d5d2 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 5 Sep 2024 06:49:53 +0100 Subject: [PATCH 50/63] nixos/perlless: remove redundant `system.switch.enableNg` This is now on by default. --- nixos/modules/profiles/perlless.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nixos/modules/profiles/perlless.nix b/nixos/modules/profiles/perlless.nix index cb98895743d5..c331a9088267 100644 --- a/nixos/modules/profiles/perlless.nix +++ b/nixos/modules/profiles/perlless.nix @@ -2,13 +2,6 @@ { - # switch-to-configuration-ng reimplements switch-to-configuration, but - # without perl. - system.switch = lib.mkDefault { - enable = false; - enableNg = true; - }; - # Remove perl from activation boot.initrd.systemd.enable = lib.mkDefault true; system.etc.overlay.enable = lib.mkDefault true; From a5cfd68cb1924b961be5cf2d86d9ac6cbe58fa5b Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 5 Sep 2024 06:52:06 +0100 Subject: [PATCH 51/63] nixos/doc/perlless: remove outdated warning --- nixos/doc/manual/configuration/profiles/perlless.section.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/doc/manual/configuration/profiles/perlless.section.md b/nixos/doc/manual/configuration/profiles/perlless.section.md index bf055971cfc4..9ee70ed3b49c 100644 --- a/nixos/doc/manual/configuration/profiles/perlless.section.md +++ b/nixos/doc/manual/configuration/profiles/perlless.section.md @@ -1,11 +1,5 @@ # Perlless {#sec-perlless} -::: {.warning} -If you enable this profile, you will NOT be able to switch to a new -configuration and thus you will not be able to rebuild your system with -nixos-rebuild! -::: - Render your system completely perlless (i.e. without the perl interpreter). This includes a mechanism so that your build fails if it contains a Nix store path that references the string "perl". From fccd84a04522aaa8fa65b0a09395a498bd1ed11d Mon Sep 17 00:00:00 2001 From: Assistant Date: Mon, 2 Sep 2024 03:11:18 -0400 Subject: [PATCH 52/63] twitch-chat-downloader: update client_id --- pkgs/applications/misc/twitch-chat-downloader/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/misc/twitch-chat-downloader/default.nix b/pkgs/applications/misc/twitch-chat-downloader/default.nix index 922c925cbb0c..ffe1ddc9c220 100644 --- a/pkgs/applications/misc/twitch-chat-downloader/default.nix +++ b/pkgs/applications/misc/twitch-chat-downloader/default.nix @@ -20,6 +20,13 @@ buildPythonApplication rec { hash = "sha256-mV60ygrtQa9ZkJ2CImhAV59ckCJ7vJSA9cWkYE2xo1M="; }; + postPatch = '' + # Update client ID for Twitch changes + # See: + substituteInPlace tcd/example.settings.json \ + --replace-fail jzkbprff40iqj646a697cyrvl0zt2m6 kd1unb4b3q4t58fwlpcbzcbnm76a8fp + ''; + propagatedBuildInputs = [ iso8601 progressbar2 From 862911fd227110e16739fe5cebe710cb29d28942 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 30 Aug 2024 17:25:24 +0100 Subject: [PATCH 53/63] nixos/release-small: remove minimal installer ISOs These take up 2 GiB every time anything in the minimal installer changes, or up to 4 GiB per day. We already stopped building Amazon images in 9426d90c6784aa19f11a8cfc5171a46f0b21cd94. Meaningful installer changes are rare enough, and the couple of days it takes for them to trickle down to the large channel acceptable enough, that this is mostly a waste of space. This should buy enough slack to build `stdenv` on `staging` without contributing to cache size growth. --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++ nixos/release-combined.nix | 1 + nixos/release-small.nix | 12 +++--------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 1720dfea3525..11d8da634125 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -407,6 +407,9 @@ - The NixOS installation media no longer support the ReiserFS or JFS file systems by default. +- Minimal installer ISOs are no longer built on the small channel. + Please obtain installer images from the full release channels. + ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 00ab7efb03b4..969ff3bf68f6 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -86,6 +86,7 @@ in rec { # Upstream issue: https://gitlab.com/qemu-project/qemu/-/issues/2321 # (onSystems ["x86_64-linux"] "nixos.tests.hibernate") (onFullSupported "nixos.tests.i3wm") + (onSystems ["aarch64-linux"] "nixos.tests.installer.simpleUefiSystemdBoot") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolDefault") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolEscape") diff --git a/nixos/release-small.nix b/nixos/release-small.nix index d4d7b7b4149b..3a1ebd5e7c88 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -53,12 +53,8 @@ in rec { inherit (nixos'.tests.installer) lvm separateBoot - simple; - }; - boot = { - inherit (nixos'.tests.boot) - biosCdrom - uefiCdrom; + simple + simpleUefiSystemdBoot; }; }; }; @@ -107,18 +103,16 @@ in rec { "nixpkgs.tarball" "nixpkgs.release-checks" ] + (onSystems [ "aarch64-linux" ] "nixos.tests.installer.simpleUefiSystemdBoot") (map (onSystems [ "x86_64-linux" ]) [ - "nixos.tests.boot.biosCdrom" "nixos.tests.installer.lvm" "nixos.tests.installer.separateBoot" "nixos.tests.installer.simple" ]) (map onSupported [ "nixos.dummy" - "nixos.iso_minimal" "nixos.manual" "nixos.tests.acme" - "nixos.tests.boot.uefiCdrom" "nixos.tests.containers-imperative" "nixos.tests.containers-ip" "nixos.tests.firewall" From 616b34597ae2ebc2bace5b72d59a37015cdaa8f0 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 6 Sep 2024 09:06:07 +0100 Subject: [PATCH 54/63] nixos/release-small: actually remove minimal installer ISOs Fixes: 862911fd227110e16739fe5cebe710cb29d28942 --- nixos/release-small.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 3a1ebd5e7c88..ed205664a855 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -32,7 +32,7 @@ let in rec { nixos = { - inherit (nixos') channel manual options iso_minimal dummy; + inherit (nixos') channel manual options dummy; tests = { inherit (nixos'.tests) acme From 925d85f1f67a34b419b701800a3d4e5ce2ab05a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 08:14:09 +0000 Subject: [PATCH 55/63] cargo-mobile2: 0.15.1 -> 0.17.0 --- pkgs/development/tools/rust/cargo-mobile2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/development/tools/rust/cargo-mobile2/default.nix index b8180bb4348e..6eaddff17c75 100644 --- a/pkgs/development/tools/rust/cargo-mobile2/default.nix +++ b/pkgs/development/tools/rust/cargo-mobile2/default.nix @@ -12,7 +12,7 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices; pname = "cargo-mobile2"; - version = "0.15.1"; + version = "0.17.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = pname; rev = "cargo-mobile2-v${version}"; - hash = "sha256-kWoVjEZsHvuVfsl/SsVm/XJ4Y/U/gjcprY4xISE5xs8="; + hash = "sha256-w+3AqfdzbPKuRa81Q4WhQyc32xzY2IhhG2ylVmwAHkA="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-zfu5cRTJY5yZOOa41PribmcbEVcxbRJfosj4+tU/OsU="; + cargoHash = "sha256-q7cuN2ZNcMfsrn1LS4ZqlJZr1vyCKT07Ksup0L2V0o0="; preBuild = '' mkdir -p $out/share/ From cc6e93a6178bee76311e20ef3621f2254028469e Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 6 Sep 2024 11:27:13 +0300 Subject: [PATCH 56/63] nixos/release-small: also gate on simpleUefiSystemdBoot test on x86_64 We're building it anyway, might as well --- nixos/release-small.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release-small.nix b/nixos/release-small.nix index ed205664a855..d3a70506ddec 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -103,7 +103,6 @@ in rec { "nixpkgs.tarball" "nixpkgs.release-checks" ] - (onSystems [ "aarch64-linux" ] "nixos.tests.installer.simpleUefiSystemdBoot") (map (onSystems [ "x86_64-linux" ]) [ "nixos.tests.installer.lvm" "nixos.tests.installer.separateBoot" @@ -117,6 +116,7 @@ in rec { "nixos.tests.containers-ip" "nixos.tests.firewall" "nixos.tests.ipv6" + "nixos.tests.installer.simpleUefiSystemdBoot" "nixos.tests.login" "nixos.tests.misc" "nixos.tests.nat.firewall" From 3c58c8c8a86fcd112d7493be889af065d6e91e69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 08:42:44 +0000 Subject: [PATCH 57/63] androidStudioPackages.beta: 2024.1.2.11 -> 2024.2.1.6 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 68c5b6799f6d..f67f27eac17b 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,8 +13,8 @@ let sha256Hash = "sha256-dFFogg6YmpCF/4QtR85UFAfbCd97irIHcPbqieQabpI="; }; betaVersion = { - version = "2024.1.2.11"; # "Android Studio Koala Feature Drop | 2024.1.2 RC 1" - sha256Hash = "sha256-Qn5NNW2Rt6f9QiEUamIumme45uUVeTiMJ/9niAC6ilM="; + version = "2024.2.1.6"; # "Android Studio Ladybug | 2024.2.1 Beta 1" + sha256Hash = "sha256-o/otfwZu+MUy9tbLt1iZWmBPB7YVx5aMjA1KcIvMD3U="; }; latestVersion = { version = "2024.2.1.4"; # "Android Studio Ladybug | 2024.2.1 Canary 8" From 6889824f226c24504d78e6dd97b929a417bc3fd9 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 6 Sep 2024 11:52:40 +0200 Subject: [PATCH 58/63] open-webui: 0.3.18 -> 0.3.19 --- pkgs/by-name/op/open-webui/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 48a18549f393..b7f4fc454b13 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,25 +7,25 @@ }: let pname = "open-webui"; - version = "0.3.18-unstable-2024-09-05"; + version = "0.3.19"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; - rev = "c3271e84efc281dfed8c1e2d265cd24e1e5865e6"; - hash = "sha256-yOLxpRgwTVPlQASzFqul+ap/s7Wx3uxf4xr+Xb2Nb7A="; + rev = "refs/tags/v${version}"; + hash = "sha256-0POrTElR4oze9sypfsJrY8miBVK6JvHRDmzMhqntFA4="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-BkjvMD1XxELzxiPZagYd0aEUsaAl338h5W9nvxxrJJg="; + npmDepsHash = "sha256-03F9Pz4RWoswdYh9lLEHtg5WitCsrG3JOa2S/RJDtZI="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. postPatch = '' substituteInPlace package.json \ - --replace-fail "npm run pyodide:fetch && vite build" "vite build" \ + --replace-fail "npm run pyodide:fetch && vite build" "vite build" ''; env.CYPRESS_INSTALL_BINARY = "0"; # disallow cypress from downloading binaries in sandbox From a52dac7c2ffe3b4e4d329991cf5c4e83ba026ea3 Mon Sep 17 00:00:00 2001 From: Victor Nilsson Date: Thu, 5 Sep 2024 14:46:52 +0200 Subject: [PATCH 59/63] desed: init at master --- pkgs/by-name/de/desed/package.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/de/desed/package.nix diff --git a/pkgs/by-name/de/desed/package.nix b/pkgs/by-name/de/desed/package.nix new file mode 100644 index 000000000000..a6909bbde844 --- /dev/null +++ b/pkgs/by-name/de/desed/package.nix @@ -0,0 +1,28 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage { + pname = "desed"; + version = "1.2.1-unstable-2024-09-06"; + + src = fetchFromGitHub { + owner = "SoptikHa2"; + repo = "desed"; + rev = "master"; + hash = "sha256-iCpEfefXXognk4YI1LLb3mwgaqMw4m3haq/gdS1JbQU="; + }; + + cargoHash = "sha256-z2qv394C0GhQC21HuLyvlNjrM65KFEZh1XLj+Y/B9ZM="; + + meta = { + changelog = "https://github.com/SoptikHa2/desed/releases/tag/v1.2.1"; + description = "Debugger for Sed: demystify and debug your sed scripts, from comfort of your terminal. "; + homepage = "https://github.com/SoptikHa2/desed"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ vinylen ]; + mainProgram = "desed"; + }; +} From e4b8a0a243d917d78935e6c479a5005e7c52063f Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 6 Sep 2024 13:35:43 +0300 Subject: [PATCH 60/63] switch-to-configuration-ng: move sources to a subdirectory to avoid fileset shenanigans Something is wrong with source filtering and it makes installer tests fail. Move it to a subdirectory to not have to do that, at least for now. The Nix exorcism squad has been called. --- .../sw/switch-to-configuration-ng/package.nix | 12 ++---------- .../switch-to-configuration-ng/{ => src}/.gitignore | 0 .../switch-to-configuration-ng/{ => src}/Cargo.lock | 0 .../switch-to-configuration-ng/{ => src}/Cargo.toml | 0 .../sw/switch-to-configuration-ng/{ => src}/build.rs | 0 .../switch-to-configuration-ng/src/{ => src}/main.rs | 0 6 files changed, 2 insertions(+), 10 deletions(-) rename pkgs/by-name/sw/switch-to-configuration-ng/{ => src}/.gitignore (100%) rename pkgs/by-name/sw/switch-to-configuration-ng/{ => src}/Cargo.lock (100%) rename pkgs/by-name/sw/switch-to-configuration-ng/{ => src}/Cargo.toml (100%) rename pkgs/by-name/sw/switch-to-configuration-ng/{ => src}/build.rs (100%) rename pkgs/by-name/sw/switch-to-configuration-ng/src/{ => src}/main.rs (100%) diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/package.nix b/pkgs/by-name/sw/switch-to-configuration-ng/package.nix index aa748a0c2b3d..50694aa1dd94 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/package.nix +++ b/pkgs/by-name/sw/switch-to-configuration-ng/package.nix @@ -10,17 +10,9 @@ rustPlatform.buildRustPackage { pname = "switch-to-configuration"; version = "0.1.0"; - src = lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.unions [ - ./Cargo.lock - ./Cargo.toml - ./build.rs - ./src - ]; - }; + src = ./src; - cargoLock.lockFile = ./Cargo.lock; + cargoLock.lockFile = ./src/Cargo.lock; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/.gitignore b/pkgs/by-name/sw/switch-to-configuration-ng/src/.gitignore similarity index 100% rename from pkgs/by-name/sw/switch-to-configuration-ng/.gitignore rename to pkgs/by-name/sw/switch-to-configuration-ng/src/.gitignore diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock b/pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.lock similarity index 100% rename from pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock rename to pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.lock diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.toml b/pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.toml similarity index 100% rename from pkgs/by-name/sw/switch-to-configuration-ng/Cargo.toml rename to pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.toml diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/build.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/build.rs similarity index 100% rename from pkgs/by-name/sw/switch-to-configuration-ng/build.rs rename to pkgs/by-name/sw/switch-to-configuration-ng/src/build.rs diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs similarity index 100% rename from pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs rename to pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs From 7d34adda138185351f1672ed708dc8929ba39ac5 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 6 Sep 2024 13:39:31 +0300 Subject: [PATCH 61/63] nixos/tests/installer: add some Perl libraries that are now missing due to stc-ng --- nixos/tests/installer.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index d57866c9f52c..8467220942ac 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -626,6 +626,9 @@ let libxslt.bin nixos-artwork.wallpapers.simple-dark-gray-bottom ntp + perlPackages.ConfigIniFiles + perlPackages.FileSlurp + perlPackages.JSON perlPackages.ListCompare perlPackages.XMLLibXML # make-options-doc/default.nix From 91b7e41f61df616d076092ec8e82b6ef01dc7c6a Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 6 Sep 2024 13:39:44 +0300 Subject: [PATCH 62/63] nixos/tests/containers-imperative: add Perl library that is now missing due to stc-ng --- nixos/tests/containers-imperative.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index ea1046b40354..c654c4378807 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -33,6 +33,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { stdenv stdenvNoCC emptyContainer.config.containers.foo.path libxslt desktop-file-utils texinfo docbook5 libxml2 docbook_xsl_ns xorg.lndir documentation-highlighter + perlPackages.ConfigIniFiles ]; }; From d4838fd5efae125120270a6ff126dfe6338d9ab9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 6 Sep 2024 12:53:55 +0200 Subject: [PATCH 63/63] Revert "nixos/all-tests: skip hibernate test for now" This reverts commit a1de57d6fc1c292db47c2b0debf404d46dd6dc49. We're now on QEMU 9.1.0, which contains the fix. --- nixos/release-combined.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 00ab7efb03b4..864f8afd5f4c 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -82,9 +82,7 @@ in rec { (onFullSupported "nixos.tests.gitlab") (onFullSupported "nixos.tests.gnome") (onFullSupported "nixos.tests.gnome-xorg") - # FIXME: broken by QEMU 8.2.3 upgrade, reenable when fixed - # Upstream issue: https://gitlab.com/qemu-project/qemu/-/issues/2321 - # (onSystems ["x86_64-linux"] "nixos.tests.hibernate") + (onSystems ["x86_64-linux"] "nixos.tests.hibernate") (onFullSupported "nixos.tests.i3wm") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolDefault")