From 896a8a9b9486bdf30c5ae306dcaf05f7180f4d15 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Sep 2023 18:28:00 +0900 Subject: [PATCH 01/18] python312: 3.12.0b4 -> 3.12.0rc2 https://docs.python.org/3.12/whatsnew/changelog.html#python-3-12-0rc2 Fixes: CVE-2023-40217 (cherry picked from commit bc9bf8621c99a683f5195bee441b355841692774) --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index f30ca87bbc6e..04ff317fe440 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -197,9 +197,9 @@ in { major = "3"; minor = "12"; patch = "0"; - suffix = "b2"; + suffix = "rc2"; }; - hash = "sha256-jfxC3abk0GR8+Kb3zZAHBN6p/YZkAqKCgpvS5uJxuBg="; + hash = "sha256-EesQN25rr3vqUwAfUYHq7heXeIxNtug6Bh5CI1eSdnQ="; inherit (darwin) configd; inherit passthruFun; }; From 6d6c76c8c088287a47c69910268b293a11d8db1a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Sep 2023 18:30:15 +0900 Subject: [PATCH 02/18] python38: 3.8.17 -> 3.8.18 https://docs.python.org/release/3.8.18/whatsnew/changelog.html Fixes: CVE-2023-40217 (cherry picked from commit ab5b8e656af09171554dc4f49188d3ca46c1edf0) --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 04ff317fe440..a88cc572c183 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -158,10 +158,10 @@ in { sourceVersion = { major = "3"; minor = "8"; - patch = "17"; + patch = "18"; suffix = ""; }; - hash = "sha256-LlSwxoGR8WVS9t4ul6I5ZUBXKiGfa7soWRoTfOzEkKk="; + hash = "sha256-P/txzTSaMmunsvrcfn34a6V33ZxJF+UqhAGtvadAXj8="; inherit (darwin) configd; inherit passthruFun; }; From 4d2dc901f68ae3d8b484f383f25740648a88ad28 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 9 Sep 2023 18:32:34 +0900 Subject: [PATCH 03/18] python39: 3.9.17 -> 3.9.18 https://docs.python.org/release/3.9.18/whatsnew/changelog.html Fixes: CVE-2023-40217 (cherry picked from commit 0a6f3b585712858a07a62c887f1d7179cdfe4e0c) --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index a88cc572c183..65849a948cad 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -171,10 +171,10 @@ in { sourceVersion = { major = "3"; minor = "9"; - patch = "17"; + patch = "18"; suffix = ""; }; - hash = "sha256-MM4FfETyg/jtk2Bsy9uNUd1Sa9xMYszl4Nwhe/o+jO4="; + hash = "sha256-AVl9sBMsHPezMe/2iuCbWiNaPDyqnJRMKcrH0cTEwAo="; inherit (darwin) configd; inherit passthruFun; }; From fceab0d1040e218cc6eab4bb309f6deefc04ca24 Mon Sep 17 00:00:00 2001 From: GenericNerdyUsername Date: Wed, 23 Aug 2023 23:15:53 +0100 Subject: [PATCH 04/18] abaddon: 0.1.10 -> 0.1.11 (cherry picked from commit 7cfef206542d65dfbdef3c663e989a699bcd455f) --- .../instant-messengers/abaddon/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/pkgs/applications/networking/instant-messengers/abaddon/default.nix index 601720345eb4..d749e3509622 100644 --- a/pkgs/applications/networking/instant-messengers/abaddon/default.nix +++ b/pkgs/applications/networking/instant-messengers/abaddon/default.nix @@ -9,20 +9,24 @@ , curl , gtkmm3 , libhandy +, libopus , libsecret +, libsodium , nlohmann_json +, pcre2 +, spdlog , sqlite }: stdenv.mkDerivation rec { pname = "abaddon"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "uowuo"; repo = "abaddon"; rev = "v${version}"; - hash = "sha256-84DrPx0e3pZjg87dHZO4y/z7KfIYNyAibE7/J7oYwXA="; + hash = "sha256-KrBZESYab7QFwUfpTl40cgKn/if31oqA9oCe0PwoYbs="; fetchSubmodules = true; }; @@ -37,8 +41,12 @@ stdenv.mkDerivation rec { curl gtkmm3 libhandy + libopus libsecret + libsodium nlohmann_json + pcre2 + spdlog sqlite ]; From 8088f310ae62297ef743331ab08e2369f9e006b7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 15 Sep 2023 14:09:52 +0200 Subject: [PATCH 05/18] roundcube: 1.6.2 -> 1.6.3 ChangeLog: https://github.com/roundcube/roundcubemail/releases/tag/1.6.3 (cherry picked from commit 99f70f9717e69a50548369f4864e75af99d3c100) --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index ee9fff230748..26dab5953811 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-yJgwfZXMSEGM+VUX71K1sAiMUAFPZ6bvgVdjQoqAQ/A="; + sha256 = "sha256-XmDM1Q9i+wDEPTNewIqb2vvyvdAlUiVsxACZCLOa2Y8="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From aca6b805e26ec2eed99ef2b6873850f4fb820ed7 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 17 Sep 2023 15:18:02 +0200 Subject: [PATCH 06/18] matrix-appservice-discord: 3.1.1 -> 4.0.0 This release contains compatibility fixes for Synapse 1.90.0+ and NodeJS 20. (cherry picked from commit d1e79831b1a133e633745b9e824ebda7b11c02e5) --- .../matrix-appservice-discord/package.json | 16 ++++++++-------- pkgs/servers/matrix-appservice-discord/pin.json | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/matrix-appservice-discord/package.json b/pkgs/servers/matrix-appservice-discord/package.json index d382f29c686a..f2ea8a3d924d 100644 --- a/pkgs/servers/matrix-appservice-discord/package.json +++ b/pkgs/servers/matrix-appservice-discord/package.json @@ -1,11 +1,11 @@ { "name": "matrix-appservice-discord", - "version": "3.1.1", + "version": "4.0.0", "description": "A bridge between Matrix and Discord", "main": "discordas.js", "engines": { "npm": "please-use-yarn", - "node": ">=16 <=18" + "node": ">=18 <=20" }, "scripts": { "test": "mocha -r ts-node/register test/config.ts test/test_*.ts test/**/test_*.ts", @@ -13,8 +13,8 @@ "coverage": "tsc && nyc mocha build/test/config.js build/test", "build": "tsc", "postinstall": "yarn build", - "start": "yarn build && node ./build/src/discordas.js -c config.yaml", - "debug": "yarn build && node --inspect ./build/src/discordas.js -c config.yaml", + "start": "node ./build/src/discordas.js", + "debug": "node --inspect ./build/src/discordas.js", "addbot": "node ./build/tools/addbot.js", "adminme": "node ./build/tools/adminme.js", "usertool": "node ./build/tools/userClientTools.js", @@ -40,16 +40,16 @@ }, "homepage": "https://github.com/Half-Shot/matrix-appservice-discord#readme", "dependencies": { - "@mx-puppet/matrix-discord-parser": "0.1.10", - "better-discord.js": "github:matrix-org/better-discord.js#5024781db755259e88abe915630b7d5b3ba5f48f", - "better-sqlite3": "^7.1.0", + "@mx-puppet/better-discord.js": "^12.5.1", + "@mx-puppet/matrix-discord-parser": "^0.1.10", + "better-sqlite3": "^8.6.0", "command-line-args": "^5.1.1", "command-line-usage": "^6.1.0", "escape-html": "^1.0.3", "escape-string-regexp": "^4.0.0", "js-yaml": "^3.14.0", "marked": "^1.2.2", - "matrix-appservice-bridge": "^5.0.0", + "matrix-appservice-bridge": "^9.0.1", "mime": "^2.4.6", "p-queue": "^6.4.0", "pg-promise": "^10.5.6", diff --git a/pkgs/servers/matrix-appservice-discord/pin.json b/pkgs/servers/matrix-appservice-discord/pin.json index 57b7ffd28a2c..95135ec18ec4 100644 --- a/pkgs/servers/matrix-appservice-discord/pin.json +++ b/pkgs/servers/matrix-appservice-discord/pin.json @@ -1,5 +1,5 @@ { - "version": "3.1.1", - "srcSha256": "g681w7RD96/xKP+WnIyY4bcVHVQhysgDPZo4TgCRiuY=", - "yarnSha256": "0cm9yprj0ajmrdpap3p2lx3xrrkar6gghlxnj9127ks6p5c1ji3r" + "version": "4.0.0", + "srcSha256": "UyRMMbnX4aJVv8oQfgn/rkZT1cRATtcgFj4fXszDKqo=", + "yarnSha256": "11zw1nkvsplnsiddyi1nb9zgdxn1mkh24nlcvaa69rpsjns9rj5k" } From 290cc9cf97d3bfa0acee5d8aedaa1352f3eb6b9d Mon Sep 17 00:00:00 2001 From: Janik H Date: Sat, 16 Sep 2023 20:46:53 +0200 Subject: [PATCH 07/18] vimPlugins: vim-sensible patch vimrc detection The vimrc detection won't work if you are using the vim_configurable package (which the nixos and home-manager module both do) because vim-sensible only checks for files in the users home matches `~/...` but in our case it gets called from a wrapper script which looks something like: `vim -u /nix/store/.../vimrc`. --- .../editors/vim/plugins/overrides.nix | 4 +++ .../fix-nix-store-path-regex.patch | 25 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/editors/vim/plugins/patches/vim-sensible/fix-nix-store-path-regex.patch diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 4e6fee9b88fe..a6b2e7d80b8e 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1390,6 +1390,10 @@ self: super: { preInstall = "cd vim"; }); + vim-sensible = super.vim-sensible.overrideAttrs { + patches = [ ./patches/vim-sensible/fix-nix-store-path-regex.patch ]; + }; + vim-snipmate = super.vim-snipmate.overrideAttrs (old: { dependencies = with self; [ vim-addon-mw-utils tlib_vim ]; }); diff --git a/pkgs/applications/editors/vim/plugins/patches/vim-sensible/fix-nix-store-path-regex.patch b/pkgs/applications/editors/vim/plugins/patches/vim-sensible/fix-nix-store-path-regex.patch new file mode 100644 index 000000000000..27241632ee8d --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/vim-sensible/fix-nix-store-path-regex.patch @@ -0,0 +1,25 @@ +From 07c799a1b170c0e28b385474b511c1034cfcb263 Mon Sep 17 00:00:00 2001 +From: Janik H +Date: Sat, 16 Sep 2023 19:45:32 +0200 +Subject: [PATCH] fix nix store path regex + +--- + plugin/sensible.vim | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugin/sensible.vim b/plugin/sensible.vim +index 0fc26e0..b3ee6e9 100644 +--- a/plugin/sensible.vim ++++ b/plugin/sensible.vim +@@ -26,7 +26,7 @@ function! s:MaySet(option) abort + silent verbose execute 'setglobal all' a:option . '?' + redir END + endif +- return out !~# " \\(\\~[\\/][^\n]*\\|Lua\\)$" ++ return out !~# "/nix/store/.*" && out !~# " \\(\\~[\\/][^\n]*\\|Lua\\)$" + endfunction + + if s:MaySet('backspace') +-- +2.41.0 + From b2a4389a1fd2d37bbf4e2168d30ef0ceb3ebeb49 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Aug 2023 12:26:54 +0200 Subject: [PATCH 08/18] chromium: Fix the chromedriver version Chromium was updated to M116 but the ChromeDriver version wasn't. (cherry picked from commit ed9c38b3fa956d50c835b8f95d14f735c985508b) --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 41356b991757..b7acecd869ac 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ }; stable = { chromedriver = { - sha256_darwin = "1c41cb7zh13ny4xvpwy7703cnjrkmqxd3n8zpja7n6a38mi8mgsk"; + sha256_darwin = "0gzx3zka8i2ngsdiqp8sr0v6ir978vywa1pj7j08vsf8kmb93iiy"; sha256_darwin_aarch64 = - "1kliszw10jnnlhzi8jrdzjq0r7vfn6ksk1spsh2rfn2hmghccv2d"; - sha256_linux = "1797qmb213anvp9lmrkj6wmfdwkdfswmshmk1816zankw5dl883j"; - version = "115.0.5790.98"; + "18iyapwjg0yha8qgbw7f605n0j54nd36shv3497bd84lc9k74b14"; + sha256_linux = "0d8mqzjc11g1bvxvffk0xyhxfls2ycl7ym4ssyjq752g2apjblhp"; + version = "116.0.5845.96"; }; deps = { gn = { From a9e1b120f2e2c4fd9f4a85b99ffe8f64871d108f Mon Sep 17 00:00:00 2001 From: networkException Date: Sun, 17 Sep 2023 13:05:16 +0200 Subject: [PATCH 09/18] chromium: 116.0.5845.187 -> 117.0.5938.88 https://chromereleases.googleblog.com/2023/09/stable-channel-update-for-desktop_12.html https://chromereleases.googleblog.com/2023/09/stable-channel-update-for-desktop_15.html This update includes 11 security fixes. CVEs: CVE-2023-4863 CVE-2023-4900 CVE-2023-4901 CVE-2023-4902 CVE-2023-4903 CVE-2023-4904 CVE-2023-4905 CVE-2023-4906 CVE-2023-4907 CVE-2023-4908 CVE-2023-4909 (cherry picked from commit e4514334bb72b7300eec9ec55a2140162a5cf2b6) --- .../networking/browsers/chromium/upstream-info.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index b7acecd869ac..70a3c45c5f4b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -35,15 +35,15 @@ }; deps = { gn = { - rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d"; - sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw"; + rev = "811d332bd90551342c5cbd39e133aa276022d7f8"; + sha256 = "0jlg3d31p346na6a3yk0x29pm6b7q03ck423n5n6mi8nv4ybwajq"; url = "https://gn.googlesource.com/gn"; - version = "2023-06-09"; + version = "2023-08-01"; }; }; - sha256 = "152lyrw8k36gbmf4fmfny4ajqh0523y5d48yrshbgwn5klmbhaji"; - sha256bin64 = "118sk39939d52srws2vgs1mfizpikswxh5ihd9x053vzn0aj8cfa"; - version = "116.0.5845.187"; + sha256 = "01n9aqnilsjrbpv5kkx3c6nxs9p5l5lfwxj67hd5s5g4740di4a6"; + sha256bin64 = "1dhgagphdzbd19gkc7vpl1hxc9vn0l7sxny346qjlmrwafqlhbgi"; + version = "117.0.5938.88"; }; ungoogled-chromium = { deps = { From 020a58950c8bf52782f6fc57d825884e77466cf5 Mon Sep 17 00:00:00 2001 From: networkException Date: Sun, 17 Sep 2023 13:16:55 +0200 Subject: [PATCH 10/18] ungoogled-chromium: 116.0.5845.187 -> 117.0.5938.88 https://chromereleases.googleblog.com/2023/09/stable-channel-update-for-desktop_12.html https://chromereleases.googleblog.com/2023/09/stable-channel-update-for-desktop_15.html This update includes 11 security fixes. CVEs: CVE-2023-4863 CVE-2023-4900 CVE-2023-4901 CVE-2023-4902 CVE-2023-4903 CVE-2023-4904 CVE-2023-4905 CVE-2023-4906 CVE-2023-4907 CVE-2023-4908 CVE-2023-4909 (cherry picked from commit b677e255d9934a9ec9d4056d2f20543e9757daba) --- .../browsers/chromium/ungoogled-flags.toml | 1 - .../browsers/chromium/upstream-info.nix | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml index 8578089ae41a..76a992fef3d0 100644 --- a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml +++ b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml @@ -4,7 +4,6 @@ clang_use_chrome_plugins=false disable_fieldtrial_testing_config=true enable_hangout_services_extension=false enable_mdns=false -enable_mse_mpeg2ts_stream_parser=true enable_nacl=false enable_reading_list=false enable_remoting=false diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 70a3c45c5f4b..991bf93eb3f6 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -48,18 +48,18 @@ ungoogled-chromium = { deps = { gn = { - rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d"; - sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw"; + rev = "811d332bd90551342c5cbd39e133aa276022d7f8"; + sha256 = "0jlg3d31p346na6a3yk0x29pm6b7q03ck423n5n6mi8nv4ybwajq"; url = "https://gn.googlesource.com/gn"; - version = "2023-06-09"; + version = "2023-08-01"; }; ungoogled-patches = { - rev = "116.0.5845.187-1"; - sha256 = "0br5lms6mxg2mg8ix5mkb79bg6wk5f2hn0xy1xc7gk9h3rl58is1"; + rev = "117.0.5938.88-1"; + sha256 = "1wz15ib56j8c84bgrbf0djk5wli49b1lvaqbg18pdclkp1mqy5w9"; }; }; - sha256 = "152lyrw8k36gbmf4fmfny4ajqh0523y5d48yrshbgwn5klmbhaji"; - sha256bin64 = "118sk39939d52srws2vgs1mfizpikswxh5ihd9x053vzn0aj8cfa"; - version = "116.0.5845.187"; + sha256 = "01n9aqnilsjrbpv5kkx3c6nxs9p5l5lfwxj67hd5s5g4740di4a6"; + sha256bin64 = "1dhgagphdzbd19gkc7vpl1hxc9vn0l7sxny346qjlmrwafqlhbgi"; + version = "117.0.5938.88"; }; } From f5d7664e4c751da3982d702eb1f49414bc565912 Mon Sep 17 00:00:00 2001 From: networkException Date: Sun, 17 Sep 2023 13:12:31 +0200 Subject: [PATCH 11/18] chromedriver: 116.0.5845.96 -> 117.0.5938.88 (cherry picked from commit c62013004e42033c5f11cfff99d3ce5d0d1f09be) --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 991bf93eb3f6..749a158260a0 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ }; stable = { chromedriver = { - sha256_darwin = "0gzx3zka8i2ngsdiqp8sr0v6ir978vywa1pj7j08vsf8kmb93iiy"; + sha256_darwin = "0phhcqid7wjw923qdi65zql3fid25swwszksgnw3b8fgz67jn955"; sha256_darwin_aarch64 = - "18iyapwjg0yha8qgbw7f605n0j54nd36shv3497bd84lc9k74b14"; - sha256_linux = "0d8mqzjc11g1bvxvffk0xyhxfls2ycl7ym4ssyjq752g2apjblhp"; - version = "116.0.5845.96"; + "00fwq8slvjm6c7krgwjd4mxhkkrp23n4icb63qlvi2hy06gfj4l6"; + sha256_linux = "0ws8ch1j2hzp483vr0acvam1zxmzg9d37x6gqdwiqwgrk6x5pvkh"; + version = "117.0.5938.88"; }; deps = { gn = { From 95ee3b768c16bd2e9f5c95af0232b45c08f71d6f Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 17 Sep 2023 14:08:00 +0200 Subject: [PATCH 12/18] chromium: temporarily work around stdenv/patchShebangs.sh bug (cherry picked from commit df39696f6b35b4e21cf15bb65518ee1b5f67ee3d) --- pkgs/applications/networking/browsers/chromium/common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index bb44bf54af73..c50f27f46440 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -241,6 +241,12 @@ let # We need the fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1254408: base64 --decode ${clangFormatPython3} > buildtools/linux64/clang-format + # Add final newlines to scripts that do not end with one. + # This is a temporary workaround until https://github.com/NixOS/nixpkgs/pull/255463 (or similar) has been merged, + # as patchShebangs hard-crashes when it encounters files that contain only a shebang and do not end with a final + # newline. + find . -type f -perm -0100 -exec sed -i -e '$a\' {} + + patchShebangs . # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin From d167f9ccce2fba8e33bf8fb14ab0539aaad8b5d7 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 22 Aug 2023 20:51:38 +0200 Subject: [PATCH 13/18] deploy-rs: Set mainProgram meta attribute This makes it possible to run `deploy-rs` using `nix run nixpkgs#deploy-rs` (cherry picked from commit 078f5caffc04d1b635a87dda0cfc37bfd654d64b) --- pkgs/tools/package-management/deploy-rs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/package-management/deploy-rs/default.nix b/pkgs/tools/package-management/deploy-rs/default.nix index 86c0963db178..fbb8a644e35b 100644 --- a/pkgs/tools/package-management/deploy-rs/default.nix +++ b/pkgs/tools/package-management/deploy-rs/default.nix @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/serokell/deploy-rs"; license = licenses.mpl20; maintainers = with maintainers; [ teutat3s ]; + mainProgram = "deploy"; }; } From 67fe3be896a87ca96f182ec7fb7388139dd7e5c8 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sat, 16 Sep 2023 21:03:02 +0200 Subject: [PATCH 14/18] deploy-rs: unstable-2023-06-04 -> unstable-2023-09-12 https://github.com/serokell/deploy-rs/compare/65211db63ba1199f09b4c9f27e5eba5ec50d76ac..31c32fb2959103a796e07bbe47e0a5e287c343a8 (cherry picked from commit 25e50be6e26f431b7985b909e36589e88e46a670) --- pkgs/tools/package-management/deploy-rs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/deploy-rs/default.nix b/pkgs/tools/package-management/deploy-rs/default.nix index fbb8a644e35b..7f4aeac5a45a 100644 --- a/pkgs/tools/package-management/deploy-rs/default.nix +++ b/pkgs/tools/package-management/deploy-rs/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage { pname = "deploy-rs"; - version = "unstable-2023-06-04"; + version = "unstable-2023-09-12"; src = fetchFromGitHub { owner = "serokell"; repo = "deploy-rs"; - rev = "65211db63ba1199f09b4c9f27e5eba5ec50d76ac"; - hash = "sha256-1FldJ059so0X/rScdbIiOlQbjjSNCCTdj2cUr5pHU4A="; + rev = "31c32fb2959103a796e07bbe47e0a5e287c343a8"; + hash = "sha256-wE5kHco3+FQjc+MwTPwLVqYz4hM7uno2CgXDXUFMCpc="; }; - cargoHash = "sha256-iUYtLH01YGxsDQbSnQrs4jw2eJxsOn2v3HOIfhsZbdQ="; + cargoHash = "sha256-WqZnDWMrqWy1rzR6n+acFW6VHWbDnQmoxtPDA5B37JU="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 4a87c59dda47b2fef4a21b1d6790c90c067b8c9b Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 15 Aug 2023 18:59:18 +0200 Subject: [PATCH 15/18] linuxPackages.apfs: 0.3.3 -> 0.3.4 https://github.com/linux-apfs/linux-apfs-rw/releases/tag/v0.3.4 (cherry picked from commit c873b591218ff01a14e8f8070eea68172f1e5196) --- pkgs/os-specific/linux/apfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 70c344903f54..1df3237dd1ca 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -6,7 +6,7 @@ }: let - tag = "0.3.3"; + tag = "0.3.4"; in stdenv.mkDerivation { pname = "apfs"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "linux-apfs"; repo = "linux-apfs-rw"; rev = "v${tag}"; - hash = "sha256-dxbpJ9Jdn8u16yD001zCZxrr/nPbxdpF7JvU+oD+hTw="; + hash = "sha256-EeVOrZtmKi5VfPerW9IntjRvdU3AbFPHG+pyAI4ciGk="; }; hardeningDisable = [ "pic" ]; From e3df77b69ac0c0f43fb377865aa8a5985a912c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Sep 2023 18:37:41 -0700 Subject: [PATCH 16/18] ytfzf: 2.6.0 -> 2.6.1 Diff: https://github.com/pystardust/ytfzf/compare/v2.6.0...v2.6.1 Changelog: https://github.com/pystardust/ytfzf/releases/tag/v2.6.1 (cherry picked from commit d4875de3619b3b3976dfede09360a3ab38a2810f) --- pkgs/tools/misc/ytfzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index af0c01cd318a..92b9864c3589 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - hash = "sha256-b/rsujR3GRwxrVc0iPVbxyPTRTr8kk2WKqEMwdb9lac="; + hash = "sha256-wd7IgJRSh8UJ28slItIz1OhAg7cgVSDUldCyaObn6Ak="; }; nativeBuildInputs = [ makeWrapper ]; From 82126da7b479f8f31157df29d951fbfc9956b8fa Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 16 Sep 2023 19:48:52 -0400 Subject: [PATCH 17/18] sic-image-cli: 0.22.3 -> 0.22.4 Diff: https://github.com/foresterre/sic/compare/v0.22.3...v0.22.4 Changelog: https://github.com/foresterre/sic/blob/v0.22.4/CHANGELOG.md (cherry picked from commit ec78ee8516237f521b44f25725370e24d16bede3) --- pkgs/tools/graphics/sic-image-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/sic-image-cli/default.nix b/pkgs/tools/graphics/sic-image-cli/default.nix index ee6963a9b7c0..42dae849fc9f 100644 --- a/pkgs/tools/graphics/sic-image-cli/default.nix +++ b/pkgs/tools/graphics/sic-image-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sic-image-cli"; - version = "0.22.3"; + version = "0.22.4"; src = fetchFromGitHub { owner = "foresterre"; repo = "sic"; rev = "v${version}"; - sha256 = "sha256-gTKStoQakquJqBv4OLWC4/1FtV+Cvw0nN+dY6AH8TNw="; + hash = "sha256-PFbHHO3m4mnV5s8DVev/iao9sC3FYht0whTHYzO25Yo="; }; - cargoSha256 = "sha256-xYPSI0/I67vmMPRmJOlbDJ9gTdhViQmeo3XWGhWR91Y="; + cargoHash = "sha256-Pw5PJ0xQCLfPaVEzsfqeHJ0E3miDwlj+71J98KRrYDs="; nativeBuildInputs = [ installShellFiles nasm ]; From b55a6ca1daa836bb17cf1a816441a688f2057a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Sep 2023 14:30:11 -0700 Subject: [PATCH 18/18] mousai: 0.7.3 -> 0.7.5 Diff: https://github.com/SeaDve/Mousai/compare/v0.7.3...v0.7.5 (cherry picked from commit 3a9ded7690ca7c56d2a31fcdb173d44cad3d2c12) --- pkgs/applications/audio/mousai/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 0da6acc242fa..fae165495e19 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -23,19 +23,19 @@ stdenv.mkDerivation rec { pname = "mousai"; - version = "0.7.3"; + version = "0.7.5"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Mousai"; rev = "v${version}"; - hash = "sha256-VAP2ENgI0Ge1JJEfNtw8dgOLZ1g0sEaoZHICFKI3hXM="; + hash = "sha256-4olJGpS5QfPyt6/ZmigoojP7kGjx6LExW3LKrL4nxTE="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-vbMfIk/fXmAHgouzyeceP7jAc/OIyUxFDu/+31aB1F4="; + hash = "sha256-SeKcguCB+f2ocKKf7Moc74O2sGK2EXgEEkTiN82dSps="; }; nativeBuildInputs = [