Merge staging-next-22.05 into staging-22.05

2026-08-25 17:55:21 +00:00 · 2022-07-18 00:14:28 +00:00
parent af172fd6c7 d7adcceace
commit bb73fd4409
12 changed files with 90 additions and 63 deletions
--- 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
--- 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=";
  };

--- 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 = [
--- 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",
--- 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"
 }
--- 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}" ];

--- 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";
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -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";
+  };
 }
--- 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";
  };

@@ -38,21 +39,22 @@ 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;
  };

  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;
--- 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:

--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -2,15 +2,15 @@

 let
  stableVariant = {
-    version = "5.15.40";
+    version = "5.15.53";
    suffix = "xanmod1";
-    hash = "sha256-P9pRPfzBVQNhWp6ulDiBgV/ki2C0CTbIRV6KRhUD+vQ=";
+    hash = "sha256-mLgzaXG6QaJ0hfzfNlLbAEldxHK6iHuMVUv6p8zqRBo=";
  };

  edgeVariant = {
-    version = "5.17.8";
+    version = "5.18.10";
    suffix = "xanmod1";
-    hash = "sha256-Q8YmBeocolr6Ds2inwV299Td6/zE8RTA1SWve5ZykAs=";
+    hash = "sha256-RtvrJujd854bKf1YPiPavTh9oplpFN9ykr624K17vKE=";
  };

  xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec {
@@ -24,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);
+      {
+        # TODO: remove this once https://github.com/NixOS/nixpkgs/pull/175433 is in master
+        WERROR = no;

-      # AMD P-state driver
-      X86_AMD_PSTATE = yes;
+        # removed options
+        CFS_BANDWIDTH = lib.mkForce (option no);
+        RT_GROUP_SCHED = lib.mkForce (option no);
+        SCHED_AUTOGROUP = lib.mkForce (option no);

-      # Linux RNG framework
-      LRNG = yes;
+        # AMD P-state driver
+        X86_AMD_PSTATE = 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;
--- 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
@@ -14929,7 +14929,8 @@ with pkgs;
    electron_15
    electron_16
    electron_17
-    electron_18;
+    electron_18
+    electron_19;

  autobuild = callPackage ../development/tools/misc/autobuild { };