Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2024-03-18 00:13:49 +00:00 committed by GitHub
commit 7ef9aa960c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
239 changed files with 3655 additions and 2830 deletions

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/**/*

View File

@ -24,7 +24,7 @@ jobs:
with: with:
ref: ${{ github.event.pull_request.head.sha }} ref: ${{ github.event.pull_request.head.sha }}
- name: Create backport PRs - name: Create backport PRs
uses: korthout/backport-action@08bafb375e6e9a9a2b53a744b987e5d81a133191 # v2.1.1 uses: korthout/backport-action@e8161d6a0dbfa2651b7daa76cbb75bc7c925bbf3 # v2.4.1
with: with:
# Config README: https://github.com/korthout/backport-action#backport-action # Config README: https://github.com/korthout/backport-action#backport-action
copy_labels_pattern: 'severity:\ssecurity' copy_labels_pattern: 'severity:\ssecurity'

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

@ -228,7 +228,15 @@ rec {
`acc` `acc`
: The initial accumulator value : The initial accumulator value.
The accumulator value is evaluated in any case before the first iteration starts.
To avoid evaluation even before the `list` argument is given an eta expansion can be used:
```nix
list: lib.foldl' op acc list
```
`list` `list`
@ -254,13 +262,11 @@ rec {
foldl' = foldl' =
op: op:
acc: acc:
list:
# The builtin `foldl'` is a bit lazier than one might expect. # The builtin `foldl'` is a bit lazier than one might expect.
# See https://github.com/NixOS/nix/pull/7158. # See https://github.com/NixOS/nix/pull/7158.
# In particular, the initial accumulator value is not forced before the first iteration starts. # In particular, the initial accumulator value is not forced before the first iteration starts.
builtins.seq acc builtins.seq acc
(builtins.foldl' op acc list); (builtins.foldl' op acc);
/** /**
Map with index starting from 0 Map with index starting from 0

View File

@ -6653,6 +6653,11 @@
githubId = 46672819; githubId = 46672819;
name = "Frido Friedemann"; name = "Frido Friedemann";
}; };
friedrichaltheide = {
github = "friedrichaltheide";
githubId = 11352905;
name = "Friedrich Altheide";
};
frlan = { frlan = {
email = "frank@frank.uvena.de"; email = "frank@frank.uvena.de";
github = "frlan"; github = "frlan";
@ -15899,7 +15904,7 @@
githubId = 10837173; githubId = 10837173;
}; };
qjoly = { qjoly = {
email = "github@thoughtless.eu"; email = "github@une-pause-cafe.fr";
github = "qjoly"; github = "qjoly";
githubId = 82603435; githubId = 82603435;
name = "Quentin JOLY"; name = "Quentin JOLY";

View File

@ -73,13 +73,26 @@ in rec {
optional (attr ? ${name} && (! isMacAddress attr.${name} && attr.${name} != "none")) optional (attr ? ${name} && (! isMacAddress attr.${name} && attr.${name} != "none"))
"Systemd ${group} field `${name}` must be a valid MAC address or the special value `none`."; "Systemd ${group} field `${name}` must be a valid MAC address or the special value `none`.";
isNumberOrRangeOf = check: v:
if isInt v
then check v
else let
parts = splitString "-" v;
lower = toIntBase10 (head parts);
upper = if tail parts != [] then toIntBase10 (head (tail parts)) else lower;
in
length parts <= 2 && lower <= upper && check lower && check upper;
isPort = i: i >= 0 && i <= 65535; isPort = i: i >= 0 && i <= 65535;
isPortOrPortRange = isNumberOrRangeOf isPort;
assertPort = name: group: attr: assertPort = name: group: attr:
optional (attr ? ${name} && ! isPort attr.${name}) optional (attr ? ${name} && ! isPort attr.${name})
"Error on the systemd ${group} field `${name}': ${attr.name} is not a valid port number."; "Error on the systemd ${group} field `${name}': ${attr.name} is not a valid port number.";
assertPortOrPortRange = name: group: attr:
optional (attr ? ${name} && ! isPortOrPortRange attr.${name})
"Error on the systemd ${group} field `${name}': ${attr.name} is not a valid port number or range of port numbers.";
assertValueOneOf = name: values: group: attr: assertValueOneOf = name: values: group: attr:
optional (attr ? ${name} && !elem attr.${name} values) optional (attr ? ${name} && !elem attr.${name} values)
"Systemd ${group} field `${name}' cannot have value `${toString attr.${name}}'."; "Systemd ${group} field `${name}' cannot have value `${toString attr.${name}}'.";

View File

@ -277,7 +277,7 @@ self: super: {
Here's a recipe on how to override a particular plugin through an overlay: Here's a recipe on how to override a particular plugin through an overlay:
``` ```
self: super: { self: super: {
postgresql_15 = super.postgresql_15.override { this = self.postgresql_15; } // { postgresql_15 = super.postgresql_15// {
pkgs = super.postgresql_15.pkgs // { pkgs = super.postgresql_15.pkgs // {
pg_repack = super.postgresql_15.pkgs.pg_repack.overrideAttrs (_: { pg_repack = super.postgresql_15.pkgs.pg_repack.overrideAttrs (_: {
name = "pg_repack-v20181024"; name = "pg_repack-v20181024";

View File

@ -14,7 +14,7 @@ let
# package = pkgs.postgresql_<major>; # package = pkgs.postgresql_<major>;
# }; # };
# works. # works.
base = if cfg.enableJIT && !cfg.package.jitSupport then cfg.package.withJIT else cfg.package; base = if cfg.enableJIT then cfg.package.withJIT else cfg.package;
in in
if cfg.extraPlugins == [] if cfg.extraPlugins == []
then base then base

View File

@ -215,7 +215,7 @@ in {
serif = ["Noto Serif"]; serif = ["Noto Serif"];
}; };
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt; programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
programs.ssh.askPassword = mkDefault "${kdePackages.ksshaskpass.out}/bin/ksshaskpass"; programs.ssh.askPassword = mkDefault "${kdePackages.ksshaskpass.out}/bin/ksshaskpass";
# Enable helpful DBus services. # Enable helpful DBus services.

View File

@ -7,6 +7,7 @@ let
mkValueStringTinyproxy = with lib; v: mkValueStringTinyproxy = with lib; v:
if true == v then "yes" if true == v then "yes"
else if false == v then "no" else if false == v then "no"
else if types.path.check v then ''"${v}"''
else generators.mkValueStringDefault {} v; else generators.mkValueStringDefault {} v;
mkKeyValueTinyproxy = { mkKeyValueTinyproxy = {
mkValueString ? mkValueStringDefault {} mkValueString ? mkValueStringDefault {}

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

@ -66,7 +66,7 @@ in
services.upower.enable = mkDefault config.powerManagement.enable; services.upower.enable = mkDefault config.powerManagement.enable;
networking.networkmanager.enable = mkDefault true; networking.networkmanager.enable = mkDefault true;
programs.dconf.enable = mkDefault true; programs.dconf.enable = mkDefault true;
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt; programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
fonts.packages = with pkgs; [ noto-fonts ]; fonts.packages = with pkgs; [ noto-fonts ];
xdg.mime.enable = true; xdg.mime.enable = true;

View File

@ -62,7 +62,7 @@ in
# Link some extra directories in /run/current-system/software/share # Link some extra directories in /run/current-system/software/share
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt; programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
# virtual file systems support for PCManFM-QT # virtual file systems support for PCManFM-QT
services.gvfs.enable = true; services.gvfs.enable = true;

View File

@ -336,7 +336,7 @@ in
serif = [ "Noto Serif" ]; serif = [ "Noto Serif" ];
}; };
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt; programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
programs.ssh.askPassword = mkDefault "${pkgs.plasma5Packages.ksshaskpass.out}/bin/ksshaskpass"; programs.ssh.askPassword = mkDefault "${pkgs.plasma5Packages.ksshaskpass.out}/bin/ksshaskpass";
# Enable helpful DBus services. # Enable helpful DBus services.

View File

@ -131,7 +131,7 @@ in
xfdesktop xfdesktop
] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages; ] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages;
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2; programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2;
programs.xfconf.enable = true; programs.xfconf.enable = true;
programs.thunar.enable = true; programs.thunar.enable = true;

View File

@ -729,8 +729,8 @@ let
(assertInt "FirewallMark") (assertInt "FirewallMark")
(assertRange "FirewallMark" 1 4294967295) (assertRange "FirewallMark" 1 4294967295)
(assertInt "Priority") (assertInt "Priority")
(assertPort "SourcePort") (assertPortOrPortRange "SourcePort")
(assertPort "DestinationPort") (assertPortOrPortRange "DestinationPort")
(assertValueOneOf "InvertRule" boolValues) (assertValueOneOf "InvertRule" boolValues)
(assertValueOneOf "Family" ["ipv4" "ipv6" "both"]) (assertValueOneOf "Family" ["ipv4" "ipv6" "both"])
(assertInt "SuppressPrefixLength") (assertInt "SuppressPrefixLength")

View File

@ -464,7 +464,7 @@ in {
keymap = handleTest ./keymap.nix {}; keymap = handleTest ./keymap.nix {};
knot = handleTest ./knot.nix {}; knot = handleTest ./knot.nix {};
komga = handleTest ./komga.nix {}; komga = handleTest ./komga.nix {};
krb5 = discoverTests (import ./krb5 {}); krb5 = discoverTests (import ./krb5);
ksm = handleTest ./ksm.nix {}; ksm = handleTest ./ksm.nix {};
kthxbye = handleTest ./kthxbye.nix {}; kthxbye = handleTest ./kthxbye.nix {};
kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {}; kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};

View File

@ -40,4 +40,4 @@ let
''; '';
}); });
in in
builtins.mapAttrs (k: v: mkTest k v { }) tests builtins.mapAttrs (k: v: mkTest k v) tests

View File

@ -6,8 +6,8 @@ let
certs = import ./common/acme/server/snakeoil-certs.nix; certs = import ./common/acme/server/snakeoil-certs.nix;
frontendUrl = "https://${certs.domain}"; frontendUrl = "https://${certs.domain}";
keycloakTest = import ./make-test-python.nix ( keycloakTest = databaseType: import ./make-test-python.nix (
{ pkgs, databaseType, ... }: { pkgs, ... }:
let let
initialAdminPassword = "h4Iho\"JFn't2>iQIR9"; initialAdminPassword = "h4Iho\"JFn't2>iQIR9";
adminPasswordFile = pkgs.writeText "admin-password" "${initialAdminPassword}"; adminPasswordFile = pkgs.writeText "admin-password" "${initialAdminPassword}";
@ -76,16 +76,18 @@ let
enabled = true; enabled = true;
realm = "test-realm"; realm = "test-realm";
clients = [ client ]; clients = [ client ];
users = [( users = [
user // { (
enabled = true; user // {
credentials = [{ enabled = true;
type = "password"; credentials = [{
temporary = false; type = "password";
value = password; temporary = false;
}]; value = password;
} }];
)]; }
)
];
}; };
realmDataJson = pkgs.writeText "realm-data.json" (builtins.toJSON realm); realmDataJson = pkgs.writeText "realm-data.json" (builtins.toJSON realm);
@ -177,7 +179,7 @@ let
); );
in in
{ {
postgres = keycloakTest { databaseType = "postgresql"; }; postgres = keycloakTest "postgresql";
mariadb = keycloakTest { databaseType = "mariadb"; }; mariadb = keycloakTest "mariadb";
mysql = keycloakTest { databaseType = "mysql"; }; mysql = keycloakTest "mysql";
} }

View File

@ -1,4 +1,3 @@
{ system ? builtins.currentSystem }:
{ {
example-config = import ./example-config.nix { inherit system; }; example-config = import ./example-config.nix;
} }

View File

@ -1,5 +1,5 @@
f: { f: {
system ? builtins.currentSystem, system,
pkgs ? import ../.. { inherit system; config = {}; overlays = []; }, pkgs ? import ../.. { inherit system; config = {}; overlays = []; },
... ...
} @ args: } @ args:

View File

@ -1,7 +1,7 @@
let let
opensearchTest = opensearchTest = extraSettings:
import ./make-test-python.nix ( import ./make-test-python.nix (
{ pkgs, lib, extraSettings ? {} }: { { pkgs, lib, ... }: {
name = "opensearch"; name = "opensearch";
meta.maintainers = with pkgs.lib.maintainers; [ shyim ]; meta.maintainers = with pkgs.lib.maintainers; [ shyim ];
@ -27,20 +27,18 @@ in
{ {
opensearch = opensearchTest {}; opensearch = opensearchTest {};
opensearchCustomPathAndUser = opensearchTest { opensearchCustomPathAndUser = opensearchTest {
extraSettings = { services.opensearch.dataDir = "/var/opensearch_test";
services.opensearch.dataDir = "/var/opensearch_test"; services.opensearch.user = "open_search";
services.opensearch.user = "open_search"; services.opensearch.group = "open_search";
services.opensearch.group = "open_search"; systemd.tmpfiles.rules = [
systemd.tmpfiles.rules = [ "d /var/opensearch_test 0700 open_search open_search -"
"d /var/opensearch_test 0700 open_search open_search -" ];
]; users = {
users = { groups.open_search = { };
groups.open_search = {}; users.open_search = {
users.open_search = { description = "OpenSearch daemon user";
description = "OpenSearch daemon user"; group = "open_search";
group = "open_search"; isSystemUser = true;
isSystemUser = true;
};
}; };
}; };
}; };

View File

@ -76,4 +76,4 @@ let
}); });
in in
builtins.mapAttrs (k: v: mkTest k v { }) tests builtins.mapAttrs (k: v: mkTest k v) tests

View File

@ -11,7 +11,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.2.2"; version = "2.2.3";
pname = "jacktrip"; pname = "jacktrip";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
repo = "jacktrip"; repo = "jacktrip";
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "sha256-idfetMiMqjl9Qrun4hlFhQaGWcvasgjojTts+0F3GGE="; sha256 = "sha256-uUmaTqUiih4nVt4Cba77WDt4xGQixsBe3WNavBDanx0=";
}; };
preConfigure = '' preConfigure = ''

View File

@ -4,13 +4,13 @@
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "pithos"; pname = "pithos";
version = "1.6.1"; version = "1.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = "refs/tags/${version}";
hash = "sha256-GPDbFlwiGT/B2paX33d3mUCV77q+fPM0LMaKFsQQjjQ="; hash = "sha256-3j6IoMi30BQ8WHK4BxbsW+/3XZx7rBFd47EBENa2GiQ=";
}; };
format = "other"; format = "other";

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

@ -9,13 +9,13 @@
}: }:
let let
version = "unstable-2023-12-01"; version = "unstable-2024-02-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zbelial"; owner = "zbelial";
repo = "lspce"; repo = "lspce";
rev = "1958b6fcdfb6288aa17fa42360315d6c4aa85991"; rev = "543dcf0ea9e3ff5c142c4365d90b6ae8dc27bd15";
hash = "sha256-HUIRm1z6xNJWgX7ykujzniBrOTh76D3dJHrm0LR3nuQ="; hash = "sha256-LZWRQOKkTjNo8jecBRholW9SHpiK0SWcV8yObojpvxo=";
}; };
meta = { meta = {
@ -30,7 +30,7 @@ let
inherit version src meta; inherit version src meta;
pname = "lspce-module"; pname = "lspce-module";
cargoHash = "sha256-qMLwdZwqrK7bPXL1bIbOqM7xQPpeiO8FDoje0CEJeXQ="; cargoHash = "sha256-W9rsi7o4KvyRoG/pqRKOBbJtUoSW549Sh8+OV9sLcxs=";
checkFlags = [ checkFlags = [
# flaky test # flaky test

View File

@ -8593,6 +8593,18 @@ final: prev:
meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; meta.homepage = "https://github.com/jmbuhr/otter.nvim/";
}; };
outline-nvim = buildVimPlugin {
pname = "outline.nvim";
version = "2024-01-22";
src = fetchFromGitHub {
owner = "hedyhli";
repo = "outline.nvim";
rev = "a8d40aecb799196303ff3521c0e31c87bba57198";
sha256 = "1xhqrgjj37d1wq7vrcw9vwmrvzl5a3vyz4k0dglvgjq5z2g5zb0x";
};
meta.homepage = "https://github.com/hedyhli/outline.nvim/";
};
overseer-nvim = buildVimPlugin { overseer-nvim = buildVimPlugin {
pname = "overseer.nvim"; pname = "overseer.nvim";
version = "2024-03-07"; version = "2024-03-07";

View File

@ -722,6 +722,7 @@ https://github.com/salkin-mada/openscad.nvim/,HEAD,
https://github.com/nvim-orgmode/orgmode/,, https://github.com/nvim-orgmode/orgmode/,,
https://github.com/rgroli/other.nvim/,HEAD, https://github.com/rgroli/other.nvim/,HEAD,
https://github.com/jmbuhr/otter.nvim/,, https://github.com/jmbuhr/otter.nvim/,,
https://github.com/hedyhli/outline.nvim/,HEAD,
https://github.com/stevearc/overseer.nvim/,HEAD, https://github.com/stevearc/overseer.nvim/,HEAD,
https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD, https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD,
https://github.com/vuki656/package-info.nvim/,, https://github.com/vuki656/package-info.nvim/,,

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "fm"; pname = "fm";
version = "unstable-2023-07-25"; version = "0-unstable-2024-01-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "euclio"; owner = "euclio";
repo = "fm"; repo = "fm";
rev = "a0830b5483a48a8b1e40982f20c28dcb5bfe4a6e"; rev = "f1da116fe703a2c3d5bc9450703ecf1a1f1b4fda";
hash = "sha256-uso7j+bf6PF5wiTzSJymSxNNfzqXVcJygkfGdzQl4xA="; hash = "sha256-fCufqCy5H5Up6V15sOz8SJrixth7OQ7tc4yIymmfq1M=";
}; };
cargoHash = "sha256-3IxpnDYbfLI1VAMgqIE4eSkiT9Z6HcC3K6MH6uqD9Ic="; cargoHash = "sha256-E/mT+e17Qse4aPCY5Tuvih+ZMDnUqwvEBY0N70kciMs=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View File

@ -22,16 +22,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "oculante"; pname = "oculante";
version = "0.8.13"; version = "0.8.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "woelper"; owner = "woelper";
repo = "oculante"; repo = "oculante";
rev = version; rev = version;
hash = "sha256-RbRvV3OkRZXc0n7qGzqbBtbU81wFc+/Ohg9pbVqdsw4="; hash = "sha256-C8USTDW5C+mjj/fr242is/42RpmUvcK3lUeaq0/BSGA=";
}; };
cargoHash = "sha256-qt4bHCHpiP6yOce9hquVVlLFF906ADwhss4xAP9E0fA="; cargoHash = "sha256-w8k0QG509PRHHB1e4WThYnM6R0PwWMbSBxs2B0zQ0ww=";
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake

View File

@ -32,11 +32,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "calibre"; pname = "calibre";
version = "7.6.0"; version = "7.7.0";
src = fetchurl { src = fetchurl {
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
hash = "sha256-fD2kTwH692x6Nm93NrUQvmbcXiX9hHBpo4wvUvBqLAM="; hash = "sha256-+kz3Fz1RDQ+ROgv7y0WNAWvIESKvHKID8UnSeCh8yA4=";
}; };
patches = [ patches = [

View File

@ -4,6 +4,7 @@
, bash , bash
, coreutils , coreutils
, curl , curl
, fetchurl
, gnugrep , gnugrep
, gnupg , gnupg
, gnused , gnused
@ -13,7 +14,22 @@
let let
downloadPageUrl = "https://download.electrum.org"; downloadPageUrl = "https://download.electrum.org";
signingKeys = ["6694 D8DE 7BE8 EE56 31BE D950 2BD5 824B 7F94 70E6"]; signingKeys = lib.lists.map fetchurl [
{
url = "https://github.com/spesmilo/electrum/raw/master/pubkeys/Emzy.asc";
hash = "sha256-QG0cM6AKlSKFacVlhcso/xvrooUdF7oqoppyezt0hjE=";
}
{
url = "https://github.com/spesmilo/electrum/raw/master/pubkeys/ThomasV.asc";
hash = "sha256-37ApVZlI+2EevxQIKXVKVpktt1Ls3UbWq4dfio2ORdo=";
}
{
url = "https://github.com/spesmilo/electrum/raw/master/pubkeys/sombernight_releasekey.asc";
hash = "sha256-GgdPJ9TB5hh5SPCcTZURfqXkrU4qwl0dCci52V/wpdQ=";
}
];
gpgImportPaths = lib.concatStringsSep " " signingKeys;
in in
writeScript "update-electrum" '' writeScript "update-electrum" ''
@ -48,7 +64,7 @@ sigFile=$srcFile.asc
export GNUPGHOME=$PWD/gnupg export GNUPGHOME=$PWD/gnupg
mkdir -m 700 -p "$GNUPGHOME" mkdir -m 700 -p "$GNUPGHOME"
gpg --batch --recv-keys ${lib.concatStringsSep " " (map (x: "'${x}'") signingKeys)} gpg --batch --import ${gpgImportPaths}
gpg --batch --verify "$sigFile" "$srcFile" gpg --batch --verify "$sigFile" "$srcFile"
sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$srcFile") sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$srcFile")

View File

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "inlyne"; pname = "inlyne";
version = "0.4.0"; version = "0.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "trimental"; owner = "trimental";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-dDGTy5WOCyeWYfemVtv+YswNyHSqDL4C7MbHsKgRwLk="; hash = "sha256-kZQREYnauR8xusyX6enBPUKHSe39aBLlrZjKEjJlfx0=";
}; };
cargoHash = "sha256-GDy7/FooHD77X5dZmlLX+isRKr2WjadKPKyVD55M9ZE="; cargoHash = "sha256-2mQFr2nLJ/iBLpdOUmerY6F2C8Kt+/vMEjS6THpmJic=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles

View File

@ -6,13 +6,13 @@
mkDerivation rec { mkDerivation rec {
pname = "pure-maps"; pname = "pure-maps";
version = "3.2.1"; version = "3.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rinigus"; owner = "rinigus";
repo = "pure-maps"; repo = "pure-maps";
rev = version; rev = version;
hash = "sha256-AZt0JcNegHkUkWy+NW5CNLZfxjjFyKWBrhLJgSTv3to="; hash = "sha256-TeFolD3jXRdLGfXdy+QcwtOcQQVUB5fn8PwoYfRLaPQ=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -7,18 +7,18 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wttrbar"; pname = "wttrbar";
version = "0.9.2"; version = "0.9.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bjesus"; owner = "bjesus";
repo = "wttrbar"; repo = "wttrbar";
rev = version; rev = version;
hash = "sha256-2oUj9G82+aGXU+qB37f+lRz5rctZNnb3bK8IETrt/4g="; hash = "sha256-9qAluu9W6OG/G1SmAEOe97mUS83PZL/oLYUsIJNunwY=";
}; };
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]);
cargoHash = "sha256-yvgqvcOxl/AmvUg6jTFtYh13sgqAWKPt2uMFHaX5OMM="; cargoHash = "sha256-AVlI2Yi3Gx9jCgP2O5NfaTvUFHdw6HPRmsMqbPFvxf8=";
meta = { meta = {
description = "A simple but detailed weather indicator for Waybar using wttr.in"; description = "A simple but detailed weather indicator for Waybar using wttr.in";

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,20 +1,20 @@
{ {
beta = import ./browser.nix { beta = import ./browser.nix {
channel = "beta"; channel = "beta";
version = "123.0.2420.32"; version = "123.0.2420.41";
revision = "1"; revision = "1";
hash = "sha256-ItKwlXaHHupTIXrwc4IXaFvldhFGZc4L8aJnxM1XLkM="; hash = "sha256-tWsd+RyGJp+/1Sf4yDrq4EbLfaYsLkm4wLj9rfWmPlE=";
}; };
dev = import ./browser.nix { dev = import ./browser.nix {
channel = "dev"; channel = "dev";
version = "124.0.2438.2"; version = "124.0.2450.2";
revision = "1"; revision = "1";
hash = "sha256-QMcq1lgtO50u2DoTdugJvkOcnIkppmeg/UCQ1oc5TZs="; hash = "sha256-9PRQnnTYhArwRcTxuCufM7JcAcr6K7jKeFCrOsarCh0=";
}; };
stable = import ./browser.nix { stable = import ./browser.nix {
channel = "stable"; channel = "stable";
version = "122.0.2365.80"; version = "122.0.2365.92";
revision = "1"; revision = "1";
hash = "sha256-fBu5ANA23Oicr3otQiqNznkUT0M9NcrDs6oNW/JuBtk="; hash = "sha256-6rEVxFS2advEL4O2uczJTsTy31os9r52IGnHXxj3A+g=";
}; };
} }

View File

@ -34,7 +34,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "calls"; pname = "calls";
version = "45.0"; version = "46.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-NIQFKVpZSxY2QOb73WfYsCzMQwB9XySoADCL7IlmGe8="; hash = "sha256-ZUVMK0Ex77EQKTGM0gBDHt8W9l4rHspihYduMcwMGho=";
}; };
outputs = [ "out" "devdoc" ]; outputs = [ "out" "devdoc" ];

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "atmos"; pname = "atmos";
version = "1.65.0"; version = "1.66.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudposse"; owner = "cloudposse";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-KhWi5zxPyBe0xJuJjTROwFIyMPqgUvDeRRIOVowKVxc="; sha256 = "sha256-8cEJw4gCyh3aosck70vdLVYGOL3zR0AOpAMNv/j6rEM=";
}; };
vendorHash = "sha256-imMIxEmMdW8nAsQC4q7TID+c7J8LbdtAWFj8qvPGtyA="; vendorHash = "sha256-k03pRrUzHvVjKt6w40JEiJTvbwhKa/0rjkZQsnmfe68=";
ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cilium-cli"; pname = "cilium-cli";
version = "0.15.22"; version = "0.16.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cilium"; owner = "cilium";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-tjVrcxWXE/eOeVoXnoBHYXk4rA3QqcWDbK1MRZ+v7uE="; hash = "sha256-RJJETvgLdE/fJtd1LMShJ7Hm8/s1zUybhec6YPT44wg=";
}; };
vendorHash = null; vendorHash = null;
@ -17,7 +17,7 @@ buildGoModule rec {
ldflags = [ ldflags = [
"-s" "-w" "-s" "-w"
"-X github.com/cilium/cilium-cli/cli.Version=${version}" "-X github.com/cilium/cilium-cli/defaults.CLIVersion=${version}"
]; ];
# Required to workaround install check error: # Required to workaround install check error:
@ -26,7 +26,7 @@ buildGoModule rec {
doInstallCheck = true; doInstallCheck = true;
installCheckPhase = '' installCheckPhase = ''
$out/bin/cilium version | grep ${version} > /dev/null $out/bin/cilium version --client | grep ${version} > /dev/null
''; '';
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

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

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 = "krelay"; pname = "krelay";
version = "0.0.7"; version = "0.0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "knight42"; owner = "knight42";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-FB+N4gSjAG/HyL5a/D44G4VVzlAQZ8Vjt+YUclCcy3w="; hash = "sha256-KR5lBLgzv9yjL3JvCjg8dxXWmPgagnnKxYtrPunAyXY=";
}; };
vendorHash = "sha256-Nktv3yRrK2AypCzvQDH9gax65GJEXq6Fb3eBWvltQVk="; vendorHash = "sha256-vaWdJyPOLsrLrhipBvUCOHo/TjnJz4Qpvj3lvUPHomU=";
subPackages = [ "cmd/client" ]; subPackages = [ "cmd/client" ];

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

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dns-stats"; owner = "dns-stats";
repo = pname; repo = "compactor";
rev = version; rev = version;
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-5Z14suhO5ghhmZsSj4DsSoKm+ct2gQFO6qxhjmx4Xm4="; hash = "sha256-5Z14suhO5ghhmZsSj4DsSoKm+ct2gQFO6qxhjmx4Xm4=";
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Tools to capture DNS traffic and record it in C-DNS files"; description = "Tools to capture DNS traffic and record it in C-DNS files";
homepage = "https://dns-stats.org/"; homepage = "https://dns-stats.org/";
changelog = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt"; changelog = "https://github.com/dns-stats/compactor/raw/${version}/ChangeLog.txt";
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ fdns ]; maintainers = with maintainers; [ fdns ];
platforms = platforms.unix; platforms = platforms.unix;

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

@ -12,25 +12,25 @@ in {
guiStable = mkGui { guiStable = mkGui {
channel = "stable"; channel = "stable";
version = "2.2.45"; version = "2.2.46";
hash = "sha256-SMnhPz5zTPtidy/BIvauDM60WgDLG+NIr9rdUrQhz0A="; hash = "sha256-i/Eq66dYDGR4RLJ76ZlKruhU0KC9KlMMf8Wb91ZoyY0=";
}; };
guiPreview = mkGui { guiPreview = mkGui {
channel = "stable"; channel = "stable";
version = "2.2.45"; version = "2.2.46";
hash = "sha256-SMnhPz5zTPtidy/BIvauDM60WgDLG+NIr9rdUrQhz0A="; hash = "sha256-i/Eq66dYDGR4RLJ76ZlKruhU0KC9KlMMf8Wb91ZoyY0=";
}; };
serverStable = mkServer { serverStable = mkServer {
channel = "stable"; channel = "stable";
version = "2.2.45"; version = "2.2.46";
hash = "sha256-1GwhZEPfRW1e+enJipy7YOnA4QzeqZ7aCG92GrsZhms="; hash = "sha256-A6rAhc/EGvbqVdg1jXxNX3bKQLcGurqa7hKh9LvH+es=";
}; };
serverPreview = mkServer { serverPreview = mkServer {
channel = "stable"; channel = "stable";
version = "2.2.45"; version = "2.2.46";
hash = "sha256-1GwhZEPfRW1e+enJipy7YOnA4QzeqZ7aCG92GrsZhms="; hash = "sha256-A6rAhc/EGvbqVdg1jXxNX3bKQLcGurqa7hKh9LvH+es=";
}; };
} }

View File

@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
inherit hash; inherit hash;
owner = "GNS3"; owner = "GNS3";
repo = pname; repo = pname;
rev = "v${version}"; rev = "refs/tags/v${version}";
}; };
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [

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

@ -13,16 +13,16 @@ let
common = { stname, target, postInstall ? "" }: common = { stname, target, postInstall ? "" }:
buildGoModule rec { buildGoModule rec {
pname = stname; pname = stname;
version = "1.27.2"; version = "1.27.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "syncthing"; owner = "syncthing";
repo = "syncthing"; repo = "syncthing";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-CDOWN2b7DCRqhbJmiz4zp+q03GwmuVKv1MZT3NaO7lI="; hash = "sha256-TXkZJAN72Qa3Mo2TYvCHNOl3BWfRxu78XXHW48Jjj0M=";
}; };
vendorHash = "sha256-3MWVx0N17YgvFira56gvqMJlR1o/udtmWBn9oEVEp04="; vendorHash = "sha256-ALdmETpEmvA3bTfBRK6LaO7bnlH03fljX1P7rqzskG4=";
nativeBuildInputs = lib.optionals stdenv.isDarwin [ nativeBuildInputs = lib.optionals stdenv.isDarwin [
# Recent versions of macOS seem to require binaries to be signed when # Recent versions of macOS seem to require binaries to be signed when

View File

@ -33,14 +33,14 @@ let
}.${system} or throwSystem; }.${system} or throwSystem;
hash = { hash = {
x86_64-linux = "sha256-MtSpyPj2PX8K2e4ZLAmvn0T5bJvPtBbzmn6/cTXGlbc="; x86_64-linux = "sha256-5AxEkGmThLEEw1XGrWuabRcVgYH8OT2cXxyeFrYeBOI=";
}.${system} or throwSystem; }.${system} or throwSystem;
displayname = "XPipe"; displayname = "XPipe";
in stdenvNoCC.mkDerivation rec { in stdenvNoCC.mkDerivation rec {
pname = "xpipe"; pname = "xpipe";
version = "8.0.1"; version = "8.3";
src = fetchzip { src = fetchzip {
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";

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,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mafft"; pname = "mafft";
version = "7.520"; version = "7.525";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "sysimm"; owner = "sysimm";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-H+EcKahJWwidAx+IUT4uCZEty+S8hUeMSB8VbTu5SmQ="; sha256 = "sha256-ckBmvFssYAmYcBHAEftjQqBV0MB0theGfemaPx3XUws=";
}; };
preBuild = '' preBuild = ''

View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "getdp"; pname = "getdp";
version = "3.5.0"; version = "3.6.0";
src = fetchurl { src = fetchurl {
url = "http://getdp.info/src/getdp-${version}-source.tgz"; url = "http://getdp.info/src/getdp-${version}-source.tgz";
sha256 = "sha256-C/dsSe+puIQBpFfBL3qr2XWXrUnvYy0/uTCKqOpDe9w="; sha256 = "sha256-N1cb72W77Dr+TzeHpLgv5FuFb+SJqyGcfn+kOfEvZgA=";
}; };
inherit (petsc) mpiSupport; inherit (petsc) mpiSupport;

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

@ -38,13 +38,13 @@ let
in in
buildPerlModule rec { buildPerlModule rec {
pname = "pipe-viewer"; pname = "pipe-viewer";
version = "0.4.9"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "trizen"; owner = "trizen";
repo = "pipe-viewer"; repo = "pipe-viewer";
rev = version; rev = version;
hash = "sha256-7l8exCC9robe1hKnQAaIVfnn8L+FuwTOkxaxlwJmpe0="; hash = "sha256-tNIAGvv3dCPd7MA27yd2AHMSgs+1D2uiJJTQgTsEVNU=";
}; };
nativeBuildInputs = [ makeWrapper ] nativeBuildInputs = [ makeWrapper ]

View File

@ -281,7 +281,7 @@ in stdenv.mkDerivation {
]; ];
license = licenses.gpl2; license = licenses.gpl2;
homepage = "https://www.virtualbox.org/"; homepage = "https://www.virtualbox.org/";
maintainers = with maintainers; [ sander ]; maintainers = with maintainers; [ sander friedrichaltheide ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
mainProgram = "VirtualBox"; mainProgram = "VirtualBox";
}; };

View File

@ -19,7 +19,7 @@ fetchurl rec {
description = "Oracle Extension pack for VirtualBox"; description = "Oracle Extension pack for VirtualBox";
license = licenses.virtualbox-puel; license = licenses.virtualbox-puel;
homepage = "https://www.virtualbox.org/"; homepage = "https://www.virtualbox.org/";
maintainers = with maintainers; [ sander ]; maintainers = with maintainers; [ sander friedrichaltheide ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }

View File

@ -146,7 +146,7 @@ in stdenv.mkDerivation rec {
''; '';
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = "GPL"; license = "GPL";
maintainers = [ lib.maintainers.sander ]; maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10"); broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10");
}; };

View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "evilwm"; pname = "evilwm";
version = "1.4.2"; version = "1.4.3";
src = fetchurl { src = fetchurl {
url = "http://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz"; url = "http://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz";
sha256 = "sha256-QhLW2QywBbLMiIFLyFN3NrSVCrWCZLu2W4gHrGO9xLk="; sha256 = "sha256-1ZRbILEskdskEvrA29o/ucPsjeu44bEJg4mSsrG75dQ=";
}; };
buildInputs = [ buildInputs = [

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

@ -53,6 +53,10 @@
, gccForLibs ? if useCcForLibs then cc else null , gccForLibs ? if useCcForLibs then cc else null
, fortify-headers ? null , fortify-headers ? null
, includeFortifyHeaders ? null , includeFortifyHeaders ? null
# https://github.com/NixOS/nixpkgs/issues/295322
# should -march flag be used
, disableMarch ? false
}: }:
with lib; with lib;
@ -609,7 +613,7 @@ stdenv.mkDerivation {
# TODO: aarch64-darwin has mcpu incompatible with gcc # TODO: aarch64-darwin has mcpu incompatible with gcc
+ optionalString ((targetPlatform ? gcc.arch) && !isClang && !(stdenv.isDarwin && stdenv.isAarch64) && + optionalString ((targetPlatform ? gcc.arch) && !isClang && !(stdenv.isDarwin && stdenv.isAarch64) &&
isGccArchSupported targetPlatform.gcc.arch) '' isGccArchSupported targetPlatform.gcc.arch && !disableMarch) ''
echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before
'' ''
@ -705,7 +709,7 @@ stdenv.mkDerivation {
+ optionalString isClang '' + optionalString isClang ''
# Escape twice: once for this script, once for the one it gets substituted into. # Escape twice: once for this script, once for the one it gets substituted into.
export march=${lib.escapeShellArg export march=${lib.escapeShellArg
(lib.optionalString (targetPlatform ? gcc.arch) (lib.optionalString (targetPlatform ? gcc.arch && !disableMarch)
(lib.escapeShellArg "-march=${targetPlatform.gcc.arch}"))} (lib.escapeShellArg "-march=${targetPlatform.gcc.arch}"))}
export defaultTarget=${targetPlatform.config} export defaultTarget=${targetPlatform.config}
substituteAll ${./add-clang-cc-cflags-before.sh} $out/nix-support/add-local-cc-cflags-before.sh substituteAll ${./add-clang-cc-cflags-before.sh} $out/nix-support/add-local-cc-cflags-before.sh

View File

@ -42,13 +42,13 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "amazon-ssm-agent"; pname = "amazon-ssm-agent";
version = "3.3.40.0"; version = "3.3.131.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aws"; owner = "aws";
repo = "amazon-ssm-agent"; repo = "amazon-ssm-agent";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-o1THIj0QAafqhbFoZKVZXWiAEcaYB+xP5Y2e45D/6Xg="; hash = "sha256-fYFY5HQcArSDdh1qtIo4OzeLt+mIlbwlSr4O1py3MAk=";
}; };
vendorHash = null; vendorHash = null;

View File

@ -13,10 +13,10 @@ let
}.${system} or throwSystem; }.${system} or throwSystem;
hash = { hash = {
x86_64-linux = "sha256-/heSkG7TtDHzNfvXblR6A5y+c12EmuQ8XZGDRqIEvtg="; x86_64-linux = "sha256-5rvLkJ0sFRgIekGVxk/r1gxheJHIKYsWqvtukqh+YTI=";
aarch64-linux = "sha256-WkpcNwWS0e5NURfHloV4xjIGSRPfP0RRflq98NY16AY="; aarch64-linux = "sha256-19jKB71ZLkDqrsuacFb2JLBniOEyMediJBfLCP5Ss7o=";
x86_64-darwin = "sha256-nXPaangEVRZf/dEt+i0AWOyT66jGIcRaN4ZO3k/VMh4="; x86_64-darwin = "sha256-DVuBMNhdQUcz29aidzkBQfHNk/ttOg0WrmUAuu6MG7A=";
aarch64-darwin = "sha256-hs2lLy9thrp414+oQSf9euwNuU06UggLQ/EuMg/lrc0="; aarch64-darwin = "sha256-lf/kBZFVYbE9GMkPPM/5MrMyavywCJF+FO54RTnup8g=";
}.${system} or throwSystem; }.${system} or throwSystem;
bin = "$out/bin/codeium_language_server"; bin = "$out/bin/codeium_language_server";
@ -24,7 +24,7 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "codeium"; pname = "codeium";
version = "1.8.5"; version = "1.8.13";
src = fetchurl { src = fetchurl {
name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";

View File

@ -0,0 +1,23 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.0"; sha256 = "1lpv5sggdxza0bmcqmzf5r4i340f0m7nr5073lac18naj5697q5g"; })
(fetchNuGet { pname = "AngleSharp"; version = "1.0.7"; sha256 = "1f0sb4jknw7f9mhg4f5khk1q257mn97b9qyy017jjljhqyxp449f"; })
(fetchNuGet { pname = "AsyncKeyedLock"; version = "6.2.4"; sha256 = "1sizwdkj7ysk7nvdrnnnvl67r4smyq45k6ih4si38kxm27sqwhjw"; })
(fetchNuGet { pname = "CliFx"; version = "2.3.5"; sha256 = "0rlbv93ssw0d8kvhnvrz2f06ka66gz4gbz1va2q135dab99cmrin"; })
(fetchNuGet { pname = "CSharpier.MsBuild"; version = "0.26.7"; sha256 = "1pa96gci9nwav1g93vxq4mc0h1bjasax9j6giya1ms6rdmqxxlyn"; })
(fetchNuGet { pname = "Deorcify"; version = "1.0.2"; sha256 = "0nwxyrl4rd5x621i2hs5fl3w7fxpm13lkdssxr9fd5042px2gqbm"; })
(fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.5.2"; sha256 = "0j3z9wdhn6d4np0cjxv2wb5n9blm9frgbxs1p6zdafbxr98qzb73"; })
(fetchNuGet { pname = "Gress"; version = "2.1.1"; sha256 = "1svz1flhyl26h3xjch0acjjinympgf6bhj5vpb188njfih3ip4ck"; })
(fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; })
(fetchNuGet { pname = "Polly"; version = "8.2.0"; sha256 = "0gxdi4sf60vpxsb258v592ykkq9a3dq2awayp99yy9djys8bglks"; })
(fetchNuGet { pname = "Polly.Core"; version = "8.2.0"; sha256 = "00b4jbyiyslqvswy4j2lfw0rl0gq8m4v5fj2asb96i6l224bs7d3"; })
(fetchNuGet { pname = "RazorBlade"; version = "0.5.0"; sha256 = "11s68yqvpp65yam954f281vw9pmb2c5mxnk0n5j6xv1xylng4x5b"; })
(fetchNuGet { pname = "Spectre.Console"; version = "0.48.0"; sha256 = "0v3zijim9k5lcmhn0ajlsix0japvx3c20r9b7x7f7gvraa8w3gl6"; })
(fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; })
(fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.14.0"; sha256 = "0c41zw1bwz6ybxagq5vr26cx7najd17rrdbqjpn8mabynq380ayr"; })
(fetchNuGet { pname = "YoutubeExplode"; version = "6.3.10"; sha256 = "0b3n8mfxa4l7bfk0c1s7yfw4m1kvnm2r5pqfvr6s20gjq3wzfih5"; })
]

View File

@ -8,19 +8,19 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "discordchatexporter-cli"; pname = "discordchatexporter-cli";
version = "2.41.2"; version = "2.42.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tyrrrz"; owner = "tyrrrz";
repo = "discordchatexporter"; repo = "discordchatexporter";
rev = version; rev = version;
hash = "sha256-8ETEIZXIo7Tx6Vb9Id/E/8IklpcvO9OpcrYD+mHRX3o="; hash = "sha256-54NTeIs0a8hd2xKQkAxwfyGwEPUlSSXXvDamGLfa9ls=";
}; };
projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj";
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;
dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_7_0; dotnet-runtime = dotnetCorePackages.runtime_8_0;
postFixup = '' postFixup = ''
ln -s $out/bin/DiscordChatExporter.Cli $out/bin/discordchatexporter-cli ln -s $out/bin/DiscordChatExporter.Cli $out/bin/discordchatexporter-cli

View File

@ -4,7 +4,7 @@ set -eo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")" cd "$(dirname "${BASH_SOURCE[0]}")"
new_version="$(curl -s "https://api.github.com/repos/tyrrrz/DiscordChatExporter/releases?per_page=1" | jq -r '.[0].name')" new_version="$(curl -s "https://api.github.com/repos/tyrrrz/DiscordChatExporter/releases?per_page=1" | jq -r '.[0].name')"
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
if [[ "$new_version" == "$old_version" ]]; then if [[ "$new_version" == "$old_version" ]]; then
echo "Up to date" echo "Up to date"
exit 0 exit 0

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,33 +1,35 @@
{ lib { lib
, stdenv
, fetchurl , fetchurl
, gettext
, python3
, wrapQtAppsHook
, fsuae , fsuae
, gettext
, python3Packages
, stdenv
, libsForQt5
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "fs-uae-launcher"; pname = "fs-uae-launcher";
version = "3.1.68"; version = "3.1.70";
src = fetchurl { src = fetchurl {
url = "https://fs-uae.net/files/FS-UAE-Launcher/Stable/${finalAttrs.version}/fs-uae-launcher-${finalAttrs.version}.tar.xz"; url = "https://fs-uae.net/files/FS-UAE-Launcher/Stable/${finalAttrs.version}/fs-uae-launcher-${finalAttrs.version}.tar.xz";
hash = "sha256-42EERC2yeODx0HPbwr4vmpN80z6WSWi3WzJMOT+OwDA="; hash = "sha256-yvJ8sa44V13SEUJ6C9SgS+N2ZFH5+20TTL2ICY9A36c=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
gettext gettext
python3 python3Packages.python
wrapQtAppsHook libsForQt5.wrapQtAppsHook
]; ];
buildInputs = with python3.pkgs; [ buildInputs = with python3Packages; [
pyqt5 pyqt5
requests requests
setuptools setuptools
]; ];
strictDeps = true;
makeFlags = [ "prefix=$(out)" ]; makeFlags = [ "prefix=$(out)" ];
dontWrapQtApps = true; dontWrapQtApps = true;
@ -47,8 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://fs-uae.net"; homepage = "https://fs-uae.net";
description = "Graphical front-end for the FS-UAE emulator"; description = "Graphical front-end for the FS-UAE emulator";
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
mainProgram = "fs-uae-launcher";
maintainers = with lib.maintainers; [ sander AndersonTorres ]; maintainers = with lib.maintainers; [ sander AndersonTorres ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = with lib.systems.inspect;
patternLogicalAnd patterns.isx86 patterns.isLinux;
}; };
}) })

View File

@ -1,8 +1,7 @@
{ lib { lib
, stdenv
, fetchFromGitHub
, SDL2 , SDL2
, autoreconfHook , autoreconfHook
, fetchFromGitHub
, freetype , freetype
, gettext , gettext
, glib , glib
@ -13,6 +12,7 @@
, lua , lua
, openal , openal
, pkg-config , pkg-config
, stdenv
, zip , zip
, zlib , zlib
}: }:
@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs:{
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
pkg-config pkg-config
zip
]; ];
buildInputs = [ buildInputs = [
@ -44,10 +45,11 @@ stdenv.mkDerivation (finalAttrs:{
libmpeg2 libmpeg2
lua lua
openal openal
zip
zlib zlib
]; ];
strictDeps = true;
meta = { meta = {
homepage = "https://fs-uae.net"; homepage = "https://fs-uae.net";
description = "An accurate, customizable Amiga Emulator"; description = "An accurate, customizable Amiga Emulator";
@ -58,7 +60,9 @@ stdenv.mkDerivation (finalAttrs:{
Amigas. Amigas.
''; '';
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
mainProgram = "fs-uae";
maintainers = with lib.maintainers; [ AndersonTorres ]; maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = with lib.systems.inspect;
patternLogicalAnd patterns.isx86 patterns.isLinux;
}; };
}) })

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "git-agecrypt"; pname = "git-agecrypt";
version = "unstable-2023-07-14"; version = "unstable-2024-03-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vlaci"; owner = "vlaci";
repo = "git-agecrypt"; repo = "git-agecrypt";
rev = "945b80556d8848f6e85a8cc0053f9020bdc8b359"; rev = "126be86c515466c5878a60561f754a9ab4af6ee8";
hash = "sha256-6FjyJRYGyZt+uvYjXWvXI7DGq/+BNZHSSAT/DhOsF/E="; hash = "sha256-cmnBW/691mmLHq8tWpD3+zwCf7Wph5fcVdSxQGxqd1k=";
}; };
cargoHash = "sha256-QCV0DT0kcDRMzVc+9uTn9FYPpf+xvKJbakP6CHRcibo="; cargoHash = "sha256-FmlJeWMIIyTsg3TTLUia14et+aTgFCTkOr1J5dp0SGY=";
nativeBuildInputs = [ pkg-config git ]; nativeBuildInputs = [ pkg-config git ];

View File

@ -10,16 +10,16 @@
buildGoModule rec { buildGoModule rec {
pname = "hugo"; pname = "hugo";
version = "0.123.8"; version = "0.124.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gohugoio"; owner = "gohugoio";
repo = "hugo"; repo = "hugo";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-sL/LiQwbn3nD2eDFNuAbDHRGemTiBhTfb5IaugYL9dM="; hash = "sha256-LLjIKkNtrnnpIUjdJZJlrsyP4O634/B+cyn8DEYfRdk=";
}; };
vendorHash = "sha256-V7YRrC+6fOIjXOu7E0kIOZZt++4oFLPhmHeWmOVU3Xw="; vendorHash = "sha256-xl3X9AjlDcmjMExHvzgMp2mXJnt3jae6WNQSklHWKPQ=";
doCheck = false; doCheck = false;

View File

@ -10,16 +10,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "igir"; pname = "igir";
version = "2.5.0"; version = "2.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emmercm"; owner = "emmercm";
repo = "igir"; repo = "igir";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-7gK3NTjirlaraUWGixDdeQrCip9W3X/18mbzXYOizRs="; hash = "sha256-z70oPKUTVKWQ/BME2ourQZWNmFYRTvSRs+2mKVfoIh8=";
}; };
npmDepsHash = "sha256-2X0zCCHKFps3fN5X7rnOdD//D7RU9m4V9cyr3CgoXOE="; npmDepsHash = "sha256-lTqAUtUv0WmS/TUkPZQyCOYhY5BFz4ZCXqJN5I6l/cI=";
# I have no clue why I have to do this # I have no clue why I have to do this
postPatch = '' postPatch = ''

View File

@ -6,13 +6,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "lubelogger"; pname = "lubelogger";
version = "1.2.6"; version = "1.2.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hargata"; owner = "hargata";
repo = "lubelog"; repo = "lubelog";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ZFFTkRCwcoYBjdzlkeAl2MCokF1dXuRV56WpGo2oaiA="; hash = "sha256-7bU+ZXYvwg33hW0d+4it/3eSnvQ2SW9vWEbqhGMYxQQ=";
}; };
projectFile = "CarCareTracker.sln"; projectFile = "CarCareTracker.sln";

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

@ -18,13 +18,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "open-scq30"; pname = "open-scq30";
version = "1.10.6"; version = "1.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Oppzippy"; owner = "Oppzippy";
repo = "OpenSCQ30"; repo = "OpenSCQ30";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-qYWLf0ns4YSq+yAspVTMvKQi861iUMJar2wjqm+BV/0="; hash = "sha256-yls7F6ou0TsoY6CDi694fJrq30Y3B6d96T1VWl47K0w=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
darwin.apple_sdk.frameworks.Foundation darwin.apple_sdk.frameworks.Foundation
]; ];
cargoHash = "sha256-BQLNm+yyimBh7WomrccdQ2lvrQzCNXf4MEa1LlPhck0="; cargoHash = "sha256-VxweKzXNWOrBrzLzId8D6O0tZG8bI7HjhD+GJ3vRyhk=";
INSTALL_PREFIX = placeholder "out"; INSTALL_PREFIX = placeholder "out";

View File

@ -0,0 +1,63 @@
{
lib,
stdenv,
buildBazelPackage,
fetchFromGitHub,
fetchpatch,
bazel_6,
jdk,
elfutils,
libcap,
}:
buildBazelPackage rec {
pname = "perf_data_converter";
version = "0-unstable-2024-03-12";
src = fetchFromGitHub {
owner = "google";
repo = "perf_data_converter";
rev = "e1cfe1e7e5d8cf3b728a166bf02d4227c82801eb";
hash = "sha256-Y3tBLH2jf1f28o6RK2inq9FulKc66qcqwKmxYdFC5tA=";
};
bazel = bazel_6;
bazelFlags = [
"--java_runtime_version=local_jdk"
"--tool_java_runtime_version=local_jdk"
];
fetchAttrs = {
sha256 = "sha256-IauQ4zEn9YHppLgW+4XjPv4N5IZlEkp//tE/Dy7k28s=";
};
nativeBuildInputs = [ jdk ];
buildInputs = [
elfutils
libcap
];
removeRulesCC = false;
bazelBuildFlags = [ "-c opt" ];
bazelTargets = [ "src:perf_to_profile" ];
bazelTestTargets = [ "src:all" ];
buildAttrs = {
installPhase = ''
runHook preInstall
install -Dm555 -t "$out/bin" bazel-bin/src/perf_to_profile
runHook postInstall
'';
};
meta = with lib; {
description = "Tool to convert Linux perf files to the profile.proto format used by pprof";
homepage = "https://github.com/google/perf_data_converter";
license = licenses.bsd3;
maintainers = with maintainers; [ hzeller ];
platforms = platforms.linux;
};
}

View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "qrtool"; pname = "qrtool";
version = "0.10.5"; version = "0.10.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sorairolake"; owner = "sorairolake";
repo = "qrtool"; repo = "qrtool";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-XYoa5AueI0AYH5Lw7CmzeK9RkNy8WXbAAePAGkcwzWw="; sha256 = "sha256-uniYvYFrwlYfTPpg4lKa2GLURdLHDRFfym8FjrKfSL4=";
}; };
cargoHash = "sha256-s68OCW2KS1ADTp8rWaUOGXCrl+Qapyf9FcLVhSF4QMg="; cargoHash = "sha256-f0ufdFGrOIHFrDLz3rwNSl3AlM6um0r9bQzfn0Syd1M=";
nativeBuildInputs = [ asciidoctor installShellFiles ]; nativeBuildInputs = [ asciidoctor installShellFiles ];

View File

@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sarasa-gothic"; pname = "sarasa-gothic";
version = "1.0.6"; version = "1.0.7";
src = fetchurl { src = fetchurl {
# Use the 'ttc' files here for a smaller closure size. # Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}b/Sarasa-TTC-${finalAttrs.version}.zip"; url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
hash = "sha256-MkbmEn4vV2WEDC8pW+WewPuVhlLPi2iGmhvJW6Szksw="; hash = "sha256-R0mVOKYlxSk3s6zPG/h9ddKUZX+WJp47QCulFUO97YI=";
}; };
sourceRoot = "."; sourceRoot = ".";

View File

@ -14,9 +14,9 @@
}: }:
stdenv.mkDerivation (self: { stdenv.mkDerivation (self: {
pname = "srm-cuarzo"; pname = "srm-cuarzo";
version = "0.5.4-1"; version = "0.5.5-1";
rev = "v${self.version}"; rev = "v${self.version}";
hash = "sha256-nmYMhX3XtyIyv6Kxi7s+ahkOHfnuLcjpwSU58HcPNeU="; hash = "sha256-4aeKzvhfVmimz4Df7wnyZESAZa7RMjYUqbhFhqPJ59o=";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit (self) rev hash; inherit (self) rev hash;

View File

@ -1,5 +1,18 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, buildPackages, cmake, installShellFiles { lib
, boost, lua, protobuf, rapidjson, shapelib, sqlite, zlib, testers }: , stdenv
, fetchFromGitHub
, buildPackages
, cmake
, installShellFiles
, boost
, lua
, protobuf_21
, rapidjson
, shapelib
, sqlite
, zlib
, testers
}:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "tilemaker"; pname = "tilemaker";
@ -13,23 +26,26 @@ stdenv.mkDerivation (finalAttrs: {
}; };
postPatch = '' postPatch = ''
substituteInPlace src/tilemaker.cpp \ substituteInPlace src/options_parser.cpp \
--replace "config.json" "$out/share/tilemaker/config-openmaptiles.json" \ --replace-fail "config.json" "$out/share/tilemaker/config-openmaptiles.json" \
--replace "process.lua" "$out/share/tilemaker/process-openmaptiles.lua" --replace-fail "process.lua" "$out/share/tilemaker/process-openmaptiles.lua"
substituteInPlace server/server.cpp \
--replace-fail "default_value(\"static\")" "default_value(\"$out/share/tilemaker/static\")"
''; '';
nativeBuildInputs = [ cmake installShellFiles ]; nativeBuildInputs = [ cmake installShellFiles ];
buildInputs = [ boost lua protobuf rapidjson shapelib sqlite zlib ]; buildInputs = [ boost lua protobuf_21 rapidjson shapelib sqlite zlib ];
cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"-DPROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"; (lib.cmakeFeature "PROTOBUF_PROTOC_EXECUTABLE" "${buildPackages.protobuf}/bin/protoc");
env.NIX_CFLAGS_COMPILE = toString [ "-DTM_VERSION=${finalAttrs.version}" ]; env.NIX_CFLAGS_COMPILE = toString [ "-DTM_VERSION=${finalAttrs.version}" ];
postInstall = '' postInstall = ''
installManPage ../docs/man/tilemaker.1 installManPage ../docs/man/tilemaker.1
install -Dm644 ../resources/* -t $out/share/tilemaker install -Dm644 ../resources/*.{json,lua} -t $out/share/tilemaker
cp -r ../server/static $out/share/tilemaker
''; '';
passthru.tests.version = testers.testVersion { passthru.tests.version = testers.testVersion {
@ -44,5 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.free; # FTWPL license = licenses.free; # FTWPL
maintainers = with maintainers; [ sikmir ]; maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix; platforms = platforms.unix;
mainProgram = "tilemaker";
}; };
}) })

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,7 +9,7 @@
}: }:
let let
version = "2.9.0"; version = "2.10.0";
completion = fetchurl { completion = fetchurl {
url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash";
@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl { src = fetchurl {
url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/wp-cli-${version}.phar"; url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/wp-cli-${version}.phar";
hash = "sha256-r2t8zCHtCQfLUE21oFnw4SAReQWmAXv91Ddc7jyT2GQ="; hash = "sha256-TGqTzsrn9JnKSB+nptbUKZyLkyFOXlMI4mdw2/02Md8=";
}; };
dontUnpack = true; dontUnpack = true;
@ -72,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; { meta = with lib; {
description = "A command line interface for WordPress"; description = "A command line interface for WordPress";
homepage = "https://wp-cli.org"; homepage = "https://wp-cli.org";
changelog = "https://github.com/wp-cli/wp-cli/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all; platforms = platforms.all;

View File

@ -0,0 +1,50 @@
{
lib,
python3,
fetchFromGitHub,
fetchPypi
}:
let
python3Packages =
(python3.override {
packageOverrides = final: prev: {
wxpython = prev.wxpython.overrideAttrs rec {
version = "4.2.0";
src = fetchPypi {
pname = "wxPython";
inherit version;
hash = "sha256-ZjzrxFCdfl0RNRiGX+J093+VQ0xdV7w4btWNZc7thsc=";
};
};
};
}).pkgs;
in
python3Packages.buildPythonApplication rec {
pname = "yt-dlg";
version = "1.8.5";
src = fetchFromGitHub {
owner = "oleksis";
repo = "youtube-dl-gui";
rev = "v${version}";
hash = "sha256-W1ZlArmM+Ro5MF/rB88me/PD79dJA4v188mPbMd8Kow=";
};
pyproject = true;
build-system = with python3Packages; [
setuptools
wheel
];
dependencies = with python3Packages; [
pypubsub
wxpython
];
meta = {
description = "A cross platform front-end GUI of the popular youtube-dl written in wxPython.";
homepage = "https://oleksis.github.io/youtube-dl-gui";
license = lib.licenses.unlicense;
mainProgram = "yt-dlg";
maintainers = with lib.maintainers; [ quantenzitrone ];
};
}

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

@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sketchybar-app-font"; pname = "sketchybar-app-font";
version = "2.0.8"; version = "2.0.11";
src = fetchurl { src = fetchurl {
url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf";
hash = "sha256-WX30kF0DF85RNMapVrADCh1LKLnYpJdpgG/3dGWhuRs="; hash = "sha256-coTwsCIausXlg1BGRPARnwq50rJgR8WyfER5Q4dkMuw=";
}; };
dontUnpack = true; dontUnpack = true;

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

Some files were not shown because too many files have changed in this diff Show More