Merge master into staging-next

2026-01-19 06:09:12 +00:00
parent d0d5baad5f 27b5557239
commit a3b2646da3
24 changed files with 176 additions and 60 deletions
@@ -8623,6 +8623,13 @@
    githubId = 52276064;
    name = "figboy9";
  };
+  figsoda = {
+    email = "figsoda@pm.me";
+    matrix = "@figsoda:matrix.org";
+    github = "figsoda";
+    githubId = 40620903;
+    name = "figsoda";
+  };
  fionera = {
    email = "nix@fionera.de";
    github = "fionera";
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "mednafen-pce-fast";
-  version = "0-unstable-2025-11-14";
+  version = "0-unstable-2026-01-16";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "beetle-pce-fast-libretro";
-    rev = "7e9b257b8a591cb7e00f9e55371edba19db9799c";
-    hash = "sha256-LBx4bSnE3XeQw/Bc5EID8U6Dxj7uc6JBrV8vSwO/jEM=";
+    rev = "6d182b22f6b9430c76ea71579ffb2eee0e2e9521";
+    hash = "sha256-QHkG5CSZgaakblOgp5HxGvtWg8K4Nbag481nhG4UjoY=";
  };

  makefile = "Makefile";
@@ -62,19 +62,20 @@ mkChromiumDerivation (base: rec {
      $out/share/applications/chromium-browser.desktop

    substituteInPlace $out/share/applications/chromium-browser.desktop \
-      --replace "@@MENUNAME@@" "Chromium" \
-      --replace "@@PACKAGE@@" "chromium" \
-      --replace "Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "Exec=chromium"
-
-    # Append more mime types to the end
-    sed -i '/^MimeType=/ s,$,x-scheme-handler/webcal;x-scheme-handler/mailto;x-scheme-handler/about;x-scheme-handler/unknown,' \
-      $out/share/applications/chromium-browser.desktop
+      --replace-fail "@@MENUNAME@@" "Chromium" \
+      --replace-fail "@@PACKAGE@@" "chromium" \
+      --replace-fail "/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "chromium" \
+      --replace-fail "@@URI_SCHEME@@" "x-scheme-handler/chromium;" \
+      --replace-fail "@@EXTRA_DESKTOP_ENTRIES@@" ""

    # See https://github.com/NixOS/nixpkgs/issues/12433
-    sed -i \
-      -e '/\[Desktop Entry\]/a\' \
-      -e 'StartupWMClass=chromium-browser' \
-      $out/share/applications/chromium-browser.desktop
+    substituteInPlace $out/share/applications/chromium-browser.desktop \
+      --replace-fail "[Desktop Entry]" "[Desktop Entry]''\nStartupWMClass=chromium-browser"
+
+    if grep -F '@@' $out/share/applications/chromium-browser.desktop ; then
+      echo "error: chromium-browser.desktop contains unsubstituted placeholders" >&2
+      exit 1
+    fi
  '';

  passthru = { inherit sandboxExecutableName; };
@@ -5,7 +5,7 @@
  "packages": {
    "": {
      "dependencies": {
-        "@sourcegraph/amp": "^0.0.1768219292-g8af118"
+        "@sourcegraph/amp": "^0.0.1768760544-gf06f5a"
      }
    },
    "node_modules/@napi-rs/keyring": {
@@ -228,9 +228,9 @@
      }
    },
    "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1768219292-g8af118",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1768219292-g8af118.tgz",
-      "integrity": "sha512-GW5MyNOiTu4G4cY29UI/0ttXu4b2QRwjmz4I9pvZqvIFrMmotBKC4wQinj8Dt6jD0ey7284Rhm8xHJ1iRtMoxA==",
+      "version": "0.0.1768760544-gf06f5a",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1768760544-gf06f5a.tgz",
+      "integrity": "sha512-ECw/n1n3aKERHW8qo5KaFgKgLDj4zJElFsyHnAS10BRv3ON0T6BPbboMvqvtYq1NEeX00QGpBDO2u0Q1+k3oGQ==",
      "license": "Amp Commercial License",
      "dependencies": {
        "@napi-rs/keyring": "1.1.9"
@@ -9,11 +9,11 @@

 buildNpmPackage (finalAttrs: {
  pname = "amp-cli";
-  version = "0.0.1768219292-g8af118";
+  version = "0.0.1768760544-gf06f5a";

  src = fetchzip {
    url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-DstiWCfox5CuHKfy3EgLk7N8KK67txuMG/flriiDH3I=";
+    hash = "sha256-URgYg3SZXeHrw+xXiXC1BDe0/ZUFRu9mDmqtTIA9ObU=";
  };

  postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
    chmod +x bin/amp-wrapper.js
  '';

-  npmDepsHash = "sha256-oB8YPiKoCG6+oNGlE6YdZ6F/6FEq96qJq/tdC164nrM=";
+  npmDepsHash = "sha256-7r522RT+38rjv1YqjhR9XIhWYoxVHmRUKeYfToCbsHA=";

  propagatedBuildInputs = [
    ripgrep
@@ -13,7 +13,7 @@ buildGoModule rec {

  src = fetchFromGitHub {
    owner = "argoproj";
-    repo = "argo";
+    repo = "argo-workflows";
    tag = "v${version}";
    hash = "sha256-TM/eK8biMxKV4SFJ1Lys+NPPeaHVjbBo83k2RH1Xi40=";
  };
@@ -55,7 +55,7 @@ buildGoModule rec {
  meta = {
    description = "Container native workflow engine for Kubernetes";
    mainProgram = "argo";
-    homepage = "https://github.com/argoproj/argo";
+    homepage = "https://github.com/argoproj/argo-workflows";
    changelog = "https://github.com/argoproj/argo-workflows/blob/v${version}/CHANGELOG.md";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ groodt ];
@@ -6,10 +6,12 @@
  git,
  pkg-config,
  boost,
-  eigen_3_4_0,
+  eigen_5,
  glm,
+  gcc,
  libGL,
  libpng,
+  makeWrapper,
  openexr,
  onetbb,
  xorg,
@@ -20,14 +22,14 @@

 stdenv.mkDerivation {
  pname = "curv";
-  version = "0.5-unstable-2025-01-20";
+  version = "0.5-unstable-2026-01-17";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "doug-moen";
    repo = "curv";
-    rev = "ef082c6612407dd8abce06015f9a16b1ebf661b8";
-    hash = "sha256-BGL07ZBA+ao3fg3qp56sVTe+3tM2SOp8TGu/jF7SVlM=";
+    rev = "1c2eb68e47e3c61a98e39cd3c50f90691c5a268d";
+    hash = "sha256-PuRBnJswrg+PjtU6ize+PjoBpQSSEzO2CeCx9mQF+3w=";
    fetchSubmodules = true;
  };

@@ -36,11 +38,12 @@ stdenv.mkDerivation {
    cmake
    git
    pkg-config
+    makeWrapper
  ];

  buildInputs = [
    boost
-    eigen_3_4_0
+    eigen_5
    glm
    libGL
    libpng
@@ -75,6 +78,18 @@ stdenv.mkDerivation {
      --replace-fail "cmake_minimum_required(VERSION 2.6.2)" "cmake_minimum_required(VERSION 3.10)"
  '';

+  ## support runtime compilation with -Ojit
+  fixupPhase = ''
+    wrapProgram $out/bin/curv \
+      --set NIX_CFLAGS_COMPILE_${gcc.suffixSalt} "$NIX_CFLAGS_COMPILE" \
+      --set NIX_LDFLAGS_${gcc.suffixSalt} "$NIX_LDFLAGS" \
+      --prefix PATH : "${
+        lib.makeBinPath [
+          gcc
+        ]
+      }"
+  '';
+
  passthru.updateScript = unstableGitUpdater { };

  meta = {
@@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
  # the Equicord repository. Dates as tags (and automatic releases) were the compromise
  # we came to with upstream. Please do not change the version schema (e.g., to semver)
  # unless upstream changes the tag schema from dates.
-  version = "2025-12-25";
+  version = "2026-01-19";

  src = fetchFromGitHub {
    owner = "Equicord";
    repo = "Equicord";
    tag = finalAttrs.version;
-    hash = "sha256-ce5n7E+eJLPnj/dUnaaDi4R8kKO4+iOcQgdtOin4NcM=";
+    hash = "sha256-pEFU1E+BqAAAz2ywPrS1MejhZ/g47iG/4BBey+2F7Hw=";
  };

  pnpmDeps = fetchPnpmDeps {
@@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "gitlogue";
-  version = "0.6.0";
+  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "unhappychoice";
    repo = "gitlogue";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-tcq0TIB9Mfm3kt2PInMto7g2VNpDsOvBiQGNP8+nFvY=";
+    hash = "sha256-mZ2A6274Ujpo5rTewFaMUslZhLCKJ2iw43J8X3vuBBI=";
  };

-  cargoHash = "sha256-RZ+JiMy0zHu8aEn4ytRmFcvASRcsHDVK9ls77W7ann0=";
+  cargoHash = "sha256-MueaRVomOiQsPSOnHpB/k9a8fNpKpFRilAXgIkVxZ94=";

  nativeBuildInputs = [ pkg-config ];

@@ -19,13 +19,13 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "grimblast";
-  version = "0.1-unstable-2025-12-18";
+  version = "0.1-unstable-2026-01-14";

  src = fetchFromGitHub {
    owner = "hyprwm";
    repo = "contrib";
-    rev = "41dbcac8183bb1b3a4ade0d8276b2f2df6ae4690";
-    hash = "sha256-d3HmUbmfTDIt9mXEHszqyo2byqQMoyJtUJCZ9U1IqHQ=";
+    rev = "541628cebe42792ddf5063c4abd6402c2f1bd68f";
+    hash = "sha256-CopNx3j//gZ2mE0ggEK9dZ474UcbDhpTw+KMor8mSxI=";
  };

  strictDeps = true;
@@ -95,6 +95,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
    homepage = "https://github.com/nix-community/nix-init";
    changelog = "https://github.com/nix-community/nix-init/blob/${finalAttrs.src.tag}/CHANGELOG.md";
    license = lib.licenses.mpl20;
-    maintainers = [ lib.maintainers.eclairevoyant ];
+    maintainers = with lib.maintainers; [
+      eclairevoyant
+      figsoda
+    ];
  };
 })
@@ -52,7 +52,10 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://github.com/nix-community/nurl";
    changelog = "https://github.com/nix-community/nurl/blob/v${version}/CHANGELOG.md";
    license = lib.licenses.mpl20;
-    maintainers = [ lib.maintainers.matthiasbeyer ];
+    maintainers = with lib.maintainers; [
+      figsoda
+      matthiasbeyer
+    ];
    mainProgram = "nurl";
  };
 }
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "probe-rs-tools";
-  version = "0.30.0";
+  version = "0.31.0";

  src = fetchFromGitHub {
    owner = "probe-rs";
    repo = "probe-rs";
    tag = "v${version}";
-    hash = "sha256-3tVCsMXrNTFhTQit4PNTXtHOXq8GSEWdLBJ9iqtgWyQ=";
+    hash = "sha256-ZcH2FBKsbBtTYfRQgPfOOODDpyB7VydcO7F7pq8xzD0=";
  };

-  cargoHash = "sha256-CL+aTPllQqa22ENU2FWhBMSe0Mf1MAfemytIiqf0bHk=";
+  cargoHash = "sha256-fVmwZw34lK6eKkqNT/SW5wzeeyWg6Qp48eso6yibICE=";

  buildAndTestSubdir = pname;

@@ -24,7 +24,7 @@ let
 in
 python3Packages.buildPythonApplication rec {
  pname = "rcu";
-  version = "4.0.32";
+  version = "4.0.33";

  pyproject = false;

@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
    let
      src-tarball = requireFile {
        name = "rcu-${version}-source.tar.gz";
-        hash = "sha256-0sJyCRDV76HUy78RBO27AgkXGroL217GNwHp8HMSKx8=";
+        hash = "sha256-ezbG3qUfUyr9JEXyKTrULYCVm4hA4+nvcHPzJpdLaWY=";
        url = "https://www.davisr.me/projects/rcu/";
      };
    in
@@ -28,11 +28,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "reqable";
-  version = "3.0.33";
+  version = "3.0.34";

  src = fetchurl {
    url = "https://github.com/reqable/reqable-app/releases/download/${finalAttrs.version}/reqable-app-linux-x86_64.deb";
-    hash = "sha256-Cb4cJsUvmlCupquE9o9VkxxHoTnRkvuAaximyABeBQk=";
+    hash = "sha256-cKkrGvGnccU4sRzQ/LFzSh1yG1BViNz2E8aLUlzQaAI=";
  };

  nativeBuildInputs = [
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 8f7a1e2..e2062c4 100644
+--- a/Cargo.toml
+++ b/Cargo.toml
+@@ -10,7 +10,7 @@ readme = "README.md"
+ keywords = ["ci"]
+ categories = ["development-tools"]
+ authors = ["dpc <dpc@dpc.pw>"]
+-rust-version = "1.92"
+rust-version = "1.91"
+ 
+ [[bin]]
+ name = "selfci"
@@ -0,0 +1,48 @@
+{
+  lib,
+  fetchgit,
+  nix-update-script,
+  rustPlatform,
+  git,
+  makeWrapper,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "selfci";
+  version = "0-unstable-2026-01-17";
+
+  src = fetchgit {
+    url = "https://radicle.dpc.pw/z2tDzYbAXxTQEKTGFVwiJPajkbeDU.git";
+    rev = "83e693dada851ce0da32713869d3da02c52ed257";
+    hash = "sha256-f0BfHvIQnhhiPie3a+9MeEGzZ+/KcgrbKBneu8Jo+xs=";
+  };
+
+  cargoHash = "sha256-Z3f35HIZiNeKeDNFPUVkFvL2OpMWzqRvxOL5/hUEzJw=";
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  patches = [
+    ./Cargo.toml.patch
+  ];
+
+  doCheck = false;
+
+  postInstall = ''
+    wrapProgram "$out"/bin/selfci \
+    --prefix PATH : ${lib.makeBinPath [ git ]}
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Minimalistic local-first Unix-philosophy-abiding CI";
+    homepage = "https://app.radicle.xyz/nodes/radicle.dpc.pw/rad%3Az2tDzYbAXxTQEKTGFVwiJPajkbeDU";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
+      dvn0
+    ];
+    mainProgram = "selfci";
+  };
+})
@@ -0,0 +1,30 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  openssh,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "ssh-agent-mux";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "overhacked";
+    repo = "ssh-agent-mux";
+    rev = "v${version}";
+    hash = "sha256-tIGrENlZcT9fGke6MRnsLsmm+kb0Mm3C6DckkZi8hpE=";
+  };
+
+  cargoHash = "sha256-u5kGYCYDvEhSuGOLnhdt9IpRwzllXbSJDwY1XzpHBCc=";
+
+  nativeCheckInputs = [ openssh ];
+
+  meta = {
+    description = "A proxy that multiplexes SSH agent requests to multiple upstream agents";
+    homepage = "https://github.com/overhacked/ssh-agent-mux";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.kalbasit ];
+    mainProgram = "ssh-agent-mux";
+  };
+}
@@ -109,6 +109,5 @@ buildPythonPackage (finalAttrs: {
    homepage = "https://github.com/danielgtaylor/python-betterproto";
    changelog = "https://github.com/danielgtaylor/python-betterproto/blob/${finalAttrs.src.tag}/CHANGELOG.md";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ nikstur ];
  };
 })
@@ -50,6 +50,5 @@ buildPythonPackage rec {
    homepage = "https://github.com/vmagamedov/grpclib";
    changelog = "https://github.com/vmagamedov/grpclib/blob/v${version}/docs/changelog/index.rst";
    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ nikstur ];
  };
 }
@@ -65,6 +65,5 @@ buildPythonPackage rec {
    homepage = "https://github.com/mikitex70/plantuml-markdown";
    changelog = "https://github.com/mikitex70/plantuml-markdown/releases/tag/${src.tag}";
    license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ nikstur ];
  };
 }
@@ -33,6 +33,5 @@ buildPythonPackage {
    description = "Python interface to a plantuml web service instead of having to run java locally";
    homepage = "https://github.com/dougn/python-plantuml";
    license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ nikstur ];
  };
 }
@@ -5,24 +5,23 @@
  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "types-regex";
-  version = "2025.11.3.20251106";
+  version = "2026.1.15.20260116";
  pyproject = true;

  src = fetchPypi {
    pname = "types_regex";
-    inherit version;
-    hash = "sha256-X5go7TmlpScntjf5P38PkJ1W+iIRYE7MIT/Ou1CbnVA=";
+    inherit (finalAttrs) version;
+    hash = "sha256-cVGpvMW7+ez8z4M1xFGsqCBPWgmS4GIqr69IKHbO5Pc=";
  };

-  build-system = [
-    setuptools
-  ];
+  build-system = [ setuptools ];

-  pythonImportsCheck = [
-    "regex-stubs"
-  ];
+  pythonImportsCheck = [ "regex-stubs" ];
+
+  # Module has no tests
+  doCheck = false;

  meta = {
    description = "Typing stubs for regex";
@@ -30,4 +29,4 @@ buildPythonPackage rec {
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ dwoffinden ];
  };
-}
+})
@@ -1588,6 +1588,7 @@ mapAliases {
  spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet
  spark2014 = throw "'spark2014' has been renamed to/replaced by 'gnatprove'"; # Converted to throw 2025-10-27
  sparkle = throw "'sparkle' has been removed because upstream repository source code has been deleted"; # Added 2025-12-29
+  speed_dreams = speed-dreams; # Added 2026-01-19
  spidermonkey_91 = throw "'spidermonkey_91 is EOL since 2022/09"; # Added 2025-08-26
  spoof = throw "'spoof' has been removed, as it is broken with the latest MacOS versions and is unmaintained upstream"; # Added 2025-11-14
  spotify-unwrapped = throw "'spotify-unwrapped' has been renamed to/replaced by 'spotify'"; # Converted to throw 2025-10-27