nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-13 19:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-12-20 12:00:53 +00:00 committed by GitHub
commit 176c80219d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
90 changed files with 869 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
doc/build-helpers/testers.chapter.md
View File

@ -30,38 +30,49 @@ meta.pkgConfigModules = [ "libfoo" ];
## `testVersion` {#tester-testVersion}
Checks the command output contains the specified version
Checks that the output from running a command contains the specified version string in it as a whole word.
Although simplistic, this test assures that the main program
can run. While there's no substitute for a real test case,
it does catch dynamic linking errors and such. It also provides
some protection against accidentally building the wrong version,
for example when using an 'old' hash in a fixed-output derivation.
Although simplistic, this test assures that the main program can run.
While there's no substitute for a real test case, it does catch dynamic linking errors and such.
It also provides some protection against accidentally building the wrong version, for example when using an "old" hash in a fixed-output derivation.
Examples:
By default, the command to be run will be inferred from the given `package` attribute:
it will check `meta.mainProgram` first, and fall back to `pname` or `name`.
The default argument to the command is `--version`, and the version to be checked will be inferred from the given `package` attribute as well.
:::{.example #ex-testversion-hello}
# Check a program version using all the default values
This example will run the command `hello --version`, and then check that the version of the `hello` package is in the output of the command.
```nix
passthru.tests.version = testers.testVersion { package = hello; };
```
:::
:::{.example #ex-testversion-different-commandversion}
# Check the program version using a specified command and expected version string
This example will run the command `leetcode -V`, and then check that `leetcode 0.4.2` is in the output of the command as a whole word (separated by whitespaces).
This means that an output like "leetcode 0.4.21" would fail the tests, and an output like "You're running leetcode 0.4.2" would pass the tests.
A common usage of the `version` attribute is to specify `version = "v${version}"`.
```nix
version = "0.4.2";
passthru.tests.version = testers.testVersion {
package = seaweedfs;
command = "weed version";
};
passthru.tests.version = testers.testVersion {
package = key;
command = "KeY --help";
# Wrong '2.5' version in the code. Drop on next version.
version = "2.5";
};
passthru.tests.version = testers.testVersion {
package = ghr;
# The output needs to contain the 'version' string without any prefix or suffix.
version = "v${version}";
package = leetcode-cli;
command = "leetcode -V";
version = "leetcode ${version}";
};
```
:::
## `testBuildFailure` {#tester-testBuildFailure}
Make sure that a build does not succeed. This is useful for testing testers.

10
maintainers/team-list.nix
View File

@ -403,6 +403,16 @@ with lib.maintainers; {
enableFeatureFreezePing = true;
};
helsinki-systems = {
# Verify additions to this team with at least one already existing member of the team.
members = [
ajs124
das_j
];
scope = "Group registration for packages maintained by Helsinki Systems";
shortName = "Helsinki Systems employees";
};
home-assistant = {
members = [
fab

2
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -52,6 +52,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- If [`system.stateVersion`](#opt-system.stateVersion) is >=23.11, `pkgs.nextcloud27` will be installed by default.
- Please note that an upgrade from v26 (or older) to v28 directly is not possible. Please upgrade to `nextcloud27` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud27;`](options.html#opt-services.nextcloud.package).
- `services.resolved.fallbackDns` can now be used to disable the upstream fallback servers entirely by setting it to an empty list. To get the previous behaviour of the upstream defaults set it to null, the new default, instead.
- `services.avahi.nssmdns` got split into `services.avahi.nssmdns4` and `services.avahi.nssmdns6` which enable the mDNS NSS switch for IPv4 and IPv6 respectively.
Since most mDNS responders only register IPv4 addresses, most users want to keep the IPv6 support disabled to avoid long timeouts.

20
nixos/modules/programs/ssh.nix
View File

@ -8,14 +8,12 @@ let
cfg = config.programs.ssh;
askPassword = cfg.askPassword;
askPasswordWrapper = pkgs.writeScript "ssh-askpass-wrapper"
''
#! ${pkgs.runtimeShell} -e
export DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^DISPLAY=\(.*\)/\1/; t; d')"
export WAYLAND_DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^WAYLAND_DISPLAY=\(.*\)/\1/; t; d')"
exec ${askPassword} "$@"
exec ${cfg.askPassword} "$@"
'';
knownHosts = attrValues cfg.knownHosts;
@ -52,10 +50,11 @@ in
};
forwardX11 = mkOption {
type = types.bool;
type = with lib.types; nullOr bool;
default = false;
description = lib.mdDoc ''
Whether to request X11 forwarding on outgoing connections by default.
If set to null, the option is not set at all.
This is useful for running graphical programs on the remote machine and have them display to your local X11 server.
Historically, this value has depended on the value used by the local sshd daemon, but there really isn't a relation between the two.
Note: there are some security risks to forwarding an X11 connection.
@ -274,10 +273,10 @@ in
config = {
programs.ssh.setXAuthLocation =
mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 || config.services.openssh.settings.X11Forwarding);
mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 == true || config.services.openssh.settings.X11Forwarding);
assertions =
[ { assertion = cfg.forwardX11 -> cfg.setXAuthLocation;
[ { assertion = cfg.forwardX11 == true -> cfg.setXAuthLocation;
message = "cannot enable X11 forwarding without setting XAuth location";
}
] ++ flip mapAttrsToList cfg.knownHosts (name: data: {
@ -298,11 +297,8 @@ in
AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
GlobalKnownHostsFile ${concatStringsSep " " knownHostsFiles}
${optionalString cfg.setXAuthLocation ''
XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
''}
ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
${optionalString cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"}
${lib.optionalString (cfg.forwardX11 != null) "ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}"}
${optionalString (cfg.pubkeyAcceptedKeyTypes != []) "PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}
${optionalString (cfg.hostKeyAlgorithms != []) "HostKeyAlgorithms ${concatStringsSep "," cfg.hostKeyAlgorithms}"}
@ -344,7 +340,7 @@ in
fi
'';
environment.variables.SSH_ASKPASS = optionalString cfg.enableAskPassword askPassword;
environment.variables.SSH_ASKPASS = optionalString cfg.enableAskPassword cfg.askPassword;
};
}

9
nixos/modules/system/boot/resolved.nix
View File

@ -23,12 +23,13 @@ in
};
services.resolved.fallbackDns = mkOption {
default = [ ];
default = null;
example = [ "8.8.8.8" "2001:4860:4860::8844" ];
type = types.listOf types.str;
type = types.nullOr (types.listOf types.str);
description = lib.mdDoc ''
A list of IPv4 and IPv6 addresses to use as the fallback DNS servers.
If this option is empty, a compiled-in list of DNS servers is used instead.
If this option is null, a compiled-in list of DNS servers is used instead.
Setting this option to an empty list will override the built-in list to an empty list, disabling fallback.
'';
};
@ -134,7 +135,7 @@ in
[Resolve]
${optionalString (config.networking.nameservers != [])
"DNS=${concatStringsSep " " config.networking.nameservers}"}
${optionalString (cfg.fallbackDns != [])
${optionalString (cfg.fallbackDns != null)
"FallbackDNS=${concatStringsSep " " cfg.fallbackDns}"}
${optionalString (cfg.domains != [])
"Domains=${concatStringsSep " " cfg.domains}"}

4
nixos/tests/iscsi-root.nix
View File

@ -7,8 +7,8 @@ import ./make-test-python.nix (
{
name = "iscsi";
meta = {
maintainers = pkgs.lib.teams.deshaw.members
++ (with pkgs.lib.maintainers; [ ajs124 ]);
maintainers = lib.teams.deshaw.members
++ lib.teams.helsinki-systems.members;
};
nodes = {

4
nixos/tests/lvm2/systemd-stage-1.nix
View File

@ -54,9 +54,9 @@
'';
}.${flavour};
in import ../make-test-python.nix ({ pkgs, ... }: {
in import ../make-test-python.nix ({ pkgs, lib, ... }: {
name = "lvm2-${flavour}-systemd-stage-1";
meta.maintainers = with pkgs.lib.maintainers; [ das_j ];
meta.maintainers = lib.teams.helsinki-systems.members;
nodes.machine = { pkgs, lib, ... }: {
imports = [ extraConfig ];

2
nixos/tests/lvm2/thinpool.nix
View File

@ -1,7 +1,7 @@
{ kernelPackages ? null }:
import ../make-test-python.nix ({ pkgs, lib, ... }: {
name = "lvm2-thinpool";
meta.maintainers = with pkgs.lib.maintainers; [ ajs124 ];
meta.maintainers = lib.teams.helsinki-systems.members;
nodes.machine = { pkgs, lib, ... }: {
virtualisation.emptyDiskImages = [ 4096 ];

4
nixos/tests/lvm2/vdo.nix
View File

@ -1,7 +1,7 @@
{ kernelPackages ? null }:
import ../make-test-python.nix ({ pkgs, ... }: {
import ../make-test-python.nix ({ pkgs, lib, ... }: {
name = "lvm2-vdo";
meta.maintainers = with pkgs.lib.maintainers; [ ajs124 ];
meta.maintainers = lib.teams.helsinki-systems.members;
nodes.machine = { pkgs, lib, ... }: {
# Minimum required size for VDO volume: 5063921664 bytes

4
nixos/tests/mysql/mariadb-galera.nix
View File

@ -17,8 +17,8 @@ let
galeraPackage ? pkgs.mariadb-galera
}: makeTest {
name = "${name}-galera-mariabackup";
meta = with pkgs.lib.maintainers; {
maintainers = [ izorkin ajs124 das_j ];
meta = {
maintainers = with lib.maintainers; [ izorkin ] ++ lib.teams.helsinki-systems.members;
};
# The test creates a Galera cluster with 3 nodes and is checking if mariabackup-based SST works. The cluster is tested by creating a DB and an empty table on one node,

4
nixos/tests/mysql/mysql-replication.nix
View File

@ -18,8 +18,8 @@ let
name ? mkTestName package,
}: makeTest {
name = "${name}-replication";
meta = with pkgs.lib.maintainers; {
maintainers = [ ajs124 das_j ];
meta = {
maintainers = lib.teams.helsinki-systems.members;
};
nodes = {

4
nixos/tests/mysql/mysql.nix
View File

@ -18,8 +18,8 @@ let
hasRocksDB ? pkgs.stdenv.hostPlatform.is64bit
}: makeTest {
inherit name;
meta = with lib.maintainers; {
maintainers = [ ajs124 das_j ];
meta = {
maintainers = lib.teams.helsinki-systems.members;
};
nodes = {

2
nixos/tests/sogo.nix
View File

@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "sogo";
meta = with pkgs.lib.maintainers; {
maintainers = [ ajs124 das_j ];
maintainers = [];
};
nodes = {

6
nixos/tests/varnish.nix
View File

@ -3,12 +3,12 @@
, pkgs ? import ../.. { inherit system; }
, package
}:
import ./make-test-python.nix ({ pkgs, ... }: let
import ./make-test-python.nix ({ pkgs, lib, ... }: let
testPath = pkgs.hello;
in {
name = "varnish";
meta = with pkgs.lib.maintainers; {
maintainers = [ ajs124 ];
meta = {
maintainers = lib.teams.helsinki-systems.members;
};
nodes = {

2
pkgs/applications/backup/unifi-protect-backup/default.nix
View File

@ -49,7 +49,7 @@ python3.pkgs.buildPythonApplication rec {
homepage = "https://github.com/ep1cman/unifi-protect-backup";
changelog = "https://github.com/ep1cman/unifi-protect-backup/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ ajs124 ];
maintainers = teams.helsinki-systems.members;
mainProgram = "unifi-protect-backup";
};
}

2
pkgs/applications/misc/geoipupdate/default.nix
View File

@ -21,6 +21,6 @@ buildGoModule rec {
description = "Automatic GeoIP database updater";
homepage = "https://github.com/maxmind/geoipupdate";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ das_j ];
maintainers = teams.helsinki-systems.members;
};
}

1
pkgs/applications/science/logic/coq/default.nix
View File

@ -56,6 +56,7 @@ let
"8.17.0".sha256 = "sha256-TGwm7S6+vkeZ8cidvp8pkiAd9tk008jvvPvYgfEOXhM=";
"8.17.1".sha256 = "sha256-x+RwkbxMg9aR0L3WSCtpIz8jwA5cJA4tXAtHMZb20y4=";
"8.18.0".sha256 = "sha256-WhiBs4nzPHQ0R24xAdM49kmxSCPOxiOVMA1iiMYunz4=";
"8.19+rc1".sha256 = "sha256-hQ57tLj8lXTbMrW+F0skPtzpHJnXbqPIc/EzocRV5qo=";
};
releaseRev = v: "V${v}";
fetched = import ../../../../build-support/coq/meta-fetch/default.nix

4
pkgs/applications/version-management/gerrit/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gerrit";
version = "3.8.3";
version = "3.9.1";
src = fetchurl {
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
hash = "sha256-EfXnJ7oyXsnAajUPJTmBQE/lUCW8Xm/hF4+N6BvX6fQ=";
hash = "sha256-WQjzkykKtrXfkNSWcM9GWy8LPMwxJpSbnWjpmslP0HA=";
};
buildCommand = ''

2
pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
View File

@ -20,6 +20,6 @@ buildGoModule rec {
homepage = "https://gitlab.com/gitlab-org/gitlab-pages";
changelog = "https://gitlab.com/gitlab-org/gitlab-pages/-/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ ajs124 das_j ] ++ teams.gitlab.members;
maintainers = teams.helsinki-systems.members ++ teams.gitlab.members;
};
}

700
pkgs/by-name/li/liana/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

7
pkgs/by-name/li/liana/package.nix
View File

@ -32,19 +32,19 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "liana";
version = "2.0";
version = "4.0";
src = fetchFromGitHub {
owner = "wizardsardine";
repo = pname;
rev = "v${version}";
hash = "sha256-GQNPKlqOBoh684x57gVV3CImgO7HBqt3UFp6CHC13do=";
hash = "sha256-aeNbPtzS8QhZ+d/HC9/Nx1GvIWsCrjUrMqghIspt2+o=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"liana-2.0.0" = "sha256-Dv/Ad8Kv7Mit8yhewzANbUbngQjtQaap/NQy9jqnbfA=";
"liana-4.0.0" = "sha256-GT5/HlFU+Cf/Q5aQoT6ldZ+f+7I+S3wpUbq3JAhJjz8=";
"iced_futures-0.6.0" = "sha256-ejkAxU6DwiX1/119eA0GRapSmz7dqwx9M0uMwyDHATQ=";
};
};
@ -81,6 +81,7 @@ rustPlatform.buildRustPackage rec {
doCheck = true;
meta = with lib; {
mainProgram = "liana-gui";
description = "A Bitcoin wallet leveraging on-chain timelocks for safety and recovery";
homepage = "https://wizardsardine.com/liana";
license = licenses.bsd3;

31
pkgs/by-name/te/terrapin-scanner/package.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "terrapin-scanner";
version = "1.0.3";
src = fetchFromGitHub {
owner = "RUB-NDS";
repo = "Terrapin-Scanner";
rev = "refs/tags/v${version}";
hash = "sha256-snKEIWhFj+uG/jY1nbq/8T0y2FcAdkIUTf9J2Lz6owo=";
};
vendorHash = null;
ldflags = [
"-s"
"-w"
];
meta = with lib; {
description = "Vulnerability scanner for the Terrapin attack";
homepage = "https://github.com/RUB-NDS/Terrapin-Scanner";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
mainProgram = "Terrapin-Scanner";
};
}

8
pkgs/desktops/plasma-5/breeze-gtk.nix
View File

@ -1,6 +1,4 @@
{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, sassc, python3, breeze-qt5 }:
let inherit (lib) getLib; in
{ mkDerivation, extra-cmake-modules, qtbase, sassc, python3, breeze-qt5 }:
mkDerivation {
pname = "breeze-gtk";
@ -9,9 +7,5 @@ mkDerivation {
patches = [
./patches/0001-fix-add-executable-bit.patch
];
postPatch = ''
sed -i cmake/FindGTKEngine.cmake \
-e "s|\''${KDE_INSTALL_FULL_LIBDIR}|${getLib gtk2}/lib|"
'';
cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ];
}

3
pkgs/desktops/plasma-5/kde-gtk-config/default.nix
View File

@ -2,7 +2,6 @@
, extra-cmake-modules
, wrapGAppsHook
, glib
, gtk2
, gtk3
, karchive
, kcmutils
@ -25,7 +24,6 @@ mkDerivation {
ki18n
kio
glib
gtk2
gtk3
karchive
kcmutils
@ -39,7 +37,6 @@ mkDerivation {
];
cmakeFlags = [
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
"-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"
];
# The gtkconfig KDED module will crash the daemon if the GSettings schemas

2
pkgs/development/coq-modules/Cheerios/default.nix
View File

@ -5,7 +5,7 @@ mkCoqDerivation {
owner = "uwplse";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.14" "8.18"; out = "20230107"; }
{ case = range "8.14" "8.19"; out = "20230107"; }
{ case = range "8.6" "8.16"; out = "20200201"; }
] null;
release."20230107".rev = "bad8ad2476e14df6b5a819b7aaddc27a7c53fb69";

2
pkgs/development/coq-modules/InfSeqExt/default.nix
View File

@ -5,7 +5,7 @@ mkCoqDerivation {
owner = "DistributedComponents";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.9" "8.18"; out = "20230107"; }
{ case = range "8.9" "8.19"; out = "20230107"; }
{ case = range "8.5" "8.16"; out = "20200131"; }
] null;
release."20230107".rev = "601e89ec019501c48c27fcfc14b9a3c70456e408";

2
pkgs/development/coq-modules/LibHyps/default.nix
View File

@ -4,7 +4,7 @@ mkCoqDerivation {
pname = "LibHyps";
owner = "Matafou";
inherit version;
defaultVersion = if (lib.versions.range "8.11" "8.18") coq.version then "2.0.4.1" else null;
defaultVersion = if (lib.versions.range "8.11" "8.19") coq.version then "2.0.4.1" else null;
release = {
"2.0.4.1".sha256 = "09p89701zhrfdmqlpxw3mziw8yylj1w1skb4b0xpbdwd1vsn4k3h";
};

2
pkgs/development/coq-modules/StructTact/default.nix
View File

@ -5,7 +5,7 @@ mkCoqDerivation {
owner = "uwplse";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.9" "8.18"; out = "20230107"; }
{ case = range "8.9" "8.19"; out = "20230107"; }
{ case = range "8.6" "8.16"; out = "20210328"; }
{ case = range "8.5" "8.13"; out = "20181102"; }
] null;

3
pkgs/development/coq-modules/bignums/default.nix
View File

@ -5,10 +5,11 @@ mkCoqDerivation {
owner = "coq";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.13" "8.18"; out = "9.0.0+coq${coq.coq-version}"; }
{ case = range "8.13" "8.19"; out = "9.0.0+coq${coq.coq-version}"; }
{ case = range "8.6" "8.17"; out = "${coq.coq-version}.0"; }
] null;
release."9.0.0+coq8.19".sha256 = "sha256-02uL+qWbUveHe67zKfc8w3U0iN3X2DKBsvP3pKpW8KQ=";
release."9.0.0+coq8.18".sha256 = "sha256-vLeJ0GNKl4M84Uj2tAwlrxJOSR6VZoJQvdlDhxJRge8=";
release."9.0.0+coq8.17".sha256 = "sha256-Mn85LqxJKPDIfpxRef9Uh5POwOKlTQ7jsMVz1wnQwuY=";
release."9.0.0+coq8.16".sha256 = "sha256-pwFTl4Unr2ZIirAB3HTtfhL2YN7G/Pg88RX9AhKWXbE=";

2
pkgs/development/coq-modules/ceres/default.nix
View File

@ -8,7 +8,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.14" "8.18"; out = "0.4.1"; }
{ case = range "8.14" "8.19"; out = "0.4.1"; }
{ case = range "8.8" "8.16"; out = "0.4.0"; }
] null;
release."0.4.1".sha256 = "sha256-9vyk8/8IVsqNyhw3WPzl8w3L9Wu7gfaMVa3n2nWjFiA=";

2
pkgs/development/coq-modules/coq-ext-lib/default.nix
View File

@ -5,7 +5,7 @@ mkCoqDerivation rec {
owner = "coq-ext-lib";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.11" "8.18"; out = "0.12.0"; }
{ case = range "8.11" "8.19"; out = "0.12.0"; }
{ case = range "8.8" "8.16"; out = "0.11.6"; }
{ case = range "8.8" "8.14"; out = "0.11.4"; }
{ case = range "8.8" "8.13"; out = "0.11.3"; }

2
pkgs/development/coq-modules/coq-record-update/default.nix
View File

@ -5,7 +5,7 @@
owner = "tchajed";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.10" "8.18"; out = "0.3.1"; }
{ case = range "8.10" "8.19"; out = "0.3.1"; }
] null;
release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk=";
release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z";

2
pkgs/development/coq-modules/corn/default.nix
View File

@ -4,10 +4,10 @@ mkCoqDerivation rec {
pname = "corn";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = "8.6"; out = "8.8.1"; }
{ case = (range "8.14" "8.18"); out = "8.18.0"; }
{ case = (range "8.11" "8.17"); out = "8.16.0"; }
{ case = (range "8.7" "8.15"); out = "8.13.0"; }
{ case = "8.6"; out = "8.8.1"; }
] null;
release = {
"8.8.1".sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp";

2
pkgs/development/coq-modules/mathcomp/default.nix
View File

@ -19,7 +19,7 @@ let
owner = "math-comp";
withDoc = single && (args.withDoc or false);
defaultVersion = with versions; lib.switch coq.coq-version [
{ case = isGe "8.17"; out = "1.18.0"; }
{ case = range "8.17" "8.18"; out = "1.18.0"; }
{ case = range "8.15" "8.18"; out = "1.17.0"; }
{ case = range "8.16" "8.18"; out = "2.1.0"; }
{ case = range "8.16" "8.18"; out = "2.0.0"; }

3
pkgs/development/coq-modules/paramcoq/default.nix
View File

@ -4,10 +4,11 @@ mkCoqDerivation {
pname = "paramcoq";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.10" "8.18"; out = "1.1.3+coq${coq.coq-version}"; }
{ case = range "8.10" "8.19"; out = "1.1.3+coq${coq.coq-version}"; }
{ case = range "8.7" "8.13"; out = "1.1.2+coq${coq.coq-version}"; }
] null;
displayVersion = { paramcoq = "..."; };
release."1.1.3+coq8.19".sha256 = "sha256-5NVsdLXaoz6qrr5ra5YfoHeuK4pEf8JX/X9+SZA0U+U=";
release."1.1.3+coq8.18".sha256 = "sha256-hNBaj9hB+OzwXsOX+TOXtDLjA5oP4EmEgseLwxFxW+I=";
release."1.1.3+coq8.17".sha256 = "sha256-m8QGGuwj1lHzDprf4LHgAuzwfoblxtDIHunHBdpmiuM=";
release."1.1.3+coq8.16".sha256 = "sha256-K7/8hXH6DwiW7Gw41sgQF8UDAO3c32xBGWQQapzG8Mo=";

2
pkgs/development/coq-modules/parsec/default.nix
View File

@ -11,7 +11,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.14" "8.18"; out = "0.1.2"; }
{ case = range "8.14" "8.19"; out = "0.1.2"; }
{ case = range "8.12" "8.16"; out = "0.1.1"; }
{ case = range "8.12" "8.13"; out = "0.1.0"; }
] null;

2
pkgs/development/coq-modules/pocklington/default.nix
View File

@ -9,7 +9,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = isGe "8.7"; out = "8.12.0"; }
{ case = range "8.7" "8.18"; out = "8.12.0"; }
] null;
meta = with lib; {

2
pkgs/development/coq-modules/simple-io/default.nix
View File

@ -6,7 +6,7 @@
repo = "coq-simple-io";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.11" "8.18"; out = "1.8.0"; }
{ case = range "8.11" "8.19"; out = "1.8.0"; }
{ case = range "8.7" "8.13"; out = "1.3.0"; }
] null;
release."1.8.0".sha256 = "sha256-3ADNeXrBIpYRlfUW+LkLHUWV1w1HFrVc/TZISMuwvRY=";

2
pkgs/development/coq-modules/zorns-lemma/default.nix
View File

@ -18,7 +18,7 @@
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.12" "8.18"; out = "10.2.0"; }
{ case = range "8.12" "8.19"; out = "10.2.0"; }
{ case = range "8.10" "8.16"; out = "9.0.0"; }
{ case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; }

6
pkgs/development/libraries/aqbanking/gwenhywfar.nix
View File

@ -2,7 +2,7 @@
, which
# GUI support
, gtk2, gtk3, qt5
, gtk3, qt5
, pluginSearchPaths ? [
"/run/current-system/sw/lib/gwenhywfar/plugins"
@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
];
preConfigure = ''
configureFlagsArray+=("--with-guis=gtk2 gtk3 qt5")
configureFlagsArray+=("--with-guis=gtk3 qt5")
'';
postPatch = let
@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config gettext which ];
buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpg-error ];
buildInputs = [ gtk3 qt5.qtbase gnutls openssl libgcrypt libgpg-error ];
dontWrapQtApps = true;

2
pkgs/development/libraries/libmaxminddb/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
description = "C library for working with MaxMind geolocation DB files";
homepage = "https://github.com/maxmind/libmaxminddb";
license = licenses.asl20;
maintainers = [ maintainers.ajs124 ];
maintainers = teams.helsinki-systems.members;
mainProgram = "mmdblookup";
platforms = platforms.all;
};

2
pkgs/development/libraries/libnftnl/default.nix
View File

@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
homepage = "https://netfilter.org/projects/libnftnl/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz ajs124 ];
maintainers = with maintainers; [ fpletz ] ++ teams.helsinki-systems.members;
};
}

2
pkgs/development/libraries/libspf2/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
"authorization (Helsinki Systems fork)";
homepage = "https://github.com/helsinki-systems/libspf2";
license = with licenses; [ lgpl21Plus bsd2 ];
maintainers = with maintainers; [ pacien ajs124 das_j ];
maintainers = with maintainers; [ pacien ] ++ teams.helsinki-systems.members;
platforms = platforms.all;
};
}

2
pkgs/development/libraries/opendmarc/default.nix
View File

@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
description = "A free open source software implementation of the DMARC specification";
homepage = "http://www.trusteddomain.org/opendmarc/";
license = with licenses; [ bsd3 sendmail ];
maintainers = with maintainers; [ ajs124 das_j ];
maintainers = teams.helsinki-systems.members;
};
}

2
pkgs/development/libraries/openldap/default.nix
View File

@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.openldap.org/";
description = "An open source implementation of the Lightweight Directory Access Protocol";
license = licenses.openldap;
maintainers = with maintainers; [ ajs124 das_j hexa ];
maintainers = with maintainers; [ hexa ] ++ teams.helsinki-systems.members;
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/sope/default.nix
View File

@ -59,6 +59,6 @@ gnustep.stdenv.mkDerivation rec {
license = licenses.publicDomain;
homepage = "https://github.com/inverse-inc/sope";
platforms = platforms.linux;
maintainers = with maintainers; [ ajs124 das_j ];
maintainers = with maintainers; [];
};
}

2
pkgs/development/libraries/spandsp/common.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "A portable and modular SIP User-Agent with audio and video support";
homepage = "https://github.com/freeswitch/spandsp";
platforms = with lib.platforms; unix;
maintainers = with lib.maintainers; [ ajs124 misuzu ];
maintainers = with lib.maintainers; [ misuzu ];
license = lib.licenses.gpl2;
downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
};

2
pkgs/development/php-packages/maxminddb/default.nix
View File

@ -23,6 +23,6 @@ buildPecl {
description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader";
license = with licenses; [ asl20 ];
homepage = "https://github.com/maxmind/MaxMind-DB-Reader-php";
maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members;
maintainers = teams.helsinki-systems.members ++ teams.php.members;
};
}

4
pkgs/development/python-modules/google-cloud-securitycenter/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-securitycenter";
version = "1.24.1";
version = "1.25.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-P1Hj4HidTr4R29PwpAhT5xn6sTKDo6gL6M7AgunEU5k=";
hash = "sha256-SofrNcO5Rir8iQfwjADlUJnGmf1y1xkBG8r6gBVxva4=";
};
propagatedBuildInputs = [

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

@ -8,7 +8,7 @@
}:
buildPythonPackage rec {
pname = "gotenberg-client";
version = "0.3.0";
version = "0.4.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "stumpylog";
repo = "gotenberg-client";
rev = "refs/tags/${version}";
hash = "sha256-xgkpVvklZrew+XOoqFKcbuDsTVfDda67R6YIxR3kzS8=";
hash = "sha256-mjVzwlawJojSHI7SSchUWLS320wXl1eHy7A7/IPU8mk=";
};
nativeBuildInputs = [

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

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "grpcio-testing";
version = "1.59.0";
version = "1.60.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-YiqbhlOsyoAT/uYNPbLQK5c2T8cYGEDXVkAPIzCaOQ4=";
hash = "sha256-XF+za8O9x4m/8ewEBQG5reoPiK64vh7VyA1oic0Jq0A=";
};
postPatch = ''

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

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "soco";
version = "0.29.1";
version = "0.30.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "SoCo";
repo = "SoCo";
rev = "refs/tags/v${version}";
hash = "sha256-Kp9rG7fJzvmnLpjVulf9kODoABdjaaHvgyed9I+FHVA=";
hash = "sha256-xoHXUcHmzEDmE17r0+vI56UBAPQEhpglBkWtwE9b2Nw=";
};
propagatedBuildInputs = [

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.129.0";
version = "0.131.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "jstasiak";
repo = "python-zeroconf";
rev = "refs/tags/${version}";
hash = "sha256-TjBaKw5AI1xPShmX/Ny7V7pvhz/4xwbxTZrDbMeLF5o=";
hash = "sha256-l+uz+wj+tgptxEjEN8ZlmxH8I4Nhrg8qAY3yCcOgBfE=";
};
postPatch = ''

2
pkgs/development/tools/continuous-integration/jenkins/default.nix
View File

@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
homepage = "https://jenkins.io/";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.mit;
maintainers = with maintainers; [ coconnor earldouglas nequissimus ajs124 ];
maintainers = with maintainers; [ coconnor earldouglas nequissimus ] ++ teams.helsinki-systems.members;
changelog = "https://www.jenkins.io/changelog-stable/#v${version}";
mainProgram = "jenkins-cli";
platforms = platforms.all;

2
pkgs/development/tools/misc/hydra/unstable.nix
View File

@ -260,6 +260,6 @@ stdenv.mkDerivation rec {
homepage = "https://nixos.org/hydra";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ lheckemann mindavi das_j ];
maintainers = with maintainers; [ lheckemann mindavi ] ++ teams.helsinki-systems.members;
};
}

4
pkgs/games/path-of-building/default.nix
View File

@ -2,13 +2,13 @@
let
data = stdenv.mkDerivation(finalAttrs: {
pname = "path-of-building-data";
version = "2.38.3";
version = "2.38.4";
src = fetchFromGitHub {
owner = "PathOfBuildingCommunity";
repo = "PathOfBuilding";
rev = "v${finalAttrs.version}";
hash = "sha256-LzNHc6lx0d+Hg0qkOb9G50V5pYOxH7eavQdcAXE5EKI=";
hash = "sha256-fCKOmP0PxhK2trBA1lyE6kf128FrsuCmBrXMIGTIt0U=";
};
nativeBuildInputs = [ unzip ];

2
pkgs/os-specific/linux/apparmor/default.nix
View File

@ -28,7 +28,7 @@ let
homepage = "https://apparmor.net/";
description = "A mandatory access control system - ${component}";
license = with licenses; [ gpl2Only lgpl21Only ];
maintainers = with maintainers; [ julm thoughtpolice ajs124 ];
maintainers = with maintainers; [ julm thoughtpolice ] ++ teams.helsinki-systems.members;
platforms = platforms.linux;
};

2
pkgs/os-specific/linux/lvm2/common.nix
View File

@ -156,6 +156,6 @@ stdenv.mkDerivation rec {
description = "Tools to support Logical Volume Management (LVM) on Linux";
platforms = platforms.linux;
license = with licenses; [ gpl2 bsd2 lgpl21 ];
maintainers = with maintainers; [ raskin ajs124 ];
maintainers = with maintainers; [ raskin ] ++ teams.helsinki-systems.members;
};
}

2
pkgs/os-specific/linux/nftables/default.nix
View File

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
homepage = "https://netfilter.org/projects/nftables/";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ izorkin ajs124 ];
maintainers = with maintainers; [ izorkin ] ++ teams.helsinki-systems.members;
mainProgram = "nft";
};
}

2
pkgs/os-specific/linux/vdo/default.nix
View File

@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
# platforms are defined in https://github.com/dm-vdo/vdo/blob/master/utils/uds/atomicDefs.h
platforms = [ "x86_64-linux" "aarch64-linux" "s390-linux" "powerpc64-linux" "powerpc64le-linux" ];
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ ajs124 ];
maintainers = teams.helsinki-systems.members;
};
}

2
pkgs/servers/http/nginx/generic.nix
View File

@ -204,6 +204,6 @@ stdenv.mkDerivation {
license = [ licenses.bsd2 ]
++ concatMap (m: m.meta.license) modules;
platforms = platforms.all;
maintainers = with maintainers; [ fpletz ajs124 raitobezarius ];
maintainers = with maintainers; [ fpletz raitobezarius ] ++ teams.helsinki-systems.members;
};
}

2
pkgs/servers/mail/dovecot/default.nix
View File

@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
description = "Open source IMAP and POP3 email server written with security primarily in mind";
license = with licenses; [ mit publicDomain lgpl21Only bsd3 bsdOriginal ];
mainProgram = "dovecot";
maintainers = with maintainers; [ fpletz globin ajs124 ];
maintainers = with maintainers; [ fpletz globin ] ++ teams.helsinki-systems.members;
platforms = platforms.unix;
};
passthru.tests = {

2
pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
View File

@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
homepage = "https://pigeonhole.dovecot.org/";
description = "A sieve plugin for the Dovecot IMAP server";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ globin ajs124 ];
maintainers = with maintainers; [ globin ] ++ teams.helsinki-systems.members;
platforms = platforms.unix;
};
}

2
pkgs/servers/mail/exim/default.nix
View File

@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
license = with licenses; [ gpl2Plus bsd3 ];
mainProgram = "exim";
platforms = platforms.linux;
maintainers = with maintainers; [ tv ajs124 das_j ];
maintainers = with maintainers; [ tv ] ++ teams.helsinki-systems.members;
changelog = "https://github.com/Exim/exim/blob/exim-${version}/doc/doc-txt/ChangeLog";
};
}

2
pkgs/servers/monitoring/icinga2/default.nix
View File

@ -92,6 +92,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.icinga.com";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ das_j ];
maintainers = lib.teams.helsinki-systems.members;
};
}

2
pkgs/servers/monitoring/loki/default.nix
View File

@ -55,6 +55,6 @@ buildGoModule rec {
license = with licenses; [ agpl3Only asl20 ];
homepage = "https://grafana.com/oss/loki/";
changelog = "https://github.com/grafana/loki/releases/tag/v${version}";
maintainers = with maintainers; [ willibutz globin mmahut emilylange ajs124 ];
maintainers = with maintainers; [ willibutz globin mmahut emilylange ] ++ teams.helsinki-systems.members;
};
}

2
pkgs/servers/nextcloud/notify_push.nix
View File

@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec {
description = "Update notifications for nextcloud clients";
homepage = "https://github.com/nextcloud/notify_push";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ ajs124 ];
maintainers = teams.helsinki-systems.members;
};
}

2
pkgs/servers/sql/mariadb/default.nix
View File

@ -136,7 +136,7 @@ let
description = "An enhanced, drop-in replacement for MySQL";
homepage = "https://mariadb.org/";
license = licenses.gpl2;
maintainers = with maintainers; [ thoughtpolice ajs124 das_j ];
maintainers = with maintainers; [ thoughtpolice ] ++ teams.helsinki-systems.members;
platforms = platforms.all;
};
};

2
pkgs/servers/sql/mariadb/galera/default.nix
View File

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
description = "Galera 3 wsrep provider library";
homepage = "https://galeracluster.com/";
license = licenses.lgpl2Only;
maintainers = with maintainers; [ ajs124 izorkin ];
maintainers = with maintainers; [ izorkin ] ++ teams.helsinki-systems.members;
platforms = platforms.all;
broken = stdenv.isDarwin;
};

8
pkgs/servers/sql/proxysql/default.nix
View File

@ -163,12 +163,12 @@ stdenv.mkDerivation (finalAttrs: {
sed -i s_/usr/bin/proxysql_$out/bin/proxysql_ $out/lib/systemd/system/*.service
'';
meta = {
meta = with lib; {
broken = stdenv.isDarwin;
description = "High-performance MySQL proxy";
homepage = "https://proxysql.com/";
license = with lib.licenses; [ gpl3Only ];
maintainers = with lib.maintainers; [ ajs124 ];
platforms = lib.platforms.unix;
license = with licenses; [ gpl3Only ];
maintainers = teams.helsinki-systems.members;
platforms = platforms.unix;
};
})

2
pkgs/servers/varnish/default.nix
View File

@ -45,7 +45,7 @@ let
description = "Web application accelerator also known as a caching HTTP reverse proxy";
homepage = "https://www.varnish-cache.org";
license = licenses.bsd2;
maintainers = with maintainers; [ ajs124 ];
maintainers = teams.helsinki-systems.members;
platforms = platforms.unix;
};
};

2
pkgs/servers/web-apps/sogo/default.nix
View File

@ -77,7 +77,7 @@ gnustep.stdenv.mkDerivation rec {
license = with licenses; [ gpl2Only lgpl21Only ];
homepage = "https://sogo.nu/";
platforms = platforms.linux;
maintainers = with maintainers; [ ajs124 das_j ];
maintainers = with maintainers; [];
};
}

6
pkgs/servers/x11/xorg/default.nix
View File

@ -4159,11 +4159,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "xorg-server";
version = "21.1.9";
version = "21.1.10";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/xserver/xorg-server-21.1.9.tar.xz";
sha256 = "0fjk9ggcrn96blq0bm80739yj23s3gjjjsc0nxk4jk0v07i7nsgz";
url = "mirror://xorg/individual/xserver/xorg-server-21.1.10.tar.xz";
sha256 = "1l0iaq83vbl9jr34sa7v7630c5bnp64drlw8yg6c6yn5xyib7c6f";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;

2
pkgs/servers/x11/xorg/tarballs.list
View File

@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.4.tar.xz
mirror://xorg/individual/util/makedepend-1.0.8.tar.xz
mirror://xorg/individual/util/util-macros-1.20.0.tar.xz
mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz
mirror://xorg/individual/xserver/xorg-server-21.1.9.tar.xz
mirror://xorg/individual/xserver/xorg-server-21.1.10.tar.xz

6
pkgs/tools/admin/qovery-cli/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "qovery-cli";
version = "0.74.4";
version = "0.75.3";
src = fetchFromGitHub {
owner = "Qovery";
repo = "qovery-cli";
rev = "refs/tags/v${version}";
hash = "sha256-QWXb4JBT/MgAsUyn4zaeSaauUDjV1b9mb7JYaoS2oqg=";
hash = "sha256-+7rjr6CbUFeEqAfCGooY5dyeP+V5eRlwm3UQeJln6as=";
};
vendorHash = "sha256-ilEG1relXYEFPR++oq35qcvnIcXkP4HRAjqxYr3U3XM=";
vendorHash = "sha256-gIqLyGc4ik7cv2U4WS3Wy8BnIpK5NdjWSH0Z58AiVPE=";
nativeBuildInputs = [
installShellFiles

6
pkgs/tools/admin/trivy/default.nix
View File

@ -7,19 +7,19 @@
buildGoModule rec {
pname = "trivy";
version = "0.48.0";
version = "0.48.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-NINEitFZm1d0foG1P+evLiXXNVNwzK3PMCicksDaBFc=";
hash = "sha256-BljAzfTm/POxshj34mSjXQl64vxBkQZc8T3cTe95eVA=";
};
# Hash mismatch on across Linux and Darwin
proxyVendor = true;
vendorHash = "sha256-EYcOOQBwzXu87q0EfJr7TUypGJW3qtosP3ARLssPOS8=";
vendorHash = "sha256-L+UGAg3UERhty3kwksgFojXchr5GzHqULcxJw6Gy2WM=";
subPackages = [ "cmd/trivy" ];

2
pkgs/tools/filesystems/xfsprogs/default.nix
View File

@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
description = "SGI XFS utilities";
license = with licenses; [ gpl2Only lgpl21 gpl3Plus ]; # see https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/debian/copyright
platforms = platforms.linux;
maintainers = with maintainers; [ dezgeg ajs124 ];
maintainers = with maintainers; [ dezgeg ] ++ teams.helsinki-systems.members;
};
}

3
pkgs/tools/inputmethods/ibus/default.nix
View File

@ -14,7 +14,6 @@
, glib
, gdk-pixbuf
, gobject-introspection
, gtk2
, gtk3
, gtk4
, gtk-doc
@ -103,6 +102,7 @@ stdenv.mkDerivation rec {
(lib.enableFeature (libnotify != null) "libnotify")
(lib.enableFeature withWayland "wayland")
(lib.enableFeature enableUI "ui")
"--disable-gtk2"
"--enable-gtk4"
"--enable-install-tests"
"--with-unicode-emoji-dir=${unicode-emoji}/share/unicode/emoji"
@ -144,7 +144,6 @@ stdenv.mkDerivation rec {
dconf
gdk-pixbuf
python3.pkgs.pygobject3 # for pygobject overrides
gtk2
gtk3
gtk4
isocodes

2
pkgs/tools/misc/wimboot/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
homepage = "https://ipxe.org/wimboot";
description = "Windows Imaging Format bootloader";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ das_j ajs124 ];
maintainers = teams.helsinki-systems.members;
platforms = [ "x86_64-linux" ];
};
}

2
pkgs/tools/networking/openssh/default.nix
View File

@ -13,7 +13,7 @@ in
};
extraPatches = [ ./ssh-keysign-8.5.patch ];
extraMeta.maintainers = with lib.maintainers; [ das_j ];
extraMeta.maintainers = lib.teams.helsinki-systems.members;
};
openssh_hpn = common rec {

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libpcap, perl }:
{ lib, stdenv, fetchurl, libpcap, pkg-config, perl }:
stdenv.mkDerivation rec {
pname = "tcpdump";
@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
patchShebangs tests
'';
nativeBuildInputs = lib.optional (stdenv.hostPlatform.isStatic) [ pkg-config ];
nativeCheckInputs = [ perl ];
buildInputs = [ libpcap ];

2
pkgs/tools/networking/unbound/default.nix
View File

@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Validating, recursive, and caching DNS resolver";
license = licenses.bsd3;
homepage = "https://www.unbound.net";
maintainers = with maintainers; [ ajs124 ];
maintainers = lib.teams.helsinki-systems.members;
platforms = platforms.unix;
};
})

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

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2023-12-16";
version = "2023-12-19";
src = fetchFromGitLab {
owner = "exploit-database";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-GIoOX3/TpUiXDyG2ZY6KO4twPYNXA8HaHOo1dJA4dc4=";
hash = "sha256-yIEu5JQ9sgf9HFP/pFZ/A2DG14c67imgfYRYL1+PiYA=";
};
nativeBuildInputs = [

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

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "ldeep";
version = "1.0.49";
version = "1.0.51";
format = "setuptools";
src = fetchFromGitHub {
owner = "franc-pentest";
repo = "ldeep";
rev = "refs/tags/${version}";
hash = "sha256-R94N9ZvgumxhSf3QBSwh0wHUKuLAuyTDTzcof6JRSkE=";
hash = "sha256-UbZotbq97ehVj8dF0vXM2Z61IG1H+21xk14DXKmWirA=";
};
nativeBuildInputs = with python3.pkgs; [

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

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "oauth2c";
version = "1.12.2";
version = "1.12.3";
src = fetchFromGitHub {
owner = "cloudentity";
repo = pname;
rev = "v${version}";
hash = "sha256-iFYKAdoeCvyhAeZ5K3CHSsHG0Uq+Ok0C8ACe9RztDmY=";
hash = "sha256-4ZCb8BXrKGXJ8d06fxAuFkGRxcK7PwuPFuCBc9EIXZY=";
};
vendorHash = "sha256-olDtsLoslxOsbAq60RnLp9MGZOt17/BPo9E9SgWOqoQ=";

2
pkgs/tools/security/pinentry/default.nix
View File

@ -2,7 +2,7 @@
, libgpg-error, libassuan, qtbase, wrapQtAppsHook
, ncurses, gtk2, gcr
, withLibsecret ? true, libsecret
, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ]
, enabledFlavors ? [ "curses" "tty" "emacs" ]
++ lib.optionals stdenv.isLinux [ "gnome3" ]
++ lib.optionals (!stdenv.isDarwin) [ "qt" ]
}:

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

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "terrascan";
version = "1.18.8";
version = "1.18.9";
src = fetchFromGitHub {
owner = "accurics";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-sjDPr/a448DMxwX4AnWIeFvNhxoEX/xqsJwdPMzR4K0=";
hash = "sha256-2EI/6+DRheZaVlib5e3GAaMOK58xycaL3tyzrkwceE4=";
};
vendorHash = "sha256-9zD81p/UjH43B0aeqlItP9vrGMaT/zhVYv60ot153Gc=";

6
pkgs/tools/security/trufflehog/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.63.4";
version = "3.63.5";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-z99p3VecDsxtEr6bdu1qFyADn/NvJZurZMVunqv4YD4=";
hash = "sha256-x/SYiOukZZ5CIUWc8/pgvCQjSpsIQmPFP1x3e4/uJFM=";
};
vendorHash = "sha256-LDDb00Vc+zeq25ArrG9/KD4SKXKfXJGljyLMUmw8owc=";
vendorHash = "sha256-oZkrRaThXwBORoib1GIW7CUF5RGZJ5d/Jd6YM4z3ZIA=";
ldflags = [
"-s"

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

@ -39549,6 +39549,7 @@ with pkgs;
coqPackages_8_16 coq_8_16
coqPackages_8_17 coq_8_17
coqPackages_8_18 coq_8_18
coqPackages_8_19 coq_8_19
coqPackages coq
;

2
pkgs/top-level/coq-packages.nix
View File

@ -189,6 +189,7 @@ in rec {
coq_8_16 = mkCoq "8.16";
coq_8_17 = mkCoq "8.17";
coq_8_18 = mkCoq "8.18";
coq_8_19 = mkCoq "8.19";
coqPackages_8_5 = mkCoqPackages coq_8_5 // { __attrsFailEvaluation = true; };
coqPackages_8_6 = mkCoqPackages coq_8_6 // { __attrsFailEvaluation = true; };
@ -204,6 +205,7 @@ in rec {
coqPackages_8_16 = mkCoqPackages coq_8_16 // { __attrsFailEvaluation = true; };
coqPackages_8_17 = mkCoqPackages coq_8_17 // { __attrsFailEvaluation = true; };
coqPackages_8_18 = mkCoqPackages coq_8_18 // { __attrsFailEvaluation = true; };
coqPackages_8_19 = mkCoqPackages coq_8_19 // { __attrsFailEvaluation = true; };
coqPackages =
let cp = recurseIntoAttrs coqPackages_8_18;
in cp // { coqPackages = cp.coqPackages // { __attrsFailEvaluation = true; }; } // { __recurseIntoDerivationForReleaseJobs = true; };