From 156bcd44f3be441bc1c5bf5d430046c4ed29709d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 16 Jul 2022 00:04:12 +0200 Subject: [PATCH 01/19] element-{web,desktop}: 1.10.15 -> 1.11.0 ChangeLog desktop: https://github.com/vector-im/element-desktop/releases/tag/v1.11.0 ChangeLog web: https://github.com/vector-im/element-web/releases/tag/v1.11.0 Backport of #180273 --- .../element/element-desktop-package.json | 7 ++++--- .../networking/instant-messengers/element/pin.json | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 269d928f4366..004db42ebab2 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.10.15", + "version": "1.11.0", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -61,7 +61,8 @@ "app-builder-lib": "^22.14.10", "asar": "^2.0.1", "chokidar": "^3.5.2", - "electron": "^17", + "detect-libc": "^1.0.3", + "electron": "^19", "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1", @@ -73,7 +74,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-web-i18n": "^1.2.0", + "matrix-web-i18n": "^1.3.0", "mkdirp": "^1.0.3", "needle": "^2.5.0", "node-pre-gyp": "^0.15.0", diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index 0bc7c18a497f..c2e3f1af2d20 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.10.15", - "desktopSrcHash": "2XSTE6NbhWYAH3tr1Kd16vEAGn3ApZ0a9PdpoHJn3uE=", - "desktopYarnHash": "1rnzaxy7l7912j6df8w2kw66pqwrs7kg7hd0680i38c1db5f4y6n", - "webHash": "05nlpzfqd67918292fppgnr59kci83fkxy4b096kzb1nvff9phx2" + "version": "1.11.0", + "desktopSrcHash": "WYXPsiR3hKj+cPvs5bLzZ301vLISp3ANLf/GgBBMYqM=", + "desktopYarnHash": "0v60ak06g87i3q5rqgxy3v3whk3njj0v1ml9rfdab1mbzrj6209c", + "webHash": "0lczkrdd37qj13j4vvl4k2cxf7drs0q9c2clb7zgaxalxkdrv483" } From 651665ae681ecee04f0192cdb076868b9fec4f9f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 14 Jul 2022 12:41:38 -0300 Subject: [PATCH 02/19] shellhub-agent: 0.9.2 -> 0.9.3 Signed-off-by: Otavio Salvador (cherry picked from commit dbd58ee84f2982b24c1434e9f4d98c637925281a) --- pkgs/applications/networking/shellhub-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index f584eea5cca5..531c0f965834 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "clLSkby7bmjScUpSZkVvHt5nSIoQOaYrxsoLqiuQZik="; + sha256 = "WSK2b1DYSYEFqmVIOlhjFGyqC9ok/9rWAz2ZgUZejzo="; }; modRoot = "./agent"; - vendorSha256 = "sha256-XVLsmU4EfOTFVpF5he+FCyDr/NuApUBC9R00nO1HJrg="; + vendorSha256 = "sha256-UDsgfsdq8DecyTAFrmWO09V3JIuTA5YLCEAei0tYRy4="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; From 959a9893d915d0a9d815ed577d0ca53489632622 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 5 Jul 2022 20:33:26 +0200 Subject: [PATCH 03/19] electron_19: init at 19.0.7 (cherry picked from commit 715b7691f2c4826d9c8b709beccda8b917540bca) --- pkgs/development/tools/electron/default.nix | 11 ++++++++++- pkgs/development/tools/electron/generic.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 1eb6144b4c3b..a1a593f522b5 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -23,7 +23,7 @@ let in rec { - electron = electron_18; + electron = electron_19; electron_9 = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; @@ -122,4 +122,13 @@ rec { aarch64-darwin = "97adf13306c9b3b304d3e9ddf68f5f7fb9b79c9a1342114e3671182f3cc9e808"; headers = "0gl30q2igr9c8sjlhyj5w57dm5navpkas5hnz9yl7sasbx66v10v"; }; + + electron_19 = mkElectron "19.0.7" { + armv7l-linux = "d6a6d2d7c0d658695783137d032a50f20843cdfe6582ef985451d741eef4dd32"; + aarch64-linux = "58685d21bb92c2667d20063ab12aabc2e5c2518f3eda84e98a0fa2306456ce57"; + x86_64-linux = "a4c20a068c54c238ae8c440ab8f46d39eda4168d6aa8cffcaae406800b539983"; + x86_64-darwin = "2709dd94e22ecfc8e7de0c7a7009160ed79e95ba91618c7307e24c26a33e978b"; + aarch64-darwin = "f9042bce83fe8446e22f6885285dd5fc2dca048d0b89cbf7f326a46102ffc440"; + headers = "09dbx4qh0rgp5mdm6srz6fgx12zq6b9jqq1k6l3gzyvwigi3wny1"; + }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 72cce135e04e..6aa43a409082 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -27,8 +27,9 @@ let homepage = "https://github.com/electron/electron"; license = licenses.mit; maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ] - ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "armv7l-linux" "aarch64-linux" ] + ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] + ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; knownVulnerabilities = optional (versionOlder version "15.0.0") "Electron version ${version} is EOL"; }; @@ -43,16 +44,17 @@ let }; tags = { - i686-linux = "linux-ia32"; x86_64-linux = "linux-x64"; armv7l-linux = "linux-armv7l"; aarch64-linux = "linux-arm64"; x86_64-darwin = "darwin-x64"; - aarch64-darwin = "darwin-arm64"; + } // lib.optionalAttrs (lib.versionAtLeast version "11.0.0") { + aarch64-darwin = "darwin-arm64"; + } // lib.optionalAttrs (lib.versionOlder version "19.0.0") { + i686-linux = "linux-ia32"; }; - get = as: platform: as.${platform.system} or - "Unsupported system: ${platform.system}"; + get = as: platform: as.${platform.system} or (throw "Unsupported system: ${platform.system}"); common = platform: { inherit pname version meta; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5601a8fb9844..025c768388fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14927,7 +14927,8 @@ with pkgs; electron_15 electron_16 electron_17 - electron_18; + electron_18 + electron_19; autobuild = callPackage ../development/tools/misc/autobuild { }; From f1126f1827de2350a6a3e85fb2cac6dfd7dbf1a4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 16 Jul 2022 08:49:52 +0200 Subject: [PATCH 04/19] element-desktop: use electron_19 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 025c768388fa..8fc3439407bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3413,7 +3413,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_17; + electron = electron_19; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh From d7c7f26538d8ee835abefe329b990cf913174135 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 16 Jul 2022 15:02:59 +0200 Subject: [PATCH 05/19] electron: don't update default version on 22.05 --- pkgs/development/tools/electron/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index a1a593f522b5..2fc9b6792755 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -23,7 +23,7 @@ let in rec { - electron = electron_19; + electron = electron_18; electron_9 = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; From ee41d3117f90453352ef84dd0b4eb68ad8e2d57c Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 5 Jul 2022 21:09:22 +0200 Subject: [PATCH 06/19] electron: fix headers location see https://www.electronjs.org/blog/s3-bucket-change for more info (cherry picked from commit d2184ac8686da08f294b875e9a0ec0121c3a8b1d) --- pkgs/development/tools/electron/generic.nix | 2 +- pkgs/development/tools/electron/print-hashes.sh | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 6aa43a409082..a4a234215a2e 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -39,7 +39,7 @@ let }; headersFetcher = vers: hash: fetchurl { - url = "https://atom.io/download/electron/v${vers}/node-v${vers}-headers.tar.gz"; + url = "https://artifacts.electronjs.org/headers/dist/v${vers}/node-v${vers}-headers.tar.gz"; sha256 = hash; }; diff --git a/pkgs/development/tools/electron/print-hashes.sh b/pkgs/development/tools/electron/print-hashes.sh index 48c8f0412e10..e43f1f922a94 100755 --- a/pkgs/development/tools/electron/print-hashes.sh +++ b/pkgs/development/tools/electron/print-hashes.sh @@ -7,8 +7,7 @@ if [[ $# -lt 1 ]]; then exit 1 fi - -VERSION=$1 +VERSION="$1" declare -A SYSTEMS HASHES SYSTEMS=( @@ -20,8 +19,8 @@ SYSTEMS=( [aarch64-darwin]=darwin-arm64 ) -hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" 2>/dev/null | tail -n1)" -headers="$(nix-prefetch-url "https://atom.io/download/electron/v${VERSION}/node-v${VERSION}-headers.tar.gz")" +hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" | tail -n1)" +headers="$(nix-prefetch-url "https://artifacts.electronjs.org/headers/dist/v${VERSION}/node-v${VERSION}-headers.tar.gz")" # Entry similar to the following goes in default.nix: From 02ddda06c71802a301a95e8ae9dfd845a3065bc1 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Thu, 2 Jun 2022 06:14:46 -0500 Subject: [PATCH 07/19] linuxKernels.kernels.linux_xanmod: 5.15.40 -> 5.15.43 (cherry picked from commit 3fd61ac55ec27a8eefae188ffa600d568de12067) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 14c4d00dccdc..f985d249fb4c 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -2,9 +2,9 @@ let stableVariant = { - version = "5.15.40"; + version = "5.15.43"; suffix = "xanmod1"; - hash = "sha256-P9pRPfzBVQNhWp6ulDiBgV/ki2C0CTbIRV6KRhUD+vQ="; + hash = "sha256-MeH9RUPDiuN22eAZ18v+N3aIT18dQ3FnTkcQV0MjB4k="; }; edgeVariant = { From 780404e50557411545e7413800a7a27af154c116 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 4 Jun 2022 14:22:44 -0500 Subject: [PATCH 08/19] linuxKernel.kernels.linux_xanmod_latest: 5.17.8 -> 5.18.1 (cherry picked from commit 61b37a0a20413f497c78aefd38d685cfea1fd490) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index f985d249fb4c..abf2f765b186 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -8,9 +8,9 @@ let }; edgeVariant = { - version = "5.17.8"; + version = "5.18.1"; suffix = "xanmod1"; - hash = "sha256-Q8YmBeocolr6Ds2inwV299Td6/zE8RTA1SWve5ZykAs="; + hash = "sha256-dqvB4F2S7cklSJ7XTUNvWVKTsZGLevOXME5lvhmfyis="; }; xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec { From 772158e43a0e871576a3ca3b0c66864d915dfa30 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 5 Jun 2022 10:48:39 -0500 Subject: [PATCH 09/19] linuxKernels.kernels.linux_xanmod: adjust config for 5.18 (cherry picked from commit ecaaba491d483025370857690266c953e2977941) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index abf2f765b186..4a2af2450cc3 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -34,7 +34,7 @@ let X86_AMD_PSTATE = yes; # Linux RNG framework - LRNG = yes; + LRNG = whenOlder "5.18" yes; # Paragon's NTFS3 driver NTFS3_FS = module; From c6f8eb8c5a8fba0e86533f73776025b57fc091cc Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:06:52 -0500 Subject: [PATCH 10/19] linuxKernels.kernels.linux_xanmod: import helpers Co-authored-by: fortune (cherry picked from commit d688ec7d80bb790e6c0199a8fc0487140fc91319) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 4a2af2450cc3..a0bf4b84e074 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -14,6 +14,7 @@ let }; xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec { + with (lib.kernel.whenHelpers version); inherit version; modDirVersion = "${version}-${suffix}"; From d2a52c0272e557dce85e7f4077dc7329cff56c5a Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:36:21 -0500 Subject: [PATCH 11/19] linuxKernels.kernels.linux_xanmod: apply patch from review (cherry picked from commit 83171a1dba143d34c6611d62d30cda2b983cec79) --- .../linux/kernel/xanmod-kernels.nix | 70 ++++++++++--------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index a0bf4b84e074..205a52608408 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -14,7 +14,6 @@ let }; xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec { - with (lib.kernel.whenHelpers version); inherit version; modDirVersion = "${version}-${suffix}"; @@ -25,48 +24,51 @@ let inherit hash; }; - structuredExtraConfig = with lib.kernel; { - # removed options - CFS_BANDWIDTH = lib.mkForce (option no); - RT_GROUP_SCHED = lib.mkForce (option no); - SCHED_AUTOGROUP = lib.mkForce (option no); + structuredExtraConfig = + with lib.kernel; + with (lib.kernel.whenHelpers version); + { + # removed options + CFS_BANDWIDTH = lib.mkForce (option no); + RT_GROUP_SCHED = lib.mkForce (option no); + SCHED_AUTOGROUP = lib.mkForce (option no); - # AMD P-state driver - X86_AMD_PSTATE = yes; + # AMD P-state driver + X86_AMD_PSTATE = yes; - # Linux RNG framework - LRNG = whenOlder "5.18" yes; + # Linux RNG framework + LRNG = whenOlder "5.18" yes; - # Paragon's NTFS3 driver - NTFS3_FS = module; - NTFS3_LZX_XPRESS = yes; - NTFS3_FS_POSIX_ACL = yes; + # Paragon's NTFS3 driver + NTFS3_FS = module; + NTFS3_LZX_XPRESS = yes; + NTFS3_FS_POSIX_ACL = yes; - # Preemptive Full Tickless Kernel at 500Hz - SCHED_CORE = lib.mkForce (option no); - PREEMPT_VOLUNTARY = lib.mkForce no; - PREEMPT = lib.mkForce yes; - NO_HZ_FULL = yes; - HZ_500 = yes; + # Preemptive Full Tickless Kernel at 500Hz + SCHED_CORE = lib.mkForce (option no); + PREEMPT_VOLUNTARY = lib.mkForce no; + PREEMPT = lib.mkForce yes; + NO_HZ_FULL = yes; + HZ_500 = yes; - # Google's BBRv2 TCP congestion Control - TCP_CONG_BBR2 = yes; - DEFAULT_BBR2 = yes; + # Google's BBRv2 TCP congestion Control + TCP_CONG_BBR2 = yes; + DEFAULT_BBR2 = yes; - # FQ-PIE Packet Scheduling - NET_SCH_DEFAULT = yes; - DEFAULT_FQ_PIE = yes; + # FQ-PIE Packet Scheduling + NET_SCH_DEFAULT = yes; + DEFAULT_FQ_PIE = yes; - # Graysky's additional CPU optimizations - CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes; + # Graysky's additional CPU optimizations + CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes; - # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. - FUTEX = yes; - FUTEX_PI = yes; + # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. + FUTEX = yes; + FUTEX_PI = yes; - # WineSync driver for fast kernel-backed Wine - WINESYNC = module; - }; + # WineSync driver for fast kernel-backed Wine + WINESYNC = module; + }; extraMeta = { branch = lib.versions.majorMinor version; From 842f0722a39714a8cb62c6a0eb82113cf1587651 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:44:47 -0500 Subject: [PATCH 12/19] linuxKernels.kernels.linux_xanmod: don't set `-Werror` by default Co-authored-by: fortune (cherry picked from commit 58b3f6693151d6c3d4a3f542be4f7dfa429519e4) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 205a52608408..761426da865d 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -28,6 +28,9 @@ let with lib.kernel; with (lib.kernel.whenHelpers version); { + # TODO: remove this once https://github.com/NixOS/nixpkgs/pull/175433 is in master + WERROR = no; + # removed options CFS_BANDWIDTH = lib.mkForce (option no); RT_GROUP_SCHED = lib.mkForce (option no); From dcd9ce1a063972b3a4b4aee94fa263772a3411ab Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 16 Jul 2022 23:25:56 +0000 Subject: [PATCH 13/19] imagemagick: fix version imagemagick.passthru.tests tests that the Nixpkgs version for imagemagick matches the one produced by magick --version, so the recent upgrade that changed the dash to a dot broke the test. Fixes: 3a4ea089422 ("imagemagick: 7.1.0-39 -> 7.1.0.43") (cherry picked from commit c82890e2e2c480c3e21701eaf6875edfafb2c926) --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 165f42913bc7..0b4416aca51b 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -45,12 +45,12 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0.43"; + version = "7.1.0-43"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; - rev = version; + rev = builtins.replaceStrings [ "-" ] [ "." ] version; hash = "sha256-SOy7Ci1rzLB12ofSQBWmX86dfbr/ywsRPunHRswlAt4="; }; From d3705c194462808d5df01d92f36a3416c89e64ea Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 17 Jul 2022 10:35:45 +0800 Subject: [PATCH 14/19] pantheon.elementary-files: fix crash when removing bookmark (cherry picked from commit 475016947e4db08c9e06281d8a618592155e1035) --- .../pantheon/apps/elementary-files/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 6944dfac1ea5..9817962920a1 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -32,6 +33,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + # Fix terminal critical warnings and possible crash when removing bookmark + # https://github.com/elementary/files/pull/2062 + (fetchpatch { + url = "https://github.com/elementary/files/commit/daa5ab244b45aafdd7be49eb0bd6f052ded5b5a7.patch"; + sha256 = "sha256-crGvbo9Ye9656cOy6YqNreMLE2pEMO0Rg8oz81OfJkw="; + }) + ]; + src = fetchFromGitHub { owner = "elementary"; repo = "files"; From 73dce5b99521e19098041f3c13d678995f628cfb Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 1 Jul 2022 14:28:51 -0400 Subject: [PATCH 15/19] linux_xanmod: 5.15.43 -> 5.15.53 (cherry picked from commit 3087ec9f2141949dc95a39a211e7df5defbfd7d0) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 761426da865d..2bc2cf4c3f15 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -2,9 +2,9 @@ let stableVariant = { - version = "5.15.43"; + version = "5.15.53"; suffix = "xanmod1"; - hash = "sha256-MeH9RUPDiuN22eAZ18v+N3aIT18dQ3FnTkcQV0MjB4k="; + hash = "sha256-mLgzaXG6QaJ0hfzfNlLbAEldxHK6iHuMVUv6p8zqRBo="; }; edgeVariant = { From 55ba92838fa0a01cedc323dfece09e39f1fe718c Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 1 Jul 2022 14:29:05 -0400 Subject: [PATCH 16/19] linux_xanmod_latest: 5.18.1 -> 5.18.10 (cherry picked from commit bc799b322259bdfb5f95f28bf3338dbbbbbe6a73) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 2bc2cf4c3f15..3825f9f751ed 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -8,9 +8,9 @@ let }; edgeVariant = { - version = "5.18.1"; + version = "5.18.10"; suffix = "xanmod1"; - hash = "sha256-dqvB4F2S7cklSJ7XTUNvWVKTsZGLevOXME5lvhmfyis="; + hash = "sha256-RtvrJujd854bKf1YPiPavTh9oplpFN9ykr624K17vKE="; }; xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec { From dfdcb11bec6036694d418e7d7ca4c8e013e22cb0 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 8 Jul 2022 06:14:36 -0400 Subject: [PATCH 17/19] linux_xanmod: remove LRNG option (cherry picked from commit 100c1bcc117196c51aaa3493f1e316fd3a7de768) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 3825f9f751ed..33ddc3f6b6fd 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -39,9 +39,6 @@ let # AMD P-state driver X86_AMD_PSTATE = yes; - # Linux RNG framework - LRNG = whenOlder "5.18" yes; - # Paragon's NTFS3 driver NTFS3_FS = module; NTFS3_LZX_XPRESS = yes; From fb02b1f4a9609bcc2b759fdc2064090a8b468c58 Mon Sep 17 00:00:00 2001 From: amesgen Date: Mon, 27 Jun 2022 21:17:01 +0200 Subject: [PATCH 18/19] sigal: add `setuptools` to deps (cherry picked from commit b622a654771b41fe0e7e8d1902846ff28e400fba) --- pkgs/applications/misc/sigal/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index e8d382bbf21b..832ff337ad79 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -28,6 +28,8 @@ python3.pkgs.buildPythonApplication rec { feedgenerator zopfli cryptography + + setuptools # needs pkg_resources ]; checkInputs = [ From cccc62fe973895829c46dc23bde7da78b4d9ef47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 17 Jul 2022 14:53:22 +0200 Subject: [PATCH 19/19] nixos/jenkins-job-builder: create secret file with umask 0077 IOW, don't make it world readable. (cherry picked from commit 837ba2d4070b160a8360f5df2adba937b3f9e3a7) --- .../services/continuous-integration/jenkins/job-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix index deabeec0b295..edbf31f5ca1a 100644 --- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix +++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix @@ -165,7 +165,7 @@ in { jenkins_url="http://${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}" auth_file="$RUNTIME_DIRECTORY/jenkins_auth_file.txt" trap 'rm -f "$auth_file"' EXIT - printf "${cfg.accessUser}:@password_placeholder@" >"$auth_file" + (umask 0077; printf "${cfg.accessUser}:@password_placeholder@" >"$auth_file") "${pkgs.replace-secret}/bin/replace-secret" "@password_placeholder@" "$access_token_file" "$auth_file" if ! "${pkgs.jenkins}/bin/jenkins-cli" -s "$jenkins_url" -auth "@$auth_file" reload-configuration; then