summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--maintainers/maintainer-list.nix7
-rw-r--r--pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix6
-rw-r--r--pkgs/applications/networking/browsers/chromium/browser.nix23
-rw-r--r--pkgs/by-name/ar/argo-workflows/package.nix4
-rw-r--r--pkgs/by-name/cu/curv/package.nix25
-rw-r--r--pkgs/by-name/eq/equicord/package.nix4
-rw-r--r--pkgs/by-name/ni/nix-init/package.nix5
-rw-r--r--pkgs/by-name/nu/nurl/package.nix5
-rw-r--r--pkgs/by-name/rc/rcu/package.nix4
-rw-r--r--pkgs/by-name/se/selfci/Cargo.toml.patch13
-rw-r--r--pkgs/by-name/se/selfci/package.nix48
-rw-r--r--pkgs/by-name/ss/ssh-agent-mux/package.nix30
-rw-r--r--pkgs/development/python-modules/betterproto/default.nix1
-rw-r--r--pkgs/development/python-modules/grpclib/default.nix1
-rw-r--r--pkgs/development/python-modules/plantuml-markdown/default.nix1
-rw-r--r--pkgs/development/python-modules/plantuml/default.nix1
-rw-r--r--pkgs/development/python-modules/types-regex/default.nix21
-rw-r--r--pkgs/top-level/aliases.nix1
18 files changed, 158 insertions, 42 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2484f0dc7bce..a7f18929b11b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -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";
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
index 4e994394f762..8230f8c72f3a 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
@@ -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";
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 99d0f4bd1a68..2c88fd184cfa 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -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; };
diff --git a/pkgs/by-name/ar/argo-workflows/package.nix b/pkgs/by-name/ar/argo-workflows/package.nix
index 3bb18cd36d0e..235ea7a9ecbf 100644
--- a/pkgs/by-name/ar/argo-workflows/package.nix
+++ b/pkgs/by-name/ar/argo-workflows/package.nix
@@ -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 ];
diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix
index afc56199ca7e..865b021bf54e 100644
--- a/pkgs/by-name/cu/curv/package.nix
+++ b/pkgs/by-name/cu/curv/package.nix
@@ -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 = {
diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index ec8b144b022b..60947666ec93 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -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 {
diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix
index e6a84d96ea5e..fee8f60c7566 100644
--- a/pkgs/by-name/ni/nix-init/package.nix
+++ b/pkgs/by-name/ni/nix-init/package.nix
@@ -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
+ ];
};
})
diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix
index 88d1ae1c0311..0211d0575337 100644
--- a/pkgs/by-name/nu/nurl/package.nix
+++ b/pkgs/by-name/nu/nurl/package.nix
@@ -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";
};
}
diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix
index 7a00c9b90c72..9312c9a684f4 100644
--- a/pkgs/by-name/rc/rcu/package.nix
+++ b/pkgs/by-name/rc/rcu/package.nix
@@ -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
diff --git a/pkgs/by-name/se/selfci/Cargo.toml.patch b/pkgs/by-name/se/selfci/Cargo.toml.patch
new file mode 100644
index 000000000000..ab385872ce7a
--- /dev/null
+++ b/pkgs/by-name/se/selfci/Cargo.toml.patch
@@ -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"
diff --git a/pkgs/by-name/se/selfci/package.nix b/pkgs/by-name/se/selfci/package.nix
new file mode 100644
index 000000000000..a5c4f3d33b83
--- /dev/null
+++ b/pkgs/by-name/se/selfci/package.nix
@@ -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";
+ };
+})
diff --git a/pkgs/by-name/ss/ssh-agent-mux/package.nix b/pkgs/by-name/ss/ssh-agent-mux/package.nix
new file mode 100644
index 000000000000..d33864f444bd
--- /dev/null
+++ b/pkgs/by-name/ss/ssh-agent-mux/package.nix
@@ -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";
+ };
+}
diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix
index 20b08f490367..d968849c4b95 100644
--- a/pkgs/development/python-modules/betterproto/default.nix
+++ b/pkgs/development/python-modules/betterproto/default.nix
@@ -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 ];
};
})
diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix
index fcf657b3a6b5..58802844660c 100644
--- a/pkgs/development/python-modules/grpclib/default.nix
+++ b/pkgs/development/python-modules/grpclib/default.nix
@@ -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 ];
};
}
diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix
index e5998caeb092..3f203385238a 100644
--- a/pkgs/development/python-modules/plantuml-markdown/default.nix
+++ b/pkgs/development/python-modules/plantuml-markdown/default.nix
@@ -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 ];
};
}
diff --git a/pkgs/development/python-modules/plantuml/default.nix b/pkgs/development/python-modules/plantuml/default.nix
index 29d89e69935e..e2c46cf32417 100644
--- a/pkgs/development/python-modules/plantuml/default.nix
+++ b/pkgs/development/python-modules/plantuml/default.nix
@@ -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 ];
};
}
diff --git a/pkgs/development/python-modules/types-regex/default.nix b/pkgs/development/python-modules/types-regex/default.nix
index fd6ddb3c846f..31474f561da8 100644
--- a/pkgs/development/python-modules/types-regex/default.nix
+++ b/pkgs/development/python-modules/types-regex/default.nix
@@ -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 ];
};
-}
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d279f6c5672c..b554df37753b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1584,6 +1584,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