dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2024-03-17 18:00:54 +00:00 committed by GitHub
commit 100b3bb178
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
61 changed files with 435 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

409
.github/labeler.yml vendored
View File

@ -1,224 +1,347 @@
"6.topic: agda": "6.topic: agda":
- doc/languages-frameworks/agda.section.md - any:
- nixos/tests/agda.nix - changed-files:
- pkgs/build-support/agda/**/* - any-glob-to-any-file:
- pkgs/development/libraries/agda/**/* - doc/languages-frameworks/agda.section.md
- pkgs/top-level/agda-packages.nix - nixos/tests/agda.nix
- pkgs/build-support/agda/**/*
- pkgs/development/libraries/agda/**/*
- pkgs/top-level/agda-packages.nix
"6.topic: cinnamon": "6.topic: cinnamon":
- pkgs/desktops/cinnamon/**/* - any:
- nixos/modules/services/x11/desktop-managers/cinnamon.nix - changed-files:
- nixos/tests/cinnamon.nix - any-glob-to-any-file:
- pkgs/desktops/cinnamon/**/*
- nixos/modules/services/x11/desktop-managers/cinnamon.nix
- nixos/tests/cinnamon.nix
"6.topic: emacs": "6.topic: emacs":
- nixos/modules/services/editors/emacs.nix - any:
- nixos/modules/services/editors/emacs.xml - changed-files:
- nixos/tests/emacs-daemon.nix - any-glob-to-any-file:
- pkgs/applications/editors/emacs/elisp-packages/**/* - nixos/modules/services/editors/emacs.nix
- pkgs/applications/editors/emacs/**/* - nixos/modules/services/editors/emacs.xml
- pkgs/build-support/emacs/**/* - nixos/tests/emacs-daemon.nix
- pkgs/top-level/emacs-packages.nix - pkgs/applications/editors/emacs/elisp-packages/**/*
- pkgs/applications/editors/emacs/**/*
- pkgs/build-support/emacs/**/*
- pkgs/top-level/emacs-packages.nix
"6.topic: Enlightenment DE": "6.topic: Enlightenment DE":
- nixos/modules/services/x11/desktop-managers/enlightenment.nix - any:
- pkgs/desktops/enlightenment/**/* - changed-files:
- pkgs/development/python-modules/python-efl/* - any-glob-to-any-file:
- nixos/modules/services/x11/desktop-managers/enlightenment.nix
- pkgs/desktops/enlightenment/**/*
- pkgs/development/python-modules/python-efl/*
"6.topic: erlang": "6.topic: erlang":
- doc/languages-frameworks/beam.section.md - any:
- pkgs/development/beam-modules/**/* - changed-files:
- pkgs/development/interpreters/elixir/**/* - any-glob-to-any-file:
- pkgs/development/interpreters/erlang/**/* - doc/languages-frameworks/beam.section.md
- pkgs/development/tools/build-managers/rebar/**/* - pkgs/development/beam-modules/**/*
- pkgs/development/tools/build-managers/rebar3/**/* - pkgs/development/interpreters/elixir/**/*
- pkgs/development/tools/erlang/**/* - pkgs/development/interpreters/erlang/**/*
- pkgs/top-level/beam-packages.nix - pkgs/development/tools/build-managers/rebar/**/*
- pkgs/development/tools/build-managers/rebar3/**/*
- pkgs/development/tools/erlang/**/*
- pkgs/top-level/beam-packages.nix
"6.topic: fetch": "6.topic: fetch":
- pkgs/build-support/fetch*/**/* - any:
- changed-files:
- any-glob-to-any-file:
- pkgs/build-support/fetch*/**/*
"6.topic: flakes": "6.topic: flakes":
- '**/flake.nix' - any:
- lib/systems/flake-systems.nix - changed-files:
- nixos/modules/config/nix-flakes.nix - any-glob-to-any-file:
- '**/flake.nix'
- lib/systems/flake-systems.nix
- nixos/modules/config/nix-flakes.nix
"6.topic: GNOME": "6.topic: GNOME":
- doc/languages-frameworks/gnome.section.md - any:
- nixos/modules/services/desktops/gnome/**/* - changed-files:
- nixos/modules/services/x11/desktop-managers/gnome.nix - any-glob-to-any-file:
- nixos/tests/gnome-xorg.nix - doc/languages-frameworks/gnome.section.md
- nixos/tests/gnome.nix - nixos/modules/services/desktops/gnome/**/*
- pkgs/desktops/gnome/**/* - nixos/modules/services/x11/desktop-managers/gnome.nix
- nixos/tests/gnome-xorg.nix
- nixos/tests/gnome.nix
- pkgs/desktops/gnome/**/*
"6.topic: golang": "6.topic: golang":
- doc/languages-frameworks/go.section.md - any:
- pkgs/build-support/go/**/* - changed-files:
- pkgs/development/compilers/go/**/* - any-glob-to-any-file:
- doc/languages-frameworks/go.section.md
- pkgs/build-support/go/**/*
- pkgs/development/compilers/go/**/*
"6.topic: haskell": "6.topic: haskell":
- doc/languages-frameworks/haskell.section.md - any:
- maintainers/scripts/haskell/**/* - changed-files:
- pkgs/development/compilers/ghc/**/* - any-glob-to-any-file:
- pkgs/development/haskell-modules/**/* - doc/languages-frameworks/haskell.section.md
- pkgs/development/tools/haskell/**/* - maintainers/scripts/haskell/**/*
- pkgs/test/haskell/**/* - pkgs/development/compilers/ghc/**/*
- pkgs/top-level/haskell-packages.nix - pkgs/development/haskell-modules/**/*
- pkgs/top-level/release-haskell.nix - pkgs/development/tools/haskell/**/*
- pkgs/test/haskell/**/*
- pkgs/top-level/haskell-packages.nix
- pkgs/top-level/release-haskell.nix
"6.topic: jupyter": "6.topic: jupyter":
- pkgs/development/python-modules/jupyter*/**/* - any:
- pkgs/development/python-modules/mkdocs-jupyter/* - changed-files:
- nixos/modules/services/development/jupyter/**/* - any-glob-to-any-file:
- pkgs/applications/editors/jupyter-kernels/**/* - pkgs/development/python-modules/jupyter*/**/*
- pkgs/applications/editors/jupyter/**/* - pkgs/development/python-modules/mkdocs-jupyter/*
- nixos/modules/services/development/jupyter/**/*
- pkgs/applications/editors/jupyter-kernels/**/*
- pkgs/applications/editors/jupyter/**/*
"6.topic: kernel": "6.topic: kernel":
- pkgs/build-support/kernel/**/* - any:
- pkgs/os-specific/linux/kernel/**/* - changed-files:
- any-glob-to-any-file:
- pkgs/build-support/kernel/**/*
- pkgs/os-specific/linux/kernel/**/*
"6.topic: lib": "6.topic: lib":
- lib/** - any:
- changed-files:
- any-glob-to-any-file:
- lib/**
"6.topic: lua": "6.topic: lua":
- pkgs/development/interpreters/lua-5/**/* - any:
- pkgs/development/interpreters/luajit/**/* - changed-files:
- pkgs/development/lua-modules/**/* - any-glob-to-any-file:
- pkgs/top-level/lua-packages.nix - pkgs/development/interpreters/lua-5/**/*
- pkgs/development/interpreters/luajit/**/*
- pkgs/development/lua-modules/**/*
- pkgs/top-level/lua-packages.nix
"6.topic: Lumina DE": "6.topic: Lumina DE":
- nixos/modules/services/x11/desktop-managers/lumina.nix - any:
- pkgs/desktops/lumina/**/* - changed-files:
- any-glob-to-any-file:
- nixos/modules/services/x11/desktop-managers/lumina.nix
- pkgs/desktops/lumina/**/*
"6.topic: LXQt": "6.topic: LXQt":
- nixos/modules/services/x11/desktop-managers/lxqt.nix - any:
- pkgs/desktops/lxqt/**/* - changed-files:
- any-glob-to-any-file:
- nixos/modules/services/x11/desktop-managers/lxqt.nix
- pkgs/desktops/lxqt/**/*
"6.topic: mate": "6.topic: mate":
- nixos/modules/services/x11/desktop-managers/mate.nix - any:
- nixos/tests/mate.nix - changed-files:
- pkgs/desktops/mate/**/* - any-glob-to-any-file:
- nixos/modules/services/x11/desktop-managers/mate.nix
- nixos/tests/mate.nix
- pkgs/desktops/mate/**/*
"6.topic: module system": "6.topic: module system":
- lib/modules.nix - any:
- lib/types.nix - changed-files:
- lib/options.nix - any-glob-to-any-file:
- lib/tests/modules.sh - lib/modules.nix
- lib/tests/modules/** - lib/types.nix
- lib/options.nix
- lib/tests/modules.sh
- lib/tests/modules/**
"6.topic: nixos": "6.topic: nixos":
- nixos/**/* - any:
- pkgs/os-specific/linux/nixos-rebuild/**/* - changed-files:
- any-glob-to-any-file:
- nixos/**/*
- pkgs/os-specific/linux/nixos-rebuild/**/*
"6.topic: nim": "6.topic: nim":
- doc/languages-frameworks/nim.section.md - any:
- pkgs/development/compilers/nim/* - changed-files:
- pkgs/development/nim-packages/**/* - any-glob-to-any-file:
- pkgs/top-level/nim-packages.nix - doc/languages-frameworks/nim.section.md
- pkgs/development/compilers/nim/*
- pkgs/development/nim-packages/**/*
- pkgs/top-level/nim-packages.nix
"6.topic: nodejs": "6.topic: nodejs":
- doc/languages-frameworks/javascript.section.md - any:
- pkgs/build-support/node/**/* - changed-files:
- pkgs/development/node-packages/**/* - any-glob-to-any-file:
- pkgs/development/tools/yarn/* - doc/languages-frameworks/javascript.section.md
- pkgs/development/tools/yarn2nix-moretea/**/* - pkgs/build-support/node/**/*
- pkgs/development/web/nodejs/* - pkgs/development/node-packages/**/*
- pkgs/development/tools/yarn/*
- pkgs/development/tools/yarn2nix-moretea/**/*
- pkgs/development/web/nodejs/*
"6.topic: ocaml": "6.topic: ocaml":
- doc/languages-frameworks/ocaml.section.md - any:
- pkgs/development/compilers/ocaml/**/* - changed-files:
- pkgs/development/compilers/reason/**/* - any-glob-to-any-file:
- pkgs/development/ocaml-modules/**/* - doc/languages-frameworks/ocaml.section.md
- pkgs/development/tools/ocaml/**/* - pkgs/development/compilers/ocaml/**/*
- pkgs/top-level/ocaml-packages.nix - pkgs/development/compilers/reason/**/*
- pkgs/development/ocaml-modules/**/*
- pkgs/development/tools/ocaml/**/*
- pkgs/top-level/ocaml-packages.nix
"6.topic: pantheon": "6.topic: pantheon":
- nixos/modules/services/desktops/pantheon/**/* - any:
- nixos/modules/services/x11/desktop-managers/pantheon.nix - changed-files:
- nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix - any-glob-to-any-file:
- nixos/tests/pantheon.nix - nixos/modules/services/desktops/pantheon/**/*
- pkgs/desktops/pantheon/**/* - nixos/modules/services/x11/desktop-managers/pantheon.nix
- nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
- nixos/tests/pantheon.nix
- pkgs/desktops/pantheon/**/*
"6.topic: php": "6.topic: php":
- doc/languages-frameworks/php.section.md - any:
- pkgs/build-support/php/**/* - changed-files:
- pkgs/development/interpreters/php/* - any-glob-to-any-file:
- pkgs/development/php-packages/**/* - doc/languages-frameworks/php.section.md
- pkgs/test/php/default.nix - pkgs/build-support/php/**/*
- pkgs/top-level/php-packages.nix - pkgs/development/interpreters/php/*
- pkgs/development/php-packages/**/*
- pkgs/test/php/default.nix
- pkgs/top-level/php-packages.nix
"6.topic: policy discussion": "6.topic: policy discussion":
- .github/**/* - any:
- changed-files:
- any-glob-to-any-file:
- .github/**/*
"6.topic: printing": "6.topic: printing":
- nixos/modules/services/printing/cupsd.nix - any:
- pkgs/misc/cups/**/* - changed-files:
- any-glob-to-any-file:
- nixos/modules/services/printing/cupsd.nix
- pkgs/misc/cups/**/*
"6.topic: python": "6.topic: python":
- doc/languages-frameworks/python.section.md - any:
- pkgs/development/interpreters/python/**/* - changed-files:
- pkgs/development/python-modules/**/* - any-glob-to-any-file:
- pkgs/top-level/python-packages.nix - doc/languages-frameworks/python.section.md
- pkgs/development/interpreters/python/**/*
- pkgs/development/python-modules/**/*
- pkgs/top-level/python-packages.nix
"6.topic: qt/kde": "6.topic: qt/kde":
- doc/languages-frameworks/qt.section.md - any:
- nixos/modules/services/x11/desktop-managers/plasma5.nix - changed-files:
- nixos/tests/plasma5.nix - any-glob-to-any-file:
- pkgs/applications/kde/**/* - doc/languages-frameworks/qt.section.md
- pkgs/desktops/plasma-5/**/* - nixos/modules/services/x11/desktop-managers/plasma5.nix
- pkgs/development/libraries/kde-frameworks/**/* - nixos/tests/plasma5.nix
- pkgs/development/libraries/qt-5/**/* - pkgs/applications/kde/**/*
- pkgs/desktops/plasma-5/**/*
- pkgs/development/libraries/kde-frameworks/**/*
- pkgs/development/libraries/qt-5/**/*
"6.topic: ruby": "6.topic: ruby":
- doc/languages-frameworks/ruby.section.md - any:
- pkgs/development/interpreters/ruby/**/* - changed-files:
- pkgs/development/ruby-modules/**/* - any-glob-to-any-file:
- doc/languages-frameworks/ruby.section.md
- pkgs/development/interpreters/ruby/**/*
- pkgs/development/ruby-modules/**/*
"6.topic: rust": "6.topic: rust":
- doc/languages-frameworks/rust.section.md - any:
- pkgs/build-support/rust/**/* - changed-files:
- pkgs/development/compilers/rust/**/* - any-glob-to-any-file:
- doc/languages-frameworks/rust.section.md
- pkgs/build-support/rust/**/*
- pkgs/development/compilers/rust/**/*
"6.topic: stdenv": "6.topic: stdenv":
- pkgs/stdenv/**/* - any:
- changed-files:
- any-glob-to-any-file:
- pkgs/stdenv/**/*
"6.topic: steam": "6.topic: steam":
- pkgs/games/steam/**/* - any:
- changed-files:
- any-glob-to-any-file:
- pkgs/games/steam/**/*
"6.topic: systemd": "6.topic: systemd":
- pkgs/os-specific/linux/systemd/**/* - any:
- nixos/modules/system/boot/systemd*/**/* - changed-files:
- any-glob-to-any-file:
- pkgs/os-specific/linux/systemd/**/*
- nixos/modules/system/boot/systemd*/**/*
"6.topic: TeX": "6.topic: TeX":
- doc/languages-frameworks/texlive.section.md - any:
- pkgs/test/texlive/** - changed-files:
- pkgs/tools/typesetting/tex/**/* - any-glob-to-any-file:
- doc/languages-frameworks/texlive.section.md
- pkgs/test/texlive/**
- pkgs/tools/typesetting/tex/**/*
"6.topic: vim": "6.topic: vim":
- doc/languages-frameworks/vim.section.md - any:
- pkgs/applications/editors/vim/**/* - changed-files:
- pkgs/applications/editors/vim/plugins/**/* - any-glob-to-any-file:
- nixos/modules/programs/neovim.nix - doc/languages-frameworks/vim.section.md
- pkgs/applications/editors/neovim/**/* - pkgs/applications/editors/vim/**/*
- pkgs/applications/editors/vim/plugins/**/*
- nixos/modules/programs/neovim.nix
- pkgs/applications/editors/neovim/**/*
"6.topic: vscode": "6.topic: vscode":
- pkgs/applications/editors/vscode/**/* - any:
- changed-files:
- any-glob-to-any-file:
- pkgs/applications/editors/vscode/**/*
"6.topic: xfce": "6.topic: xfce":
- nixos/doc/manual/configuration/xfce.xml - any:
- nixos/modules/services/x11/desktop-managers/xfce.nix - changed-files:
- nixos/tests/xfce.nix - any-glob-to-any-file:
- pkgs/desktops/xfce/**/* - nixos/doc/manual/configuration/xfce.xml
- nixos/modules/services/x11/desktop-managers/xfce.nix
- nixos/tests/xfce.nix
- pkgs/desktops/xfce/**/*
"6.topic: zig": "6.topic: zig":
- pkgs/development/compilers/zig/**/* - any:
- doc/hooks/zig.section.md - changed-files:
- any-glob-to-any-file:
- pkgs/development/compilers/zig/**/*
- doc/hooks/zig.section.md
"8.has: changelog": "8.has: changelog":
- nixos/doc/manual/release-notes/**/* - any:
- changed-files:
- any-glob-to-any-file:
- nixos/doc/manual/release-notes/**/*
"8.has: documentation": "8.has: documentation":
- doc/**/* - any:
- nixos/doc/**/* - changed-files:
- any-glob-to-any-file:
- doc/**/*
- nixos/doc/**/*
"8.has: module (update)": "8.has: module (update)":
- nixos/modules/**/* - any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/**/*

2
.github/workflows/labels.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')"
steps: steps:
- uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594 # v4.3.0 - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
sync-labels: true sync-labels: true

4
nixos/modules/services/web-apps/engelsystem.nix
View File

@ -3,6 +3,8 @@
let let
inherit (lib) mkDefault mkEnableOption mkIf mkOption types mkPackageOption; inherit (lib) mkDefault mkEnableOption mkIf mkOption types mkPackageOption;
cfg = config.services.engelsystem; cfg = config.services.engelsystem;
phpExt = pkgs.php.withExtensions
({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql mbstring ] ++ enabled);
in { in {
options = { options = {
services.engelsystem = { services.engelsystem = {
@ -99,7 +101,7 @@ in {
''; '';
services.phpfpm.pools.engelsystem = { services.phpfpm.pools.engelsystem = {
phpPackage = pkgs.php81; phpPackage = phpExt;
user = "engelsystem"; user = "engelsystem";
settings = { settings = {
"listen.owner" = config.services.nginx.user; "listen.owner" = config.services.nginx.user;

4
pkgs/applications/blockchains/exodus/default.nix
View File

@ -27,13 +27,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exodus"; pname = "exodus";
version = "24.2.12"; version = "24.11.5";
src = fetchurl { src = fetchurl {
name = "exodus-linux-x64-${version}.zip"; name = "exodus-linux-x64-${version}.zip";
url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip";
curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; curlOptsList = [ "--user-agent" "Mozilla/5.0" ];
sha256 = "sha256-oT0CgmfNXq9Kdoo+l+GHW2NVcT12MxJxq9BlIP7lMDE="; sha256 = "sha256-sh6Ym+Dm5UIEiESIu1cuY8XSsnJcENCzW7b4S562ax8=";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

10
pkgs/applications/networking/browsers/librewolf/src.json
View File

@ -1,15 +1,15 @@
{ {
"packageVersion": "123.0-1", "packageVersion": "123.0.1-1",
"source": { "source": {
"rev": "123.0-1", "rev": "123.0.1-1",
"sha256": "1ic71b9sf6pgvsyinz0r8qhbpkryfdbj7lz6lh02d27xhnw9jd93" "sha256": "1rw10n0na7v2syf0dqmjl91d6jhnhzb6xbcd13frwclp1v5j0irk"
}, },
"settings": { "settings": {
"rev": "8a499ecdab8a5136faee50aae1fdd48997711de6", "rev": "8a499ecdab8a5136faee50aae1fdd48997711de6",
"sha256": "1c12y7b09rrz8zlpar8nnd9k2nvldjqq3cicbc57g6s1npnf8rz6" "sha256": "1c12y7b09rrz8zlpar8nnd9k2nvldjqq3cicbc57g6s1npnf8rz6"
}, },
"firefox": { "firefox": {
"version": "123.0", "version": "123.0.1",
"sha512": "a19567a13e1b663e538c4af17491146adad1f0ab977995e8da9ce9ed428008ad20902dee4efb82d54e1319a0e31768609696bc822563d75732b622760129d8bb" "sha512": "e9af61c1ca800edd16ab7a0d24c9a36bbb34813ed0a11ff62389aa38fa83deba394bca5d95cdaad55ad29ffa3c0e5d3dd15ac1099f7fa3649f4b6c835b7498c2"
} }
} }

8
pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix
View File

@ -1,10 +1,10 @@
{ {
traefik-crd = { traefik-crd = {
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-21.2.1+up21.2.0.tgz"; url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz";
sha256 = "05j3vyikb7g2z2i07rij9h4ki5lb2hb2rynpiqfd4l1y5qm0qhw9"; sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq";
}; };
traefik = { traefik = {
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-21.2.1+up21.2.0.tgz"; url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz";
sha256 = "0gvz0yzph2893scd0q10b938yc7f36b3zqs57pkjgqqpl1d0nwhg"; sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89";
}; };
} }

16
pkgs/applications/networking/cluster/k3s/1_26/versions.nix
View File

@ -1,14 +1,14 @@
{ {
k3sVersion = "1.26.9+k3s1"; k3sVersion = "1.26.14+k3s1";
k3sCommit = "4e217286a7ea41b82f1b67ab851d444ecf9a0f9b"; k3sCommit = "c7e6922aa84369b3c0d28bb800e67bb162895a1c";
k3sRepoSha256 = "1rf2gzf3ilcd1gc6d4k1w6cficr70x8lwzcq81njpz72dr6883z3"; k3sRepoSha256 = "1spvyyzk711g4ik1pv21xaasy7va5l5gcvbfkamfv4ijn0wz4mjx";
k3sVendorHash = "sha256-heCQNRaa0qFNkL69KEiIH2qEg+pukgS+fLOSWcwFddA="; k3sVendorHash = "sha256-ursq2Vq1J9MdkwDl3kKioxizhR46yo2urNc3VpwVH2A=";
chartVersions = import ./chart-versions.nix; chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2"; k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
k3sCNIVersion = "1.3.0-k3s1"; k3sCNIVersion = "1.4.0-k3s2";
k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";
containerdVersion = "1.7.6-k3s1.26"; containerdVersion = "1.7.11-k3s2.26";
containerdSha256 = "1bj7nggfmkrrgm5yk08p665z1mw1y376k4g3vjbkqldfglzpx7sq"; containerdSha256 = "0413a81kzb05xkklwyngg8g6a0w4icsi938rim69jmr2sijc89ww";
criCtlVersion = "1.26.0-rc.0-k3s1"; criCtlVersion = "1.26.0-rc.0-k3s1";
} }

12
pkgs/applications/networking/cluster/k3s/1_27/versions.nix
View File

@ -1,13 +1,13 @@
{ {
k3sVersion = "1.27.9+k3s1"; k3sVersion = "1.27.11+k3s1";
k3sCommit = "2c249a39358bd36438ab53aedef5487d950fd558"; k3sCommit = "06d6bc80b469a61e5e90438b1f2639cd136a89e7";
k3sRepoSha256 = "16zcp1ih34zpz6115ivbcs49n5yikgj8mpiv177jvvb2vakmkgv6"; k3sRepoSha256 = "0qkm8yqs9p34kb5k2q0j5wiykj78qc12n65n0clas5by23jrqcqa";
k3sVendorHash = "sha256-zvoBN1mErSXovv/xVzjntHyZjVyCfPzsOdlcTSIwKus="; k3sVendorHash = "sha256-+z8pr30+28puv7yjA7ZvW++I0ipNEmen2OhCxFMzYOY=";
chartVersions = import ./chart-versions.nix; chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2"; k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
k3sCNIVersion = "1.3.0-k3s1"; k3sCNIVersion = "1.4.0-k3s2";
k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";
containerdVersion = "1.7.11-k3s2.27"; containerdVersion = "1.7.11-k3s2.27";
containerdSha256 = "0xjxc5dgh3drk2glvcabd885damjffp9r4cs0cm1zgnrrbhlipra"; containerdSha256 = "0xjxc5dgh3drk2glvcabd885damjffp9r4cs0cm1zgnrrbhlipra";
criCtlVersion = "1.26.0-rc.0-k3s1"; criCtlVersion = "1.26.0-rc.0-k3s1";

13
pkgs/applications/networking/cluster/k3s/builder.nix
View File

@ -187,13 +187,12 @@ let
patches = patches =
# Disable: Add runtime checking of golang version # Disable: Add runtime checking of golang version
lib.optional (lib.versionAtLeast k3sVersion "1.28") (fetchpatch {
(fetchpatch { # https://github.com/k3s-io/k3s/pull/9054
# https://github.com/k3s-io/k3s/pull/9054 url = "https://github.com/k3s-io/k3s/commit/b297996b9252b02e56e9425f55f6becbf6bb7832.patch";
url = "https://github.com/k3s-io/k3s/commit/b297996b9252b02e56e9425f55f6becbf6bb7832.patch"; hash = "sha256-xBOY2jnLhT9dtVKtq26V9QUnuX1q6E/9UcO9IaU719U=";
hash = "sha256-xBOY2jnLhT9dtVKtq26V9QUnuX1q6E/9UcO9IaU719U="; revert = true;
revert = true; });
});
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libseccomp sqlite.dev ]; buildInputs = [ libseccomp sqlite.dev ];

4
pkgs/applications/networking/cluster/k3s/update-script.sh
View File

@ -25,8 +25,8 @@ LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | \
K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//') K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//')
K3S_COMMIT=$(curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ K3S_COMMIT=$(curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
https://api.github.com/repos/k3s-io/k3s/tags \ https://api.github.com/repos/k3s-io/k3s/git/refs/tags \
| jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") | jq -r "map(select(.ref == \"refs/tags/${LATEST_TAG_NAME}\")) | .[0] | .object.sha")
K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/k3s-io/k3s/archive/refs/tags/${LATEST_TAG_NAME}.tar.gz) K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/k3s-io/k3s/archive/refs/tags/${LATEST_TAG_NAME}.tar.gz)

6
pkgs/applications/networking/cluster/kubectl-gadget/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kubectl-gadget"; pname = "kubectl-gadget";
version = "0.25.1"; version = "0.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "inspektor-gadget"; owner = "inspektor-gadget";
repo = "inspektor-gadget"; repo = "inspektor-gadget";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-RbLc8c2F2Jy9jHwcd1FgqxhC5cl82oOauo/hsZ5zaG0="; hash = "sha256-G2FvKnO+YuLlRlzfB1YMRhCHWa6v4sMFLyDqp12bzn4=";
}; };
vendorHash = "sha256-/1dDAcICf7+g8hxaIAUsUwR9FNqatMhgAsvXrOuvGyk="; vendorHash = "sha256-IrSx1iCOd95CWyLo6WuEtTFm6p62se/t8dcBmH5eOP4=";
CGO_ENABLED = 0; CGO_ENABLED = 0;

4
pkgs/applications/networking/flexget/default.nix
View File

@ -6,7 +6,7 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "flexget"; pname = "flexget";
version = "3.11.23"; version = "3.11.24";
pyproject = true; pyproject = true;
# Fetch from GitHub in order to use `requirements.in` # Fetch from GitHub in order to use `requirements.in`
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "Flexget"; owner = "Flexget";
repo = "Flexget"; repo = "Flexget";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-qEGgXpwECt9vAV+0GfAIQSuHwWtz4vFxy+6QuVUe5Rs="; hash = "sha256-GivnZ7WWoS4fc7/uUfZFTdT0W+pW7W6Vhb56CmkEb0k=";
}; };
postPatch = '' postPatch = ''

4
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "signalbackup-tools"; pname = "signalbackup-tools";
version = "20240306"; version = "20240314";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bepaald"; owner = "bepaald";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-KN4FkqgWj92LqPtwU/Wyk1qe8AyUsWlobypq5WgRVyI="; hash = "sha256-m22OD2pq7bIN8X5FNCtkNt+VnWDAflXF2nYGgMepLzs=";
}; };
postPatch = '' postPatch = ''

15
pkgs/applications/networking/newsreaders/liferea/default.nix
View File

@ -1,6 +1,5 @@
{ lib, stdenv { lib, stdenv
, fetchurl , fetchurl
, fetchpatch
, pkg-config , pkg-config
, intltool , intltool
, python3Packages , python3Packages
@ -25,23 +24,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "liferea"; pname = "liferea";
version = "1.15.5"; version = "1.15.6";
src = fetchurl { src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
hash = "sha256-7lanrs63N6ZnqxvjcW/+cUZVDqUbML2gftQUc/sLr3Q="; hash = "sha256-4P/0fwHofsRjZcLuFdkUKxWIp/9P5yXA2ED/zqTGd94=";
}; };
patches = [
# Pull upstream fix for libxml2-2.12 compatibility:
# https://github.com/lwindolf/liferea/pull/1329
(fetchpatch {
name = "libxml2-2.12.patch";
url = "https://github.com/lwindolf/liferea/commit/be8ef494586d9ef73c04ec4ca058a9a158ae3562.patch";
hash = "sha256-K1R7dJMm7ui6QKQqAHCo/ZrLCW3PhPU1EKRPEICtCsQ=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
wrapGAppsHook wrapGAppsHook
python3Packages.wrapPython python3Packages.wrapPython

6
pkgs/applications/office/treesheets/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "treesheets"; pname = "treesheets";
version = "unstable-2024-01-30"; version = "unstable-2024-03-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aardappel"; owner = "aardappel";
repo = "treesheets"; repo = "treesheets";
rev = "f11a3418cb6e403898be215f3efcc2fcb7bc0f19"; rev = "4910f91cc067b1022d773a40d5762b0ebd47d0f3";
sha256 = "FOeRfNPX1ER1ZMUWy+4b67XfrATPPZntfhywjaGgDpo="; sha256 = "We3+Y2V2izsgem0fJ0/2pPj5tyjXhOEuubP7lIhnEQ0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/applications/radio/cloudlog/default.nix
View File

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "cloudlog"; pname = "cloudlog";
version = "2.6.5"; version = "2.6.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "magicbug"; owner = "magicbug";
repo = "Cloudlog"; repo = "Cloudlog";
rev = version; rev = version;
hash = "sha256-RxA0joF+hqIL+eElVVwG0kxvzxkt3YsFaomf9GIHtCw="; hash = "sha256-wq7CCf+IJ7BpbLwXBemDrsqXy2dHITubQKNR2bUfqW0=";
}; };
postPatch = '' postPatch = ''

6
pkgs/applications/science/biology/deeptools/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "deeptools"; pname = "deeptools";
version = "3.5.4"; version = "3.5.5";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deeptools"; owner = "deeptools";
repo = "deepTools"; repo = "deepTools";
rev = version; rev = "refs/tags/${version}";
hash = "sha256-A8YdlMptmJyxWW0EYLjXFIWjIO/mttEC7VYdlCe9MaI="; hash = "sha256-2kSlL7Y5f/FjVtStnmz+GlTw2oymrtxOCaXlqgbQ7FU=";
}; };
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [

6
pkgs/applications/version-management/glab/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "glab"; pname = "glab";
version = "1.36.0"; version = "1.37.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-BS5v+R3DqkLLNZScr2PutMMrLZCI4tUK9HDN/viFYMU="; hash = "sha256-H1yYjI7ct/YO44czX5J0cHc/YbhxtXJQThJcARyUEq0=";
}; };
vendorHash = "sha256-x96ChhozvTrX0eBWt3peX8dpd4gyukJ28RkqcD2W/OM="; vendorHash = "sha256-4CQ4NPHAs736LQxDxvKWEH9TQvIKAouJ6zVReAoZTec=";
ldflags = [ ldflags = [
"-s" "-s"

4
pkgs/applications/video/media-downloader/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "media-downloader"; pname = "media-downloader";
version = "4.3.1"; version = "4.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mhogomchungu"; owner = "mhogomchungu";
repo = "media-downloader"; repo = "media-downloader";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-+vPGfPncb8f5c9OiBmpMvvDh3X6ZMHPbyngcDfrP9qQ="; hash = "sha256-/W0SkKe9rcwf8HBIEcdJCPdZEnx9eh+twBu9wa6Sq30=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/applications/window-managers/i3/lock.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "i3lock"; pname = "i3lock";
version = "2.14.1"; version = "2.15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "i3"; owner = "i3";
repo = "i3lock"; repo = "i3lock";
rev = version; rev = version;
sha256 = "sha256-cC908c47fkU6msLqZSxpEbKxO1/PatH81QeuCzBSZGw="; sha256 = "sha256-OyV6GSLnNV3GUqrfs3OBnIaBvicH2PXgeY4acOk5dR4=";
}; };
nativeBuildInputs = [ meson ninja pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config ];

4
pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
View File

@ -20,12 +20,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "phosh-mobile-settings"; pname = "phosh-mobile-settings";
version = "0.36.0"; version = "0.37.0";
src = fetchurl { src = fetchurl {
# This tarball includes the meson wrapped subproject 'gmobile'. # This tarball includes the meson wrapped subproject 'gmobile'.
url = "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; url = "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-rktrEBRjOUWGb0Qfcyr03dSxpU2XnC0xHb07x8qc9JU="; hash = "sha256-HW3wM/lb8pvr+eDoeqa0iHXiKhBQ8ybBIy0wwHPsrOg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/by-name/fl/fleng/package.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "fleng"; pname = "fleng";
version = "19"; version = "20";
src = fetchurl { src = fetchurl {
url = "http://www.call-with-current-continuation.org/fleng/fleng-${finalAttrs.version}.tgz"; url = "http://www.call-with-current-continuation.org/fleng/fleng-${finalAttrs.version}.tgz";
hash = "sha256-xYMNGS3avZ9JsR8kJlSHz+C2XsLmhsDO/KTr5JquRK8="; hash = "sha256-kkouDNbdVGE7vskmu8kISA/RHIGed5vLY/ch4qgew3g=";
}; };
doCheck = true; doCheck = true;

20
pkgs/by-name/ni/nixops-dns/deps.nix generated
View File

@ -1,20 +0,0 @@
[
{
goPackagePath = "github.com/mattn/go-sqlite3";
fetch = {
type = "git";
url = "https://github.com/mattn/go-sqlite3";
rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
};
}
{
goPackagePath = "github.com/miekg/dns";
fetch = {
type = "git";
url = "https://github.com/miekg/dns";
rev = "75229eecb7af00b2736e93b779a78429dcb19472";
sha256 = "1vsjy07kkyx11iz4qsihhykac3ddq3ywdgv6bwrv407504f7x6wl";
};
}
]

19
pkgs/by-name/ni/nixops-dns/package.nix
View File

@ -1,23 +1,24 @@
{ lib { lib
, buildGoPackage , buildGoModule
, fetchFromGitHub }: , fetchFromGitHub }:
buildGoPackage rec { buildGoModule rec {
pname = "nixops-dns"; pname = "nixops-dns";
version = "1.0"; version = "1.0.1";
goDeps = ./deps.nix;
goPackagePath = "github.com/kamilchm/nixops-dns";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kamilchm"; owner = "museoa";
repo = "nixops-dns"; repo = "nixops-dns";
rev = "v${version}"; rev = "v${version}";
sha256 = "1fyqwk2knrv40zpf71a56bjyaycr3p6fzrqq7gaan056ydy83cai"; hash = "sha256-d3vVm6YeQTOAE5HFSKI01L9ZqfbQKrdoLsMwHP5HulE=";
}; };
vendorHash = "sha256-3DVNjvW0AAdogpTi3GMnn92FqqOUWNdQvRBityyKwcI=";
ldflags = [ "-s" "-w" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/kamilchm/nixops-dns/"; homepage = "https://github.com/museoa/nixops-dns";
description = "DNS server for resolving NixOps machines"; description = "DNS server for resolving NixOps machines";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ kamilchm sorki ]; maintainers = with maintainers; [ kamilchm sorki ];

4
pkgs/by-name/ni/nixos-anywhere/package.nix
View File

@ -28,12 +28,12 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "nixos-anywhere"; pname = "nixos-anywhere";
version = "1.1.1"; version = "1.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "numtide"; owner = "numtide";
repo = "nixos-anywhere"; repo = "nixos-anywhere";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-GN0G3g3QEzb2ZG3zSzbRaRBsmQsWJu81CZy9mIofRZ0="; hash = "sha256-JzgZnHQ4Bknh1ebE4iMVzR3cWZG+8k7MRy0X7cNSnBE=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
installPhase = '' installPhase = ''

4
pkgs/games/unciv/default.nix → pkgs/by-name/un/unciv/package.nix
View File

@ -27,11 +27,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "unciv"; pname = "unciv";
version = "4.10.15"; version = "4.10.19";
src = fetchurl { src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
hash = "sha256-SikrApaaGCAQc6ncqI4vRfXSgG/hgfO1wn5B5fj+W6Y="; hash = "sha256-f9fg2Clz9CjoC8xzCguJ2A3Aczom+KjEyIlMJC2oS/o=";
}; };
dontUnpack = true; dontUnpack = true;

6
pkgs/by-name/ux/uxn/package.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "uxn"; pname = "uxn";
version = "unstable-2024-03-10"; version = "unstable-2024-03-16";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~rabbits"; owner = "~rabbits";
repo = "uxn"; repo = "uxn";
rev = "cf964e43777bcce2e938964a5c764d1318e52ea6"; rev = "5d3cf8b61457fea833d3e232297b378ba54c8350";
hash = "sha256-NBIfpdZT9MjSUX+JUAoN1kkHKknsbRvaPMSaGmBXmac="; hash = "sha256-PXXsMKAPRUs4/Y4s/NBorcJmv7RtNK7UlRgmyowrm3A=";
}; };
outputs = [ "out" "projects" ]; outputs = [ "out" "projects" ];

1
pkgs/by-name/vi/victoriametrics/package.nix
View File

@ -21,6 +21,7 @@ buildGoModule rec {
"app/vlstorage" "app/vlstorage"
"app/vmagent" "app/vmagent"
"app/vmalert-tool" "app/vmalert-tool"
"app/vmalert"
"app/vmauth" "app/vmauth"
"app/vmctl" "app/vmctl"
"app/vminsert" "app/vminsert"

4
pkgs/data/documentation/gnome-user-docs/default.nix
View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-user-docs"; pname = "gnome-user-docs";
version = "45.1"; version = "45.5";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "L5DGgntfFgXfLt++orNChwMAqamBvDktyWIU2WfzrfE="; sha256 = "sha256-dBZ/z0KgTZ5dPMEw0nvCA9h7aFzmBqhGdN8k4f9xnlQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/data/fonts/unifont/default.nix
View File

@ -4,16 +4,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "unifont"; pname = "unifont";
version = "15.1.04"; version = "15.1.05";
otf = fetchurl { otf = fetchurl {
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.otf"; url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.otf";
hash = "sha256-J8g8ojXDq5nV013zXXi1rEAYQhpCh7G06mV7IpmZbTg="; hash = "sha256-e2K1CsuxhmidwwxEbOQ2e4fXlInpkHuDJV+fvg3PueE=";
}; };
pcf = fetchurl { pcf = fetchurl {
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
hash = "sha256-XHKP8xx+GvhFYBW03Sambpd2gclKvQUz1JAjIlb59OI="; hash = "sha256-zpc9Z4XXvma/tXRYOvAAQIpjyYS+1XPiaLZF4xYPTbw=";
}; };
nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];

4
pkgs/desktops/gnome/core/eog/default.nix
View File

@ -31,13 +31,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "eog"; pname = "eog";
version = "45.2"; version = "45.3";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-2UzDnYLIDO5ygbgqzkLIIll2rV0MPvmVx+Aw9rqyIZw="; sha256 = "sha256-hlD2YtSSHYOnkE9rucokW69zX3F7R/rFs38NkOXokag=";
}; };
patches = [ patches = [

4
pkgs/desktops/gnome/core/gnome-shell/default.nix
View File

@ -67,13 +67,13 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell"; pname = "gnome-shell";
version = "45.4"; version = "45.5";
outputs = [ "out" "devdoc" ]; outputs = [ "out" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
sha256 = "W/6jeeEgscfyN/PsNprSfvXC9ZMMffFjs5J4LYWCCQ0="; sha256 = "sha256-vVw9PQKNRyM+QgUiPwrAKsmpc7aZvCd0OQlNQaeNarA=";
}; };
patches = [ patches = [

4
pkgs/desktops/gnome/core/mutter/default.nix
View File

@ -67,13 +67,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mutter"; pname = "mutter";
version = "45.4"; version = "45.5";
outputs = [ "out" "dev" "man" "devdoc" ]; outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
sha256 = "kRQIN74VWC8sdTvmYauOQtrVXUobDwZQvQssk/Ar16s="; sha256 = "sha256-UcMyS4qXX5luWsaTqzhWPElubxQubNM1e0lQ0lAzSHQ=";
}; };
mesonFlags = [ mesonFlags = [

13
pkgs/development/libraries/gnome-online-accounts/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv { stdenv
, lib , lib
, fetchurl , fetchurl
, fetchpatch
, pkg-config , pkg-config
, vala , vala
, glib , glib
@ -33,23 +32,15 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "gnome-online-accounts"; pname = "gnome-online-accounts";
version = "3.48.0"; version = "3.48.1";
outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ]; outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
hash = "sha256-QYu5/P/b1yqYIFrTZRN2F/weNVGlTedPapjUXSZhdb8="; hash = "sha256-PqDHEIS/WVzOXKo3zv8uhT0OyWRLsB/UZDMArblRf4o=";
}; };
patches = [
# Fix crash with EWS and libxml2.12.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/commit/b9638e2418408be4906752297e700506766dcf20.patch";
hash = "sha256-l9+qS9WF3RuG9NtQQzSjpFSLNJV4FkXxOsLKYbINqrQ=";
})
];
mesonFlags = [ mesonFlags = [
"-Dfedora=false" # not useful in NixOS or for NixOS users. "-Dfedora=false" # not useful in NixOS or for NixOS users.
"-Dgoabackend=${lib.boolToString enableBackend}" "-Dgoabackend=${lib.boolToString enableBackend}"

4
pkgs/development/libraries/json-fortran/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "json-fortran"; pname = "json-fortran";
version = "8.3.0"; version = "8.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jacobwilliams"; owner = "jacobwilliams";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-96W9bzWEZ3EN4wtnDT3G3pvLdcI4SIhGJWBVPU3rNZ4="; hash = "sha256-qy3CK8Op3YVNpXjq60UYq9V9qWBEXpX/li/lYxXW9Fk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/libraries/liblouis/default.nix
View File

@ -13,7 +13,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "liblouis"; pname = "liblouis";
version = "3.28.0"; version = "3.29.0";
outputs = [ "out" "dev" "info" "doc" ] outputs = [ "out" "dev" "info" "doc" ]
# configure: WARNING: cannot generate manual pages while cross compiling # configure: WARNING: cannot generate manual pages while cross compiling
@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "liblouis"; owner = "liblouis";
repo = "liblouis"; repo = "liblouis";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-PvGlhsnAxQctcODiK628BDdzYaWUIF/F3dN2g//Gywg="; hash = "sha256-TaMPl53FlUSZIsjhoTYcv3Y+j86fDHuBTjiyr/uP1tM=";
}; };
strictDeps = true; strictDeps = true;

4
pkgs/development/libraries/libspelling/default.nix
View File

@ -17,7 +17,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libspelling"; pname = "libspelling";
version = "0.2.0"; version = "0.2.1";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "chergert"; owner = "chergert";
repo = "libspelling"; repo = "libspelling";
rev = version; rev = version;
hash = "sha256-OOSQgdtnEx6/5yKwavCGdY/5L0Mr3XW0Srmd42ZTdUk="; hash = "sha256-0OGcwPGWtYYf0XmvzXEaQgebBOW/6JWcDuF4MlQjCZQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/pyvista/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyvista"; pname = "pyvista";
version = "0.43.3"; version = "0.43.4";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-yJEggiWK73zzUPvOsPucpalmSMxywinE9t2e2dqBM9M="; hash = "sha256-nesI3rYGPCih+rckT6E6pyy6kZdfxBOjpfwvzKt8c6I=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/spyder/default.nix
View File

@ -41,14 +41,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "spyder"; pname = "spyder";
version = "5.5.1"; version = "5.5.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-+z8Jj0eA/mYH1r8ZQUyYUFMk7h1mBxjoTD5YZk0cH0k="; hash = "sha256-i3OEKbiELfEmgff3EQfr6xGc74f1kMx1e+PbbXprkis=";
}; };
patches = [ patches = [

4
pkgs/development/python-modules/xiaomi-ble/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "xiaomi-ble"; pname = "xiaomi-ble";
version = "0.27.0"; version = "0.27.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices"; owner = "Bluetooth-Devices";
repo = "xiaomi-ble"; repo = "xiaomi-ble";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-D1LqIdnusCs7vzVCPnbhXqRER/+uPKWoVsfeGe2M6b8="; hash = "sha256-/LOq35YrGacXXP1Izl9xoF5rrCQGONPGj/u2zGOqbt0=";
}; };
postPatch = '' postPatch = ''

6
pkgs/development/tools/analysis/snyk/default.nix
View File

@ -2,16 +2,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "snyk"; pname = "snyk";
version = "1.1281.0"; version = "1.1284.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "snyk"; owner = "snyk";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-QxmYArH9HRq2vkGzfhWlCPLS++UiwdzAStUQxhGF85Q="; hash = "sha256-CM9172gSeWf+12e6tsro6O1NtiZqUAT0EsA6LAhZ+8s=";
}; };
npmDepsHash = "sha256-JxX4r1I/F3PEzg9rLfFNEIa4Q8jwuUWC6krH1oSoc8s="; npmDepsHash = "sha256-aode80HyGSyZoEiCdsnEPrVo8KSqTW0GxxsGdRyNdiQ=";
postPatch = '' postPatch = ''
substituteInPlace package.json --replace '"version": "1.0.0-monorepo"' '"version": "${version}"' substituteInPlace package.json --replace '"version": "1.0.0-monorepo"' '"version": "${version}"'

10
pkgs/development/web/bun/default.nix
View File

@ -12,7 +12,7 @@
}: }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
version = "1.0.30"; version = "1.0.31";
pname = "bun"; pname = "bun";
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec {
sources = { sources = {
"aarch64-darwin" = fetchurl { "aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
hash = "sha256-8S8fC7t7aRstWDvhlJe2gsYWaAvZJZqINv1sMyvmWsE="; hash = "sha256-0w+Vp1SkZ3brx5HJOp36vED4K/DWPo4w8+tYi5lHgOk=";
}; };
"aarch64-linux" = fetchurl { "aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
hash = "sha256-7jMs7I7LWY9z/SX1xiNe/hi7ikqTY0qm26UsB0GZWhE="; hash = "sha256-TAD41TlVMut2Fjlo8FGJBf8R7MIMlnts5RTRLqFwvT4=";
}; };
"x86_64-darwin" = fetchurl { "x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
hash = "sha256-qZqbFQCpX5zoXOhIGQq5FLXuKpbro8qTGHV/KaynLWE="; hash = "sha256-2hkCgIdgdCiIEQzOi/cWi4PwS4ShZr2qRnHnxsKL938=";
}; };
"x86_64-linux" = fetchurl { "x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
hash = "sha256-ZrBAukdbxmK0pfXptmt/VwfJFr9T4XGjXLeWCNzO55I="; hash = "sha256-Z8eOFiodmE/VrYy8gejJblBkcHsppOamg4akfiM/oEE=";
}; };
}; };
updateScript = writeShellScript "update-bun" '' updateScript = writeShellScript "update-bun" ''

4
pkgs/games/doom-ports/doomretro/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "doomretro"; pname = "doomretro";
version = "5.2.1"; version = "5.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bradharding"; owner = "bradharding";
repo = "doomretro"; repo = "doomretro";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-jM7SNZ8VsF0caB2Q2qOX8W6SuFxyZWpCo3+jD53R3qU="; hash = "sha256-LCCBtsDEyjzsPS5ADPzsup714p84MO65FQDVjAHhSts=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/games/jfsw/default.nix
View File

@ -11,14 +11,14 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "jfsw"; pname = "jfsw";
version = "20211225"; version = "20240303";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jonof"; owner = "jonof";
repo = "jfsw"; repo = "jfsw";
rev = "refs/tags/${finalAttrs.version}"; rev = "refs/tags/${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-oRJHVsVo+KQfJyd8TcPxTMPPi993qxQb0wnD9nR4vJY="; hash = "sha256-bOUgRa9zWufTFEj5huXAKeRerV8PqfqQVDoVUvRrj2I=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/misc/rivalcfg/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
pname = "rivalcfg"; pname = "rivalcfg";
version = "4.11.0"; version = "4.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "flozz"; owner = "flozz";
repo = "rivalcfg"; repo = "rivalcfg";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-6hgGb2BlXbnJ6uHbk8EUqrS/G1y65jTcw0zVCKt5+3k="; sha256 = "sha256-fkZvEaJJIfzyVyXhlb7Jlv5dASNKyclDIlyXU0uu5wo=";
}; };
propagatedBuildInputs = with python3Packages; [ hidapi setuptools ]; propagatedBuildInputs = with python3Packages; [ hidapi setuptools ];

6
pkgs/os-specific/linux/mmc-utils/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "mmc-utils"; pname = "mmc-utils";
version = "unstable-2023-10-10"; version = "unstable-2024-03-07";
src = fetchzip rec { src = fetchzip rec {
url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz"; url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz";
passthru.rev = "b5ca140312d279ad2f22068fd72a6230eea13436"; passthru.rev = "e1281d4de9166b7254ba30bb58f9191fc2c9e7fb";
sha256 = "QU4r8eajrrhT6u6WHEf1xtB1iyecBeHxu4vS+QcwAgM="; sha256 = "/lkcZ/ArdBAStV9usavrbfjULXenqb+h2rbDJzxZjJk=";
}; };
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ];

1
pkgs/servers/home-assistant/default.nix
View File

@ -619,6 +619,7 @@ in python.pkgs.buildPythonApplication rec {
certifi certifi
ciso8601 ciso8601
cryptography cryptography
hass-nabucasa
httpx httpx
home-assistant-bluetooth home-assistant-bluetooth
ifaddr ifaddr

6
pkgs/servers/monitoring/unpoller/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "unpoller"; pname = "unpoller";
version = "2.9.5"; version = "2.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "unpoller"; owner = "unpoller";
repo = "unpoller"; repo = "unpoller";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-hNDRzQGTS3sAdt/0ZdJV5zRpSdrBHGLDZJ62X+kFg7M="; hash = "sha256-aJbK1Fhlfm0CrI1O7sWh1xjk+OR8gLa1goSnQ4wfrI0=";
}; };
vendorHash = "sha256-+fXNfDGzZy43WjQrvK2enOWtSv2qN3Zo+O+9Bn+KO1s="; vendorHash = "sha256-iOfjjRjN07iD+B7GjWKbmQu/xNm5wjFQOTA4jBxMh/E=";
ldflags = [ ldflags = [
"-w" "-s" "-w" "-s"

6
pkgs/servers/nats-server/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "nats-server"; pname = "nats-server";
version = "2.10.11"; version = "2.10.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nats-io"; owner = "nats-io";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-fRbjAqu1tFLUUk7aeIkEifcWkDUhNCbVZ957b2ntD+o="; hash = "sha256-T0rwSa1xTPUZHkFDu9hnD2Kk1ME/vMUa4iK+Zbic6PM=";
}; };
vendorHash = "sha256-lVCWTZvzLkYl+o+EUQ0kzIhgl9C236w9i3RRA5o+IAw="; vendorHash = "sha256-pSjtUSbJPclsd30KLhLOkN4u6pSn307s3RohroxmExc=";
doCheck = false; doCheck = false;

8
pkgs/servers/readarr/default.nix
View File

@ -8,13 +8,13 @@ let
x86_64-darwin = "x64"; x86_64-darwin = "x64";
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = { hash = {
x64-linux_hash = "sha256-uNZQizvOPygP+LVyBAGshBcfjC4rrX9mGtaqv8pBWKA="; x64-linux_hash = "sha256-4kCDbmq47wb7OuE5JzHPZ/mM9w6wcupFblJieu5dFxc=";
arm64-linux_hash = "sha256-6wXqUZ1D3E3LB+FlJDhQ0XVawHYQ2QtiAYOeJKZv/ek="; arm64-linux_hash = "sha256-Val9dEB4E3dnfeXT2ERwE+VoITSXeA7Lc51dyz1jJyQ=";
x64-osx_hash = "sha256-JowEooaANOaMTlQCGuXwSp87EdULjbGmY+1RBfddcng="; x64-osx_hash = "sha256-LvjAeftlNw5F6YFyhKLW9Fv9UIk6AgnGnxOu6ctmQNg=";
}."${arch}-${os}_hash"; }."${arch}-${os}_hash";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "readarr"; pname = "readarr";
version = "0.3.19.2437"; version = "0.3.20.2452";
src = fetchurl { src = fetchurl {
url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz";

6
pkgs/servers/sql/rqlite/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "rqlite"; pname = "rqlite";
version = "8.22.1"; version = "8.23.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rqlite"; owner = "rqlite";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-g5W+rHD4gUS82E+wFLQ3VTSwIWQUogwTutwPTtf+IdM="; sha256 = "sha256-n4ALjayvcOR+VcpKPRh6WswAEEdlYyxhYyfPRje98Rs=";
}; };
vendorHash = "sha256-onR4n6ok6y9APRwGjBoMISbidGDVw19D48TkogRp1uM="; vendorHash = "sha256-UYO5asCX+KpESAT1ws7O91QaOJ8zPbd06JzHexBiWj0=";
subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ];

6
pkgs/servers/web-apps/engelsystem/default.nix
View File

@ -2,15 +2,15 @@
let let
phpExt = php.withExtensions phpExt = php.withExtensions
({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql ]); ({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql mbstring ] ++ enabled);
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "engelsystem"; pname = "engelsystem";
version = "3.4.1"; version = "3.5.0";
src = fetchzip { src = fetchzip {
url = "https://github.com/engelsystem/engelsystem/releases/download/v${version}/engelsystem-v${version}.zip"; url = "https://github.com/engelsystem/engelsystem/releases/download/v${version}/engelsystem-v${version}.zip";
hash = "sha256-5KniP1nrLfmWHruXnUJmlvgL95U+EsDmCs4tg/YLWtw="; hash = "sha256-RbzAHBZN02u14WaLtq5EOh4XwIdHKvzX7NhDBhn/CaU=";
}; };
buildInputs = [ phpExt ]; buildInputs = [ phpExt ];

30
pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch
View File

@ -1,15 +1,15 @@
This patch does two things: This patch does two things:
1) Drops probe-bcache, so now new util-linux detecting functionality is used. 1) Drops probe-bcache, so now util-linux detecting functionality is used.
2) Drops bcache-register, using kmod (built in udev) and moving registering device 2) Drops bcache-register, moving registering device functionality into rule
into rule using 'sh'. using 'sh'.
This reduces things that need to be present in initrd, replacing them with already This reduces things that need to be present in initrd, replacing them with
existing functionality and reducing overall initrd size. already existing functionality and reducing overall initrd size.
diff --git a/69-bcache.rules b/69-bcache.rules diff --git a/69-bcache.rules b/69-bcache.rules
index 5d28e70..6a52893 100644 index 9cc7f0d..6a52893 100644
--- a/69-bcache.rules --- a/69-bcache.rules
+++ b/69-bcache.rules +++ b/69-bcache.rules
@@ -10,15 +10,11 @@ KERNEL=="fd*|sr*", GOTO="bcache_end" @@ -10,16 +10,11 @@ KERNEL=="fd*|sr*", GOTO="bcache_end"
# It recognised bcache (util-linux 2.24+) # It recognised bcache (util-linux 2.24+)
ENV{ID_FS_TYPE}=="bcache", GOTO="bcache_backing_found" ENV{ID_FS_TYPE}=="bcache", GOTO="bcache_backing_found"
# It recognised something else; bail # It recognised something else; bail
@ -22,31 +22,21 @@ index 5d28e70..6a52893 100644
+GOTO="bcache_backing_end" +GOTO="bcache_backing_end"
LABEL="bcache_backing_found" LABEL="bcache_backing_found"
RUN{builtin}+="kmod load bcache"
-RUN+="bcache-register $tempnode" -RUN+="bcache-register $tempnode"
+RUN{builtin}+="kmod load bcache"
+RUN+="/bin/sh -c 'echo $tempnode > /sys/fs/bcache/register_quiet'" +RUN+="/bin/sh -c 'echo $tempnode > /sys/fs/bcache/register_quiet'"
LABEL="bcache_backing_end" LABEL="bcache_backing_end"
# Cached devices: symlink # Cached devices: symlink
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 3f8d87b..15638a7 100644 index c824ae3..c5f7309 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -9,7 +9,7 @@ all: make-bcache probe-bcache bcache-super-show @@ -9,7 +9,6 @@ all: make-bcache probe-bcache bcache-super-show bcache-register
install: make-bcache probe-bcache bcache-super-show install: make-bcache probe-bcache bcache-super-show
$(INSTALL) -m0755 make-bcache bcache-super-show $(DESTDIR)${PREFIX}/sbin/ $(INSTALL) -m0755 make-bcache bcache-super-show $(DESTDIR)${PREFIX}/sbin/
- $(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/ - $(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/
+# $(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/
$(INSTALL) -m0644 69-bcache.rules $(DESTDIR)$(UDEVLIBDIR)/rules.d/ $(INSTALL) -m0644 69-bcache.rules $(DESTDIR)$(UDEVLIBDIR)/rules.d/
$(INSTALL) -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/ $(INSTALL) -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/
$(INSTALL) -D -m0755 initramfs/hook $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache $(INSTALL) -D -m0755 initramfs/hook $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache
diff --git a/bcache-register b/bcache-register
index 9b592bc..75b4faf 100755
--- a/bcache-register
+++ b/bcache-register
@@ -1,4 +1,3 @@
#!/bin/sh
-/sbin/modprobe -qba bcache
test -f /sys/fs/bcache/register_quiet && echo "$1" > /sys/fs/bcache/register_quiet

4
pkgs/tools/filesystems/bcache-tools/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bcache-tools"; pname = "bcache-tools";
version = "1.0.7"; version = "1.0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "g2p"; owner = "g2p";
repo = "bcache-tools"; repo = "bcache-tools";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Ors2xXRrVTf8Cq3BYnSVSfJy/nyGjT5BGLSNpxOcHR4="; hash = "sha256-6gy0ymecMgEHXbwp/nXHlrUEeDFnmFXWZZPlzP292g4=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

4
pkgs/tools/filesystems/tar2ext4/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "tar2ext4"; pname = "tar2ext4";
version = "0.11.4"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "microsoft"; owner = "microsoft";
repo = "hcsshim"; repo = "hcsshim";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-bu1uLJmFSetTv1R3qyCtZxba+wxjDDSkEpBwKNZ/meM="; sha256 = "sha256-Zpcv3sSO1iQGgoy6PYfhf165BgGi2mkS9s+y8Ewhxa8=";
}; };
sourceRoot = "${src.name}/cmd/tar2ext4"; sourceRoot = "${src.name}/cmd/tar2ext4";

4
pkgs/tools/networking/miniupnpd/default.nix
View File

@ -28,11 +28,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "miniupnpd"; pname = "miniupnpd";
version = "2.3.4"; version = "2.3.5";
src = fetchurl { src = fetchurl {
url = "https://miniupnp.tuxfamily.org/files/miniupnpd-${version}.tar.gz"; url = "https://miniupnp.tuxfamily.org/files/miniupnpd-${version}.tar.gz";
sha256 = "sha256-5zAzSPyKxCfefwTw7rdX1J3Mg2cxHuJYJVLDj11toIo="; sha256 = "sha256-ljekEsM9J3jNrlYQWJM7TgtnRl/xNOlnYaexl1Gy+g8=";
}; };
buildInputs = [ iptables-legacy libuuid openssl ] buildInputs = [ iptables-legacy libuuid openssl ]

4
pkgs/tools/security/isolate/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "isolate"; pname = "isolate";
version = "1.10.1"; version = "2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ioi"; owner = "ioi";
repo = "isolate"; repo = "isolate";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-xY2omzqIJYElLtzj4byy/QG4pW4erCxc+cD2X9nA2jM="; hash = "sha256-kKXkXPVB9ojyIERvEdkHkXC//Agin8FPcpTBmTxh/ZE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/tools/security/tboot/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tboot"; pname = "tboot";
version = "1.11.1"; version = "1.11.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz";
sha256 = "sha256-1sPCbF/e5tWOEfBHM67lnK/QFyHRFZjRjAKxXAfw6nc="; sha256 = "sha256-faTdvjjTFXZEoHeVQ1HMTfU+215yruiliFQcQbc/1VA=";
}; };
buildInputs = [ openssl trousers zlib ]; buildInputs = [ openssl trousers zlib ];

4
pkgs/tools/system/java-service-wrapper/default.nix
View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "java-service-wrapper"; pname = "java-service-wrapper";
version = "3.5.54"; version = "3.5.56";
src = fetchurl { src = fetchurl {
url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
hash = "sha256-t16i1WqvDqr4J5sDldeUk6+DAyN/6oWGV6eME5yj+i4="; hash = "sha256-zZfJP/uf78D/6G51Km1bNRRIv5i8x69Xw+imho4/ZpQ=";
}; };
strictDeps = true; strictDeps = true;

4
pkgs/tools/text/wgetpaste/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wgetpaste"; pname = "wgetpaste";
version = "2.33"; version = "2.34";
src = fetchurl { src = fetchurl {
url = "https://github.com/zlin/wgetpaste/releases/download/${version}/wgetpaste-${version}.tar.xz"; url = "https://github.com/zlin/wgetpaste/releases/download/${version}/wgetpaste-${version}.tar.xz";
sha256 = "sha256-6TWdhKOmO7vRKGIVNcUwLy46heI6UiAOgej6ubd+lxs="; sha256 = "sha256-vW0G7ZAaPWPJyMVxJghP8JlPCZAb+xY4uHlT6sHpQz8=";
}; };
# currently zsh-autocompletion support is not installed # currently zsh-autocompletion support is not installed

10
pkgs/top-level/all-packages.nix
View File

@ -25959,7 +25959,7 @@ with pkgs;
dspam = callPackage ../servers/mail/dspam { }; dspam = callPackage ../servers/mail/dspam { };
engelsystem = callPackage ../servers/web-apps/engelsystem { php = php81; }; engelsystem = callPackage ../servers/web-apps/engelsystem { };
envoy = callPackage ../servers/http/envoy { envoy = callPackage ../servers/http/envoy {
go = go_1_20; go = go_1_20;
@ -32501,10 +32501,8 @@ with pkgs;
jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };
inherit (callPackage ../applications/networking/cluster/k3s { inherit (callPackage ../applications/networking/cluster/k3s {
buildGoModule = buildGo120Module; buildGoModule = buildGo121Module;
}) k3s_1_26 k3s_1_27 k3s_1_28; }) k3s_1_26 k3s_1_27 k3s_1_28 k3s_1_29;
inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_29;
k3s = k3s_1_29; k3s = k3s_1_29;
k3sup = callPackage ../applications/networking/cluster/k3sup { }; k3sup = callPackage ../applications/networking/cluster/k3sup { };
@ -37931,8 +37929,6 @@ with pkgs;
umoria = callPackage ../games/umoria { }; umoria = callPackage ../games/umoria { };
unciv = callPackage ../games/unciv { };
unnethack = callPackage ../games/unnethack { }; unnethack = callPackage ../games/unnethack { };
uqm = callPackage ../games/uqm { }; uqm = callPackage ../games/uqm { };