Merge remote-tracking branch 'upstream/staging-next' into staging

This commit is contained in:
annalee 2024-03-17 18:13:09 +00:00
commit f1166afe59
No known key found for this signature in database
89 changed files with 626 additions and 420 deletions

123
.github/labeler.yml vendored
View file

@ -1,4 +1,7 @@
"6.topic: agda": "6.topic: agda":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/agda.section.md - doc/languages-frameworks/agda.section.md
- nixos/tests/agda.nix - nixos/tests/agda.nix
- pkgs/build-support/agda/**/* - pkgs/build-support/agda/**/*
@ -6,11 +9,17 @@
- pkgs/top-level/agda-packages.nix - pkgs/top-level/agda-packages.nix
"6.topic: cinnamon": "6.topic: cinnamon":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/desktops/cinnamon/**/* - pkgs/desktops/cinnamon/**/*
- nixos/modules/services/x11/desktop-managers/cinnamon.nix - nixos/modules/services/x11/desktop-managers/cinnamon.nix
- nixos/tests/cinnamon.nix - nixos/tests/cinnamon.nix
"6.topic: emacs": "6.topic: emacs":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/editors/emacs.nix - nixos/modules/services/editors/emacs.nix
- nixos/modules/services/editors/emacs.xml - nixos/modules/services/editors/emacs.xml
- nixos/tests/emacs-daemon.nix - nixos/tests/emacs-daemon.nix
@ -20,11 +29,17 @@
- pkgs/top-level/emacs-packages.nix - pkgs/top-level/emacs-packages.nix
"6.topic: Enlightenment DE": "6.topic: Enlightenment DE":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/x11/desktop-managers/enlightenment.nix - nixos/modules/services/x11/desktop-managers/enlightenment.nix
- pkgs/desktops/enlightenment/**/* - pkgs/desktops/enlightenment/**/*
- pkgs/development/python-modules/python-efl/* - pkgs/development/python-modules/python-efl/*
"6.topic: erlang": "6.topic: erlang":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/beam.section.md - doc/languages-frameworks/beam.section.md
- pkgs/development/beam-modules/**/* - pkgs/development/beam-modules/**/*
- pkgs/development/interpreters/elixir/**/* - pkgs/development/interpreters/elixir/**/*
@ -35,14 +50,23 @@
- pkgs/top-level/beam-packages.nix - pkgs/top-level/beam-packages.nix
"6.topic: fetch": "6.topic: fetch":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/build-support/fetch*/**/* - pkgs/build-support/fetch*/**/*
"6.topic: flakes": "6.topic: flakes":
- any:
- changed-files:
- any-glob-to-any-file:
- '**/flake.nix' - '**/flake.nix'
- lib/systems/flake-systems.nix - lib/systems/flake-systems.nix
- nixos/modules/config/nix-flakes.nix - nixos/modules/config/nix-flakes.nix
"6.topic: GNOME": "6.topic: GNOME":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/gnome.section.md - doc/languages-frameworks/gnome.section.md
- nixos/modules/services/desktops/gnome/**/* - nixos/modules/services/desktops/gnome/**/*
- nixos/modules/services/x11/desktop-managers/gnome.nix - nixos/modules/services/x11/desktop-managers/gnome.nix
@ -51,11 +75,17 @@
- pkgs/desktops/gnome/**/* - pkgs/desktops/gnome/**/*
"6.topic: golang": "6.topic: golang":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/go.section.md - doc/languages-frameworks/go.section.md
- pkgs/build-support/go/**/* - pkgs/build-support/go/**/*
- pkgs/development/compilers/go/**/* - pkgs/development/compilers/go/**/*
"6.topic: haskell": "6.topic: haskell":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/haskell.section.md - doc/languages-frameworks/haskell.section.md
- maintainers/scripts/haskell/**/* - maintainers/scripts/haskell/**/*
- pkgs/development/compilers/ghc/**/* - pkgs/development/compilers/ghc/**/*
@ -66,6 +96,9 @@
- pkgs/top-level/release-haskell.nix - pkgs/top-level/release-haskell.nix
"6.topic: jupyter": "6.topic: jupyter":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/development/python-modules/jupyter*/**/* - pkgs/development/python-modules/jupyter*/**/*
- pkgs/development/python-modules/mkdocs-jupyter/* - pkgs/development/python-modules/mkdocs-jupyter/*
- nixos/modules/services/development/jupyter/**/* - nixos/modules/services/development/jupyter/**/*
@ -73,13 +106,22 @@
- pkgs/applications/editors/jupyter/**/* - pkgs/applications/editors/jupyter/**/*
"6.topic: kernel": "6.topic: kernel":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/build-support/kernel/**/* - pkgs/build-support/kernel/**/*
- pkgs/os-specific/linux/kernel/**/* - pkgs/os-specific/linux/kernel/**/*
"6.topic: lib": "6.topic: lib":
- any:
- changed-files:
- any-glob-to-any-file:
- lib/** - lib/**
"6.topic: lua": "6.topic: lua":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/development/tools/misc/luarocks/* - pkgs/development/tools/misc/luarocks/*
- pkgs/development/interpreters/lua-5/**/* - pkgs/development/interpreters/lua-5/**/*
- pkgs/development/interpreters/luajit/**/* - pkgs/development/interpreters/luajit/**/*
@ -87,19 +129,31 @@
- pkgs/top-level/lua-packages.nix - pkgs/top-level/lua-packages.nix
"6.topic: Lumina DE": "6.topic: Lumina DE":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/x11/desktop-managers/lumina.nix - nixos/modules/services/x11/desktop-managers/lumina.nix
- pkgs/desktops/lumina/**/* - pkgs/desktops/lumina/**/*
"6.topic: LXQt": "6.topic: LXQt":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/x11/desktop-managers/lxqt.nix - nixos/modules/services/x11/desktop-managers/lxqt.nix
- pkgs/desktops/lxqt/**/* - pkgs/desktops/lxqt/**/*
"6.topic: mate": "6.topic: mate":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/x11/desktop-managers/mate.nix - nixos/modules/services/x11/desktop-managers/mate.nix
- nixos/tests/mate.nix - nixos/tests/mate.nix
- pkgs/desktops/mate/**/* - pkgs/desktops/mate/**/*
"6.topic: module system": "6.topic: module system":
- any:
- changed-files:
- any-glob-to-any-file:
- lib/modules.nix - lib/modules.nix
- lib/types.nix - lib/types.nix
- lib/options.nix - lib/options.nix
@ -107,16 +161,25 @@
- lib/tests/modules/** - lib/tests/modules/**
"6.topic: nixos": "6.topic: nixos":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/**/* - nixos/**/*
- pkgs/os-specific/linux/nixos-rebuild/**/* - pkgs/os-specific/linux/nixos-rebuild/**/*
"6.topic: nim": "6.topic: nim":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/nim.section.md - doc/languages-frameworks/nim.section.md
- pkgs/development/compilers/nim/* - pkgs/development/compilers/nim/*
- pkgs/development/nim-packages/**/* - pkgs/development/nim-packages/**/*
- pkgs/top-level/nim-packages.nix - pkgs/top-level/nim-packages.nix
"6.topic: nodejs": "6.topic: nodejs":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/javascript.section.md - doc/languages-frameworks/javascript.section.md
- pkgs/build-support/node/**/* - pkgs/build-support/node/**/*
- pkgs/development/node-packages/**/* - pkgs/development/node-packages/**/*
@ -125,6 +188,9 @@
- pkgs/development/web/nodejs/* - pkgs/development/web/nodejs/*
"6.topic: ocaml": "6.topic: ocaml":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/ocaml.section.md - doc/languages-frameworks/ocaml.section.md
- pkgs/development/compilers/ocaml/**/* - pkgs/development/compilers/ocaml/**/*
- pkgs/development/compilers/reason/**/* - pkgs/development/compilers/reason/**/*
@ -133,6 +199,9 @@
- pkgs/top-level/ocaml-packages.nix - pkgs/top-level/ocaml-packages.nix
"6.topic: pantheon": "6.topic: pantheon":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/desktops/pantheon/**/* - nixos/modules/services/desktops/pantheon/**/*
- nixos/modules/services/x11/desktop-managers/pantheon.nix - nixos/modules/services/x11/desktop-managers/pantheon.nix
- nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix - nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
@ -140,6 +209,9 @@
- pkgs/desktops/pantheon/**/* - pkgs/desktops/pantheon/**/*
"6.topic: php": "6.topic: php":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/php.section.md - doc/languages-frameworks/php.section.md
- pkgs/build-support/php/**/* - pkgs/build-support/php/**/*
- pkgs/development/interpreters/php/* - pkgs/development/interpreters/php/*
@ -148,19 +220,31 @@
- pkgs/top-level/php-packages.nix - pkgs/top-level/php-packages.nix
"6.topic: policy discussion": "6.topic: policy discussion":
- any:
- changed-files:
- any-glob-to-any-file:
- .github/**/* - .github/**/*
"6.topic: printing": "6.topic: printing":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/printing/cupsd.nix - nixos/modules/services/printing/cupsd.nix
- pkgs/misc/cups/**/* - pkgs/misc/cups/**/*
"6.topic: python": "6.topic: python":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/python.section.md - doc/languages-frameworks/python.section.md
- pkgs/development/interpreters/python/**/* - pkgs/development/interpreters/python/**/*
- pkgs/development/python-modules/**/* - pkgs/development/python-modules/**/*
- pkgs/top-level/python-packages.nix - pkgs/top-level/python-packages.nix
"6.topic: qt/kde": "6.topic: qt/kde":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/qt.section.md - doc/languages-frameworks/qt.section.md
- nixos/modules/services/x11/desktop-managers/plasma5.nix - nixos/modules/services/x11/desktop-managers/plasma5.nix
- nixos/tests/plasma5.nix - nixos/tests/plasma5.nix
@ -170,31 +254,52 @@
- pkgs/development/libraries/qt-5/**/* - pkgs/development/libraries/qt-5/**/*
"6.topic: ruby": "6.topic: ruby":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/ruby.section.md - doc/languages-frameworks/ruby.section.md
- pkgs/development/interpreters/ruby/**/* - pkgs/development/interpreters/ruby/**/*
- pkgs/development/ruby-modules/**/* - pkgs/development/ruby-modules/**/*
"6.topic: rust": "6.topic: rust":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/rust.section.md - doc/languages-frameworks/rust.section.md
- pkgs/build-support/rust/**/* - pkgs/build-support/rust/**/*
- pkgs/development/compilers/rust/**/* - pkgs/development/compilers/rust/**/*
"6.topic: stdenv": "6.topic: stdenv":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/stdenv/**/* - pkgs/stdenv/**/*
"6.topic: steam": "6.topic: steam":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/games/steam/**/* - pkgs/games/steam/**/*
"6.topic: systemd": "6.topic: systemd":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/os-specific/linux/systemd/**/* - pkgs/os-specific/linux/systemd/**/*
- nixos/modules/system/boot/systemd*/**/* - nixos/modules/system/boot/systemd*/**/*
"6.topic: TeX": "6.topic: TeX":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/texlive.section.md - doc/languages-frameworks/texlive.section.md
- pkgs/test/texlive/** - pkgs/test/texlive/**
- pkgs/tools/typesetting/tex/**/* - pkgs/tools/typesetting/tex/**/*
"6.topic: vim": "6.topic: vim":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/vim.section.md - doc/languages-frameworks/vim.section.md
- pkgs/applications/editors/vim/**/* - pkgs/applications/editors/vim/**/*
- pkgs/applications/editors/vim/plugins/**/* - pkgs/applications/editors/vim/plugins/**/*
@ -202,24 +307,42 @@
- pkgs/applications/editors/neovim/**/* - pkgs/applications/editors/neovim/**/*
"6.topic: vscode": "6.topic: vscode":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/applications/editors/vscode/**/* - pkgs/applications/editors/vscode/**/*
"6.topic: xfce": "6.topic: xfce":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/doc/manual/configuration/xfce.xml - nixos/doc/manual/configuration/xfce.xml
- nixos/modules/services/x11/desktop-managers/xfce.nix - nixos/modules/services/x11/desktop-managers/xfce.nix
- nixos/tests/xfce.nix - nixos/tests/xfce.nix
- pkgs/desktops/xfce/**/* - pkgs/desktops/xfce/**/*
"6.topic: zig": "6.topic: zig":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/development/compilers/zig/**/* - pkgs/development/compilers/zig/**/*
- doc/hooks/zig.section.md - doc/hooks/zig.section.md
"8.has: changelog": "8.has: changelog":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/doc/manual/release-notes/**/* - nixos/doc/manual/release-notes/**/*
"8.has: documentation": "8.has: documentation":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/**/* - doc/**/*
- nixos/doc/**/* - nixos/doc/**/*
"8.has: module (update)": "8.has: module (update)":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/**/* - nixos/modules/**/*

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

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;

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

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"
} }
} }

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";
}; };
} }

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";
} }

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

View file

@ -187,7 +187,6 @@ 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";

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)

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;

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 = ''

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 = ''

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

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 = [

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 = ''

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

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"

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 = [

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

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 = [

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;

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

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

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 = ''

View file

@ -78,6 +78,14 @@ python.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ nativeBuildInputs = [
gettext gettext
] ++ (with python.pkgs; [
pythonRelaxDepsHook
setuptools
]);
pythonRelaxDeps = [
"django-csp"
"python-dateutil"
]; ];
propagatedBuildInputs = with python.pkgs; [ propagatedBuildInputs = with python.pkgs; [

View file

@ -1,6 +1,8 @@
{ lib { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, rustPlatform , rustPlatform
, darwin
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -18,6 +20,10 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-BystESOFIitw3ER2K1TPOf5luOBvKXFuqc/unL93yRY="; cargoHash = "sha256-BystESOFIitw3ER2K1TPOf5luOBvKXFuqc/unL93yRY=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration
];
# TODO: enable tests # TODO: enable tests
# The test suite depends on a number of browsers and network requests, # The test suite depends on a number of browsers and network requests,
# check the Gentoo package for inspiration # check the Gentoo package for inspiration

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;

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" ];

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"

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 = [

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

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 = [

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 = [

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 = [

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}"

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 = [

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;

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 = [

View file

@ -8,12 +8,14 @@
, fetchFromGitHub , fetchFromGitHub
, fsspec , fsspec
, pythonOlder , pythonOlder
, setuptools
, setuptools-scm
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "adlfs"; pname = "adlfs";
version = "2024.2.0"; version = "2024.2.0";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -24,7 +26,12 @@ buildPythonPackage rec {
hash = "sha256-/Qakr7ISlzDqunoshUf8mpWCvFXOH3haUx/C79j4RZA="; hash = "sha256-/Qakr7ISlzDqunoshUf8mpWCvFXOH3haUx/C79j4RZA=";
}; };
propagatedBuildInputs = [ build-system = [
setuptools
setuptools-scm
];
dependencies = [
aiohttp aiohttp
azure-core azure-core
azure-datalake-store azure-datalake-store

View file

@ -3,6 +3,7 @@
, capstone , capstone
, stdenv , stdenv
, setuptools , setuptools
, pythonAtLeast
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -10,6 +11,9 @@ buildPythonPackage rec {
version = lib.getVersion capstone; version = lib.getVersion capstone;
format = "setuptools"; format = "setuptools";
# distutils usage
disabled = pythonAtLeast "3.12";
src = capstone.src; src = capstone.src;
sourceRoot = "${src.name}/bindings/python"; sourceRoot = "${src.name}/bindings/python";

View file

@ -1,16 +1,17 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, nose , pynose
, pythonOlder , pythonOlder
, pytestCheckHook , pythonRelaxDepsHook
, setuptools
, six , six
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "case"; pname = "case";
version = "1.5.3"; version = "1.5.3";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -19,8 +20,18 @@ buildPythonPackage rec {
sha256 = "48432b01d91913451c3512c5b90e31b0f348f1074b166a3431085eb70d784fb1"; sha256 = "48432b01d91913451c3512c5b90e31b0f348f1074b166a3431085eb70d784fb1";
}; };
propagatedBuildInputs = [ build-system = [
nose setuptools
pythonRelaxDepsHook
];
pythonRemoveDeps = [
# replaced with pynopse for python 3.12 compat
"nose"
];
dependencies = [
pynose
six six
]; ];

View file

@ -1,20 +1,47 @@
{ lib, fetchPypi, buildPythonPackage, django }: { lib
, fetchPypi
, buildPythonPackage
# build-system
, setuptools
# dependencies
, django
# tests
, jinja2
, pytest-django
, pytestCheckHook
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-csp"; pname = "django-csp";
version = "3.8"; version = "3.8";
format = "setuptools"; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "django_csp"; pname = "django_csp";
sha256 = "sha256-7w8an32Nporm4WnALprGYcDs8E23Dg0dhWQFEqaEccA="; hash = "sha256-7w8an32Nporm4WnALprGYcDs8E23Dg0dhWQFEqaEccA=";
}; };
# too complicated to setup - needs a running django instance postPatch = ''
doCheck = false; sed -i "/addopts =/d" pyproject.toml
'';
propagatedBuildInputs = [ django ]; build-system = [
setuptools
];
dependencies = [
django
];
nativeCheckInputs = [
jinja2
pytest-django
pytestCheckHook
];
meta = with lib; { meta = with lib; {
description = "Adds Content-Security-Policy headers to Django"; description = "Adds Content-Security-Policy headers to Django";

View file

@ -80,6 +80,11 @@ buildPythonPackage rec {
"test_storage_save_gzip" "test_storage_save_gzip"
]; ];
disabledTestPaths = [
# ImportError: cannot import name 'mock_s3' from 'moto'
"tests/test_s3.py"
];
meta = with lib; { meta = with lib; {
description = "Collection of custom storage backends for Django"; description = "Collection of custom storage backends for Django";
changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst";

View file

@ -79,6 +79,8 @@ buildPythonPackage rec {
disabledTests = [ disabledTests = [
# requires django with gdal # requires django with gdal
"test_rest_framework_gis" "test_rest_framework_gis"
# outdated test artifact
"test_pydantic_decoration"
]; ];
pythonImportsCheck = [ "drf_spectacular" ]; pythonImportsCheck = [ "drf_spectacular" ];

View file

@ -66,7 +66,7 @@ buildPythonPackage rec {
owner = "iterative"; owner = "iterative";
repo = "dvc"; repo = "dvc";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-k41MvkHuZEanOBXOcwsaSSRY0r446ks5eEGyqQbTZAY="; hash = "sha256-NY3fwo7063hrgYK0a7/PLlPORxhqGgowNtLWo/CN+PY=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [

View file

@ -17,13 +17,13 @@
, optuna , optuna
, pandas , pandas
, pillow , pillow
, pytestCheckHook , psutil
, pynvml
, pythonOlder , pythonOlder
, ruamel-yaml , ruamel-yaml
, scikit-learn , scikit-learn
, scmrepo , scmrepo
, setuptools-scm , setuptools-scm
, tabulate
, tensorflow , tensorflow
, torch , torch
, transformers , transformers
@ -56,6 +56,8 @@ buildPythonPackage rec {
gto gto
ruamel-yaml ruamel-yaml
scmrepo scmrepo
psutil
pynvml
]; ];
passthru.optional-dependencies = { passthru.optional-dependencies = {

View file

@ -34,6 +34,10 @@ buildPythonPackage rec {
requests-mock requests-mock
]; ];
pytestFlagsArray = [
"-W" "ignore::pytest.PytestRemovedIn8Warning"
];
pythonImportsCheck = [ pythonImportsCheck = [
"favicon" "favicon"
]; ];

View file

@ -1,6 +1,5 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, buildPythonPackage , buildPythonPackage
# build-system # build-system
@ -28,14 +27,6 @@ buildPythonPackage rec {
hash = "sha256-eLdpLw1I4t9H0ek3AR9Cteb7Gfxo/LepM287p34Zw3s="; hash = "sha256-eLdpLw1I4t9H0ek3AR9Cteb7Gfxo/LepM287p34Zw3s=";
}; };
patches = [
(fetchpatch {
# https://github.com/Tethik/flask-session-captcha/pull/44
url = "https://github.com/Tethik/flask-session-captcha/commit/3f79c22a71c60dd60e9df61b550cce641603dcb6.patch";
hash = "sha256-MXsoSytBNbcg3HU6IWlvf2MgNUL78T5ToxKGv4YMtZw=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
setuptools setuptools
]; ];

View file

@ -7,6 +7,7 @@
, poetry-core , poetry-core
# propagates # propagates
, fastapi
, flet-core , flet-core
, flet-runtime , flet-runtime
, httpx , httpx
@ -14,6 +15,7 @@
, packaging , packaging
, qrcode , qrcode
, cookiecutter , cookiecutter
, uvicorn
, watchdog , watchdog
, websocket-client , websocket-client
, websockets , websockets
@ -40,8 +42,10 @@ buildPythonPackage rec {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
fastapi
flet-core flet-core
flet-runtime flet-runtime
uvicorn
websocket-client websocket-client
watchdog watchdog
oauthlib oauthlib

View file

@ -3,6 +3,7 @@
, pythonOlder , pythonOlder
, fetchFromGitHub , fetchFromGitHub
, setuptools , setuptools
, setuptools-scm
, pytestCheckHook , pytestCheckHook
, numpy , numpy
, pandas , pandas
@ -23,7 +24,10 @@ buildPythonPackage rec {
hash = "sha256-A0CI0bpoRYFAcPiNAf5haQu9BEqmBgxF7HfIl4qcML0="; hash = "sha256-A0CI0bpoRYFAcPiNAf5haQu9BEqmBgxF7HfIl4qcML0=";
}; };
nativeBuildInputs = [ setuptools ]; nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [ propagatedBuildInputs = [
numpy numpy

View file

@ -29,7 +29,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fsspec"; pname = "fsspec";
version = "2023.10.0"; version = "2024.3.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "fsspec"; owner = "fsspec";
repo = "filesystem_spec"; repo = "filesystem_spec";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-cLkCQQbb/AakDSz1NTrVlHh8LdgoqtjX8OPT+Nb1NA4="; hash = "sha256-C+47BcIELZTEARXW8fAMHMjyKUWxU1tNKWGoPPtt/fQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -126,6 +126,10 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
preCheck = ''
export HOME=$(mktemp -d)
'';
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
disabledTests = [ disabledTests = [
@ -144,6 +148,8 @@ buildPythonPackage rec {
# this two tests however, assume nanosecond resolution # this two tests however, assume nanosecond resolution
"test_modified" "test_modified"
"test_touch" "test_touch"
# tries to access /home, ignores $HOME
"test_directories"
]; ];
disabledTestPaths = [ disabledTestPaths = [

View file

@ -1,10 +1,12 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, colorlog
, jinja2 , jinja2
, lxml , lxml
, pygments , pygments
, pythonOlder , pythonOlder
, tomli
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -20,9 +22,12 @@ buildPythonPackage rec {
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
colorlog
jinja2 jinja2
lxml lxml
pygments pygments
] ++ lib.optionals (pythonOlder "3.11") [
tomli
]; ];
# There are no unit tests in the pypi tarball. Most of the unit tests on the # There are no unit tests in the pypi tarball. Most of the unit tests on the
@ -32,7 +37,6 @@ buildPythonPackage rec {
pythonImportsCheck = [ pythonImportsCheck = [
"gcovr" "gcovr"
"gcovr.workers"
"gcovr.configuration" "gcovr.configuration"
]; ];

View file

@ -19,7 +19,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "gcsfs"; pname = "gcsfs";
version = "2023.4.0"; version = "2024.2.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "fsspec"; owner = "fsspec";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-FHS+g0SuYH9OPiE/+p2SHrsWfzBQ82GM6hTph8koh+o="; hash = "sha256-6O09lP2cWLzeMTBathb3O/tVGZPEHSqujfUPWZIBUJI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -50,11 +50,18 @@ buildPythonPackage rec {
vcrpy vcrpy
]; ];
disabledTests =[
# Cannot connect to host storage.googleapis.com:443
"test_credentials_from_raw_token"
];
disabledTestPaths = [ disabledTestPaths = [
# Tests require a running Docker instance # Tests require a running Docker instance
"gcsfs/tests/test_core.py" "gcsfs/tests/test_core.py"
"gcsfs/tests/test_mapping.py" "gcsfs/tests/test_mapping.py"
"gcsfs/tests/test_retry.py" "gcsfs/tests/test_retry.py"
"gcsfs/tests/derived/gcsfs_test.py"
"gcsfs/tests/test_inventory_report_listing.py"
]; ];
pytestFlagsArray = [ pytestFlagsArray = [

View file

@ -57,6 +57,7 @@ buildPythonPackage rec {
disabledTests = [ disabledTests = [
# Network access # Network access
"test_validate_ping" "test_validate_ping"
"test_logging"
# Fails since yamllint 1.27.x # Fails since yamllint 1.27.x
"test_yaml_lint" "test_yaml_lint"
]; ];

View file

@ -1,22 +1,23 @@
diff --git a/green/test/test_integration.py b/green/test/test_integration.py diff --git a/green/test/test_integration.py b/green/test/test_integration.py
index 0cf8cbb..40d9f6b 100644 index 9a2d824..372e6e0 100644
--- a/green/test/test_integration.py --- a/green/test/test_integration.py
+++ b/green/test/test_integration.py +++ b/green/test/test_integration.py
@@ -41,9 +41,7 @@ class TestFinalizer(unittest.TestCase): @@ -37,9 +37,7 @@ class TestFinalizer(unittest.TestCase):
)
) )
fh.close()
args = [ args = [
- sys.executable, - sys.executable,
- "-m", - "-m",
- "green.cmdline", - "green.cmdline",
+ "@green@", + "@green@"
"--finalizer=test_finalizer0.msg", "--finalizer=test_finalizer.msg",
"--maxtasksperchild=1", "--maxtasksperchild=1",
] ]
@@ -58,6 +56,5 @@ class TestFinalizer(unittest.TestCase): @@ -54,7 +52,6 @@ class TestFinalizer(unittest.TestCase):
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
env=env, env=env,
- timeout=10, - timeout=10,
).stdout.decode("utf-8") encoding="utf-8",
self.assertIn("finalizer worked", output) check=True,
).stdout

View file

@ -73,6 +73,8 @@ buildPythonPackage rec {
"test_bash_completion_with_dot_in_path" "test_bash_completion_with_dot_in_path"
"test_install_uninstall" "test_install_uninstall"
"test_config_search_path" "test_config_search_path"
# does not raise UserWarning
"test_initialize_compat_version_base"
]; ];
disabledTestPaths = [ disabledTestPaths = [

View file

@ -4,6 +4,7 @@
, dulwich , dulwich
, pbr , pbr
, sphinx , sphinx
, pythonAtLeast
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -11,6 +12,9 @@ buildPythonPackage rec {
version = "3.2.0"; version = "3.2.0";
format = "setuptools"; format = "setuptools";
# breaks on import due to distutils import through pbr.packaging
disabled = pythonAtLeast "3.12";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-PwSWLJr5Hjwz8cRXXutnE4Jc+vLcL3TJTZl6biK/4E4="; hash = "sha256-PwSWLJr5Hjwz8cRXXutnE4Jc+vLcL3TJTZl6biK/4E4=";

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 = [

View file

@ -1,15 +1,27 @@
{ lib { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, buildPythonPackage , buildPythonPackage
, pythonOlder , pythonOlder
# build-system
, hatchling
# dependencies
, click , click
, redis , redis
# tests
, psutil
, pytestCheckHook
, redis-server
, sentry-sdk
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "rq"; pname = "rq";
version = "1.15.1"; version = "1.16.1";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -17,16 +29,33 @@ buildPythonPackage rec {
owner = "rq"; owner = "rq";
repo = "rq"; repo = "rq";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-cymNXFI+6YEVw2Pc7u6+vroC0428oW7BTLxyBgPqLng="; hash = "sha256-1E7jPTSQCjuKZVFL4uZqL1WZHnxWSLTNcnpyvfHz7oY=";
}; };
propagatedBuildInputs = [ build-system = [
hatchling
];
dependencies = [
click click
redis redis
]; ];
# Tests require a running Redis rerver nativeCheckInputs = [
doCheck = false; psutil
pytestCheckHook
sentry-sdk
];
preCheck = lib.optionalString stdenv.isLinux ''
PATH=$out/bin:$PATH
${redis-server}/bin/redis-server &
REDIS_PID=$!
'';
postCheck = lib.optionalString stdenv.isLinux ''
kill $REDIS_PID
'';
pythonImportsCheck = [ pythonImportsCheck = [
"rq" "rq"

View file

@ -75,18 +75,12 @@ buildPythonPackage rec {
export SKLEARN_BUILD_PARALLEL=$NIX_BUILD_CORES export SKLEARN_BUILD_PARALLEL=$NIX_BUILD_CORES
''; '';
doCheck = !stdenv.isAarch64; # PermissionError: [Errno 1] Operation not permitted: '/nix/nix-installer'
doCheck = !stdenv.isDarwin;
disabledTests = [ disabledTests = [
# Skip test_feature_importance_regression - does web fetch # Skip test_feature_importance_regression - does web fetch
"test_feature_importance_regression" "test_feature_importance_regression"
# failing on macos
"check_regressors_train"
"check_classifiers_train"
"xfail_ignored_in_check_estimator"
] ++ lib.optionals (stdenv.isDarwin) [
"test_graphical_lasso"
]; ];
pytestFlagsArray = [ pytestFlagsArray = [

View file

@ -13,7 +13,6 @@
, pkg-config , pkg-config
, pythran , pythran
, wheel , wheel
, nose
, setuptools , setuptools
, hypothesis , hypothesis
, pytestCheckHook , pytestCheckHook
@ -116,7 +115,6 @@ in buildPythonPackage {
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
nativeCheckInputs = [ nativeCheckInputs = [
nose
hypothesis hypothesis
# Failed: DID NOT WARN. No warnings of type (<class 'DeprecationWarning'>, <class 'PendingDeprecationWarning'>, <class 'FutureWarning'>) were emitted. # Failed: DID NOT WARN. No warnings of type (<class 'DeprecationWarning'>, <class 'PendingDeprecationWarning'>, <class 'FutureWarning'>) were emitted.
(pytestCheckHook.override { pytest = pytest_7; }) (pytestCheckHook.override { pytest = pytest_7; })

View file

@ -64,6 +64,8 @@ buildPythonPackage rec {
pytest-trio pytest-trio
]; ];
__darwinAllowLocalNetworking = true;
passthru.tests = { passthru.tests = {
testing-vaultwarden = nixosTests.vaultwarden; testing-vaultwarden = nixosTests.vaultwarden;
}; };

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 = [

View file

@ -9,6 +9,7 @@
, fonttools , fonttools
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, pythonRelaxDepsHook
, setuptools-scm , setuptools-scm
, skia-pathops , skia-pathops
, ufolib2 , ufolib2
@ -28,6 +29,11 @@ buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
setuptools-scm setuptools-scm
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"cffsubr"
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -71,6 +71,8 @@ buildPythonPackage rec {
"test_seed_link_via_app_data" "test_seed_link_via_app_data"
# Permission Error # Permission Error
"test_bad_exe_py_info_no_raise" "test_bad_exe_py_info_no_raise"
] ++ lib.optionals (pythonOlder "3.11") [
"test_help"
] ++ lib.optionals (isPyPy) [ ] ++ lib.optionals (isPyPy) [
# encoding problems # encoding problems
"test_bash" "test_bash"

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 = ''

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}"'

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" ''

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 = [

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 = [

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

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)" ];

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

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"

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;

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

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" ];

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

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

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

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

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 ]

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 = [

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

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;

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

View file

@ -21741,7 +21741,7 @@ with pkgs;
hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
hydra-check = with python310.pkgs; toPythonApplication hydra-check; hydra-check = with python3.pkgs; toPythonApplication hydra-check;
hyena = callPackage ../development/libraries/hyena { }; hyena = callPackage ../development/libraries/hyena { };
@ -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 { };

View file

@ -13101,7 +13101,9 @@ self: super: with self; {
rpyc4 = callPackage ../development/python-modules/rpyc4 { }; rpyc4 = callPackage ../development/python-modules/rpyc4 { };
rq = callPackage ../development/python-modules/rq { }; rq = callPackage ../development/python-modules/rq {
redis-server = pkgs.redis;
};
rsa = callPackage ../development/python-modules/rsa { }; rsa = callPackage ../development/python-modules/rsa { };