diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 332d1582ad2b..dc364515cca6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4256,6 +4256,16 @@
githubId = 1313787;
name = "Gabriel Gonzalez";
};
+ gador = {
+ email = "florian.brandes@posteo.de";
+ github = "gador";
+ githubId = 1883533;
+ name = "Florian Brandes";
+ keys = [{
+ longkeyid = "rsa4096/0xBBB3E40E53797FD9";
+ fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9";
+ }];
+ };
gal_bolle = {
email = "florent.becker@ens-lyon.org";
github = "FlorentBecker";
@@ -9820,6 +9830,13 @@
githubId = 1016742;
name = "Rafael García";
};
+ raitobezarius = {
+ email = "ryan@lahfa.xyz";
+ matrix = "@raitobezarius:matrix.org";
+ github = "RaitoBezarius";
+ githubId = 314564;
+ name = "Ryan Lahfa";
+ };
raquelgb = {
email = "raquel.garcia.bautista@gmail.com";
github = "raquelgb";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 6f1059bba304..932d60d6b361 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -369,6 +369,28 @@
~/.local/share/polymc/polymc.cfg.
+
+
+ pkgs.noto-fonts-cjk is now deprecated in
+ favor of pkgs.noto-fonts-cjk-sans and
+ pkgs.noto-fonts-cjk-serif because they each
+ have different release schedules. To maintain compatibility
+ with prior releases of Nixpkgs,
+ pkgs.noto-fonts-cjk is currently an alias
+ of pkgs.noto-fonts-cjk-sans and doesn’t
+ include serif fonts.
+
+
+
+
+ The interface that allows activation scripts to restart units
+ has been reworked. Restarting and reloading is now done by a
+ single file
+ /run/nixos/activation-restart-list that
+ honors restartIfChanged and
+ reloadIfChanged of the units.
+
+
@@ -528,6 +550,31 @@
Plugins are automatically repackaged using autoPatchelf.
+
+
+ The zrepl package has been updated from
+ 0.4.0 to 0.5:
+
+
+
+
+ The RPC protocol version was bumped; all zrepl daemons in
+ a setup must be updated and restarted before replication
+ can resume.
+
+
+
+
+ A bug involving encrypt-on-receive has been fixed. Read
+ the
+ zrepl
+ documentation and check the output of
+ zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS
+ on the receiver.
+
+
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 7dbaf4157e56..7e97bd06676c 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -114,6 +114,14 @@ In addition to numerous new and upgraded packages, this release has the followin
- MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`.
+- `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans`
+ and `pkgs.noto-fonts-cjk-serif` because they each have different release
+ schedules. To maintain compatibility with prior releases of Nixpkgs,
+ `pkgs.noto-fonts-cjk` is currently an alias of `pkgs.noto-fonts-cjk-sans` and
+ doesn't include serif fonts.
+
+- The interface that allows activation scripts to restart units has been reworked. Restarting and reloading is now done by a single file `/run/nixos/activation-restart-list` that honors `restartIfChanged` and `reloadIfChanged` of the units.
+
## Other Notable Changes {#sec-release-22.05-notable-changes}
- The option [services.redis.servers](#opt-services.redis.servers) was added
@@ -181,3 +189,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- `services.mattermost.plugins` has been added to allow the declarative installation of Mattermost plugins.
Plugins are automatically repackaged using autoPatchelf.
+
+- The `zrepl` package has been updated from 0.4.0 to 0.5:
+ * The RPC protocol version was bumped; all zrepl daemons in a setup must be updated and restarted before replication can resume.
+ * A bug involving encrypt-on-receive has been fixed. Read the [zrepl documentation](https://zrepl.github.io/configuration/sendrecvoptions.html#job-recv-options-placeholder) and check the output of `zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS` on the receiver.
diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix
index 602253a321d7..8a1653318ab5 100644
--- a/nixos/modules/programs/chromium.nix
+++ b/nixos/modules/programs/chromium.nix
@@ -7,6 +7,7 @@ let
defaultProfile = filterAttrs (k: v: v != null) {
HomepageLocation = cfg.homepageLocation;
+ DefaultSearchProviderEnabled = cfg.defaultSearchProviderEnabled;
DefaultSearchProviderSearchURL = cfg.defaultSearchProviderSearchURL;
DefaultSearchProviderSuggestURL = cfg.defaultSearchProviderSuggestURL;
ExtensionInstallForcelist = cfg.extensions;
@@ -50,6 +51,13 @@ in
example = "https://nixos.org";
};
+ defaultSearchProviderEnabled = mkOption {
+ type = types.nullOr types.bool;
+ description = "Enable the default search provider.";
+ default = null;
+ example = true;
+ };
+
defaultSearchProviderSearchURL = mkOption {
type = types.nullOr types.str;
description = "Chromium default search provider url.";
diff --git a/nixos/modules/services/misc/ananicy.nix b/nixos/modules/services/misc/ananicy.nix
index f76f534fb450..191666bc3625 100644
--- a/nixos/modules/services/misc/ananicy.nix
+++ b/nixos/modules/services/misc/ananicy.nix
@@ -84,7 +84,7 @@ in
} // (if ((lib.getName cfg.package) == (lib.getName pkgs.ananicy-cpp)) then {
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/blob/master/src/config.cpp#L12
loglevel = mkOD "warn"; # default is info but its spammy
- cgroup_realtime_workaround = mkOD true;
+ cgroup_realtime_workaround = mkOD config.systemd.enableUnifiedCgroupHierarchy;
} else {
# https://github.com/Nefelim4ag/Ananicy/blob/master/ananicy.d/ananicy.conf
check_disks_schedulers = mkOD true;
diff --git a/nixos/modules/services/misc/heisenbridge.nix b/nixos/modules/services/misc/heisenbridge.nix
index 353a2781d28b..7ce8a23d9af1 100644
--- a/nixos/modules/services/misc/heisenbridge.nix
+++ b/nixos/modules/services/misc/heisenbridge.nix
@@ -23,7 +23,7 @@ let
in
{
options.services.heisenbridge = {
- enable = mkEnableOption "A bouncer-style Matrix IRC bridge";
+ enable = mkEnableOption "the Matrix to IRC bridge";
package = mkOption {
type = types.package;
@@ -172,25 +172,39 @@ in
++ (map (lib.escapeShellArg) cfg.extraArgs)
);
- ProtectHome = true;
- PrivateDevices = true;
- ProtectKernelTunables = true;
- ProtectKernelModules = true;
- ProtectControlGroups = true;
- StateDirectory = "heisenbridge";
- StateDirectoryMode = "755";
+ # Hardening options
User = "heisenbridge";
Group = "heisenbridge";
+ RuntimeDirectory = "heisenbridge";
+ RuntimeDirectoryMode = "0700";
+ StateDirectory = "heisenbridge";
+ StateDirectoryMode = "0755";
- CapabilityBoundingSet = [ "CAP_CHOWN" ] ++ optional (cfg.port < 1024 || cfg.identd.port < 1024) "CAP_NET_BIND_SERVICE";
+ ProtectSystem = "strict";
+ ProtectHome = true;
+ PrivateTmp = true;
+ PrivateDevices = true;
+ ProtectKernelTunables = true;
+ ProtectControlGroups = true;
+ RestrictSUIDSGID = true;
+ PrivateMounts = true;
+ ProtectKernelModules = true;
+ ProtectKernelLogs = true;
+ ProtectHostname = true;
+ ProtectClock = true;
+ ProtectProc = "invisible";
+ ProcSubset = "pid";
+ RestrictNamespaces = true;
+ RemoveIPC = true;
+ UMask = "0077";
+
+ CapabilityBoundingSet = [ "CAP_CHOWN" ] ++ optional (cfg.port < 1024 || (cfg.identd.enable && cfg.identd.port < 1024)) "CAP_NET_BIND_SERVICE";
AmbientCapabilities = CapabilityBoundingSet;
NoNewPrivileges = true;
-
LockPersonality = true;
RestrictRealtime = true;
- PrivateMounts = true;
- SystemCallFilter = "~@aio @clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @setuid @swap";
+ SystemCallFilter = ["@system-service" "~@priviledged" "@chown"];
SystemCallArchitectures = "native";
RestrictAddressFamilies = "AF_INET AF_INET6";
};
diff --git a/nixos/modules/services/networking/adguardhome.nix b/nixos/modules/services/networking/adguardhome.nix
index 05713adbd83a..98ddf0716087 100644
--- a/nixos/modules/services/networking/adguardhome.nix
+++ b/nixos/modules/services/networking/adguardhome.nix
@@ -87,6 +87,22 @@ in {
};
config = mkIf cfg.enable {
+ assertions = [
+ {
+ assertion = cfg.settings != { }
+ -> (hasAttrByPath [ "dns" "bind_host" ] cfg.settings)
+ || (hasAttrByPath [ "dns" "bind_hosts" ] cfg.settings);
+ message =
+ "AdGuard setting dns.bind_host or dns.bind_hosts needs to be configured for a minimal working configuration";
+ }
+ {
+ assertion = cfg.settings != { }
+ -> hasAttrByPath [ "dns" "bootstrap_dns" ] cfg.settings;
+ message =
+ "AdGuard setting dns.bootstrap_dns needs to be configured for a minimal working configuration";
+ }
+ ];
+
systemd.services.adguardhome = {
description = "AdGuard Home: Network-level blocker";
after = [ "network.target" ];
@@ -96,7 +112,7 @@ in {
StartLimitBurst = 10;
};
- preStart = ''
+ preStart = optionalString (cfg.settings != { }) ''
if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \
&& [ "${toString cfg.mutableSettings}" = "1" ]; then
# Writing directly to AdGuardHome.yaml results in empty file
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index 2d498d4dbbcf..85d3ea5bd751 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -556,7 +556,7 @@ in
systemd.services.mosquitto = {
description = "Mosquitto MQTT Broker Daemon";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
+ after = [ "network-online.target" ];
serviceConfig = {
Type = "notify";
NotifyAccess = "main";
diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix
index 390f0ddaee83..432938d59d90 100644
--- a/nixos/modules/services/networking/nix-serve.nix
+++ b/nixos/modules/services/networking/nix-serve.nix
@@ -26,6 +26,12 @@ in
'';
};
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Open ports in the firewall for nix-serve.";
+ };
+
secretKeyFile = mkOption {
type = types.nullOr types.str;
default = null;
@@ -77,5 +83,9 @@ in
"NIX_SECRET_KEY_FILE:${cfg.secretKeyFile}";
};
};
+
+ networking.firewall = mkIf cfg.openFirewall {
+ allowedTCPPorts = [ cfg.port ];
+ };
};
}
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 3fbab8b94c93..93fff889d6bc 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -18,11 +18,13 @@ my $startListFile = "/run/nixos/start-list";
my $restartListFile = "/run/nixos/restart-list";
my $reloadListFile = "/run/nixos/reload-list";
-# Parse restart/reload requests by the activation script
+# Parse restart/reload requests by the activation script.
+# Activation scripts may write newline-separated units to this
+# file and switch-to-configuration will handle them. While
+# `stopIfChanged = true` is ignored, switch-to-configuration will
+# handle `restartIfChanged = false` and `reloadIfChanged = true`.
my $restartByActivationFile = "/run/nixos/activation-restart-list";
-my $reloadByActivationFile = "/run/nixos/activation-reload-list";
my $dryRestartByActivationFile = "/run/nixos/dry-activation-restart-list";
-my $dryReloadByActivationFile = "/run/nixos/dry-activation-reload-list";
make_path("/run/nixos", { mode => oct(755) });
@@ -382,7 +384,6 @@ sub filterUnits {
}
my @unitsToStopFiltered = filterUnits(\%unitsToStop);
-my @unitsToStartFiltered = filterUnits(\%unitsToStart);
# Show dry-run actions.
@@ -395,21 +396,39 @@ if ($action eq "dry-activate") {
print STDERR "would activate the configuration...\n";
system("$out/dry-activate", "$out");
- $unitsToRestart{$_} = 1 foreach
- split('\n', read_file($dryRestartByActivationFile, err_mode => 'quiet') // "");
+ # Handle the activation script requesting the restart or reload of a unit.
+ foreach (split('\n', read_file($dryRestartByActivationFile, err_mode => 'quiet') // "")) {
+ my $unit = $_;
+ my $baseUnit = $unit;
+ my $newUnitFile = "$out/etc/systemd/system/$baseUnit";
- $unitsToReload{$_} = 1 foreach
- split('\n', read_file($dryReloadByActivationFile, err_mode => 'quiet') // "");
+ # Detect template instances.
+ if (!-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) {
+ $baseUnit = "$1\@.$2";
+ $newUnitFile = "$out/etc/systemd/system/$baseUnit";
+ }
+
+ my $baseName = $baseUnit;
+ $baseName =~ s/\.[a-z]*$//;
+
+ # Start units if they were not active previously
+ if (not defined $activePrev->{$unit}) {
+ $unitsToStart{$unit} = 1;
+ next;
+ }
+
+ handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToRestart, \%unitsToRestart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip);
+ }
+ unlink($dryRestartByActivationFile);
print STDERR "would restart systemd\n" if $restartSystemd;
print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n"
if scalar(keys %unitsToReload) > 0;
print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n"
if scalar(keys %unitsToRestart) > 0;
+ my @unitsToStartFiltered = filterUnits(\%unitsToStart);
print STDERR "would start the following units: ", join(", ", @unitsToStartFiltered), "\n"
if scalar @unitsToStartFiltered;
- unlink($dryRestartByActivationFile);
- unlink($dryReloadByActivationFile);
exit 0;
}
@@ -433,13 +452,31 @@ print STDERR "activating the configuration...\n";
system("$out/activate", "$out") == 0 or $res = 2;
# Handle the activation script requesting the restart or reload of a unit.
-# We can only restart and reload (not stop/start) because the units to be
-# stopped are already stopped before the activation script is run.
-$unitsToRestart{$_} = 1 foreach
- split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // "");
+foreach (split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // "")) {
+ my $unit = $_;
+ my $baseUnit = $unit;
+ my $newUnitFile = "$out/etc/systemd/system/$baseUnit";
-$unitsToReload{$_} = 1 foreach
- split('\n', read_file($reloadByActivationFile, err_mode => 'quiet') // "");
+ # Detect template instances.
+ if (!-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) {
+ $baseUnit = "$1\@.$2";
+ $newUnitFile = "$out/etc/systemd/system/$baseUnit";
+ }
+
+ my $baseName = $baseUnit;
+ $baseName =~ s/\.[a-z]*$//;
+
+ # Start units if they were not active previously
+ if (not defined $activePrev->{$unit}) {
+ $unitsToStart{$unit} = 1;
+ recordUnit($startListFile, $unit);
+ next;
+ }
+
+ handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToRestart, \%unitsToRestart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip);
+}
+# We can remove the file now because it has been propagated to the other restart/reload files
+unlink($restartByActivationFile);
# Restart systemd if necessary. Note that this is done using the
# current version of systemd, just in case the new one has trouble
@@ -480,7 +517,6 @@ if (scalar(keys %unitsToReload) > 0) {
print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n";
system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4;
unlink($reloadListFile);
- unlink($reloadByActivationFile);
}
# Restart changed services (those that have to be restarted rather
@@ -489,7 +525,6 @@ if (scalar(keys %unitsToRestart) > 0) {
print STDERR "restarting the following units: ", join(", ", sort(keys %unitsToRestart)), "\n";
system("@systemd@/bin/systemctl", "restart", "--", sort(keys %unitsToRestart)) == 0 or $res = 4;
unlink($restartListFile);
- unlink($restartByActivationFile);
}
# Start all active targets, as well as changed units we stopped above.
@@ -498,6 +533,7 @@ if (scalar(keys %unitsToRestart) > 0) {
# that are symlinks to other units. We shouldn't start both at the
# same time because we'll get a "Failed to add path to set" error from
# systemd.
+my @unitsToStartFiltered = filterUnits(\%unitsToStart);
print STDERR "starting the following units: ", join(", ", @unitsToStartFiltered), "\n"
if scalar @unitsToStartFiltered;
system("@systemd@/bin/systemctl", "start", "--", sort(keys %unitsToStart)) == 0 or $res = 4;
diff --git a/nixos/tests/adguardhome.nix b/nixos/tests/adguardhome.nix
new file mode 100644
index 000000000000..ddbe8ff9c117
--- /dev/null
+++ b/nixos/tests/adguardhome.nix
@@ -0,0 +1,57 @@
+import ./make-test-python.nix {
+ name = "adguardhome";
+
+ nodes = {
+ minimalConf = { ... }: {
+ services.adguardhome = { enable = true; };
+ };
+
+ declarativeConf = { ... }: {
+ services.adguardhome = {
+ enable = true;
+
+ mutableSettings = false;
+ settings = {
+ dns = {
+ bind_host = "0.0.0.0";
+ bootstrap_dns = "127.0.0.1";
+ };
+ };
+ };
+ };
+
+ mixedConf = { ... }: {
+ services.adguardhome = {
+ enable = true;
+
+ mutableSettings = true;
+ settings = {
+ dns = {
+ bind_host = "0.0.0.0";
+ bootstrap_dns = "127.0.0.1";
+ };
+ };
+ };
+ };
+ };
+
+ testScript = ''
+ with subtest("Minimal config test"):
+ minimalConf.wait_for_unit("adguardhome.service")
+ minimalConf.wait_for_open_port(3000)
+
+ with subtest("Declarative config test, DNS will be reachable"):
+ declarativeConf.wait_for_unit("adguardhome.service")
+ declarativeConf.wait_for_open_port(53)
+ declarativeConf.wait_for_open_port(3000)
+
+ with subtest("Mixed config test, check whether merging works"):
+ mixedConf.wait_for_unit("adguardhome.service")
+ mixedConf.wait_for_open_port(53)
+ mixedConf.wait_for_open_port(3000)
+ # Test whether merging works properly, even if nothing is changed
+ mixedConf.systemctl("restart adguardhome.service")
+ mixedConf.wait_for_unit("adguardhome.service")
+ mixedConf.wait_for_open_port(3000)
+ '';
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 6dee3baa9d51..2bc34d6fd786 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -23,6 +23,7 @@ in
{
_3proxy = handleTest ./3proxy.nix {};
acme = handleTest ./acme.nix {};
+ adguardhome = handleTest ./adguardhome.nix {};
aesmd = handleTest ./aesmd.nix {};
agda = handleTest ./agda.nix {};
airsonic = handleTest ./airsonic.nix {};
diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix
index daad9134885f..1c32bf6beb95 100644
--- a/nixos/tests/switch-test.nix
+++ b/nixos/tests/switch-test.nix
@@ -45,6 +45,50 @@ import ./make-test-python.nix ({ pkgs, ...} : {
systemd.services.test.restartIfChanged = false;
};
+ restart-and-reload-by-activation-script.configuration = {
+ systemd.services = rec {
+ simple-service = {
+ # No wantedBy so we can check if the activation script restart triggers them
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ ExecStart = "${pkgs.coreutils}/bin/true";
+ ExecReload = "${pkgs.coreutils}/bin/true";
+ };
+ };
+
+ simple-restart-service = simple-service // {
+ stopIfChanged = false;
+ };
+
+ simple-reload-service = simple-service // {
+ reloadIfChanged = true;
+ };
+
+ no-restart-service = simple-service // {
+ restartIfChanged = false;
+ };
+ };
+
+ system.activationScripts.restart-and-reload-test = {
+ supportsDryActivation = true;
+ deps = [];
+ text = ''
+ if [ "$NIXOS_ACTION" = dry-activate ]; then
+ f=/run/nixos/dry-activation-restart-list
+ else
+ f=/run/nixos/activation-restart-list
+ fi
+ cat <> "$f"
+ simple-service.service
+ simple-restart-service.service
+ simple-reload-service.service
+ no-restart-service.service
+ EOF
+ '';
+ };
+ };
+
mount.configuration = {
systemd.mounts = [
{
@@ -261,6 +305,32 @@ import ./make-test-python.nix ({ pkgs, ...} : {
assert_lacks(out, "as well:")
assert_contains(out, "would start the following units: test.service\n")
+ with subtest("restart and reload by activation script"):
+ out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script")
+ assert_contains(out, "stopping the following units: test.service\n")
+ assert_lacks(out, "NOT restarting the following changed units:")
+ assert_lacks(out, "reloading the following units:")
+ assert_lacks(out, "restarting the following units:")
+ assert_contains(out, "\nstarting the following units: no-restart-service.service, simple-reload-service.service, simple-restart-service.service, simple-service.service\n")
+ assert_lacks(out, "as well:")
+ # Switch to the same system where the example services get restarted
+ # by the activation script
+ out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script")
+ assert_lacks(out, "stopping the following units:")
+ assert_lacks(out, "NOT restarting the following changed units:")
+ assert_contains(out, "reloading the following units: simple-reload-service.service\n")
+ assert_contains(out, "restarting the following units: simple-restart-service.service, simple-service.service\n")
+ assert_lacks(out, "\nstarting the following units:")
+ assert_lacks(out, "as well:")
+ # The same, but in dry mode
+ out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script", action="dry-activate")
+ assert_lacks(out, "would stop the following units:")
+ assert_lacks(out, "would NOT stop the following changed units:")
+ assert_contains(out, "would reload the following units: simple-reload-service.service\n")
+ assert_contains(out, "would restart the following units: simple-restart-service.service, simple-service.service\n")
+ assert_lacks(out, "\nwould start the following units:")
+ assert_lacks(out, "as well:")
+
with subtest("mounts"):
switch_to_specialisation("${machine}", "mount")
out = machine.succeed("mount | grep 'on /testmount'")
diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix
index 51dda20cc3a1..2603e88fcbdb 100644
--- a/pkgs/applications/audio/aumix/default.nix
+++ b/pkgs/applications/audio/aumix/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
+, fetchpatch
, gettext
, ncurses
, gtkGUI ? false
@@ -17,6 +18,16 @@ stdenv.mkDerivation rec {
sha256 = "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj";
};
+ patches = [
+ # Pull Gentoo fix for -fno-common toolchains. Upstream does not
+ # seem to have the contacts
+ (fetchpatch {
+ name = "fno-common.patch";
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/aumix/files/aumix-2.9.1-fno-common.patch?id=496c9ec7355f06f6d1d19be780a6981503e6df1f";
+ sha256 = "0qwylhx1hawsmx1pc7ykrjq9phksc73dq9rss6ggq15n3ggnc95y";
+ })
+ ];
+
buildInputs = [ gettext ncurses ]
++ lib.optionals gtkGUI [ pkg-config gtk2 ];
diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix
index af35ad829dda..ca51001dd62e 100644
--- a/pkgs/applications/audio/rhvoice/default.nix
+++ b/pkgs/applications/audio/rhvoice/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, pkg-config, fetchFromGitHub, sconsPackages
-, python, glibmm, libpulseaudio, libao }:
+, glibmm, libpulseaudio, libao }:
let
version = "unstable-2018-02-10";
@@ -19,7 +19,7 @@ in stdenv.mkDerivation {
];
buildInputs = [
- python glibmm libpulseaudio libao
+ glibmm libpulseaudio libao
];
# SConstruct patch
diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix
index bf74dd64f926..ce55516a40d4 100644
--- a/pkgs/applications/audio/schismtracker/default.nix
+++ b/pkgs/applications/audio/schismtracker/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, autoreconfHook
, alsa-lib
-, python
+, python3
, SDL
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-dependency-tracking" ]
++ lib.optional stdenv.isDarwin "--disable-sdltest";
- nativeBuildInputs = [ autoreconfHook python ];
+ nativeBuildInputs = [ autoreconfHook python3 ];
buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsa-lib;
diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix
index 59c7d91a3e38..e5e875f6df39 100644
--- a/pkgs/applications/audio/sorcer/default.nix
+++ b/pkgs/applications/audio/sorcer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkg-config, python }:
+{ lib, stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkg-config }:
stdenv.mkDerivation rec {
pname = "sorcer";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ boost cairomm libsndfile lv2 ntk python ];
+ buildInputs = [ boost cairomm libsndfile lv2 ntk ];
postPatch = ''
# Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72
diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix
index 92f0753fd783..5de48d1b296f 100644
--- a/pkgs/applications/audio/split2flac/default.nix
+++ b/pkgs/applications/audio/split2flac/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper
, shntool, cuetools
, flac, faac, mp4v2, wavpack, mac
-, imagemagick, libiconv, enca, lame, pythonPackages, vorbis-tools
+, imagemagick, libiconv, enca, lame, mutagen, vorbis-tools
, aacgain, mp3gain, vorbisgain
}:
@@ -12,7 +12,7 @@ let
--prefix PATH : ${lib.makeBinPath [
shntool cuetools
flac faac mp4v2 wavpack mac
- imagemagick libiconv enca lame pythonPackages.mutagen vorbis-tools
+ imagemagick libiconv enca lame mutagen vorbis-tools
aacgain mp3gain vorbisgain
]}
'';
diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix
index e17e85036949..e91cc9cc0207 100644
--- a/pkgs/applications/audio/spot/default.nix
+++ b/pkgs/applications/audio/spot/default.nix
@@ -21,19 +21,19 @@
stdenv.mkDerivation rec {
pname = "spot";
- version = "0.2.2";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "xou816";
repo = "spot";
rev = version;
- hash = "sha256-g0oVhlfez9i+Vv8lt/aNftCVqdgPMDySBBeLyOv7Zl8=";
+ hash = "sha256-An9PJsuXZkvJhP67cisWxFd2dpky53EY/xcR6StgWFY=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-n10aYzkRqEe1h2WPAfARjH79Npvv+3fdX9jCtxv2a34=";
+ hash = "sha256-2qMmPIBoZS6WT06VzCmnYWaIfLzWN2HUvk7y9GKuuXg=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/blockchains/chia-plotter/default.nix b/pkgs/applications/blockchains/chia-plotter/default.nix
index b576cd2373ce..51ca4469bc48 100644
--- a/pkgs/applications/blockchains/chia-plotter/default.nix
+++ b/pkgs/applications/blockchains/chia-plotter/default.nix
@@ -4,7 +4,7 @@
, libsodium
, cmake
, substituteAll
-, pythonPackages
+, python3Packages
}:
stdenv.mkDerivation {
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
# prevent CMake from trying to get libraries on the Internet
(substituteAll {
src = ./dont_fetch_dependencies.patch;
- pybind11_src = pythonPackages.pybind11.src;
+ pybind11_src = python3Packages.pybind11.src;
relic_src = fetchFromGitHub {
owner = "relic-toolkit";
repo = "relic";
diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix
index 0c40f83b67fa..f7614e76ef54 100644
--- a/pkgs/applications/editors/netbeans/default.nix
+++ b/pkgs/applications/editors/netbeans/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, which, unzip, libicns, imagemagick
-, jdk, perl, python
+, jdk, perl
}:
let
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
'';
nativeBuildInputs = [ makeWrapper unzip ];
- buildInputs = [ perl python libicns imagemagick ];
+ buildInputs = [ perl libicns imagemagick ];
meta = {
description = "An integrated development environment for Java, C, C++ and PHP";
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 4a53d585feae..2c3ddbf80b88 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,5 +1,5 @@
{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake
-, python, qtbase, qttools }:
+, python2, qtbase, qttools }:
mkDerivation rec {
pname = "tiled";
@@ -13,7 +13,7 @@ mkDerivation rec {
};
nativeBuildInputs = [ pkg-config qmake ];
- buildInputs = [ python qtbase qttools ];
+ buildInputs = [ python2 qtbase qttools ];
meta = with lib; {
description = "Free, easy to use and flexible tile map editor";
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
index 09037b2f0c3c..c769ab426312 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext }:
stdenv.mkDerivation rec {
pname = "wxHexEditor";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj";
};
- buildInputs = [ wxGTK autoconf automake libtool python gettext ];
+ buildInputs = [ wxGTK autoconf automake libtool python2 gettext ];
preConfigure = "patchShebangs .";
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index b93a0fcaff84..d3546f609520 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -81,6 +81,14 @@ stdenv.mkDerivation rec {
stripLen = 1;
extraPrefix = "share/extensions/";
})
+ # Remove mandatory break from end of paragraphs, added in Pango 1.49
+ # https://gitlab.com/inkscape/inkscape/-/merge_requests/3630
+ # TODO: Remove in Inkscape 1.1.2
+ (fetchpatch {
+ url = "https://gitlab.com/inkscape/inkscape/-/commit/b3dabef2245d4e4e977ee9d6776be9a134493515.patch";
+ sha256 = "YhqUlRBKL1vJ/iCM/DvdwbmPIsAHQpcgf4TPpjlnBng=";
+ })
+
];
postPatch = ''
diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix
index b7d6ecdef3d7..b62ca680cbc5 100644
--- a/pkgs/applications/graphics/screencloud/default.nix
+++ b/pkgs/applications/graphics/screencloud/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }:
+{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python2Packages }:
with lib;
stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ];
+ buildInputs = [ qt4 quazip qt-mobility qxt python2Packages.python python2Packages.pycrypto ];
patchPhase = ''
# Required to make the configure script work. Normally, screencloud's
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
postInstall = ''
patchShebangs $prefix/opt/screencloud/screencloud.sh
substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt"
- sed -i "2 i\export PYTHONPATH=$(toPythonPath ${pythonPackages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh"
+ sed -i "2 i\export PYTHONPATH=$(toPythonPath ${python2Packages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh"
mkdir $prefix/bin
mkdir $prefix/lib
ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud
diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix
index 3f8edac97b6f..174d6e22ccb3 100644
--- a/pkgs/applications/misc/auto-multiple-choice/default.nix
+++ b/pkgs/applications/misc/auto-multiple-choice/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
XMLWriter
]}:"$out/share/perl5 \
--prefix XDG_DATA_DIRS : "$out/share" \
- --set TEXINPUTS ":.:$out/share/texmf/tex/latex/AMC"
+ --set TEXINPUTS ":.:$out/tex/latex"
'';
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index 507399c012bb..41c6cdee41ca 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, fetchurl, pythonPackages, curl }:
+{ lib, fetchFromGitHub, fetchurl, python2Packages, curl }:
let
getmodel = name: sha256: {
@@ -17,7 +17,7 @@ let
];
in
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
pname = "ocropus";
version = "1.3.3";
@@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec {
owner = "tmbdev";
};
- propagatedBuildInputs = with pythonPackages; [ curl numpy scipy pillow
+ propagatedBuildInputs = with python2Packages; [ curl numpy scipy pillow
matplotlib beautifulsoup4 pygtk lxml ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix
index 65ee6a655930..20a953384971 100644
--- a/pkgs/applications/misc/pdfdiff/default.nix
+++ b/pkgs/applications/misc/pdfdiff/default.nix
@@ -1,6 +1,6 @@
-{ lib, pythonPackages, fetchurl, xpdf }:
+{ lib, python2Packages, fetchurl, xpdf }:
let
- py = pythonPackages;
+ py = python2Packages;
in
py.buildPythonApplication rec {
name = "pdfdiff-${version}";
@@ -11,7 +11,7 @@ py.buildPythonApplication rec {
sha256 = "0zxwjjbklz87wkbhkmsvhc7xmv5php7m2a9vm6ydhmhlxsybf836";
};
- buildInputs = [ pythonPackages.wrapPython ];
+ buildInputs = [ python2Packages.wrapPython ];
dontConfigure = true;
dontBuild = true;
@@ -29,7 +29,7 @@ py.buildPythonApplication rec {
cp pdfdiff.py $out/bin/pdfdiff
chmod +x $out/bin/pdfdiff
- substituteInPlace $out/bin/pdfdiff --replace "#!/usr/bin/python" "#!${pythonPackages.python.interpreter}"
+ substituteInPlace $out/bin/pdfdiff --replace "#!/usr/bin/python" "#!${python2Packages.python.interpreter}"
'';
meta = with lib; {
diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix
index 717c5c3feb10..22d94006ddca 100644
--- a/pkgs/applications/misc/phwmon/default.nix
+++ b/pkgs/applications/misc/phwmon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, pythonPackages }:
+{ lib, stdenv, fetchFromGitLab, python2Packages }:
stdenv.mkDerivation {
pname = "phwmon";
@@ -11,11 +11,11 @@ stdenv.mkDerivation {
sha256 = "1hqmsq66y8bqkpvszw84jyk8haxq3cjnz105hlkmp7786vfmkisq";
};
- nativeBuildInputs = [ pythonPackages.wrapPython ];
+ nativeBuildInputs = [ python2Packages.wrapPython ];
- buildInputs = [ pythonPackages.pygtk pythonPackages.psutil ];
+ buildInputs = [ python2Packages.pygtk python2Packages.psutil ];
- pythonPath = [ pythonPackages.pygtk pythonPackages.psutil ];
+ pythonPath = [ python2Packages.pygtk python2Packages.psutil ];
patchPhase = ''
substituteInPlace install.sh --replace "/usr/local" "$out"
diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix
new file mode 100644
index 000000000000..c2c2da37b4e7
--- /dev/null
+++ b/pkgs/applications/misc/rofi/wayland.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, rofi-unwrapped
+, wayland-protocols
+, wayland
+}:
+
+rofi-unwrapped.overrideAttrs (oldAttrs: rec {
+ pname = "rofi-wayland-unwrapped";
+ version = "1.7.2+wayland1";
+
+ src = fetchFromGitHub {
+ owner = "lbonn";
+ repo = "rofi";
+ rev = version;
+ fetchSubmodules = true;
+ sha256 = "sha256-INFYHOVjBNj8ks4UjKnxLW8mL7h1c8ySFPS/rUxOWwo=";
+ };
+
+ nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-protocols ];
+ buildInputs = oldAttrs.buildInputs ++ [ wayland ];
+
+ meta = with lib; {
+ description = "Window switcher, run dialog and dmenu replacement for Wayland";
+ homepage = "https://github.com/lbonn/rofi";
+ license = licenses.mit;
+ maintainers = with maintainers; [ bew ];
+ platforms = with platforms; linux;
+ };
+})
diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix
index 277230965884..f8f8b5b553ca 100644
--- a/pkgs/applications/misc/survex/default.nix
+++ b/pkgs/applications/misc/survex/default.nix
@@ -9,7 +9,7 @@
, proj_7
, perl532
, unscii
-, python
+, python2
, libGL
, libGLU
, xlibsWrapper
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
pname = "survex";
version = "1.2.44";
- nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python ];
+ nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python2 ];
buildInputs = [
libGL libGLU ffmpeg proj_7
diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix
index 12edfe280be7..4c5c5e3a8406 100644
--- a/pkgs/applications/misc/weather/default.nix
+++ b/pkgs/applications/misc/weather/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pythonPackages, installShellFiles }:
+{ lib, stdenv, fetchurl, python2Packages, installShellFiles }:
stdenv.mkDerivation rec {
version = "2.4.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
installShellFiles
- pythonPackages.wrapPython
+ python2Packages.wrapPython
];
dontConfigure = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
# Upstream doesn't provide a setup.py or alike, so we follow:
# http://fungi.yuggoth.org/weather/doc/install.rst#id3
installPhase = ''
- site_packages=$out/${pythonPackages.python.sitePackages}
+ site_packages=$out/${python2Packages.python.sitePackages}
install -Dt $out/bin -m 755 weather
install -Dt $site_packages weather.py
install -Dt $out/share/weather-util \
diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix
index e1ea0a690c95..8bdbf63a9ff5 100644
--- a/pkgs/applications/networking/cluster/tanka/default.nix
+++ b/pkgs/applications/networking/cluster/tanka/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tanka";
- version = "0.17.3";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Khu6ovtcXkqqt3W4OoJ09INgv80tw/6uDcJS+jt3y0Y=";
+ sha256 = "sha256-SMPStxqzoeooBoqUJdFK6Zg3dzbNHrB/tv8iwa8GdbM=";
};
- vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw=";
+ vendorSha256 = "sha256-pqwdxFFcATfxGmz6quIH8OL4U2DZKmuVyOLEct2nBlE=";
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 55b285a1b288..a9e0e1afa49e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -21,10 +21,10 @@
"owner": "aiven",
"provider-source-address": "registry.terraform.io/aiven/aiven",
"repo": "terraform-provider-aiven",
- "rev": "v2.4.0",
- "sha256": "0m43d2iaa9kywzvlgcnsya1ma9k570j9q8cq9l6ldpc8565fqq0i",
- "vendorSha256": "1lpfnpg4sivy8vilkxamdn1hyn6k61lxsfcq67afxsq8pcy6q44v",
- "version": "2.4.0"
+ "rev": "v2.5.0",
+ "sha256": "1x37bnykn28hmb80qi530zgk6jfqpk97nswrm0hdw8x5vac4v63a",
+ "vendorSha256": "0ldk06dj72551b6djsq7vil0hzfsp3ixwh3ikqb40shsdq10iplx",
+ "version": "2.5.0"
},
"akamai": {
"owner": "akamai",
@@ -40,10 +40,10 @@
"owner": "aliyun",
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
"repo": "terraform-provider-alicloud",
- "rev": "v1.151.0",
- "sha256": "0pdvbq9kfq7vwkfk75fjy6jaiq5bfkjmvr3z07712b76z29m10bz",
+ "rev": "v1.152.0",
+ "sha256": "1childp3dkdi6raya1865inkky2qx1jav95yq9c57gz20zs27x8a",
"vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg",
- "version": "1.151.0"
+ "version": "1.152.0"
},
"ansible": {
"owner": "nbering",
@@ -94,28 +94,28 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/aws",
"repo": "terraform-provider-aws",
- "rev": "v3.71.0",
- "sha256": "0jr9mk6gvimh8picpcc47pcan323k4rml438743ma53g8jhcvn2a",
- "vendorSha256": "02ax2717xci8qia3k7q19yknazn67idb64hf5mwahfnx1fjmdc22",
- "version": "3.71.0"
+ "rev": "v3.72.0",
+ "sha256": "0xkwqh7akc7rf047w6by4368n2bpn4lijk9j6j3wsgbaffw0xjlb",
+ "vendorSha256": "0apvp3vb3qx2l6698x4ai3spz40l6mb3z8gn45ms2vlxcwp2wf7y",
+ "version": "3.72.0"
},
"azuread": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azuread",
"repo": "terraform-provider-azuread",
- "rev": "v2.14.0",
- "sha256": "0sjpwhywc165gkxd1ybkwi1aww4xivry82wh0mbh4bgs607mn8lg",
+ "rev": "v2.15.0",
+ "sha256": "1gjx91svfg25x0hlx6mfam40615x278b9vxsy5p88s3dl6xs3hdv",
"vendorSha256": null,
- "version": "2.14.0"
+ "version": "2.15.0"
},
"azurerm": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
"repo": "terraform-provider-azurerm",
- "rev": "v2.91.0",
- "sha256": "0db23ch46wi5mjmwibp7n98y0j3cl06mq2pzmvw1scbzvgh0gcqp",
+ "rev": "v2.92.0",
+ "sha256": "0p4vxda4n7895xp7aqg4zqddynjn7hnzsc8am83y8hf9hbfaji8q",
"vendorSha256": null,
- "version": "2.91.0"
+ "version": "2.92.0"
},
"azurestack": {
"owner": "hashicorp",
@@ -185,10 +185,10 @@
"owner": "cloudflare",
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
"repo": "terraform-provider-cloudflare",
- "rev": "v3.6.0",
- "sha256": "1adpzk9vjllr18dq8kggxfabm3ax59m55ls98mkqh8lmgq96bh7d",
- "vendorSha256": "1rdgjb1gfz5fs6s3c15nj92rm8ifb23n25wpxl16mz4aifkjgqam",
- "version": "3.6.0"
+ "rev": "v3.7.0",
+ "sha256": "1d1wljk033b9j5sx01xjv5jmclw79f2f21s8zsix036mmzvaiswb",
+ "vendorSha256": "1g3fyxrdqa4ds6n9pcw2mvi8nfiz4dna57ssvggfwic4jl89q7zm",
+ "version": "3.7.0"
},
"cloudfoundry": {
"owner": "cloudfoundry-community",
@@ -266,10 +266,10 @@
"owner": "digitalocean",
"provider-source-address": "registry.terraform.io/digitalocean/digitalocean",
"repo": "terraform-provider-digitalocean",
- "rev": "v2.16.0",
- "sha256": "0l67yd7l0s36lwp1hm44d77i7d5019j0ddjzf22aw8cv9xd5fhxw",
+ "rev": "v2.17.0",
+ "sha256": "0in6xg4kgqy1izi8zapdi0f6dsni3i27fxh1l4sqp5kwh3vgpn0d",
"vendorSha256": null,
- "version": "2.16.0"
+ "version": "2.17.0"
},
"dme": {
"owner": "DNSMadeEasy",
@@ -347,10 +347,10 @@
"owner": "fastly",
"provider-source-address": "registry.terraform.io/fastly/fastly",
"repo": "terraform-provider-fastly",
- "rev": "v0.39.0",
- "sha256": "0sjjcz2z7qr1dmm6zzyi382cas4k5vdg0q7yxlpcqxqqrql636k8",
+ "rev": "v0.40.0",
+ "sha256": "11gf1xmj0qgn3hfw4hviqnfc23rrfd3qxz82idff4f1i7c5kym1i",
"vendorSha256": null,
- "version": "0.39.0"
+ "version": "0.40.0"
},
"flexibleengine": {
"owner": "FlexibleEngineCloud",
@@ -393,29 +393,29 @@
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
- "rev": "v4.5.0",
- "sha256": "173aqwrzqdb3y57wiq1dbgb74ksr063qqq1k178n4wrab4s1h3px",
+ "rev": "v4.6.0",
+ "sha256": "0vi0crc4i5myzw17knvb3zz0yjpg7v1qvp9rjrb0q6v89nafr30c",
"vendorSha256": "17rlq86zl83cav8pinr8am3wkmva4slab2izmxddhiw3na60a4la",
- "version": "4.5.0"
+ "version": "4.6.0"
},
"google-beta": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
- "rev": "v4.5.0",
- "sha256": "17z2jy8b9gk0id8q0318a6k60fhcqps0p36s7d7kkqmr44shgzs4",
+ "rev": "v4.6.0",
+ "sha256": "0kbdpyln8yy3128g43y134v5li9k5a6mb2fwa0jl8zffmhfc209k",
"vendorSha256": "17rlq86zl83cav8pinr8am3wkmva4slab2izmxddhiw3na60a4la",
- "version": "4.5.0"
+ "version": "4.6.0"
},
"grafana": {
"owner": "grafana",
"provider-source-address": "registry.terraform.io/grafana/grafana",
"repo": "terraform-provider-grafana",
- "rev": "v1.17.0",
- "sha256": "10mj1dvz7q3w250hvi3k4rj2x0mn592gw2xcy1j98x5ll6kx4ynd",
- "vendorSha256": "1bhygkkgd3j971cg6wha57cyh4ggbkaihw6sn6p9jvdi1k1f63lw",
- "version": "1.17.0"
+ "rev": "v1.18.0",
+ "sha256": "1qvhdshaiy1v7557nkh869k1wmz604pv2gchv98vrm3cp7zj83zn",
+ "vendorSha256": "1rgvil2kw38kbgbgcjy8mbkahj6zm91s187x41vd4x7ypc5kgbkn",
+ "version": "1.18.0"
},
"gridscale": {
"owner": "gridscale",
@@ -466,10 +466,10 @@
"owner": "huaweicloud",
"provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud",
"repo": "terraform-provider-huaweicloud",
- "rev": "v1.32.0",
- "sha256": "1k5d4a488mrba6cvpcbhd9hqhhb977yi89p32wlfx266mf11w2yw",
+ "rev": "v1.32.1",
+ "sha256": "05rm1cmpbmavza1pyqjzrd316v6r68427cjhqy6bngb749nc1als",
"vendorSha256": null,
- "version": "1.32.0"
+ "version": "1.32.1"
},
"huaweicloudstack": {
"owner": "huaweicloud",
@@ -493,10 +493,10 @@
"owner": "IBM-Cloud",
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
"repo": "terraform-provider-ibm",
- "rev": "v1.37.1",
- "sha256": "1m9038ylv44xhgws0jrqdynj7kd97x9jgk1npqblbfv86fccwqxc",
- "vendorSha256": "1a8zy023j3mcy3bswyrmllkgv61wiyxa1f7bfj8mxx3701rsb4ji",
- "version": "1.37.1"
+ "rev": "v1.38.0",
+ "sha256": "0cbyq74fy3y7ia8lywr8amwcjq53bn3psymyl5cnwqx8y97avx5w",
+ "vendorSha256": "0cgl87pij4amn77ksbrzl0qlf6a5ga29b64cnasq8lq03lbmqzw4",
+ "version": "1.38.0"
},
"icinga2": {
"owner": "Icinga",
@@ -674,10 +674,10 @@
"owner": "mongodb",
"provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
"repo": "terraform-provider-mongodbatlas",
- "rev": "v1.1.1",
- "sha256": "0ifrpamajmrqa3fmsg4qyag1i7ghrswbhl0ixj8hgw7kzbzslsyd",
- "vendorSha256": "1xrpgrzk5hr7qc5zm7nq5ljhc4sgzbsaxfszc8dlpc5y49j5q0ip",
- "version": "1.1.1"
+ "rev": "v1.2.0",
+ "sha256": "08v1byvy7c2wdlbinjxb01vbzvsqfc73nc3cacp40n69z8wl70bi",
+ "vendorSha256": "19q835m219i85bq7mm5gafpw4q2y4lhbas2ppbfn3hkky15mvwks",
+ "version": "1.2.0"
},
"ncloud": {
"owner": "NaverCloudPlatform",
@@ -701,10 +701,10 @@
"owner": "newrelic",
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
"repo": "terraform-provider-newrelic",
- "rev": "v2.34.1",
- "sha256": "1j7r6cac1ajp8f6h2492dnz7ihkxbdi8js535dv04kiah79r49d5",
- "vendorSha256": "0qbrrh5qdbcnzmf69jilcd9qql526w9mf4ix8y8bi94w7m0nwxap",
- "version": "2.34.1"
+ "rev": "v2.35.0",
+ "sha256": "0pwy3vsj332v82n3is6xaw4mgvv968ffr8n41s1r7j39r8bpl77f",
+ "vendorSha256": "13xqrdv0xnza0yxdgk155x4vq8lai9jrjvnfp153jb5p5hfnzwmp",
+ "version": "2.35.0"
},
"nomad": {
"owner": "hashicorp",
@@ -757,19 +757,19 @@
"owner": "terraform-providers",
"provider-source-address": "registry.terraform.io/hashicorp/oci",
"repo": "terraform-provider-oci",
- "rev": "v4.58.0",
- "sha256": "0cxzy9sj4n7yz7zbqhpkr92h7gqqfx7qxpr0a1jgh9a087j3752c",
+ "rev": "v4.59.0",
+ "sha256": "12i4j95g08c887xxplc90hcxwsrpwcn5qjyy5inazr21vqscjx2h",
"vendorSha256": null,
- "version": "4.58.0"
+ "version": "4.59.0"
},
"okta": {
"owner": "okta",
"provider-source-address": "registry.terraform.io/okta/okta",
"repo": "terraform-provider-okta",
- "rev": "v3.20.2",
- "sha256": "0qlm99m4dljnczsypn4gmw9n4vvxkfazi21hvkbkgy2v3wmhsms9",
- "vendorSha256": "0fyxm6wff5pz5g3rjnia23npar9qbwcv01pa3rsskxkl8jc3v13j",
- "version": "3.20.2"
+ "rev": "v3.20.3",
+ "sha256": "0m9y0dagav1pw8cz6pv9zkhag59f9bbn8b6zi1h3lcgvmzf303wv",
+ "vendorSha256": "156nyjga5q5mgwiq6aynp199i0hn5mvckj2h7j3pfzc1yz8ri5cc",
+ "version": "3.20.3"
},
"oktaasa": {
"owner": "oktadeveloper",
@@ -857,10 +857,10 @@
"owner": "PaloAltoNetworks",
"provider-source-address": "registry.terraform.io/PaloAltoNetworks/panos",
"repo": "terraform-provider-panos",
- "rev": "v1.9.1",
- "sha256": "05jsap80dcgmncxa8xbx1hnrbpi9bxjz2k9jnfnws1pmbjxl94hf",
+ "rev": "v1.9.2",
+ "sha256": "03585rm434lcp6xk58185i78iv5fjd18z7nrdnbhxxy94yhhf335",
"vendorSha256": null,
- "version": "1.9.1"
+ "version": "1.9.2"
},
"pass": {
"owner": "camptocamp",
@@ -1001,10 +1001,10 @@
"owner": "spotinst",
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
"repo": "terraform-provider-spotinst",
- "rev": "v1.64.2",
- "sha256": "0h47ik93lhb9mjg3ai9n76ya918h1mk3fyp70yr26rwc3rihvjm6",
- "vendorSha256": "1lv305kamb3xnw3a2q45ndn7a88ifnh8j8ngv7awc41028j539w4",
- "version": "1.64.2"
+ "rev": "v1.65.0",
+ "sha256": "1gk4v6lxa4k8za6c1zxrrrc6qw3ymsk46w97qhfri6y7vrc3vxh0",
+ "vendorSha256": "0xhzj8lmrh0mcpbxa7xkzhhgl3jfk6mz5adia0jgflgrx4wjaf38",
+ "version": "1.65.0"
},
"stackpath": {
"owner": "stackpath",
@@ -1046,10 +1046,10 @@
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
- "rev": "v1.60.26",
- "sha256": "1diwiyfswmgqm1iizj228s2ysrnx4z3lqlq82a7gp0z9p8rzd0vs",
+ "rev": "v1.61.1",
+ "sha256": "1v6b8ldg6pkphqy5aphdhig1q3iizzfrj611k39lyk1q3q914yf4",
"vendorSha256": null,
- "version": "1.60.26"
+ "version": "1.61.1"
},
"tfe": {
"owner": "hashicorp",
@@ -1128,10 +1128,10 @@
"owner": "vmware",
"provider-source-address": "registry.terraform.io/vmware/vcd",
"repo": "terraform-provider-vcd",
- "rev": "v3.5.0",
- "sha256": "1sdcjizg0gip55042p0599wvjicibyx9kiymxq45af14yhnwqyv5",
+ "rev": "v3.5.1",
+ "sha256": "1fwkbsgnxn0jl84nji57grasdsbw0ydd7vzcllpv7r1z3jpa545q",
"vendorSha256": "0bzp6807l4hspk1c1pmgnzk0axk0nir3v0lqmw9xvkij4c5rnz9s",
- "version": "3.5.0"
+ "version": "3.5.1"
},
"venafi": {
"deleteVendor": true,
diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix
index d63318ecfaf7..4496af4a1dfa 100644
--- a/pkgs/applications/networking/instant-messengers/franz/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix
@@ -24,6 +24,7 @@
, libnotify
, xdg-utils
, mesa
+, libappindicator-gtk3
}:
# Helper function for building a derivation for Franz and forks.
@@ -68,7 +69,7 @@ stdenv.mkDerivation rec {
expat
stdenv.cc.cc
];
- runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify ];
+ runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify libappindicator-gtk3 ];
unpackPhase = "dpkg-deb -x $src .";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
index ef9ce5bca74c..f393a17c1bc6 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pidgin, intltool, python } :
+{ lib, stdenv, fetchurl, pidgin, intltool, python2 } :
stdenv.mkDerivation rec {
pname = "purple-plugin-pack";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b";
};
- buildInputs = [ pidgin intltool python ];
+ buildInputs = [ pidgin intltool python2 ];
meta = with lib; {
homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack";
diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix
index 8fece5412721..3278d68cd0b5 100644
--- a/pkgs/applications/networking/instant-messengers/torchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python, unzip, wxPython, wrapPython, tor }:
+{ lib, stdenv, fetchFromGitHub, python2, unzip, tor }:
stdenv.mkDerivation rec {
pname = "torchat";
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ unzip ];
- buildInputs = [ python wxPython wrapPython ];
- pythonPath = [ wxPython ];
+ buildInputs = with python2.pkgs; [ python wxPython wrapPython ];
+ pythonPath = with python2.pkgs; [ wxPython ];
preConfigure = "cd torchat/src; rm portable.txt";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib/torchat
cp -rf * $out/lib/torchat
- makeWrapper ${python}/bin/python $out/bin/torchat \
+ makeWrapper ${python2}/bin/python $out/bin/torchat \
--set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \
--run "cd $out/lib/torchat" \
--add-flags "-O $out/lib/torchat/torchat.py"
diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index 1d05cafef832..9c708b795885 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -13,7 +13,10 @@ let
};
};
- boostPython = boost.override { enablePython = true; };
+ boostPython = boost.override {
+ enablePython = true;
+ python = python2;
+ };
in stdenv.mkDerivation rec {
pname = "twister";
diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix
index 8b8748d70ff3..6074b1a51ccb 100644
--- a/pkgs/applications/networking/ping/default.nix
+++ b/pkgs/applications/networking/ping/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchFromGitHub
, nix-update-script
, meson
@@ -14,7 +15,6 @@
, libsoup
, libgee
, wrapGAppsHook
-, vala_0_40
}:
stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
- vala_0_40
+ vala
pkg-config
python3
wrapGAppsHook
@@ -65,5 +65,12 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.gpl3;
mainProgram = "com.github.jeremyvaartjes.ping";
+ # Does not build with vala 0.48 or later
+ # ../src/Application.vala:696.46-696.57: error: Assignment: Cannot convert from
+ # `GLib.HashTable' to `GLib.HashTable?'
+ # HashTable tempDataList = Soup.Form.decode(testObjs[id].data);
+ # ^^^^^^^^^^^^
+ # Upstream has no activity since 28 Dec 2020
+ broken = true;
};
}
diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
index fc4605911ddb..39bb5d1bf141 100644
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@@ -19,16 +19,16 @@ let
maintainers = with maintainers; [ fliegendewurst ];
};
- version = "0.49.4";
+ version = "0.49.5";
desktopSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
- sha256 = "078w7jjkn8af3i0y0s236ky54h08b2wgzcaiakqiqx4gxdpf6jrq";
+ sha256 = "0bis0xkpcr8rvhm9364v0np5cnvkscv2fgl90f455lcwy7kk9m12";
};
serverSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
- sha256 = "0hygdxb97373z5cn3s4wr66wc41w7a55kxjyb8alck1fl9l6agn1";
+ sha256 = "1wv9xz1asjadz1jzgpaxf6lzbj5azgsq0qpawp3y257h488r1z9k";
};
in {
diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix
index efd438adf637..79dcab19acb4 100644
--- a/pkgs/applications/radio/soapysdr/default.nix
+++ b/pkgs/applications/radio/soapysdr/default.nix
@@ -2,7 +2,8 @@
, fetchFromGitHub, cmake
, libusb-compat-0_1, pkg-config
, usePython ? false
-, python, ncurses, swig2
+, python ? null
+, ncurses, swig2
, extraPackages ? []
} :
diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix
index 062cdd56c7c4..bba8a02b76e3 100644
--- a/pkgs/applications/science/biology/minimap2/default.nix
+++ b/pkgs/applications/science/biology/minimap2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "minimap2";
- version = "2.23";
+ version = "2.24";
src = fetchFromGitHub {
repo = pname;
owner = "lh3";
rev = "v${version}";
- sha256 = "sha256-oNVpSINcXO2eKzOCr/Fl8tSMguRxzmlDNu7hLZeopoQ=";
+ sha256 = "sha256-sEp7/Y5ifV9LTqrkhlkfykTJYMMuc+VtF7PvmIpBxUw=";
};
buildInputs = [ zlib ];
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
homepage = "https://lh3.github.io/minimap2";
license = licenses.mit;
platforms = platforms.all;
+ badPlatforms = platforms.aarch64;
maintainers = [ maintainers.arcadio ];
};
}
diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix
index b2cefefb5cb5..efbedf9a121a 100755
--- a/pkgs/applications/science/biology/poretools/default.nix
+++ b/pkgs/applications/science/biology/poretools/default.nix
@@ -1,6 +1,6 @@
-{ lib, pythonPackages, fetchFromGitHub }:
+{ lib, python2Packages, fetchFromGitHub }:
-pythonPackages.buildPythonPackage rec {
+python2Packages.buildPythonPackage rec {
pname = "poretools";
version = "unstable-2016-07-10";
@@ -11,7 +11,7 @@ pythonPackages.buildPythonPackage rec {
sha256 = "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am";
};
- propagatedBuildInputs = [pythonPackages.h5py pythonPackages.matplotlib pythonPackages.seaborn pythonPackages.pandas];
+ propagatedBuildInputs = [python2Packages.h5py python2Packages.matplotlib python2Packages.seaborn python2Packages.pandas];
meta = {
description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore";
diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/pkgs/applications/science/biology/tebreak/default.nix
index cb606a6b3463..e56d91dc2cd1 100644
--- a/pkgs/applications/science/biology/tebreak/default.nix
+++ b/pkgs/applications/science/biology/tebreak/default.nix
@@ -1,7 +1,7 @@
-{ lib, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa
-, samtools, findutils, python }:
+{ lib, fetchFromGitHub, last, exonerate, minia, python3, bwa
+, samtools, findutils }:
-python3Packages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "tebreak";
version = "1.1";
@@ -12,8 +12,8 @@ python3Packages.buildPythonApplication rec {
sha256 = "13mgh775d8hkl340923lfwwm4r5ps70girn8d6wgfxzwzxylz8iz";
};
- nativeBuildInputs = [ findutils python3Packages.cython ];
- propagatedBuildInputs = with python3Packages; [
+ nativeBuildInputs = [ findutils python3.pkgs.cython ];
+ propagatedBuildInputs = with python3.pkgs; [
pysam
scipy
bx-python
@@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec {
checkPhase = ''
$out/bin/tebreak -b test/data/example.ins.bam -r test/data/Homo_sapiens_chr4_50000000-60000000_assembly19.fasta -p 4 --pickle test/example.pickle --detail_out test/example.tebreak.detail.out -i lib/teref.human.fa
pushd test
- ${python.interpreter} checktest.py
+ ${python3.interpreter} checktest.py
'';
meta = with lib; {
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 78c2a56dc16f..c9ba47eca140 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "lean";
- version = "3.37.0";
+ version = "3.38.0";
src = fetchFromGitHub {
owner = "leanprover-community";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
# from. this is then used to check whether an olean file should be
# rebuilt. don't use a tag as rev because this will get replaced into
# src/githash.h.in in preConfigure.
- rev = "e69ab934262eb6f141344fdaec98ede68a9102b6";
- sha256 = "19sigzbrdl90jqk7lvl3q8j6n4nnidzwp9zzmzgq3zxxgywa2ghp";
+ rev = "a8cf8a0c9ea19a633baeb3aa7e8d706b86c2c0f9";
+ sha256 = "14dam91pnn266fgii5c2j5p9p2i31bghx0s2h3qnnqyvxi4s5isx";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
index 911d0043ed26..3cb018b9a5db 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -6,7 +6,7 @@
# build
, cmake
, ctags
-, pythonPackages
+, python2Packages
, swig
# math
, eigen
@@ -36,7 +36,7 @@
, withSvmLight ? false
}:
-assert pythonSupport -> pythonPackages != null;
+assert pythonSupport -> python2Packages != null;
assert opencvSupport -> opencv != null;
assert (!blas.isILP64) && (!lapack.isILP64);
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch;
nativeBuildInputs = [ cmake swig ctags ]
- ++ (with pythonPackages; [ python jinja2 ply ]);
+ ++ (with python2Packages; [ python jinja2 ply ]);
buildInputs = [
eigen
@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
nlopt
lp_solve
colpack
- ] ++ lib.optionals pythonSupport (with pythonPackages; [ python numpy ])
+ ] ++ lib.optionals pythonSupport (with python2Packages; [ python numpy ])
++ lib.optional opencvSupport opencv;
cmakeFlags = let
diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix
index bbbe80eb6568..d12f9454ce7e 100644
--- a/pkgs/applications/science/misc/sasview/default.nix
+++ b/pkgs/applications/science/misc/sasview/default.nix
@@ -1,25 +1,25 @@
-{ lib, fetchFromGitHub, gcc, python }:
+{ lib, fetchFromGitHub, gcc, python2 }:
let
xhtml2pdf = import ./xhtml2pdf.nix {
inherit lib;
- fetchPypi = python.pkgs.fetchPypi;
- buildPythonPackage = python.pkgs.buildPythonPackage;
- html5lib = python.pkgs.html5lib;
- httplib2 = python.pkgs.httplib2;
- nose = python.pkgs.nose;
- pillow = python.pkgs.pillow;
- pypdf2 = python.pkgs.pypdf2;
- reportlab = python.pkgs.reportlab;
+ fetchPypi = python2.pkgs.fetchPypi;
+ buildPythonPackage = python2.pkgs.buildPythonPackage;
+ html5lib = python2.pkgs.html5lib;
+ httplib2 = python2.pkgs.httplib2;
+ nose = python2.pkgs.nose;
+ pillow = python2.pkgs.pillow;
+ pypdf2 = python2.pkgs.pypdf2;
+ reportlab = python2.pkgs.reportlab;
};
in
-python.pkgs.buildPythonApplication rec {
+python2.pkgs.buildPythonApplication rec {
pname = "sasview";
version = "4.2.0";
- checkInputs = with python.pkgs; [
+ checkInputs = with python2.pkgs; [
pytest
unittest-xml-reporting
];
@@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication rec {
HOME=$(mktemp -d) py.test
'';
- propagatedBuildInputs = with python.pkgs; [
+ propagatedBuildInputs = with python2.pkgs; [
bumps
gcc
h5py
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
index 62d638717f80..1dfd47a3d381 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4
-, cmake, makeWrapper, libjpeg, python }:
+, cmake, makeWrapper, libjpeg, python2 }:
let version = "5.2.1"; in
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky";
};
- buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python ];
+ buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python2 ];
nativeBuildInputs = [ cmake makeWrapper ];
diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix
index b9f7d4ef677b..48c4f6f2c4d7 100644
--- a/pkgs/applications/terminal-emulators/mlterm/default.nix
+++ b/pkgs/applications/terminal-emulators/mlterm/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "mlterm";
- version = "3.9.1";
+ version = "3.9.2";
src = fetchFromGitHub {
owner = "arakiken";
repo = pname;
rev = "rel-${lib.replaceStrings [ "." ] [ "_" ] version}"; # 3.9.1 -> rel-3_9_1
- sha256 = "1hh196kz2n3asv8r8r2bdk5b2w93zq7rw4880ciiq1554h0ib7fj";
+ sha256 = "sha256-DvGR3rDegInpnLp3H+rXNXktCGhpjsBBPTRMwodeTro=";
};
nativeBuildInputs = [ pkg-config autoconf wrapGAppsHook ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
index b0279f004c24..7783c28927cf 100644
--- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-workspace";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "orf";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-//EyGhuE8rMRL03TtECIi0X51/p/GvTqvr2FRQEIqFA=";
+ sha256 = "sha256-uP1sex4Hx57ZsqVG4b3809FzFB10Un48+vbwaWZ7HSg=";
};
- cargoSha256 = "sha256-X0jRwDUVzS1s2tG6N2RDaFqwUUAT+mPMEft11VkJy5A=";
+ cargoSha256 = "sha256-mkrC8uzfNpL0MQUMjcNaJf5c1wSdlBVg8AMgc/zxM6A=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix
index 33eba79732db..60d011b653d4 100644
--- a/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/pkgs/applications/version-management/rapidsvn/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }:
+{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python2 }:
stdenv.mkDerivation rec {
pname = "rapidsvn";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
};
- buildInputs = [ wxGTK subversion apr aprutil python ];
+ buildInputs = [ wxGTK subversion apr aprutil python2 ];
configureFlags = [ "--with-svn-include=${subversion.dev}/include"
"--with-svn-lib=${subversion.out}/lib" ];
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index cddcd3d8aa29..1735449e3fd5 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python, rcs, git, makeWrapper }:
+{ lib, stdenv, fetchurl, python2, rcs, git, makeWrapper }:
stdenv.mkDerivation rec {
pname = "src";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ python rcs git ];
+ buildInputs = [ python2 rcs git ];
preConfigure = ''
patchShebangs .
diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix
index 11dbfc299a49..60260ee4de31 100644
--- a/pkgs/applications/version-management/srcml/default.nix
+++ b/pkgs/applications/version-management/srcml/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr2,
+{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python2, antlr2,
curl
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake antlr2 ];
- buildInputs = [ libxml2 libxslt boost libarchive python curl ];
+ buildInputs = [ libxml2 libxslt boost libarchive python2 curl ];
meta = {
description = "Infrastructure for exploration, analysis, and manipulation of source code";
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 79a21075f038..0dd3da4b37c6 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -16,13 +16,13 @@
buildGoModule rec {
pname = "runc";
- version = "1.0.3";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
- sha256 = "sha256-Tl/JKbIpao+FCjngPzaVkxse50zo3XQ9Mg/AdkblMcI=";
+ sha256 = "sha256-svLxxfiRDLWkdRuHXaDyH5Ta6qmptI8z+s41iZKgbWM=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index 7366ff196954..67097ca151a0 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -18,9 +18,9 @@ stdenv.mkDerivation {
buildInputs = [ xorgproto libX11 libXft ];
- makeFlags = [
- "PREFIX=$(out)"
- ];
+ makeFlags = [ "CC:=$(CC)" ];
+
+ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
homepage = "https://tools.suckless.org/tabbed";
diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix
index d0c35ab7cbb1..6759e15ee833 100644
--- a/pkgs/applications/window-managers/wmii-hg/default.nix
+++ b/pkgs/applications/window-managers/wmii-hg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python, which
+{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python2, which
, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }:
stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkg-config unzip ];
- buildInputs = [ libixp_hg txt2tags dash python which
+ buildInputs = [ libixp_hg txt2tags dash python2 which
libX11 libXrender libXext libXinerama libXrandr libXft ];
# For some reason including mercurial in buildInputs did not help
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index d6b4488daf05..11f911aeb470 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -3,7 +3,6 @@
, lib
, fetchFromGitHub
, fetchurl
-, fetchzip
, cairo
, python3
, pkg-config
@@ -61,6 +60,42 @@ let
maintainers = with maintainers; [ mathnerd314 emily ];
};
};
+
+ mkNotoCJK = { typeface, version, rev, sha256 }:
+ stdenvNoCC.mkDerivation {
+ pname = "noto-fonts-cjk-${lib.toLower typeface}";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "googlefonts";
+ repo = "noto-cjk";
+ inherit rev sha256;
+ };
+
+ installPhase = ''
+ install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/Variable/OTC/*.otf.ttc
+ '';
+
+ meta = with lib; {
+ description = "Beautiful and free fonts for CJK languages";
+ homepage = "https://www.google.com/get/noto/help/cjk/";
+ longDescription = ''
+ Noto ${typeface} CJK is a ${lib.toLower typeface} typeface designed as
+ an intermediate style between the modern and traditional. It is
+ intended to be a multi-purpose digital font for user interface
+ designs, digital content, reading on laptops, mobile devices, and
+ electronic books. Noto ${typeface} CJK comprehensively covers
+ Simplified Chinese, Traditional Chinese, Japanese, and Korean in a
+ unified font family. It supports regional variants of ideographic
+ characters for each of the four languages. In addition, it supports
+ Japanese kana, vertical forms, and variant characters (itaiji); it
+ supports Korean hangeul — both contemporary and archaic.
+ '';
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ mathnerd314 emily ];
+ };
+ };
in
{
@@ -74,39 +109,18 @@ in
weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*";
};
- noto-fonts-cjk = let zip = fetchzip {
- url = let rev = "be6c059ac1587e556e2412b27f5155c8eb3ddbe6"; in
- "https://raw.githubusercontent.com/googlefonts/noto-cjk/${rev}/NotoSansCJK.ttc.zip";
- # __MACOSX...
- stripRoot = false;
- sha256 = "0ik4z2b15i0pghskgfm3adzb0h35fr4gyzvz3bq49hhkhn9h85vi";
- }; in stdenvNoCC.mkDerivation {
- pname = "noto-fonts-cjk";
- version = "2.001";
+ noto-fonts-cjk-sans = mkNotoCJK {
+ typeface = "Sans";
+ version = "2.004";
+ rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";
+ sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik=";
+ };
- buildCommand = ''
- install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${zip}/*.ttc
- '';
-
- meta = with lib; {
- description = "Beautiful and free fonts for CJK languages";
- homepage = "https://www.google.com/get/noto/help/cjk/";
- longDescription =
- ''
- Noto Sans CJK is a sans serif typeface designed as an intermediate style
- between the modern and traditional. It is intended to be a multi-purpose
- digital font for user interface designs, digital content, reading on laptops,
- mobile devices, and electronic books. Noto Sans CJK comprehensively covers
- Simplified Chinese, Traditional Chinese, Japanese, and Korean in a unified font
- family. It supports regional variants of ideographic characters for each of the
- four languages. In addition, it supports Japanese kana, vertical forms, and
- variant characters (itaiji); it supports Korean hangeul — both contemporary and
- archaic.
- '';
- license = licenses.ofl;
- platforms = platforms.all;
- maintainers = with maintainers; [ mathnerd314 emily ];
- };
+ noto-fonts-cjk-serif = mkNotoCJK {
+ typeface = "Serif";
+ version = "2.000";
+ rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";
+ sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik=";
};
noto-fonts-emoji = let
diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
index 932b54e82b67..7135795914d9 100644
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, nix-update-script
, pkg-config
, meson
@@ -34,6 +35,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xIv+mOlZV58XD0Z6Vc2wA1EQUxT5BaQ0zhYc9v+ne1w=";
};
+ patches = [
+ # Fix build with meson 0.61
+ # https://github.com/elementary/camera/pull/216
+ (fetchpatch {
+ url = "https://github.com/elementary/camera/commit/ead143b7e3246c5fa9bb37c95d491fb07cea9e04.patch";
+ sha256 = "sha256-2zGigUi6DpjJx8SEvAE3Q3jrm7MggOvLc72lAPMPvs4=";
+ })
+ ];
+
nativeBuildInputs = [
appstream
desktop-file-utils
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index f83839f6c92c..5007e297267b 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, nix-update-script
, pkg-config
, meson
@@ -38,6 +39,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-AXmMcPj2hf33G5v3TUg+eZwaKOdVlRvoVXglMJFHRjw=";
};
+ patches = [
+ # Fix build with meson 0.61
+ # https://github.com/elementary/code/pull/1165
+ (fetchpatch {
+ url = "https://github.com/elementary/code/commit/a2607cce3a6b1bb62d02456456d3cbc3c6530bb0.patch";
+ sha256 = "sha256-VKR83IOUYsQhBRlU9JUTlMJtXWv/AyG4wDsjMU2vmU8=";
+ })
+ ];
+
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 21e25bad9451..4b829321c37e 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, nix-update-script
, pkg-config
, meson
@@ -43,6 +44,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-5TSzV8MQG81aCCR8yiCPhKJaLrp/fwf4mjP32KkcbbY=";
};
+ patches = [
+ # Fix build with meson 0.61
+ # https://github.com/elementary/files/pull/1973
+ (fetchpatch {
+ url = "https://github.com/elementary/files/commit/28428fbda905ece59d3427a3a40e986fdf71a916.patch";
+ sha256 = "sha256-GZTHAH9scQWrBqdrDI14cj57f61HD8o79zFcPCXjKmc=";
+ })
+ ];
+
nativeBuildInputs = [
desktop-file-utils
gettext
diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
index 90058633e907..58be49ab4bef 100644
--- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, nix-update-script
, pkg-config
, meson
@@ -34,6 +35,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-wOu9jvvwG53vzcNa38nk4eREZWW7Cin8el4qApQ8gI8=";
};
+ patches = [
+ # Fix build with meson 0.61
+ # https://github.com/elementary/mail/pull/751
+ (fetchpatch {
+ url = "https://github.com/elementary/mail/commit/bbadc56529276d8e0ff98e9df7d9bb1bf8fc5783.patch";
+ sha256 = "sha256-lJEnX5/G6e8PdKy1XGlwFIoCeSy6SR5p68tS4noj+44=";
+ })
+ ];
+
nativeBuildInputs = [
appstream
desktop-file-utils
diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index bee11ed055bc..cceeeabf15f1 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -50,6 +50,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/elementary/music/commit/aea97103d59afd213467403a48788e476e47c4c3.patch";
sha256 = "1ayj8l6lb19hhl9bhsdfbq7jgchfmpjx0qkljnld90czcksn95yx";
})
+ # Fix build with meson 0.61
+ # https://github.com/elementary/music/pull/674
+ (fetchpatch {
+ url = "https://github.com/elementary/music/commit/fb3d840049c1e2e0bf8fdddea378a2db647dd096.patch";
+ sha256 = "sha256-tQZv7hZExLqbkGXahZxDfg7bkgwCKYbDholC2zuwlNw=";
+ })
];
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
index 176c2919be04..9e65a562875a 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, nix-update-script
, pkg-config
, meson
@@ -28,6 +29,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-n+L08C/W5YnHZ5P3F1NGUYE2SH94sc4+kr1x+wXZ+cw=";
};
+ patches = [
+ # Fix build with meson 0.61
+ # https://github.com/elementary/screenshot/pull/241
+ (fetchpatch {
+ url = "https://github.com/elementary/screenshot/commit/80a5d942e813dd098e1ef0f6629b81d2ccef05ae.patch";
+ sha256 = "sha256-jOQuzUJvsjqytplLcW9BeIxzi9+/k2GFa4hHVZ3+wts=";
+ })
+ ];
+
nativeBuildInputs = [
desktop-file-utils
meson
diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index 4840f69e7cb4..f3402299ff78 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, nix-update-script
, pkg-config
, meson
@@ -32,6 +33,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-4q7YQ4LxuiM/TRae1cc3ncmw7QwE1soC2Sh+GZ+Gpq0=";
};
+ patches = [
+ # Fix build with meson 0.61
+ # https://github.com/elementary/terminal/pull/649
+ (fetchpatch {
+ url = "https://github.com/elementary/terminal/commit/15e3ace08cb25e53941249fa1ee680a1e2f871b4.patch";
+ sha256 = "sha256-XVs+kq5qbX5KlxtkqxwJnatNYNeJiVLBec7sLjQsUxg=";
+ })
+ ];
+
nativeBuildInputs = [
appstream
desktop-file-utils
diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix
index c8e6f11f111c..50a3317d6e04 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -60,6 +60,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/elementary/switchboard/commit/8d6b5f4cbbaf134880252afbf1e25d70033e6402.patch";
sha256 = "0gwq3wwj45jrnlhsmxfclbjw6xjr8kf6pp3a84vbnrazw76lg5nc";
})
+ # Fix build with meson 0.61
+ # https://github.com/elementary/switchboard/pull/226
+ (fetchpatch {
+ url = "https://github.com/elementary/switchboard/commit/ecf2a6c42122946cc84150f6927ef69c1f67c909.patch";
+ sha256 = "sha256-J62tMeDfOpliBLHMSa3uBGTc0RBNzC6eDjDBDYySL+0=";
+ })
];
postPatch = ''
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 25bce374c23c..72df609c5a47 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, nix-update-script
, linkFarm
, substituteAll
@@ -90,6 +91,12 @@ stdenv.mkDerivation rec {
src = ./hardcode-fallback-background.patch;
default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";
})
+ # Fix build with meson 0.61
+ # https://github.com/elementary/greeter/pull/590
+ (fetchpatch {
+ url = "https://github.com/elementary/greeter/commit/a4b25244058fce794a9f13f6b22a8ff7735ebde9.patch";
+ sha256 = "sha256-qPXhdvmYG8YMDU/CjbEkfZ0glgRzxnu0TsOPtvWHxLY=";
+ })
];
preFixup = ''
diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
index fbde187ce6dc..1d4a1cb74146 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, nix-update-script
, pkg-config
, meson
@@ -21,15 +22,22 @@ stdenv.mkDerivation rec {
pname = "elementary-shortcut-overlay";
version = "1.2.1";
- repoName = "shortcut-overlay";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
+ repo = "shortcut-overlay";
rev = version;
sha256 = "sha256-qmqzGCM3cVM6y80pzjm5CCyG6BO6XlKZiODAAEnwVrM=";
};
+ patches = [
+ # Fix build with meson 0.61
+ # https://github.com/elementary/shortcut-overlay/pull/113
+ (fetchpatch {
+ url = "https://github.com/elementary/shortcut-overlay/commit/130f78eb4b7770586ea98ba0a5fdbbf5bb116f3f.patch";
+ sha256 = "sha256-XXWq9CEv3Z2B8ogcFQAJZCfy19XxNHs3c8NToE2m/aA=";
+ })
+ ];
+
nativeBuildInputs = [
desktop-file-utils
libxml2
diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
index ed9919b0b037..588061b22e1b 100644
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, nix-update-script
, pkg-config
, meson
@@ -21,15 +22,22 @@ stdenv.mkDerivation rec {
pname = "elementary-capnet-assist";
version = "2.4.0";
- repoName = "capnet-assist";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
+ repo = "capnet-assist";
rev = version;
sha256 = "sha256-UdkS+w61c8z2TCJyG7YsDb0n0b2LOpFyaHzMbdCJsZI=";
};
+ patches = [
+ # Fix build with meson 0.61
+ # https://github.com/elementary/capnet-assist/pull/76
+ (fetchpatch {
+ url = "https://github.com/elementary/capnet-assist/commit/0e77bf8023ba1b35e3a5badb72c246cabf6552b9.patch";
+ sha256 = "sha256-B/KEs/TCxR+i3uQSRtWxTi2+cu0n6QLcfKCbMCvSsvs=";
+ })
+ ];
+
nativeBuildInputs = [
desktop-file-utils
meson
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix
index 3f749c85b24e..ec64a60fb54a 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala_0_40
+{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala
, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce }:
stdenv.mkDerivation rec {
@@ -12,13 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-aKrJzf9rwCyXAJsRIXdBzmJBASuXD5I5kZrp+atx4FA=";
};
- # Does not build with vala 0.48 or later
- # Upstream has no activity for a while
- # libxfce4panel-2.0.vapi:92.3-92.41: error: overriding method `Xfce.PanelPlugin.remote_event' is incompatible
- # with base method `bool Xfce.PanelPluginProvider.remote_event (string, GLib.Value, uint)': too few parameters.
- # public virtual signal bool remote_event (string name, GLib.Value value);
- # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- nativeBuildInputs = [ pkg-config vala_0_40 wafHook python3 ];
+ nativeBuildInputs = [ pkg-config vala wafHook python3 ];
buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ];
postPatch = ''
@@ -39,5 +33,12 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ volth ] ++ teams.xfce.members;
+ # Does not build with vala 0.48 or later
+ # libxfce4panel-2.0.vapi:92.3-92.41: error: overriding method `Xfce.PanelPlugin.remote_event' is incompatible
+ # with base method `bool Xfce.PanelPluginProvider.remote_event (string, GLib.Value, uint)': too few parameters.
+ # public virtual signal bool remote_event (string name, GLib.Value value);
+ # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ # Upstream has no activity since 20 May 2020
+ broken = true;
};
}
diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix
index 68c6ea39cf7e..62d8f65ff8f6 100644
--- a/pkgs/development/compilers/hip/default.nix
+++ b/pkgs/development/compilers/hip/default.nix
@@ -16,7 +16,7 @@
, makeWrapper
, numactl
, perl
-, python
+, python2
, rocclr
, rocm-comgr
, rocm-device-libs
@@ -56,7 +56,7 @@ let
substituteInPlace bin/hip_embed_pch.sh \
--replace '$LLVM_DIR/bin/' ""
- sed 's,#!/usr/bin/python,#!${python}/bin/python,' -i hip_prof_gen.py
+ sed 's,#!/usr/bin/python,#!${python2}/bin/python,' -i hip_prof_gen.py
sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \
-e 's,^\($DEVICE_LIB_PATH=\).*$,\1"${rocm-device-libs}/amdgcn/bitcode";,' \
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
sha256 = "WvOuQu/EN81Kwcoc3ZtGlhb996edQJ3OWFsmPuqeNXE=";
};
- nativeBuildInputs = [ cmake python makeWrapper perl ];
+ nativeBuildInputs = [ cmake python2 makeWrapper perl ];
buildInputs = [ libxml2 numactl libglvnd libX11 ];
propagatedBuildInputs = [
clang
diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix
index 85332a946450..176affd047c9 100644
--- a/pkgs/development/compilers/intel-graphics-compiler/default.nix
+++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix
@@ -77,5 +77,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ gloaming ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/intel-graphics-compiler.x86_64-darwin
};
}
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index daa9bf49b656..9a1365d0c964 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -15,19 +15,7 @@ let
# header file isn't available at all, but that patch (./gvc-compat.patch)
# can be shared between all versions of Vala so far.
graphvizPatch =
- let
- fp = { commit, sha256 }: fetchpatch {
- url = "https://github.com/openembedded/openembedded-core/raw/${commit}/meta/recipes-devtools/vala/vala/disable-graphviz.patch";
- inherit sha256;
- };
-
- in {
-
- # NOTE: the openembedded-core project doesn't have a patch for 0.40.12
- # We've fixed the single merge conflict in the following patch.
- # 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch
- "0.40" = ./disable-graphviz-0.40.12.patch;
-
+ {
"0.48" = ./disable-graphviz-0.46.1.patch;
"0.52" = ./disable-graphviz-0.46.1.patch;
@@ -98,19 +86,14 @@ let
});
in rec {
- vala_0_40 = generic {
- version = "0.40.25";
- sha256 = "1pxpack8rrmywlf47v440hc6rv3vi8q9c6niwqnwikxvb2pwf3w7";
- };
-
vala_0_48 = generic {
- version = "0.48.21";
- sha256 = "sha256-MFRVrrdo1u2bAYNgtVGC5IsW2xvBY6TluBQg+Y0h2Zg=";
+ version = "0.48.22";
+ sha256 = "sha256-27NHjEvjZvCTFkrGHNOu29zz5EQE2eNkFK4VEk525os=";
};
vala_0_52 = generic {
- version = "0.52.9";
- sha256 = "sha256-HpMH2B4hHxniUB6P5PtN0Z+5J8SEtV/873FOjFFdAHk=";
+ version = "0.52.10";
+ sha256 = "sha256-nCAb+BLZh04hveU/jZwU9lF0ixqBRB/1ySkSJESQEAg=";
};
vala_0_54 = generic {
diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch b/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch
deleted file mode 100644
index fdc1eabf513e..000000000000
--- a/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-diff --git i/configure.ac w/configure.ac
-index 694ffd200..915062053 100644
---- i/configure.ac
-+++ w/configure.ac
-@@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
- AC_SUBST(GMODULE_CFLAGS)
- AC_SUBST(GMODULE_LIBS)
-
--PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
--AC_MSG_CHECKING([for CGRAPH])
--cgraph_tmp_LIBADD="$LIBADD"
--cgraph_tmp_CFLAGS="$CFLAGS"
--LIBADD="$LIBADD $LIBGVC_LIBS"
--CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
--AC_RUN_IFELSE(
-- [AC_LANG_SOURCE([
-- #include
--
-- int main(void) {
-- #ifdef WITH_CGRAPH
-- return 0;
-- #else
-- return -1;
-- #endif
-- }
-- ])], [
-- AC_MSG_RESULT([yes])
-- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
-- have_cgraph=yes
-- ], [
-- AC_MSG_RESULT([no])
-- have_cgraph=no
-- ]
--)
--LIBADD="$cgraph_tmp_LIBADD"
--CFLAGS="$cgraph_tmp_CFLAGS"
-+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
-+if test x$enable_graphviz = xyes; then
-+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
-+ AC_MSG_CHECKING([for CGRAPH])
-+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
-+ cgraph_tmp_LIBADD="$LIBADD"
-+ cgraph_tmp_CFLAGS="$CFLAGS"
-+ LIBADD="$LIBADD $LIBGVC_LIBS"
-+ CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
-+ AC_RUN_IFELSE(
-+ [AC_LANG_SOURCE([
-+ #include
-+ int main(void) {
-+ #ifdef WITH_CGRAPH
-+ return 0;
-+ #else
-+ return -1;
-+ #endif
-+ }
-+ ])], [
-+ AC_MSG_RESULT([yes])
-+ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
-+ have_cgraph=yes
-+ ], [
-+ AC_MSG_RESULT([no])
-+ have_cgraph=no
-+ ]
-+ )
-+ LIBADD="$cgraph_tmp_LIBADD"
-+ CFLAGS="$cgraph_tmp_CFLAGS"
-+fi
-+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
- AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
-
- AC_PATH_PROG([XSLTPROC], [xsltproc], :)
-diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am
-index f3f790e76..3c5dc4c80 100644
---- i/libvaladoc/Makefile.am
-+++ w/libvaladoc/Makefile.am
-@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \
- content/tablerow.vala \
- content/taglet.vala \
- content/text.vala \
-- charts/chart.vala \
-- charts/chartfactory.vala \
-- charts/hierarchychart.vala \
-- charts/simplechartfactory.vala \
- parser/manyrule.vala \
- parser/oneofrule.vala \
- parser/optionalrule.vala \
-@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \
- highlighter/codetoken.vala \
- highlighter/highlighter.vala \
- html/basicdoclet.vala \
-- html/htmlchartfactory.vala \
- html/linkhelper.vala \
- html/cssclassresolver.vala \
- html/htmlmarkupwriter.vala \
- html/htmlrenderer.vala \
- $(NULL)
-
-+if ENABLE_GRAPHVIZ
-+libvaladoc_la_VALASOURCES += \
-+ charts/chart.vala \
-+ charts/chartfactory.vala \
-+ charts/hierarchychart.vala \
-+ charts/simplechartfactory.vala \
-+ html/htmlchartfactory.vala \
-+ $(NULL)
-+
-+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
-+endif
-+
- libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
- libvaladoc.vala.stamp \
- $(libvaladoc_la_VALASOURCES:.vala=.c) \
-@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
- --library valadoc \
- --vapi valadoc@PACKAGE_SUFFIX@.vapi \
- --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
-- --vapidir $(top_srcdir)/vapi --pkg libgvc \
- --vapidir $(top_srcdir)/gee --pkg gee \
- --vapidir $(top_srcdir)/vala --pkg vala \
- --vapidir $(top_srcdir)/ccode --pkg ccode \
- --vapidir $(top_srcdir)/codegen --pkg codegen \
-+ $(LIBGVC_PKG) \
- --pkg config \
- $(filter %.vala %.c,$^)
- touch $@
-@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
-
- valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
- cp $< $@
-+if !ENABLE_GRAPHVIZ
-+ sed -i "s/libgvc //g" $@
-+endif
-
- vapidir = $(datadir)/vala/vapi
- dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
-@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
-
- valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
- cp $< $@
-+if !ENABLE_GRAPHVIZ
-+ sed -i "s/libgvc//g" $@
-+endif
-
- EXTRA_DIST = \
- $(libvaladoc_la_VALASOURCES) \
-diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala
-index 192e488cd..ec0960222 100644
---- i/libvaladoc/html/basicdoclet.vala
-+++ w/libvaladoc/html/basicdoclet.vala
-@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
- protected HtmlRenderer _renderer;
- protected Html.MarkupWriter writer;
- protected Html.CssClassResolver cssresolver;
-+#if HAVE_GRAPHVIZ
- protected Charts.Factory image_factory;
-+#else
-+ protected void* image_factory;
-+#endif
- protected ErrorReporter reporter;
- protected string package_list_link = "../index.html";
-
-@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
- this.linker = new LinkHelper ();
-
- _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
-+#if HAVE_GRAPHVIZ
- this.image_factory = new SimpleChartFactory (settings, linker);
-+#endif
- }
-
-
-@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
- }
-
- protected void write_image_block (Api.Node element) {
-+#if HAVE_GRAPHVIZ
- if (element is Class || element is Interface || element is Struct) {
- unowned string format = (settings.use_svg_images ? "svg" : "png");
- var chart = new Charts.Hierarchy (image_factory, element);
-@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
- this.get_img_path_html (element, format)});
- writer.add_usemap (chart);
- }
-+#endif
- }
-
- public void write_namespace_content (Namespace node, Api.Node? parent) {
-diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala
-index dcc4dad76..cf9c860b8 100644
---- i/libvaladoc/html/htmlmarkupwriter.vala
-+++ w/libvaladoc/html/htmlmarkupwriter.vala
-@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
- }
- }
-
-+#if HAVE_GRAPHVIZ
- public MarkupWriter add_usemap (Charts.Chart chart) {
- string? buf = (string?) chart.write_buffer ("cmapx");
- if (buf != null) {
- raw_text ("\n");
- raw_text ((!) buf);
- }
-+#else
-+ public MarkupWriter add_usemap (void* chart) {
-+#endif
-
- return this;
- }
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index a1b59b8bf69d..51b1cfa11414 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll
, sbcl, bash, which, perl, hostname
-, openssl, glucose, minisat, abc-verifier, z3, python
+, openssl, glucose, minisat, abc-verifier, z3, python2
, certifyBooks ? true
} @ args:
@@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
which perl hostname makeWrapper
# Some of the books require one or more of these external tools:
openssl.out glucose minisat abc-verifier libipasir
- z3 (python.withPackages (ps: [ ps.z3 ]))
+ z3 (python2.withPackages (ps: [ ps.z3 ]))
];
# NOTE: Parallel building can be memory-intensive depending on the number of
diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix
index 7bd3913260d4..d8fa630c30df 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -8,7 +8,7 @@
, unzip
, nodePackages
, xcbuild
-, python
+, python2
, openssl
, pkgs
, fetchgit
@@ -154,7 +154,7 @@ stdenv.mkDerivation {
nodejs
clojure
jre
- python
+ python2
openssl
gnutar
nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"
diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix
index 1cc63d7b58a4..316b37f2e099 100644
--- a/pkgs/development/interpreters/php/7.4.nix
+++ b/pkgs/development/interpreters/php/7.4.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "7.4.26";
- sha256 = "0k803j5wf4jv72px0zqz2z2hxyk2w3jr6xyczy568dx4z2l8i2yn";
+ version = "7.4.27";
+ sha256 = "184aaef313fbf28c9987f6aa07b655cd1b0eae9e7e17061775a3e7d880185563";
});
in
diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix
index 8cf7d4ebc8df..b34f5974ff4e 100644
--- a/pkgs/development/interpreters/php/8.0.nix
+++ b/pkgs/development/interpreters/php/8.0.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "8.0.13";
- sha256 = "0djqh650clz4fy1zifazf0jq383znksydx23f1s48prrlixrshf2";
+ version = "8.0.14";
+ sha256 = "0jydl388mpysrrxa7h9sxf3fpp38mmygg9ryq8j7rb8p93giyf5v";
});
in
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index 675a7cdd6bc0..6022245cac73 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -1,4 +1,4 @@
-{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang, stdenv, darwin }:
+{ rustPlatform, fetchFromGitHub, lib, python2, cmake, llvmPackages, clang, stdenv, darwin }:
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1wlig9gls7s1k1swxwhl82vfga30bady8286livxc4y2zp0vb18w";
- nativeBuildInputs = [ python cmake clang ];
+ nativeBuildInputs = [ python2 cmake clang ];
buildInputs = [ llvmPackages.libclang ] ++
lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix
index a66db4800177..bc0da2ddea20 100644
--- a/pkgs/development/libraries/arrayfire/default.nix
+++ b/pkgs/development/libraries/arrayfire/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, opencl-clhpp, ocl-icd, fftw, fftwFloat
, blas, lapack, boost, mesa, libGLU, libGL
, freeimage, python3, clfft, clblas
@@ -8,11 +8,14 @@
stdenv.mkDerivation rec {
pname = "arrayfire";
- version = "3.6.4";
+ version = "3.7.3";
- src = fetchurl {
- url = "http://arrayfire.com/arrayfire_source/arrayfire-full-${version}.tar.bz2";
- sha256 = "1fin7a9rliyqic3z83agkpb8zlq663q6gdxsnm156cs8s7f7rc9h";
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0gcbg6b6gs38xhks5pp0vkcqs89zl7rh9982jqlzsd0h724qddw0";
+ fetchSubmodules = true;
};
cmakeFlags = [
diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix
index c4a983d879ce..2b5e5a4addca 100644
--- a/pkgs/development/libraries/blitz/default.nix
+++ b/pkgs/development/libraries/blitz/default.nix
@@ -4,7 +4,7 @@
, pkg-config
, gfortran
, texinfo
-, python
+, python2
, boost
# Select SIMD alignment width (in bytes) for vectorization.
, simdWidth ? 1
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
sha256 = "0nq84vwvvbq7m0my6h835ijfw53bxdp42qjc6kjhk436888qy9rh";
};
- nativeBuildInputs = [ pkg-config python texinfo ];
+ nativeBuildInputs = [ pkg-config python2 texinfo ];
buildInputs = [ gfortran texinfo boost ];
configureFlags =
diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
index 0e96a346f418..59b161384045 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
+ # see https://aur.archlinux.org/cgit/aur.git/commit/PKGBUILD?h=libfreenect&id=0d17db49ba64bcb9e3a4eed61cf55c9a5ceb97f1
+ patchPhase = lib.concatMapStrings (x: ''
+ substituteInPlace ${x} --replace "{GLUT_LIBRARY}" "{GLUT_LIBRARIES}"
+ '') [ "examples/CMakeLists.txt" "wrappers/cpp/CMakeLists.txt" ];
+
meta = {
description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS";
homepage = "http://openkinect.org";
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index eef6bbdd580f..033b9d8c6197 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python }:
+{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python2 }:
stdenv.mkDerivation rec {
pname = "ntrack";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libnl qt4 ];
- nativeBuildInputs = [ pkg-config python ];
+ nativeBuildInputs = [ pkg-config python2 ];
# error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic]
NIX_CFLAGS_COMPILE = "-Wno-error";
diff --git a/pkgs/development/libraries/openbabel/2.nix b/pkgs/development/libraries/openbabel/2.nix
index 4f2f31d614c3..627d5bbe2978 100644
--- a/pkgs/development/libraries/openbabel/2.nix
+++ b/pkgs/development/libraries/openbabel/2.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config }:
+{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python2, cairo, pcre, pkg-config }:
stdenv.mkDerivation rec {
pname = "openbabel";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
})
];
- buildInputs = [ zlib libxml2 eigen python cairo pcre ];
+ buildInputs = [ zlib libxml2 eigen python2 cairo pcre ];
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index ed2f700dc82e..34dcd240838e 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unzip
, zlib
-, enablePython ? false, pythonPackages
+, enablePython ? false, python2Packages
, enableGtk2 ? false, gtk2
, enableJPEG ? true, libjpeg
, enablePNG ? true, libpng
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ zlib ]
- ++ lib.optional enablePython pythonPackages.python
+ ++ lib.optional enablePython python2Packages.python
++ lib.optional enableGtk2 gtk2
++ lib.optional enableJPEG libjpeg
++ lib.optional enablePNG libpng
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ]
;
- propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
+ propagatedBuildInputs = lib.optional enablePython python2Packages.numpy;
nativeBuildInputs = [ cmake pkg-config unzip ];
diff --git a/pkgs/development/libraries/pcmsolver/default.nix b/pkgs/development/libraries/pcmsolver/default.nix
index 8cd4b318cc5a..dd94a4a088cb 100644
--- a/pkgs/development/libraries/pcmsolver/default.nix
+++ b/pkgs/development/libraries/pcmsolver/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python
+{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python2
, boost, eigen, zlib
} :
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
cmake
gfortran
perl
- python
+ python2
];
buildInputs = [
diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix
index 65fb04b707ab..5c3bc936e8c1 100644
--- a/pkgs/development/libraries/physics/fastjet/default.nix
+++ b/pkgs/development/libraries/physics/fastjet/default.nix
@@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchurl
-, python
+, python ? null
, withPython ? false
}:
diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix
index d0bdb95fecc2..561c9cf93c2c 100644
--- a/pkgs/development/libraries/ptex/default.nix
+++ b/pkgs/development/libraries/ptex/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, zlib, python2, cmake, pkg-config }:
stdenv.mkDerivation rec
{
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec
outputs = [ "bin" "dev" "out" "lib" ];
nativeBuildInputs = [ cmake ];
- buildInputs = [ zlib python pkg-config ];
+ buildInputs = [ zlib python2 pkg-config ];
# Can be removed in the next release
# https://github.com/wdas/ptex/pull/42
diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix
index 96e4a42ad09e..7cd3a086cdb8 100644
--- a/pkgs/development/libraries/rabbitmq-java-client/default.nix
+++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, ant, jdk, jre, python, makeWrapper }:
+{ fetchurl, lib, stdenv, ant, jdk, jre, python2, makeWrapper }:
stdenv.mkDerivation rec {
pname = "rabbitmq-java-client";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ ant jdk python ];
+ buildInputs = [ ant jdk python2 ];
buildPhase = "ant dist";
diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix
index 88560e0cd983..d7a0dcfe06a7 100644
--- a/pkgs/development/libraries/science/math/itpp/default.nix
+++ b/pkgs/development/libraries/science/math/itpp/default.nix
@@ -49,5 +49,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ andrew-d ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/itpp.x86_64-darwin
};
}
diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix
index 8c5b4e87d9bb..fd53db0dcf91 100644
--- a/pkgs/development/libraries/seasocks/default.nix
+++ b/pkgs/development/libraries/seasocks/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, python, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, python3, zlib }:
stdenv.mkDerivation rec {
pname = "seasocks";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ zlib python ];
+ buildInputs = [ zlib python3 ];
meta = with lib; {
homepage = "https://github.com/mattgodbolt/seasocks";
diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix
index 8c97d0224c66..1c876cf36360 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/pkgs/development/libraries/snack/default.nix
@@ -1,6 +1,6 @@
-# alsa-lib vorbis-tools python can be made optional
+# alsa-lib vorbis-tools python2 can be made optional
-{ lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }:
+{ lib, stdenv, fetchurl, python2, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }:
stdenv.mkDerivation rec {
pname = "snack";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
postUnpack = ''sourceRoot="$sourceRoot/unix"'';
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ python tcl tk vorbis-tools xlibsWrapper ];
+ buildInputs = [ python2 tcl tk vorbis-tools xlibsWrapper ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix
index 2325c043d014..ef30c5916eab 100644
--- a/pkgs/development/libraries/swiften/default.nix
+++ b/pkgs/development/libraries/swiften/default.nix
@@ -1,6 +1,6 @@
{ stdenv
, lib
-, python
+, python2
, libidn
, lua
, miniupnpc
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- python
+ python2
libidn
lua
miniupnpc
diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix
index 6bc0d3ef7534..19ebadd895f1 100644
--- a/pkgs/development/libraries/tiledb/default.nix
+++ b/pkgs/development/libraries/tiledb/default.nix
@@ -13,7 +13,7 @@
, libpqxx
, clang-tools
, catch2
-, python
+, python3
, gtest
, doxygen
, fixDarwinDylibNames
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
clang-tools
cmake
- python
+ python3
doxygen
] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index 0c48c6500c53..28eea0525176 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DURIPARSER_BUILD_DOCS=OFF"
- ];
+ ] ++ lib.optional (!doCheck) "-DURIPARSER_BUILD_TESTS=OFF";
checkInputs = [ gtest ];
- doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system;
+ doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
meta = with lib; {
homepage = "https://uriparser.github.io/";
diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix
index 3357b99cebfc..264d95f39f67 100644
--- a/pkgs/development/ocaml-modules/llvm/default.nix
+++ b/pkgs/development/ocaml-modules/llvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, python, cmake, libllvm, ocaml, findlib, ctypes }:
+{ stdenv, lib, python2, cmake, libllvm, ocaml, findlib, ctypes }:
let version = lib.getVersion libllvm; in
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
inherit (libllvm) src;
nativeBuildInputs = [ cmake ];
- buildInputs = [ python ocaml findlib ctypes ];
+ buildInputs = [ python2 ocaml findlib ctypes ];
propagatedBuildInputs = [ libllvm ];
cmakeFlags = [
diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix
index bee8a6106ea1..c19b40eb9afe 100644
--- a/pkgs/development/ocaml-modules/pycaml/default.nix
+++ b/pkgs/development/ocaml-modules/pycaml/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, ocaml, findlib, ncurses, python, ocaml_make }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ncurses, python2, ocaml_make }:
# This is the original pycaml version with patches from debian.
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
sourceRoot = "pycaml";
patches = [ "../debian/patches/*.patch" ];
- buildInputs = [ ncurses ocaml findlib python ocaml_make ];
+ buildInputs = [ ncurses ocaml findlib python2 ocaml_make ];
createFindlibDestdir = true;
# the Makefile is not shipped with an install target, hence we do it ourselves.
diff --git a/pkgs/development/octave-modules/miscellaneous/default.nix b/pkgs/development/octave-modules/miscellaneous/default.nix
index 74c3879aa9ef..db2f45a5ac3d 100644
--- a/pkgs/development/octave-modules/miscellaneous/default.nix
+++ b/pkgs/development/octave-modules/miscellaneous/default.nix
@@ -2,7 +2,6 @@
, lib
, fetchurl
# Build-time dependencies
-, mlterm
, ncurses # >= 5
, units
}:
@@ -17,7 +16,6 @@ buildOctavePackage rec {
};
buildInputs = [
- mlterm
ncurses
];
diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index ba8d15909f21..f1f7f0e81bd2 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -54,6 +54,8 @@ buildPythonPackage rec {
pytestFlagsArray = [
"-n"
"$NIX_BUILD_CORES"
+ "-W"
+ "ignore::DeprecationWarning"
];
disabledTests = [
diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index 8e26517ba218..cc4e19d6beb7 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -12,16 +12,67 @@
, cairo
, cffi
, numpy
-, withXcffib ? false, xcffib
+, withXcffib ? false
+, xcffib
, python
, glib
, gdk-pixbuf
-}@args:
+}:
+
+buildPythonPackage rec {
+ pname = "cairocffi";
+ version = "1.3.0";
-import ./generic.nix ({
- version = "1.2.0";
- sha256 = "sha256-mpebUAxkyBef7ChvM36P5kTsovLNBYYM4LYtJfIuoUA=";
- dlopen_patch = ./dlopen-paths.patch;
disabled = pythonOlder "3.5";
- inherit withXcffib;
-} // args)
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-EIo6fLCeIDvdhQHZuq2R14bSBFYb1x6TZOizSJfEe5E=";
+ };
+
+ LC_ALL = "en_US.UTF-8";
+
+ # checkPhase require at least one 'normal' font and one 'monospace',
+ # otherwise glyph tests fails
+ FONTCONFIG_FILE = makeFontsConf {
+ fontDirectories = [ freefont_ttf ];
+ };
+
+ propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib;
+ propagatedNativeBuildInputs = [ cffi ];
+
+ # pytestCheckHook does not work
+ checkInputs = [ numpy pytest glibcLocales ];
+
+ postPatch = ''
+ substituteInPlace setup.cfg \
+ --replace "pytest-runner" "" \
+ --replace "pytest-cov" "" \
+ --replace "pytest-flake8" "" \
+ --replace "pytest-isort" "" \
+ --replace "--flake8 --isort" ""
+ '';
+
+ checkPhase = ''
+ py.test $out/${python.sitePackages}
+ '';
+
+ patches = [
+ # OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0
+ (substituteAll {
+ src = ./dlopen-paths.patch;
+ ext = stdenv.hostPlatform.extensions.sharedLibrary;
+ cairo = cairo.out;
+ glib = glib.out;
+ gdk_pixbuf = gdk-pixbuf.out;
+ })
+ ./fix_test_scaled_font.patch
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/SimonSapin/cairocffi";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ description = "cffi-based cairo bindings for Python";
+ };
+}
diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix
deleted file mode 100644
index 004cf8ae7841..000000000000
--- a/pkgs/development/python-modules/cairocffi/generic.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ version
-, sha256
-, dlopen_patch
-, disabled ? false
-, ...
-}@args:
-
-with args;
-
-buildPythonPackage rec {
- pname = "cairocffi";
- inherit version disabled;
-
- src = fetchPypi {
- inherit pname version sha256;
- };
-
- LC_ALL = "en_US.UTF-8";
-
- # checkPhase require at least one 'normal' font and one 'monospace',
- # otherwise glyph tests fails
- FONTCONFIG_FILE = makeFontsConf {
- fontDirectories = [ freefont_ttf ];
- };
-
- propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib;
- propagatedNativeBuildInputs = [ cffi ];
-
- # pytestCheckHook does not work
- checkInputs = [ numpy pytest glibcLocales ];
-
- postPatch = ''
- substituteInPlace setup.cfg \
- --replace "pytest-runner" "" \
- --replace "pytest-cov" "" \
- --replace "pytest-flake8" "" \
- --replace "pytest-isort" "" \
- --replace "--flake8 --isort" ""
- '';
-
- checkPhase = ''
- py.test $out/${python.sitePackages}
- '';
-
- patches = [
- # OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0
- (substituteAll {
- src = dlopen_patch;
- ext = stdenv.hostPlatform.extensions.sharedLibrary;
- cairo = cairo.out;
- glib = glib.out;
- gdk_pixbuf = gdk-pixbuf.out;
- })
- ./fix_test_scaled_font.patch
- ];
-
- meta = with lib; {
- homepage = "https://github.com/SimonSapin/cairocffi";
- license = licenses.bsd3;
- maintainers = with maintainers; [];
- description = "cffi-based cairo bindings for Python";
- };
-}
diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix
index 142245221312..7a2416728c8e 100644
--- a/pkgs/development/python-modules/commoncode/default.nix
+++ b/pkgs/development/python-modules/commoncode/default.nix
@@ -8,6 +8,7 @@
, intbitset
, pytest-xdist
, pytestCheckHook
+, pythonAtLeast
, pythonOlder
, requests
, saneyaml
@@ -19,6 +20,7 @@
buildPythonPackage rec {
pname = "commoncode";
version = "30.0.0";
+ format = "setuptools";
disabled = pythonOlder "3.6";
@@ -49,12 +51,18 @@ buildPythonPackage rec {
pytestCheckHook
pytest-xdist
];
+
disabledTests = lib.optionals stdenv.isDarwin [
# expected result is tailored towards the quirks of upstream's
# CI environment on darwin
"test_searchable_paths"
];
+ disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [
+ # https://github.com/nexB/commoncode/issues/36
+ "src/commoncode/fetch.py"
+ ];
+
pythonImportsCheck = [
"commoncode"
];
diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix
index 607057b73f21..20ccfd6e0a90 100644
--- a/pkgs/development/python-modules/cot/default.nix
+++ b/pkgs/development/python-modules/cot/default.nix
@@ -1,27 +1,57 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k
-, colorlog, pyvmomi, requests, verboselogs
-, psutil, pyopenssl, setuptools
-, mock, pytest-mock, pytestCheckHook, qemu
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, colorlog
+, pyvmomi
+, requests
+, verboselogs
+, pyopenssl
+, setuptools
+, mock
+, pytest-mock
+, pytestCheckHook
+, qemu
}:
buildPythonPackage rec {
pname = "cot";
version = "2.2.1";
- disabled = !isPy3k;
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "f4b3553415f90daac656f89d3e82e79b3d751793239bb173a683b4cc0ceb2635";
+ hash = "sha256-9LNVNBX5DarGVvidPoLnmz11F5Mjm7FzpoO0zAzrJjU=";
};
- propagatedBuildInputs = [ colorlog pyvmomi requests verboselogs pyopenssl setuptools ]
- ++ lib.optional (pythonOlder "3.3") psutil;
+ propagatedBuildInputs = [
+ colorlog
+ pyvmomi
+ requests
+ verboselogs
+ pyopenssl
+ setuptools
+ ];
- checkInputs = [ mock pytestCheckHook pytest-mock qemu ];
+ checkInputs = [
+ mock
+ pytestCheckHook
+ pytest-mock
+ qemu
+ ];
+
+ prePatch = ''
+ # argparse is part of the standardlib
+ substituteInPlace setup.py \
+ --replace "'argparse'," ""
+ '';
- # Many tests require network access and/or ovftool (https://code.vmware.com/web/tool/ovf)
- # try enabling these tests with ovftool once/if it is added to nixpkgs
disabledTests = [
+ # Many tests require network access and/or ovftool (https://code.vmware.com/web/tool/ovf)
+ # try enabling these tests with ovftool once/if it is added to nixpkgs
"HelperGenericTest"
"TestCOTAddDisk"
"TestCOTAddFile"
@@ -34,14 +64,15 @@ buildPythonPackage rec {
"TestQCOW2"
"TestRAW"
"TestVMDKConversion"
+ # CLI test fails with AssertionError
+ "test_help"
] ++ lib.optionals stdenv.isDarwin [
"test_serial_fixup_invalid_host"
];
- # argparse is part of the standardlib
- prePatch = ''
- substituteInPlace setup.py --replace "'argparse'," ""
- '';
+ pythonImportsCheck = [
+ "COT"
+ ];
meta = with lib; {
description = "Common OVF Tool";
diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix
index 25e2692af3ba..a25ecd74b5d0 100644
--- a/pkgs/development/python-modules/demjson/default.nix
+++ b/pkgs/development/python-modules/demjson/default.nix
@@ -1,25 +1,34 @@
-{ lib, python, buildPythonPackage, fetchPypi, isPy3k }:
+{ lib
+, python
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+}:
buildPythonPackage rec {
pname = "demjson";
version = "2.2.4";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii";
};
- checkPhase = lib.optionalString isPy3k ''
- ${python.interpreter} -m lib2to3 -w test/test_demjson.py
- '' + ''
+ doCheck = !(isPy3k);
+
+ checkPhase = ''
${python.interpreter} test/test_demjson.py
'';
+ pythonImportsCheck = [
+ "demjson"
+ ];
+
meta = with lib; {
description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
homepage = "https://github.com/dmeranda/demjson";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ bjornfor ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix
index a8fa6b46cdd0..5e4ec4290fea 100644
--- a/pkgs/development/python-modules/flux-led/default.nix
+++ b/pkgs/development/python-modules/flux-led/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "flux-led";
- version = "0.28.3";
+ version = "0.28.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "flux_led";
rev = version;
- sha256 = "sha256-IkH5cCJbBUekABUcRyJl00tZgx+WqipEVsK8/ks2KDk=";
+ sha256 = "sha256-mD6pTrUAzApJamqqcLzzQI2JDKy3PAn5TtQz5/aPFXg=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix
index 9d548b685efd..d6dedff38e7b 100644
--- a/pkgs/development/python-modules/google-api-core/default.nix
+++ b/pkgs/development/python-modules/google-api-core/default.nix
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "google-api-core";
- version = "2.2.2";
+ version = "2.4.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "97349cc18c2bb2415f64f1353a80273a289a61294ce3eb2f7ce682d251bdd997";
+ sha256 = "sha256-uoeHt8YWMs0DQPCV4cA2vvlCayWU8Qr7KQujEa6Msss=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index d8cd4d3b5800..96a10e1a2221 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -18,12 +18,12 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
- version = "2.31.0";
+ version = "2.32.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "ff66d7d1f64795a855784706c3baa52d18fa0cd1cc4f0a150cf74268abb53ac0";
+ sha256 = "sha256-84Y6xCk/CkWF5ERh2CuR+SOXIe8z/JV11AG02n3BJ70=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
index 0e0d5982c6e2..bf9e8552aec1 100644
--- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-datacatalog";
- version = "3.6.1";
+ version = "3.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "136fb153740d4154d8c9ef306284f7f899399de45eef2c9027ca3e56249c4e2d";
+ sha256 = "sha256-9oixM+4HxHn0G3j8Hpg1iB5gM+7xyD5GBbWpEzzjdrE=";
};
propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index f74944a45e2e..e3423ac48d62 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-storage";
- version = "1.44.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "29edbfeedd157d853049302bf5d104055c6f0cb7ef283537da3ce3f730073001";
+ sha256 = "sha256-pXoVrq0PnfvUOB8b/b6L+JgYpL11urhGyvzvstuEbEc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix
index e055d462b1f3..c1b58c0e1c26 100644
--- a/pkgs/development/python-modules/google-cloud-tasks/default.nix
+++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-tasks";
- version = "2.7.1";
+ version = "2.7.2";
src = fetchPypi {
inherit pname version;
- sha256 = "2fd2222901a7d8ba65f28f9019cb41f5d4c952d012f020bdde105527a3f5ae43";
+ sha256 = "sha256-h/lmrrT8fu1YLDYF6s856EAB8+k7CMFfIMGZPDxC7Ys=";
};
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix
index 54af78da3eb5..d4551b4954a5 100644
--- a/pkgs/development/python-modules/google-cloud-testutils/default.nix
+++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-testutils";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "7a755c1247e32e92bd6df4fa2240dab185b29da9777ab3b946c3b3d9f1abf5d3";
+ sha256 = "sha256-X85NRgGZt7+OpL4poOyS+UWec4fuABiTxEYyFpkUpqs=";
};
propagatedBuildInputs = [ click google-auth six ];
diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix
index 17fb02fd10d9..8de737eeeddc 100644
--- a/pkgs/development/python-modules/gvm-tools/default.nix
+++ b/pkgs/development/python-modules/gvm-tools/default.nix
@@ -4,6 +4,7 @@
, poetry-core
, pytestCheckHook
, python-gvm
+, pythonAtLeast
, pythonOlder
}:
@@ -36,6 +37,8 @@ buildPythonPackage rec {
disabledTests = [
# Don't test sending
"SendTargetTestCase"
+ ] ++ lib.optionals (pythonAtLeast "3.10") [
+ "HelpFormattingParserTestCase"
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix
index c58e50bee868..63a2e941f0fa 100644
--- a/pkgs/development/python-modules/hap-python/default.nix
+++ b/pkgs/development/python-modules/hap-python/default.nix
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "hap-python";
- version = "4.3.0";
+ version = "4.4.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "ikalchev";
repo = "HAP-python";
rev = "v${version}";
- sha256 = "sha256-G4KL6iMeVn/tmvFtFL8vyqHGNfqk6j8iG4tDK9VpCyM=";
+ sha256 = "sha256-dSiI2W4U4FYwMRBInpxb/wkQLKxPzLHIkLPNgiZEhUA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix
index d4d091c36f8b..1bd1e6650c8d 100644
--- a/pkgs/development/python-modules/hwi/default.nix
+++ b/pkgs/development/python-modules/hwi/default.nix
@@ -8,11 +8,15 @@
, mnemonic
, pyaes
, typing-extensions
+, pythonOlder
}:
buildPythonPackage rec {
pname = "hwi";
version = "2.0.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bitcoin-core";
@@ -34,18 +38,21 @@ buildPythonPackage rec {
# make compatible with libusb1 2.x
postPatch = ''
substituteInPlace setup.py \
- --replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7'
+ --replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7' \
+ --replace "'python_requires': '>=3.6,<3.10'," "'python_requires': '>=3.6,<4',"
'';
# tests require to clone quite a few firmwares
doCheck = false;
- pythonImportsCheck = [ "hwilib" ];
+ pythonImportsCheck = [
+ "hwilib"
+ ];
- meta = {
+ meta = with lib; {
description = "Bitcoin Hardware Wallet Interface";
homepage = "https://github.com/bitcoin-core/hwi";
- license = with lib.licenses; [ mit ];
- maintainers = with lib.maintainers; [ prusnak ];
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ prusnak ];
};
}
diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix
new file mode 100644
index 000000000000..a19f27a0a753
--- /dev/null
+++ b/pkgs/development/python-modules/installer/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, pytestCheckHook
+, flit-core
+, mock
+}:
+
+buildPythonPackage rec {
+ pname = "installer";
+ version = "0.3.0";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "pradyunsg";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-AxAQgDhRFkb0HB7ttDb+pHuHzwnNDX6UOm9rswzIwmI=";
+ };
+
+ nativeBuildInputs = [ flit-core ];
+
+ checkInputs = [
+ pytestCheckHook
+ mock
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/pradyunsg/installer";
+ description = "A low-level library for installing a Python package from a wheel distribution.";
+ license = licenses.mit;
+ maintainers = with maintainers; [ cpcloud fridh ];
+ };
+}
diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 0cfcfa119da4..d146d7d64564 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "meshtastic";
- version = "1.2.56";
+ version = "1.2.57";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = version;
- sha256 = "sha256-y+LX44tjE/zTwm1FNyLACu3wmkxN4ZsmYlOnfJdcFcQ=";
+ sha256 = "sha256-olh8DUYg3s72ll1+p+0QapdKR2+aaSvgSUrZuGFif1s=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix
new file mode 100644
index 000000000000..11d677e11004
--- /dev/null
+++ b/pkgs/development/python-modules/pdm-pep517/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, git
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "pdm-pep517";
+ version = "0.9.4";
+ format = "pyproject";
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-2o2FuuvS5PW7uhxl3EGBP75CZ3dcyjPoug1k0irl51c=";
+ };
+
+ preCheck = ''
+ HOME=$TMPDIR
+
+ git config --global user.name nobody
+ git config --global user.email nobody@example.com
+ '';
+
+ checkInputs = [
+ pytestCheckHook
+ git
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/pdm-project/pdm-pep517";
+ description = "Yet another PEP 517 backend.";
+ license = licenses.mit;
+ maintainers = with maintainers; [ cpcloud ];
+ };
+}
diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix
new file mode 100644
index 000000000000..bf9cb69721c4
--- /dev/null
+++ b/pkgs/development/python-modules/pythonfinder/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, pytestCheckHook
+, attrs
+, cached-property
+, click
+, six
+, packaging
+, pytest-cov
+, pytest-timeout
+}:
+
+buildPythonPackage rec {
+ pname = "pythonfinder";
+ version = "1.2.9";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "sarugaku";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-tPMqVKbYwBRvb8/GyYNxO8lwJLcUUQyRoCoF5tg6rxs=";
+ };
+
+ propagatedBuildInputs = [
+ attrs
+ cached-property
+ click
+ six
+ packaging
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-cov
+ pytest-timeout
+ ];
+
+ pytestFlagsArray = [ "--no-cov" ];
+
+ # these tests invoke git in a subprocess and
+ # for some reason git can't be found even if included in checkInputs
+ disabledTests = [
+ "test_shims_are_kept"
+ "test_shims_are_removed"
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/sarugaku/pythonfinder";
+ description = "Cross Platform Search Tool for Finding Pythons";
+ license = licenses.mit;
+ maintainers = with maintainers; [ cpcloud ];
+ };
+}
diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index ca7397598269..f6194970adbd 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "rich";
- version = "10.16.2";
+ version = "11.0.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "willmcgugan";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-SVenprbWq+ucQPAM1e9sNVYWbGAeo7qdEBy+cvqAMK8=";
+ sha256 = "0vkwar22rv1j6a3kqj3c016j0vnnha0kwi79fkd90ib1n501m7rn";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/socketio-client/default.nix b/pkgs/development/python-modules/socketio-client/default.nix
new file mode 100644
index 000000000000..2842e3751732
--- /dev/null
+++ b/pkgs/development/python-modules/socketio-client/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, requests
+, six
+, websocket-client
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+ pname = "socketio-client";
+ version = "0.7.2";
+
+ src = fetchFromGitHub {
+ owner = "invisibleroads";
+ repo = "socketio-client";
+ rev = version;
+ sha256 = "sha256-71sjiGJDDYElPGUNCH1HaVdvgMt8KeD/kXVDpF615ho=";
+ };
+
+ propagatedBuildInputs = [
+ six
+ websocket-client
+ requests
+ ];
+
+ # Perform networking tests.
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "socketIO_client"
+ ];
+
+ meta = with lib; {
+ description = "A socket.io client library for protocol 1.x";
+ homepage = "https://github.com/invisibleroads/socketIO-client";
+ license = licenses.mit;
+ maintainers = with maintainers; [ raitobezarius ];
+ };
+}
diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix
index 9759443228d0..13c8107c9aef 100644
--- a/pkgs/development/python-modules/surepy/default.nix
+++ b/pkgs/development/python-modules/surepy/default.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'aiohttp = {extras = ["speedups"], version = "^3.7.4"}' 'aiohttp = {extras = ["speedups"], version = ">=3.7.4"}' \
- --replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1"'
+ --replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1"' \
+ --replace 'rich = "^10.1.0"' 'rich = ">=10.1.0"'
'';
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix
index bdea03896cb5..4e8c1431cc18 100644
--- a/pkgs/development/python-modules/treex/default.nix
+++ b/pkgs/development/python-modules/treex/default.nix
@@ -27,9 +27,12 @@ buildPythonPackage rec {
sha256 = "1hl3wj71c7cp7jzkhyjy7xgs2vc8c89icq0bgfr49y4pwv69n43m";
};
- patches = [
- ./relax-deps.patch
- ];
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'rich = "^10.7.0"' 'rich = ">=10.7.0"' \
+ --replace 'PyYAML = "^5.4.1"' 'PyYAML = ">=5.4.1"' \
+ --replace 'optax = "^0.0.9"' 'optax = ">=0.0.9"'
+ '';
nativeBuildInputs = [
poetry-core
diff --git a/pkgs/development/python-modules/treex/relax-deps.patch b/pkgs/development/python-modules/treex/relax-deps.patch
deleted file mode 100644
index 347098a4a6d1..000000000000
--- a/pkgs/development/python-modules/treex/relax-deps.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index f0ff8a0..56787ca 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -16,9 +16,9 @@ secondary = true
- [tool.poetry.dependencies]
- python = "^3.7"
- flax = "^0.3.4"
--PyYAML = "^5.4.1"
-+PyYAML = ">=5.4.1"
- rich = "^10.7.0"
--optax = "^0.0.9"
-+optax = ">=0.0.9"
- einops = "^0.3.2"
- treeo = "^0.0.9"
- # treeo = { path = "../treeo", develop = true }
diff --git a/pkgs/development/python-modules/types-freezegun/default.nix b/pkgs/development/python-modules/types-freezegun/default.nix
new file mode 100644
index 000000000000..89672d26e8b2
--- /dev/null
+++ b/pkgs/development/python-modules/types-freezegun/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "types-freezegun";
+ version = "1.1.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0kxiv0yjbbvp1zx694ir149b26kjzvb6600fh397v32b8jvs8w2w";
+ };
+
+ # Module doesn't have tests
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Typing stubs for freezegun";
+ homepage = "https://github.com/python/typeshed";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ jpetrucciani ];
+ };
+}
diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix
new file mode 100644
index 000000000000..504ca4f8eb8d
--- /dev/null
+++ b/pkgs/development/python-modules/types-tabulate/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "types-tabulate";
+ version = "0.8.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-A/KDvzhOoSG3tqWK+zj03vl/MHBPyhOg2mhpNrDzkqw=";
+ };
+
+ # Module doesn't have tests
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Typing stubs for tabulate";
+ homepage = "https://github.com/python/typeshed";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ jpetrucciani ];
+ };
+}
diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix
index 057e2bdb31d1..d83b031fe4c4 100644
--- a/pkgs/development/python-modules/yalexs/default.nix
+++ b/pkgs/development/python-modules/yalexs/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "yalexs";
- version = "1.1.17";
+ version = "1.1.19";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-kCLL+0ZiraTW7swgdfS9vkLcr/s6lTccFQbC02rdNDY=";
+ sha256 = "sha256-i6UFsSY2DQ4jB316fy5cZ+2C93TTmvyB4Caxj3syPdo=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 13b0e8d25705..784a87233362 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -9,7 +9,7 @@ let
common = { scalaVersion, sha256 }:
stdenv.mkDerivation rec {
pname = "ammonite";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchurl {
url =
@@ -83,10 +83,10 @@ let
in {
ammonite_2_12 = common {
scalaVersion = "2.12";
- sha256 = "sha256-JTW1xb+eCb0yhzrA1ntmalP88JoUo+KrjOBvs+cuE/A=";
+ sha256 = "sha256-XV+SPZD7IirLJDqwn/eV8/Wf8m3dSSW0DF3IcBPcixA=";
};
ammonite_2_13 = common {
scalaVersion = "2.13";
- sha256 = "sha256-l5kGPP8tuYi16t6u8ZeAY54yqAWJZR5UuopSGQ69v9Y=";
+ sha256 = "sha256-rq8SLtj0rb35vcvPsCzhDGR93EjHoU6KAhEjs2WIA6o=";
};
}
diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix
index 72154e909b65..edad1f0dd9ee 100644
--- a/pkgs/development/tools/analysis/oclgrind/default.nix
+++ b/pkgs/development/tools/analysis/oclgrind/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }:
+{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python2 }:
stdenv.mkDerivation rec {
pname = "oclgrind";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline python ];
+ buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline python2 ];
cmakeFlags = [
"-DCLANG_ROOT=${llvmPackages.clang-unwrapped}"
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
index 1f7c6641b1cc..6b238fb9266e 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind, wrapQtAppsHook }:
+{ lib, stdenv, qmake, qtbase, perl, python2, php, kcachegrind, wrapQtAppsHook }:
let
name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name;
@@ -8,7 +8,7 @@ in stdenv.mkDerivation {
src = kcachegrind.src;
- buildInputs = [ qtbase perl python php ];
+ buildInputs = [ qtbase perl python2 php ];
nativeBuildInputs = [ qmake wrapQtAppsHook ];
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index b012522c83ef..49d454d86864 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mill";
- version = "0.9.12";
+ version = "0.10.0";
src = fetchurl {
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
- sha256 = "sha256-ct4SsIs6ErWl2XbxfqX3FTOU9K9tTKo8YWu1QT83iTI=";
+ sha256 = "sha256:1acm1z24cw2yzykwwjfrcf66mi16xvsrnrrhrsd9yqrajqab707n";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix
index 930078b2dc72..220554f95d90 100644
--- a/pkgs/development/tools/database/pyrseas/default.nix
+++ b/pkgs/development/tools/database/pyrseas/default.nix
@@ -1,7 +1,7 @@
-{ lib, pythonPackages, fetchFromGitHub }:
+{ lib, python2Packages, fetchFromGitHub }:
let
- pgdbconn = pythonPackages.buildPythonPackage rec {
+ pgdbconn = python2Packages.buildPythonPackage rec {
pname = "pgdbconn";
version = "0.8.0";
src = fetchFromGitHub {
@@ -13,13 +13,13 @@ let
# The tests are impure (they try to access a PostgreSQL server)
doCheck = false;
propagatedBuildInputs = [
- pythonPackages.psycopg2
- pythonPackages.pytest
+ python2Packages.psycopg2
+ python2Packages.pytest
];
};
in
-pythonPackages.buildPythonApplication {
+python2Packages.buildPythonApplication {
pname = "pyrseas";
version = "0.8.0";
src = fetchFromGitHub {
@@ -31,9 +31,9 @@ pythonPackages.buildPythonApplication {
# The tests are impure (they try to access a PostgreSQL server)
doCheck = false;
propagatedBuildInputs = [
- pythonPackages.psycopg2
- pythonPackages.pytest
- pythonPackages.pyyaml
+ python2Packages.psycopg2
+ python2Packages.pytest
+ python2Packages.pyyaml
pgdbconn
];
meta = {
diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix
index 759c83e81c8a..64d299db155b 100644
--- a/pkgs/development/tools/misc/uncrustify/default.nix
+++ b/pkgs/development/tools/misc/uncrustify/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, python }:
+{ lib, stdenv, fetchFromGitHub, cmake, python2 }:
stdenv.mkDerivation rec {
name = "${product}-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY=";
};
- nativeBuildInputs = [ cmake python ];
+ nativeBuildInputs = [ cmake python2 ];
meta = with lib; {
description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA";
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index 6995c41cc911..e8039b1bd940 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -56,6 +56,7 @@
tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json;
tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json;
tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json;
+ tree-sitter-org = lib.importJSON ./tree-sitter-org.json;
tree-sitter-php = lib.importJSON ./tree-sitter-php.json;
tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json;
tree-sitter-prisma = lib.importJSON ./tree-sitter-prisma.json;
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json
new file mode 100644
index 000000000000..038a4f51eece
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json
@@ -0,0 +1,11 @@
+{
+ "url": "https://github.com/milisims/tree-sitter-org",
+ "rev": "39a377f5072ee9f79884e227dc49d42c2eba67d8",
+ "date": "2021-11-01T23:43:23-04:00",
+ "path": "/nix/store/cgsn53p4gp1ahq2zl38jz51xal60dckf-tree-sitter-org",
+ "sha256": "0vfnph4xxvkalzk3rgvzi6ckqkjg31ddzgh4mwbk7qwsacbq9rss",
+ "fetchLFS": false,
+ "fetchSubmodules": false,
+ "deepClone": false,
+ "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
index 448e7dd4406e..d9e4ec1fb199 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, bison, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg
-, libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase
+, libpng, perl, python2, ruby, sqlite, qtwebkit, qmake, qtbase
, darwin, writeScriptBin, cups, makeWrapper
}:
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake ];
buildInputs = [
bison flex fontconfig freetype gperf icu openssl
- libjpeg libpng perl python ruby sqlite qtwebkit qtbase
+ libjpeg libpng perl python2 ruby sqlite qtwebkit qtbase
makeWrapper
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
AGL ApplicationServices AppKit Cocoa OpenGL
diff --git a/pkgs/development/tools/udis86/default.nix b/pkgs/development/tools/udis86/default.nix
index 1885d1a43223..dd4ad058c8da 100644
--- a/pkgs/development/tools/udis86/default.nix
+++ b/pkgs/development/tools/udis86/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, python }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, python2 }:
stdenv.mkDerivation rec {
pname = "udis86";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1";
};
- nativeBuildInputs = [ autoreconfHook python ];
+ nativeBuildInputs = [ autoreconfHook python2 ];
configureFlags = [
"--enable-shared"
diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix
index 352dc83f9abd..58fef12cd6e8 100644
--- a/pkgs/development/tools/winpdb/default.nix
+++ b/pkgs/development/tools/winpdb/default.nix
@@ -1,6 +1,6 @@
-{ lib, fetchurl, pythonPackages, makeDesktopItem }:
+{ lib, fetchurl, python2Packages, makeDesktopItem }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
pname = "winpdb";
version = "1.4.8";
namePrefix = "";
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs";
};
- propagatedBuildInputs = [ pythonPackages.wxPython ];
+ propagatedBuildInputs = [ python2Packages.wxPython ];
desktopItem = makeDesktopItem {
name = "winpdb";
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 32507f0d5a38..a0c724c1d353 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.17.2";
+ version = "1.17.3";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-i8BfLnZnkHBPyNy4vUUA9J1f757KCjJ/DsWLPMVxsEg=";
+ sha256 = "sha256-S4Dt6SrSE/TLGhjAkTrIdvNR71A6ykxSxq72aiyWUX8=";
};
- cargoSha256 = "sha256-bYRBIdB9/F9OgFxC2LZ24HJWQRLeji978Z2cpH18lY8=";
+ cargoSha256 = "1ph392jxkln2ihq3x4hhjb1k3fsd2g54m37qgqkza4abvmc7adns";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix
index 61f5a5bf824d..0e21a9a1b9ea 100644
--- a/pkgs/games/amoeba/default.nix
+++ b/pkgs/games/amoeba/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, amoeba-data, alsa-lib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkg-config }:
stdenv.mkDerivation rec {
- name = "amoeba-${version}-${debver}";
+ pname = "amoeba";
version = "1.1";
debver = "29.1";
diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix
index bd29c7b616c4..76f22e98d9e9 100644
--- a/pkgs/games/blackshades/default.nix
+++ b/pkgs/games/blackshades/default.nix
@@ -1,29 +1,27 @@
{ lib, stdenv, fetchFromSourcehut
-, SDL, stb, libGLU, libGL, openal, libvorbis, freealut }:
+, zig, glfw, libGLU, libGL, openal, libsndfile }:
stdenv.mkDerivation rec {
pname = "blackshades";
- version = "1.3.1";
+ version = "2.4.7";
src = fetchFromSourcehut {
owner = "~cnx";
repo = pname;
rev = version;
- sha256 = "0yzp74ynkcp6hh5m4zmvrgx5gwm186hq7p3m7qkww54qdyijb3rv";
+ fetchSubmodules = true;
+ sha256 = "sha256-hvJwWUUmGeb7MQgKe79cPS2ckPZ9z0Yc5S9IiwuXPD8=";
};
- buildInputs = [ SDL stb libGLU libGL openal libvorbis freealut ];
+ nativeBuildInputs = [ zig ];
+ buildInputs = [ glfw libGLU libGL openal libsndfile ];
- postPatch = ''
- sed -i -e s,Data/,$out/share/$pname/,g \
- -e s,Data:,$out/share/$pname/,g \
- src/*.cpp
+ preBuild = ''
+ export HOME=$TMPDIR
'';
installPhase = ''
- mkdir -p $out/bin $out/share
- cp build/blackshades $out/bin
- cp -R Data $out/share/$pname
+ zig build -Drelease-fast -Dcpu=baseline --prefix $out install
'';
meta = {
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index 02e34e5f749d..e5eea7ece628 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -7,7 +7,7 @@
}:
stdenv.mkDerivation rec {
- name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
+ pname = "crawl${lib.optionalString tileMode "-tiles"}";
version = "0.27.1";
src = fetchFromGitHub {
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index 93f51df1819d..316d1308eb79 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -9,7 +9,8 @@ let
in
stdenv.mkDerivation {
- name = "dwarf-therapist-${dwarf-therapist.version}";
+ pname = "dwarf-therapist";
+ version = dwarf-therapist.version;
wrapper = substituteAll {
src = ./dwarf-therapist.in;
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 5b25cf4ff409..27b54667f0b9 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -72,7 +72,8 @@ let
in
stdenv.mkDerivation {
- name = "dwarf_fortress_unfuck-${release.unfuckRelease}";
+ pname = "dwarf_fortress_unfuck";
+ version = release.unfuckRelease;
src = fetchFromGitHub {
owner = "svenstaro";
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index ce989b98ffbd..3d1c3ead0604 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -92,7 +92,8 @@ let
in
stdenv.mkDerivation {
- name = "dwarf-fortress-${dwarf-fortress.dfVersion}";
+ pname = "dwarf-fortress";
+ version = dwarf-fortress.dfVersion;
dfInit = substituteAll {
name = "dwarf-fortress-init";
diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix
index 7402049a9d82..6f50869e6c69 100644
--- a/pkgs/games/gnubg/default.nix
+++ b/pkgs/games/gnubg/default.nix
@@ -1,8 +1,8 @@
{ lib, stdenv, fetchurl, pkg-config, glib, python3, gtk2, readline }:
-let version = "1.06.002"; in
-stdenv.mkDerivation {
- name = "gnubg-"+version;
+stdenv.mkDerivation rec {
+ pname = "gnubg";
+ version = "1.06.002";
src = fetchurl {
url = "http://gnubg.org/media/sources/gnubg-release-${version}-sources.tar.gz";
diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix
index a877eed6213f..bcbe2a6c6535 100644
--- a/pkgs/games/heroic/default.nix
+++ b/pkgs/games/heroic/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, appimageTools, python, gsettings-desktop-schemas, gtk3 }:
+{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:
let
pname = "heroic";
diff --git a/pkgs/games/hhexen/default.nix b/pkgs/games/hhexen/default.nix
index 0306c54ef4ee..19a0b783efdd 100644
--- a/pkgs/games/hhexen/default.nix
+++ b/pkgs/games/hhexen/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchurl, SDL, stdenv }:
stdenv.mkDerivation rec {
- name = "hhexen";
+ pname = "hhexen";
version = "1.6.3";
src = fetchurl {
url = "mirror://sourceforge/hhexen/hhexen-${version}-src.tgz";
diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index 5c35219c19bf..cafdd2b84f0d 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -1,8 +1,6 @@
{ lib, stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkg-config, lua, zlib, unzip }:
let
- version = "3.3.2";
-
# I took several games at random from https://instead.syscall.ru/games/
games = [
(fetchurl {
@@ -28,8 +26,9 @@ let
];
in
-stdenv.mkDerivation {
- name = "instead-" + version;
+stdenv.mkDerivation rec {
+ pname = "instead";
+ version = "3.3.2";
src = fetchurl {
url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix
index b623d7bd5396..12eb6b24a806 100644
--- a/pkgs/games/moon-buggy/default.nix
+++ b/pkgs/games/moon-buggy/default.nix
@@ -1,16 +1,15 @@
{lib, stdenv, fetchurl, ncurses}:
stdenv.mkDerivation rec {
- baseName = "moon-buggy";
+ pname = "moon-buggy";
version = "1.0.51";
- name = "${baseName}-${version}";
buildInputs = [
ncurses
];
src = fetchurl {
- url = "http://m.seehuhn.de/programs/${name}.tar.gz";
+ url = "http://m.seehuhn.de/programs/moon-buggy-${version}.tar.gz";
sha256 = "0gyjwlpx0sd728dwwi7pwks4zfdy9rm1w1xbhwg6zip4r9nc2b9m";
};
diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index f9939f063c80..2b29bddad93c 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -20,9 +20,9 @@ let
in stdenv.mkDerivation rec {
version = "3.6.6";
- name = if x11Mode then "nethack-x11-${version}"
- else if qtMode then "nethack-qt-${version}"
- else "nethack-${version}";
+ pname = if x11Mode then "nethack-x11"
+ else if qtMode then "nethack-qt"
+ else "nethack";
src = fetchurl {
url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz";
diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix
index 41c903e10116..01bd44ee244a 100644
--- a/pkgs/games/openra/common.nix
+++ b/pkgs/games/openra/common.nix
@@ -2,7 +2,7 @@
and out-of-tree mod packages (mod.nix).
*/
{ lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper
-, lua, mono, dotnetPackages, python
+, lua, mono, dotnetPackages, python2
, libGL, freetype, openal, SDL2
, zenity
}:
@@ -10,7 +10,7 @@
with lib;
let
- path = makeBinPath ([ mono python ] ++ optional (zenity != null) zenity);
+ path = makeBinPath ([ mono python2 ] ++ optional (zenity != null) zenity);
rpath = makeLibraryPath [ lua freetype openal SDL2 ];
mkdirp = makeSetupHook { } ./mkdirp.sh;
@@ -66,7 +66,7 @@ in {
makeWrapper
mkdirp
mono
- python
+ python2
];
makeFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
index c29af6d810f5..2debd15f814e 100644
--- a/pkgs/games/planetaryannihilation/default.nix
+++ b/pkgs/games/planetaryannihilation/default.nix
@@ -1,26 +1,15 @@
{ lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk
-, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg }:
+, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg, requireFile }:
-# TODO: use dynamic attributes once Nix 1.7 is out
-assert ((config.planetary_annihilation or null).url or null) != null;
-assert ((config.planetary_annihilation or null).sha256 or null) != null;
+stdenv.mkDerivation rec {
+ pname = "planetary-annihalation";
+ version = "62857";
-/* to setup:
- $ cat ~/.config/nixpkgs/config.nix
- {
- planetary_annihilation = {
- url = "file:///home/user/PA_Linux_62857.tar.bz2";
+ src = requireFile {
+ message = "This file has to be downloaded manually via nix-prefetch-url.";
+ name = "PA_Linux_${version}.tar.bz2";
sha256 = "0imi3k5144dsn3ka9khx3dj76klkw46ga7m6rddqjk4yslwabh3k";
};
-}
-*/
-
-stdenv.mkDerivation {
- name = "planetary-annihalation";
-
- src = fetchurl {
- inherit (config.planetary_annihilation) url sha256;
- };
nativeBuildInputs = [ patchelf makeWrapper ];
diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix
index f81ddb7edf95..809ed7a146d0 100644
--- a/pkgs/games/tennix/default.nix
+++ b/pkgs/games/tennix/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python } :
+{lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python2 } :
stdenv.mkDerivation rec {
pname = "tennix";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm";
};
- buildInputs = [ python SDL SDL_mixer SDL_image SDL_ttf SDL_net ];
+ buildInputs = [ python2 SDL SDL_mixer SDL_image SDL_ttf SDL_net ];
patches = [ ./fix_FTBFS.patch ];
diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix
index 8f4366fbcb87..10a959a676b4 100644
--- a/pkgs/games/xconq/default.nix
+++ b/pkgs/games/xconq/default.nix
@@ -2,12 +2,11 @@
, libXext, fontconfig, makeWrapper }:
stdenv.mkDerivation rec {
- name = "${baseName}-${version}";
- baseName = "xconq";
+ pname = "xconq";
version = "7.5.0-0pre.0.20050612";
src = fetchurl {
- url = "mirror://sourceforge/project/${baseName}/${baseName}/${name}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/xconq/xconq/xconq-${version}/xconq-${version}.tar.gz";
sha256 = "1za78yx57mgwcmmi33wx3533yz1x093dnqis8q2qmqivxav51lca";
};
diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix
index c2ff8ebdadaa..3552a4a8d04b 100644
--- a/pkgs/misc/emulators/fceux/default.nix
+++ b/pkgs/misc/emulators/fceux/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fceux";
- version = "2.6.0";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "TASEmulators";
repo = pname;
rev = "${pname}-${version}";
- sha256 = "sha256-FNcybq0EFN0tWgWxzwEJQMpsnpvdRxDYnIWDXW2fXkw=";
+ sha256 = "sha256-LlGM6sOjcpyHApUvSr5etKIqwDoheuiW53DSHs19W6Q=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix
index 558b5ca63377..dc1a23f33b39 100644
--- a/pkgs/misc/emulators/retrofe/default.nix
+++ b/pkgs/misc/emulators/retrofe/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkg-config
-, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell
+, python2, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell
}:
stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm";
};
- nativeBuildInputs = [ cmake makeWrapper pkg-config python ];
+ nativeBuildInputs = [ cmake makeWrapper pkg-config python2 ];
buildInputs = [
glib gst_all_1.gstreamer SDL2 SDL2_image SDL2_mixer SDL2_ttf sqlite zlib
diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix
index 3b24584f7e63..c09a83b92ea8 100644
--- a/pkgs/misc/emulators/wxmupen64plus/default.nix
+++ b/pkgs/misc/emulators/wxmupen64plus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL
+{ lib, stdenv, fetchurl, python2, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL
, wafHook }:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ wafHook ];
- buildInputs = [ python wxGTK29 SDL libX11 libGLU libGL ];
+ buildInputs = [ python2 wxGTK29 SDL libX11 libGLU libGL ];
preConfigure = ''
tar xf ${mupen64plus.src}
diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix
index 6908429e21b9..ffb9d0da8570 100644
--- a/pkgs/misc/screensavers/xtrlock-pam/default.nix
+++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, python, pkg-config, xlibsWrapper, pam }:
+{ lib, stdenv, fetchgit, python2, pkg-config, xlibsWrapper, pam }:
stdenv.mkDerivation {
pname = "xtrlock-pam";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ python xlibsWrapper pam ];
+ buildInputs = [ python2 xlibsWrapper pam ];
configurePhase = ''
substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 42b2e7a5f492..b8ab2f433125 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -10,7 +10,7 @@
, substituteAll
# Language dependencies
-, python
+, python2
, python3
, rustPlatform
@@ -184,7 +184,7 @@ self: super: {
});
ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs (old: {
- buildInputs = [ python ];
+ buildInputs = [ python2 ];
buildPhase = ''
patchShebangs .
./install.sh
@@ -862,7 +862,7 @@ self: super: {
vim-isort = super.vim-isort.overrideAttrs (old: {
postPatch = ''
substituteInPlace ftplugin/python_vimisort.vim \
- --replace 'import vim' 'import vim; import sys; sys.path.append("${python.pkgs.isort}/${python.sitePackages}")'
+ --replace 'import vim' 'import vim; import sys; sys.path.append("${python2.pkgs.isort}/${python2.sitePackages}")'
'';
});
@@ -916,7 +916,7 @@ self: super: {
});
vim-wakatime = super.vim-wakatime.overrideAttrs (old: {
- buildInputs = [ python ];
+ buildInputs = [ python2 ];
});
vim-xdebug = super.vim-xdebug.overrideAttrs (old: {
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 954af1706fe8..616f5136d7c9 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1250,6 +1250,8 @@ let
};
};
+ ms-ceintl = callPackage ./language-packs.nix {}; # non-English language packs
+
ms-dotnettools.csharp = callPackage ./ms-dotnettools-csharp { };
ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension {
@@ -1472,8 +1474,8 @@ let
mktplcRef = {
name = "metals";
publisher = "scalameta";
- version = "1.11.0";
- sha256 = "0a4agm0g16cxhvhvsmbsvvicfsjr53330rsab5xdi7gcpx9a1dff";
+ version = "1.12.0";
+ sha256 = "13zwjnrmkrs3wxh8c9nz9zxxs3p6lkj41q30v4a1md5pscfa1s44";
};
meta = {
license = lib.licenses.asl20;
@@ -1574,8 +1576,8 @@ let
mktplcRef = {
publisher = "stkb";
name = "rewrap";
- version = "1.15.4";
- sha256 = "sha256-yuXyClvhGsonvddYHDMkLSvwEsD21vOeE54Gs9BRpeg=";
+ version = "1.16.0";
+ sha256 = "sha256-351zYmMupAv/8fQ+lOc0pYzy/wsE3JqTuxfKD+AdBAc=";
};
meta = with lib; {
changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md";
@@ -1591,8 +1593,8 @@ let
mktplcRef = {
name = "code-spell-checker";
publisher = "streetsidesoftware";
- version = "2.0.14";
- sha256 = "sha256-mwcssQvaztrnUuSoo8AWK3FXT4qKmPTRCGVYkAjgfXg=";
+ version = "2.1.4";
+ sha256 = "sha256-V8ug/EtDczjiofuL7HhpN1B+qbedpnvIlXnwiXJzD/g=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
diff --git a/pkgs/misc/vscode-extensions/language-packs.nix b/pkgs/misc/vscode-extensions/language-packs.nix
new file mode 100644
index 000000000000..f97727d6c2cb
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/language-packs.nix
@@ -0,0 +1,89 @@
+{ lib, vscode-utils }:
+
+with vscode-utils;
+
+let
+
+ buildVscodeLanguagePack = { language, sha256 }:
+ buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-language-pack-${language}";
+ publisher = "MS-CEINTL";
+ version = "1.64.3";
+ inherit sha256;
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
+in
+
+# See list of core language packs at https://github.com/Microsoft/vscode-loc
+{
+ # French
+ vscode-language-pack-fr = buildVscodeLanguagePack {
+ language = "fr";
+ sha256 = "sha256-6ynT1sbMgKO8iZReQ6KxFpR1VL3Nuo58MvXCtp+67vA=";
+ };
+ # Italian
+ vscode-language-pack-it = buildVscodeLanguagePack {
+ language = "it";
+ sha256 = "sha256-5aNFpzNMZAZJH3n0rJevke9P6AW0au5i8+r4PXsb9Rg=";
+ };
+ # German
+ vscode-language-pack-de = buildVscodeLanguagePack {
+ language = "de";
+ sha256 = "sha256-oEaWtsgktHKw52lnZTESkpzC/TTY8LO4yX11IgtMG5U=";
+ };
+ # Spanish
+ vscode-language-pack-es = buildVscodeLanguagePack {
+ language = "es";
+ sha256 = "sha256-utLWbved3WCCk3XzqedbYzmyaKfbMrAmR0btT09GlxA=";
+ };
+ # Russian
+ vscode-language-pack-ru = buildVscodeLanguagePack {
+ language = "ru";
+ sha256 = "sha256-0Wr2ICOiaaj4jZ555bxUJcmXO/yWDyn0UmdvxUF3WSQ=";
+ };
+ # Chinese (Simplified)
+ vscode-language-pack-zh-hans = buildVscodeLanguagePack {
+ language = "zh-hans";
+ sha256 = "sha256-irTSQcVXf/V3MuZwfx4tFcvBk+xhbFZTnb7IG28s/p4=";
+ };
+ # Chinese (Traditional)
+ vscode-language-pack-zh-hant = buildVscodeLanguagePack {
+ language = "zh-hant";
+ sha256 = "sha256-3IA/VTTTEqS6jrDYv50GnLXOTSC1XAMvqOVfOuvIdIs=";
+ };
+ # Japanese
+ vscode-language-pack-ja = buildVscodeLanguagePack {
+ language = "ja";
+ sha256 = "sha256-rxod70ddrppEYYzukksVY1dTXR8osLFAsIPr1fSFZDg=";
+ };
+ # Korean
+ vscode-language-pack-ko = buildVscodeLanguagePack {
+ language = "ko";
+ sha256 = "sha256-QYFaxJz1PqKKIiLosLQ8Tu3JNXzpxLFqgIHjjRLwjA4=";
+ };
+ # Czech
+ vscode-language-pack-cs = buildVscodeLanguagePack {
+ language = "cs";
+ sha256 = "sha256-eMk+syy2h+Xb3k6QB8PqYaF4I1ydaY6eRsvOXmelh9Q=";
+ };
+ # Portuguese (Brazil)
+ vscode-language-pack-pt-br = buildVscodeLanguagePack {
+ language = "pt-BR";
+ sha256 = "sha256-7Trz38KBl4sD7608MvTs02pUsdD05oHEj3Sp1LvtI7I=";
+ };
+ # Turkish
+ vscode-language-pack-tr = buildVscodeLanguagePack {
+ language = "tr";
+ sha256 = "sha256-T4CTpbve3vrNdW4VDfHDg8U8cQEtuxPV5LvNdtKrqzA";
+ };
+ # Pseudo Language
+ vscode-language-pack-qps-ploc = buildVscodeLanguagePack {
+ language = "qps-ploc";
+ sha256 = "sha256-rPvCr3uQPfM8vwKoV7Un5aiMZClhf6TvG1PEe3xYNI0=";
+ };
+}
diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 268e178aad08..8124da489aee 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libnl, openssl, sqlite ? null }:
+{ lib, stdenv, fetchurl, pkg-config, libnl, openssl, sqlite ? null }:
stdenv.mkDerivation rec {
pname = "hostapd";
- version = "2.9";
+ version = "2.10";
src = fetchurl {
url = "https://w1.fi/releases/${pname}-${version}.tar.gz";
- sha256 = "1mrbvg4v7vm7mknf0n29mf88k3s4a4qj6r4d51wq8hmjj1m7s7c8";
+ sha256 = "sha256-IG58eZtnhXLC49EgMCOHhLxKn4IyOwFWtMlGbxSYkV0=";
};
nativeBuildInputs = [ pkg-config ];
@@ -16,38 +16,8 @@ stdenv.mkDerivation rec {
(fetchurl {
# Note: fetchurl seems to be unhappy with openwrt git
# server's URLs containing semicolons. Using the github mirror instead.
- url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch";
- sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";
- })
- # AP mode PMF disconnection protection bypass (CVE.2019-16275), can be removed >= 2.10
- # https://w1.fi/security/2019-7/
- (fetchurl {
- name = "CVE-2019-16275.patch";
- url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch";
- sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz";
- })
- # Fixes for UPnP SUBSCRIBE misbehavior in hostapd WPS AP (CVE-2020-12695), can be removed >= 2.10
- # https://w1.fi/security/2020-1/
- (fetchurl {
- name = "CVE-2020-12695_0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch";
- url = "https://w1.fi/security/2020-1/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch";
- sha256 = "1mrbhicqb34jlw1nid5hk2vnjbvfhvp7r5iblaj4l6vgc6fmp6id";
- })
- (fetchurl {
- name = "CVE-2020-12695_0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch";
- url = "https://w1.fi/security/2020-1/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch";
- sha256 = "1pk08b06b24is50bis3rr56xjd3b5kxdcdk8bx39n9vna9db7zj9";
- })
- (fetchurl {
- name = "CVE-2020-12695_0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch";
- url = "https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch";
- sha256 = "12npqp2skgrj934wwkqicgqksma0fxz09di29n1b5fm5i4njl8d8";
- })
- # In wpa_supplicant and hostapd 2.9, forging attacks may occur because AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and tls/x509v3.c.
- (fetchpatch {
- name = "CVE-2021-30004.patch";
- url = "https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15";
- sha256 = "1gbhlz41x1ar1hppnb76pqxj6vimiypy7c4kq6h658637s4am3xg";
+ url = "https://raw.githubusercontent.com/openwrt/openwrt/eefed841b05c3cd4c65a78b50ce0934d879e6acf/package/network/services/hostapd/patches/300-noscan.patch";
+ sha256 = "08p5frxhpq1rp2nczkscapwwl8g9nc4fazhjpxic5bcbssc3sb00";
})
];
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 045f80ce9ac2..6d1763a0d0fd 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -12,7 +12,8 @@ with lib;
assert versionAtLeast kernel.version "3.12";
stdenv.mkDerivation {
- name = "perf-linux-${kernel.version}";
+ pname = "perf-linux";
+ version = kernel.version;
inherit (kernel) src;
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 522a74dea01a..6efcb01cc531 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -9,11 +9,11 @@ in
stdenv.mkDerivation rec {
pname = "klibc";
- version = "2.0.9";
+ version = "2.0.10";
src = fetchurl {
url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz";
- sha256 = "sha256-bcynCJEzINJjCfBbDCv2gHG/EbPa3MTmx9kjg3/CPuE=";
+ sha256 = "sha256-ZidT2oiJ50TfwNtutAIcM3fufvjtZtfVd2X4yeJZOc0=";
};
patches = [ ./no-reinstall-kernel-headers.patch ];
diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
index 23d323f84b8f..15f7251f9961 100644
--- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
+++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
- name = "kmod-debian-aliases-${version}.conf";
+ pname = "kmod-debian-aliases.conf";
version = "22-1.1";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/libevdevc/default.nix b/pkgs/os-specific/linux/libevdevc/default.nix
index 2417ef6da9db..4998ee3e6b57 100644
--- a/pkgs/os-specific/linux/libevdevc/default.nix
+++ b/pkgs/os-specific/linux/libevdevc/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, coreutils, pkg-config, glib, jsoncpp }:
stdenv.mkDerivation rec {
- name = "libevdevc";
+ pname = "libevdevc";
version = "2.0.1";
src = fetchFromGitHub {
owner = "hugegreenbug";
diff --git a/pkgs/os-specific/linux/libgestures/default.nix b/pkgs/os-specific/linux/libgestures/default.nix
index bface8118be2..1454c0c78a50 100644
--- a/pkgs/os-specific/linux/libgestures/default.nix
+++ b/pkgs/os-specific/linux/libgestures/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, jsoncpp }:
stdenv.mkDerivation rec {
- name = "libgestures-${version}";
+ pname = "libgestures";
version = "2.0.1";
src = fetchFromGitHub {
owner = "hugegreenbug";
diff --git a/pkgs/os-specific/linux/net-tools/mptcp.nix b/pkgs/os-specific/linux/net-tools/mptcp.nix
index 577b7c25311a..b4ce59a7c68d 100644
--- a/pkgs/os-specific/linux/net-tools/mptcp.nix
+++ b/pkgs/os-specific/linux/net-tools/mptcp.nix
@@ -1,7 +1,7 @@
{ lib, nettools, fetchFromGitHub }:
nettools.overrideAttrs(oa: rec {
- name = "net-tools-mptcp";
+ pname = "net-tools-mptcp";
version = "0.95";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix
index 8411c4fdbfaf..0091accd57a7 100644
--- a/pkgs/os-specific/linux/pam_usb/default.nix
+++ b/pkgs/os-specific/linux/pam_usb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkg-config, pmount, pythonPackages, writeScript, runtimeShell }:
+{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkg-config, pmount, python2Packages, writeScript, runtimeShell }:
let
@@ -29,7 +29,7 @@ let
pmountBin = useSetUID pmount "/bin/pmount";
pumountBin = useSetUID pmount "/bin/pumount";
- inherit (pythonPackages) python dbus-python;
+ inherit (python2Packages) python dbus-python;
in
stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix
index 92294b58e42a..ba525c1a387a 100644
--- a/pkgs/os-specific/linux/pflask/default.nix
+++ b/pkgs/os-specific/linux/pflask/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python, wafHook }:
+{ lib, stdenv, fetchFromGitHub, python2, wafHook }:
stdenv.mkDerivation rec {
pname = "pflask";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ wafHook ];
- buildInputs = [ python ];
+ buildInputs = [ python2 ];
meta = {
description = "Lightweight process containers for Linux";
diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix
index 0797656f653e..e86658ccb0ac 100644
--- a/pkgs/os-specific/linux/pommed-light/default.nix
+++ b/pkgs/os-specific/linux/pommed-light/default.nix
@@ -10,13 +10,12 @@
}:
stdenv.mkDerivation rec {
- pkgname = "pommed-light";
+ pname = "pommed-light";
version = "1.51lw";
- name = "${pkgname}-${version}";
src = fetchFromGitHub {
owner = "bytbox";
- repo = pkgname;
+ repo = "pommed-light";
rev = "v${version}";
sha256 = "18fvdwwhcl6s4bpf2f2i389s71c8k4g0yb81am9rdddqmzaw27iy";
};
diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix
index cace3e22ae7d..b2636382aec6 100644
--- a/pkgs/os-specific/linux/smem/default.nix
+++ b/pkgs/os-specific/linux/smem/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python }:
+{ lib, stdenv, fetchurl, python2 }:
stdenv.mkDerivation rec {
pname = "smem";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "19ibv1byxf2b68186ysrgrhy5shkc5mc69abark1h18yigp3j34m";
};
- buildInputs = [ python ];
+ buildInputs = [ python2 ];
makeFlags = [ "smemcap" ];
diff --git a/pkgs/os-specific/linux/speedometer/default.nix b/pkgs/os-specific/linux/speedometer/default.nix
index 2801334688b0..2802fddf8ce5 100644
--- a/pkgs/os-specific/linux/speedometer/default.nix
+++ b/pkgs/os-specific/linux/speedometer/default.nix
@@ -1,6 +1,6 @@
-{ lib, fetchurl, pythonPackages }:
+{ lib, fetchurl, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
pname = "speedometer";
version = "2.8";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "060bikv3gwr203jbdmvawsfhc0yq0bg1m42dk8czx1nqvwvgv6fm";
};
- propagatedBuildInputs = [ pythonPackages.urwid ];
+ propagatedBuildInputs = [ python2Packages.urwid ];
postPatch = ''
sed -i "/'entry_points': {/d" setup.py
diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix
index 5afb399fc162..eefd95d1153a 100644
--- a/pkgs/os-specific/linux/statifier/default.nix
+++ b/pkgs/os-specific/linux/statifier/default.nix
@@ -1,8 +1,8 @@
{ lib, multiStdenv, fetchurl }:
-let version = "1.7.4"; in
-multiStdenv.mkDerivation {
- name = "statifier-${version}";
+multiStdenv.mkDerivation rec {
+ pname = "statifier";
+ version = "1.7.4";
src = fetchurl {
url = "mirror://sourceforge/statifier/statifier-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index 5f4f6069bcc6..091584a93cf4 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -1,9 +1,8 @@
{ lib, stdenv, fetchurl, withoutInitTools ? false }:
-let version = "3.01"; in
-
-stdenv.mkDerivation {
- name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version;
+stdenv.mkDerivation rec {
+ pname = if withoutInitTools then "sysvtools" else "sysvinit";
+ version = "3.01";
src = fetchurl {
url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix
index 5a14d3d2ee34..3a2697e0a712 100644
--- a/pkgs/os-specific/linux/tmon/default.nix
+++ b/pkgs/os-specific/linux/tmon/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, kernel, ncurses }:
stdenv.mkDerivation {
- name = "tmon-${kernel.version}";
+ pname = "tmon";
+ version = kernel.version;
inherit (kernel) src;
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index a0b748be2149..1d4166e4083d 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -54,7 +54,7 @@ let
in
stdenv.mkDerivation {
- name = "uclibc-ng-${version}";
+ pname = "uclibc-ng";
inherit version;
src = fetchurl {
diff --git a/pkgs/os-specific/linux/unstick/default.nix b/pkgs/os-specific/linux/unstick/default.nix
index 7d839f8acdb8..7856456a3c36 100644
--- a/pkgs/os-specific/linux/unstick/default.nix
+++ b/pkgs/os-specific/linux/unstick/default.nix
@@ -1,12 +1,12 @@
{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, libseccomp }:
stdenv.mkDerivation rec {
- name = "unstick";
+ pname = "unstick";
version = "0.1.0";
src = fetchFromGitHub {
owner = "kwohlfahrt";
- repo = name;
+ repo = "unstick";
rev = "effee9aa242ca12dc94cc6e96bc073f4cc9e8657";
sha256 = "08la3jmmzlf4pm48bf9zx4cqj9gbqalpqy0s57bh5vfsdk74nnhv";
};
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 656fa477768a..e48dce4f3136 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, openssl, pkg-config, libnl
+{ lib, stdenv, fetchurl, openssl, pkg-config, libnl
, nixosTests
, withDbus ? true, dbus
, withReadline ? true, readline
@@ -8,45 +8,16 @@
with lib;
stdenv.mkDerivation rec {
- version = "2.9";
+ version = "2.10";
pname = "wpa_supplicant";
src = fetchurl {
url = "https://w1.fi/releases/${pname}-${version}.tar.gz";
- sha256 = "05qzak1mssnxcgdrafifxh9w86a4ha69qabkg4bsigk499xyxggw";
+ sha256 = "sha256-IN965RVLODA1X4q0JpEjqHr/3qWf50/pKSqR0Nfhey8=";
};
patches = [
- (fetchurl {
- name = "CVE-2019-16275.patch";
- url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch";
- sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz";
- })
- (fetchpatch {
- # Expose OWE key management capability over DBus, remove >= 2.10
- name = "dbus-Export-OWE-capability-and-OWE-BSS-key_mgmt.patch";
- url = "https://w1.fi/cgit/hostap/patch/?id=7800725afb27397f7d6033d4969e2aeb61af4737";
- sha256 = "0c1la7inf4m5y9gzdjjdnhpkx32pm8vi6m5knih8p77q4mbrdgg8";
- })
- # P2P: Fix copying of secondary device types for P2P group client (https://w1.fi/security/2020-2/)
- (fetchurl {
- name = "CVE-2021-0326.patch";
- url = "https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch";
- sha256 = "19f4hx0p547mdx8y8arb3vclwyy4w9c8a6a40ryj7q33730mrmn4";
- })
- # P2P: Fix a corner case in peer addition based on PD Request (https://w1.fi/security/2021-1/)
- (fetchurl {
- name = "CVE-2021-27803.patch";
- url = "https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch";
- sha256 = "04cnds7hmbqc44jasabjvrdnh66i5hwvk2h2m5z94pmgbzncyh3z";
- })
- # In wpa_supplicant and hostapd 2.9, forging attacks may occur because AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and tls/x509v3.c.
- (fetchpatch {
- name = "CVE-2021-30004.patch";
- url = "https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15";
- sha256 = "1gbhlz41x1ar1hppnb76pqxj6vimiypy7c4kq6h658637s4am3xg";
- })
] ++ lib.optionals readOnlyModeSSIDs [
# Allow read-only networks
./0001-Implement-read-only-mode-for-ssids.patch
diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix
index dbda35670f66..e842b59651e7 100644
--- a/pkgs/os-specific/linux/x86info/default.nix
+++ b/pkgs/os-specific/linux/x86info/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, pciutils, python}:
+{lib, stdenv, fetchurl, pciutils, python2}:
stdenv.mkDerivation rec {
version = "1.30";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sed -i 's/-Werror -Wall//' Makefile
'';
- buildInputs = [ pciutils python ];
+ buildInputs = [ pciutils python2 ];
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix
index 9940decc0bc9..dcf397ed4b24 100644
--- a/pkgs/servers/adguardhome/default.nix
+++ b/pkgs/servers/adguardhome/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchzip }:
+{ lib, stdenv, fetchurl, fetchzip, nixosTests }:
stdenv.mkDerivation rec {
pname = "adguardhome";
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = ./update.sh;
+ tests.adguardhome = nixosTests.adguardhome;
};
meta = with lib; {
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index a8b837c8b3e7..a5b36ad5c4ac 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -3,7 +3,7 @@
, fetchurl
, erlang
, elixir
-, python
+, python2
, libxml2
, libxslt
, xmlto
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ];
- buildInputs = [ erlang elixir python libxml2 libxslt glibcLocales ]
+ buildInputs = [ erlang elixir python2 libxml2 libxslt glibcLocales ]
++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
outputs = [ "out" "man" "doc" ];
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index 146db2ea5de5..cf6427c860cf 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, zip, unzip
-, jdk, python
+, jdk, python2
, confFile ? ""
, extraLibraryPaths ? []
, extraJars ? []
@@ -30,11 +30,11 @@ stdenv.mkDerivation rec {
fixupPhase = ''
# Fix python reference
sed -i \
- -e '19iPYTHON=${python}/bin/python' \
- -e 's|#!/usr/bin/.*python|#!${python}/bin/python|' \
+ -e '19iPYTHON=${python2}/bin/python' \
+ -e 's|#!/usr/bin/.*python|#!${python2}/bin/python|' \
$out/bin/storm
sed -i \
- -e 's|#!/usr/bin/.*python|#!${python}/bin/python|' \
+ -e 's|#!/usr/bin/.*python|#!${python2}/bin/python|' \
-e "s|STORM_CONF_DIR = .*|STORM_CONF_DIR = os.getenv('STORM_CONF_DIR','$out/conf')|" \
-e 's|STORM_LOG4J2_CONF_DIR =.*|STORM_LOG4J2_CONF_DIR = os.path.join(STORM_CONF_DIR, "log4j2")|' \
$out/bin/storm.py
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index aab639140e5f..8888fba7b74d 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2021.12.9";
+ version = "2021.12.10";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 1cf23984adb5..0cb5e13fbd27 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -177,7 +177,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2021.12.9";
+ hassVersion = "2021.12.10";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -194,7 +194,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- hash = "sha256:17lh16c9kklx4q416ns12qjh1hc0g79y56kdkj1pvybblg0a07lm";
+ hash = "sha256:0nyddcjy4diq5bakpb76frax44i0jraj2vvpfxrj50h9l5pdwsaf";
};
# leave this in, so users don't have to constantly update their downstream patch handling
diff --git a/pkgs/servers/mapserver/default.nix b/pkgs/servers/mapserver/default.nix
index 4735264f0a97..f8b0d8196fad 100644
--- a/pkgs/servers/mapserver/default.nix
+++ b/pkgs/servers/mapserver/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, cairo, curl, fcgi, freetype, fribidi, gdal, geos, giflib, harfbuzz
, libjpeg, libpng, librsvg, libxml2, postgresql, proj, protobufc, zlib
-, withPython ? true, swig, python
+, withPython ? true, swig, python2
}:
stdenv.mkDerivation rec {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
proj
protobufc
zlib
- ] ++ lib.optional withPython python;
+ ] ++ lib.optional withPython python2;
cmakeFlags = [
"-DWITH_KML=ON"
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index d0d11f0937de..7579db1c090d 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -2,18 +2,18 @@
buildGo117Module rec {
pname = "mautrix-whatsapp";
- version = "0.2.2";
+ version = "0.2.3";
src = fetchFromGitHub {
owner = "mautrix";
repo = "whatsapp";
rev = "v${version}";
- sha256 = "sha256-W+5DtCp7P/0azfusv+Nt3G9VcWKPUxVJmNwSfPjxjbw=";
+ sha256 = "sha256-vMRmxu1TNCw5c+PuSdAPdMJpZGLdcCTzpTNz/AFrWi8=";
};
buildInputs = [ olm ];
- vendorSha256 = "sha256-maGnlnxyhrvW0NkHmHWEvNge5c/HxLDm8NuWR6zcdYg=";
+ vendorSha256 = "sha256-bvbZ7Tnd6s6zr9trN4egR/9KV5cU09mQI+U1UxyYzlE=";
doCheck = false;
diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix
index 6a63292301b5..831d2047b4e6 100644
--- a/pkgs/servers/misc/oven-media-engine/default.nix
+++ b/pkgs/servers/misc/oven-media-engine/default.nix
@@ -6,53 +6,34 @@
, bc
, pkg-config
, perl
-, openssl
+, openssl_3_0
, zlib
, ffmpeg
, libvpx
, libopus
+, libuuid
, srtp
, jemalloc
, pcre2
}:
-let
- ffmpeg = ffmpeg_3_4.overrideAttrs (super: {
- pname = "${super.pname}-ovenmediaengine";
- src = fetchFromGitHub {
- owner = "Airensoft";
- repo = "FFmpeg";
- rev = "142b4bb64b64e337f80066e6af935a68627fedae"; # on branch ome/3.4
- sha256 = "0fla3940q3z0c0ik2xzkbvdfvrdg06ban7wi6y94y8mcipszpp11";
- };
- });
-in
stdenv.mkDerivation rec {
pname = "oven-media-engine";
- version = "0.10.9-hotfix";
+ version = "0.12.9";
src = fetchFromGitHub {
owner = "AirenSoft";
repo = "OvenMediaEngine";
rev = "v${version}";
- sha256 = "1fhria0vwqsgmsglv5gn858li33vfy2dwy1f1qdd2jwikskb53am";
+ sha256 = "0d3ymw747frl40w5d6r33lf1s72v7fiv742yjr1m6la2phb9h834";
};
- patches = [
- (fetchpatch {
- # Needed to fix compilation under GCC 10.
- url = "https://github.com/AirenSoft/OvenMediaEngine/commit/ad83e1d2226445d649e4b7e0c75106e31af4940d.patch";
- sha256 = "1zk1rgi1wsjl6gdx3hdmgxlgindv6a3lsnkwcgi87ga9abw4vafw";
- stripLen = 1;
- })
- ];
-
sourceRoot = "source/src";
makeFlags = "release CONFIG_LIBRARY_PATHS= CONFIG_PKG_PATHS= GLOBAL_CC=$(CC) GLOBAL_CXX=$(CXX) GLOBAL_LD=$(CXX) SHELL=${stdenv.shell}";
enableParallelBuilding = true;
nativeBuildInputs = [ bc pkg-config perl ];
- buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 ];
+ buildInputs = [ openssl_3_0 srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid ];
preBuild = ''
patchShebangs core/colorg++
diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix
index 0be7a3f0097c..1e63b44450e7 100644
--- a/pkgs/servers/ombi/default.nix
+++ b/pkgs/servers/ombi/default.nix
@@ -10,14 +10,14 @@ let
"Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
- x64-linux_hash = "sha256-4kvcBRMMH4AnTKSES5Cpst/omTRXVRq1V1y/z5njKJI=";
- arm64-linux_hash = "sha256-NLsf0ldvlKSrHJyAXv5Ar2zIetoga6iZPOGTxFOqoQQ=";
- x64-osx_hash = "sha256-tjvGuShz/fv3qUknFVKJ+tE/bVtIyPZ7dr4JfTEcDJY=";
+ x64-linux_hash = "sha256-BLtoT6UHsur+jFp4KBlE10/Z/V6RDy0k16H10IC98WQ=";
+ arm64-linux_hash = "sha256-s8EV/VqiUXWRTNxacx4sy6r+TIAqkqhESAYYa9s0uAQ=";
+ x64-osx_hash = "sha256-woXFYmX+499NTtWmmGBpZ12PxTUazJ8klA6IPQIDjLE=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "ombi";
- version = "4.0.1468";
+ version = "4.3.3";
sourceRoot = ".";
diff --git a/pkgs/servers/ombi/update.sh b/pkgs/servers/ombi/update.sh
index 1503edde9983..a549a9f1731d 100755
--- a/pkgs/servers/ombi/update.sh
+++ b/pkgs/servers/ombi/update.sh
@@ -15,7 +15,7 @@ updateHash()
url="https://github.com/Ombi-app/Ombi/releases/download/v$version/$os-$arch.tar.gz"
hash=$(nix-prefetch-url --type sha256 $url)
- sriHash="$(nix to-sri --type sha256 $hash)"
+ sriHash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)"
sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix"
}
diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix
index 078ebfb7b6e4..142dfe29fa22 100644
--- a/pkgs/servers/sql/proxysql/default.nix
+++ b/pkgs/servers/sql/proxysql/default.nix
@@ -25,7 +25,7 @@
, pcre
, perl
, prometheus-cpp
-, python
+, python2
, re2
, zlib
}:
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
cmake
libtool
perl
- python
+ python2
];
buildInputs = [
diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
index 6c853b1ccc8b..64e8d423d91b 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/pkgs/servers/tvheadend/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config
-, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python
+, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python2
, v4l-utils, which, zlib }:
let
@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
};
buildInputs = [
- avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python
+ avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python2
which zlib
];
diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix
index 7fb2d7861937..6af5fe7cc66c 100644
--- a/pkgs/shells/zsh/zsh-git-prompt/default.nix
+++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix
@@ -25,7 +25,7 @@
# installed.
#
{ fetchFromGitHub
-, python
+, python2
, git
, lib
, haskellPackages
@@ -45,7 +45,7 @@ haskellPackages.callPackage
prePatch = ''
substituteInPlace zshrc.sh \
--replace ':-"python"' ':-"haskell"' \
- --replace 'python ' '${python.interpreter} ' \
+ --replace 'python ' '${python2.interpreter} ' \
--replace 'git ' '${git}/bin/git '
'';
preCompileBuildDriver = "cd src";
diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix
index 4c80837ff4f4..9bb3ef46d928 100644
--- a/pkgs/tools/admin/pulumi/data.nix
+++ b/pkgs/tools/admin/pulumi/data.nix
@@ -1,12 +1,12 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
- version = "3.21.0";
+ version = "3.22.1";
pulumiPkgs = {
x86_64-linux = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v3.21.0-linux-x64.tar.gz";
- sha256 = "110ab7i3ynkjhbk10q150p7301prffk4xqma79rk28cxxvxf4kk3";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-linux-x64.tar.gz";
+ sha256 = "0yxjlkvyxap4c7ny5x0ch0j4d5360qapb670f6im7vnaqhc00by0";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-linux-amd64.tar.gz";
@@ -103,8 +103,8 @@
];
x86_64-darwin = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v3.21.0-darwin-x64.tar.gz";
- sha256 = "0pd6jlrw2cc4g33kkl2dfqks5xicmc2bnbrf0cd2ymx9mdnkdaq8";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-darwin-x64.tar.gz";
+ sha256 = "0b68pfrd83x02rs2saybxycpkirjciilp4a94ps3788y1plinyih";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-darwin-amd64.tar.gz";
@@ -201,8 +201,8 @@
];
aarch64-linux = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v3.21.0-linux-arm64.tar.gz";
- sha256 = "0484hpbf25kfxac72r74h5rfp5r59hlkhzqib9vma3l1cz9icmyx";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-linux-arm64.tar.gz";
+ sha256 = "0551zp5n77jzh8k3jbqq75zj734faryxxdd2fvw881cxf95v39aj";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-linux-arm64.tar.gz";
@@ -296,8 +296,8 @@
];
aarch64-darwin = [
{
- url = "https://get.pulumi.com/releases/sdk/pulumi-v3.21.0-darwin-arm64.tar.gz";
- sha256 = "01446r5q9a684k0z5b6d2a7gdjszy2816v09jdxkc54cg37fhmlz";
+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-darwin-arm64.tar.gz";
+ sha256 = "00jzqrnw6khbw5hsaqwi73hx9h3yxdhy2n3jn3h76az27wfjkhkz";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-darwin-arm64.tar.gz";
diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh
index 013dd9cbd088..c2b0818e5b9f 100755
--- a/pkgs/tools/admin/pulumi/update.sh
+++ b/pkgs/tools/admin/pulumi/update.sh
@@ -10,7 +10,7 @@ fi
# Version of Pulumi from
# https://www.pulumi.com/docs/get-started/install/versions/
-VERSION="3.21.0"
+VERSION="3.22.1"
# An array of plugin names. The respective repository inside Pulumi's
# Github organization is called pulumi-$name by convention.
diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix
index a878bcf6c043..2b7a9b0faa9a 100644
--- a/pkgs/tools/backup/kopia/default.nix
+++ b/pkgs/tools/backup/kopia/default.nix
@@ -2,16 +2,16 @@
buildGo117Module rec {
pname = "kopia";
- version = "0.9.8";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-7Bvgtp6egZqpTv4Ac+OUkhKzTZhRRMwpdvwOCBA6Dso=";
+ sha256 = "sha256-445E+RiYlfDNOuw51Wdsavb52RjL3FkcrN9EeKmJ+Q8=";
};
- vendorSha256 = "sha256-/dCRM61Zl5YbIb0mKhcyLU15nQhR31QAaq+5TwRK4pM=";
+ vendorSha256 = "sha256-wq/9MUCeJBZjrg0SXgHYMyXodqIF3KLRHQmvi7gbv5M=";
doCheck = false;
diff --git a/pkgs/tools/backup/zrepl/default.nix b/pkgs/tools/backup/zrepl/default.nix
index 59dbfc0be72e..999dd6ccb6ee 100644
--- a/pkgs/tools/backup/zrepl/default.nix
+++ b/pkgs/tools/backup/zrepl/default.nix
@@ -6,16 +6,16 @@
}:
buildGoModule rec {
pname = "zrepl";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "zrepl";
repo = "zrepl";
rev = "v${version}";
- sha256 = "5Bp8XGCjibDJgeAjW98rcABuddI+CV4Fh3hFJaKKwbo=";
+ sha256 = "4q/wwlF11HPDS2lTXUizJ3RFQ9sX5qNnWZUKAgnvDiE=";
};
- vendorSha256 = "MwmYiK2z7ZK5kKBZV7K6kCZRSd7v5Sgjoih1eeOh6go=";
+ vendorSha256 = "xToq9pKAxxknh4kE8S3uUg5ySPMbJkLftkMhofNxotc=";
subPackages = [ "." ];
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index bdd26041d33a..9ad343f60a8c 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -1,14 +1,16 @@
-{ lib, stdenv, fetchurl, pkg-config, attr, acl, zlib, libuuid, e2fsprogs, lzo
-, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3
+{ lib, stdenv, fetchurl
+, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, pkg-config, python3, xmlto
+, zstd
+, acl, attr, e2fsprogs, libuuid, lzo, systemd, zlib
}:
stdenv.mkDerivation rec {
pname = "btrfs-progs";
- version = "5.14.1";
+ version = "5.16";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
- sha256 = "sha256-1UqTRlRcpG3xKOPMt31gwJfZDJO34xSZAjbijPr4xVs=";
+ sha256 = "0cqqlcq9bywfi3cpg5ivxiv7p9v6z1r6k4nnmin24mj1kp8krarq";
};
nativeBuildInputs = [
@@ -16,7 +18,7 @@ stdenv.mkDerivation rec {
python3 python3.pkgs.setuptools
];
- buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd python3 ];
+ buildInputs = [ acl attr e2fsprogs libuuid lzo python3 systemd zlib zstd ];
# for python cross-compiling
_PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config;
@@ -31,10 +33,14 @@ stdenv.mkDerivation rec {
configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace";
+ makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ];
+
+ enableParallelBuilding = true;
+
meta = with lib; {
description = "Utilities for the btrfs filesystem";
homepage = "https://btrfs.wiki.kernel.org/";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 9c49c4677d2a..5825f8b25eeb 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python
+{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python2
, lib, valgrind, makeWrapper, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
version = "1.5.1.81";
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ which attr python ];
+ buildInputs = [ which attr python2 ];
patches = [
(fetchpatch {
diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix
index edb94891fbe9..13f3c42faa46 100644
--- a/pkgs/tools/misc/grub/trusted.nix
+++ b/pkgs/tools/misc/grub/trusted.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python, autoconf, automake
+{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python2, autoconf, automake
, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2
, for_HP_laptop ? false
}:
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
sha256 = "0yrfwx67gpg9gij5raq0cfbx3jj769lkg3diqgb7i9n86hgcdh4k";
};
- nativeBuildInputs = [ autogen flex bison python autoconf automake ];
+ nativeBuildInputs = [ autogen flex bison python2 autoconf automake ];
buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ]
++ optional doCheck qemu;
diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index bc7baa55fecd..bffcd5e1dca4 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools
-, python, git
+, python2, git
}:
let jdk = jdk8; jre = jdk8.jre; in
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ autoconf automake curl jdk nettools python git ];
+ buildInputs = [ autoconf automake curl jdk nettools python2 git ];
preConfigure = ''
patchShebangs ./build-aux/
diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
index bfc2ce2c0e99..4dd19a7f397a 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -29,7 +29,7 @@
, bubblewrap
, pcre
, check
-, python
+, python2
, json_c
, zchunk
, libmodulemd
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
librepo
pcre
check
- python
+ python2
# libdnf # vendored unstable branch
# required by vendored libdnf
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 37361abf2b2f..80d9e191c8a6 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45
, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
-, lvm2, pam, python, util-linux, json_c, nixosTests
+, lvm2, pam, python2, util-linux, json_c, nixosTests
, ncurses }:
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2
- lvm2 pam python util-linux json_c ncurses
+ lvm2 pam python2 util-linux json_c ncurses
];
passthru.tests.snapper = nixosTests.snapper;
diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 31d5712e5b33..9f974c6751bb 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "yle-dl";
- version = "20210917";
+ version = "20211213";
src = fetchFromGitHub {
owner = "aajanki";
repo = "yle-dl";
rev = version;
- sha256 = "sha256-l8Wv15DLWRvJ+I6KeTNbIjp+S5EgoqhLOWd0wEyXckk=";
+ sha256 = "sha256-U7ydZ6nSVtMv9mxNSWT/IICwbjK3PCBKxfqjrQ9jwW0=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix
index e112b8c1df12..3c6eff4d601c 100644
--- a/pkgs/tools/networking/nss-pam-ldapd/default.nix
+++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl
, pkg-config, makeWrapper, autoreconfHook
-, openldap, python, pam
+, openldap, python2, pam
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ];
- buildInputs = [ openldap pam python ];
+ buildInputs = [ openldap pam python2 ];
preConfigure = ''
substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: "
diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix
index 60bd2f8cc7e8..dc447f3a86b9 100644
--- a/pkgs/tools/networking/philter/default.nix
+++ b/pkgs/tools/networking/philter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python }:
+{ lib, stdenv, fetchurl, python2 }:
stdenv.mkDerivation rec {
pname = "philter";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p "$out"/{bin,share/philter}
cp .philterrc "$out"/share/philter/philterrc
- sed -i 's@/usr/local/bin@${python}/bin@' src/philter.py
+ sed -i 's@/usr/local/bin@${python2}/bin@' src/philter.py
cp src/philter.py "$out"/bin/philter
chmod +x "$out"/bin/philter
'';
diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix
index a17701644c87..1d7d006f537a 100644
--- a/pkgs/tools/networking/pssh/default.nix
+++ b/pkgs/tools/networking/pssh/default.nix
@@ -1,6 +1,6 @@
-{ lib, fetchFromGitHub, pythonPackages, openssh, rsync }:
+{ lib, fetchFromGitHub, python2Packages, openssh, rsync }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
pname = "pssh";
version = "2.3.1";
diff --git a/pkgs/tools/networking/py-wmi-client/default.nix b/pkgs/tools/networking/py-wmi-client/default.nix
index 7a2774002891..8f5958193db8 100644
--- a/pkgs/tools/networking/py-wmi-client/default.nix
+++ b/pkgs/tools/networking/py-wmi-client/default.nix
@@ -1,6 +1,6 @@
-{ lib, pythonPackages, fetchFromGitHub }:
+{ lib, python2Packages, fetchFromGitHub }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
pname = "py-wmi-client";
version = "unstable-20160601";
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "1kd12gi1knqv477f1shzqr0h349s5336vzp3fpfp3xl0b502ld8d";
};
- propagatedBuildInputs = with pythonPackages; [ impacket natsort pyasn1 pycrypto ];
+ propagatedBuildInputs = with python2Packages; [ impacket natsort pyasn1 pycrypto ];
# no tests
doCheck = false;
diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix
index 7c3d23c0d17f..7a26ffdeb436 100644
--- a/pkgs/tools/networking/weighttp/default.nix
+++ b/pkgs/tools/networking/weighttp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, python, libev, wafHook }:
+{ lib, stdenv, fetchgit, python2, libev, wafHook }:
stdenv.mkDerivation rec {
pname = "weighttp";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ wafHook ];
- buildInputs = [ python libev ];
+ buildInputs = [ python2 libev ];
meta = with lib; {
description = "Lightweight and simple webserver benchmarking tool";
diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix
index 4abbbd2d1d1f..9c73f8a00195 100644
--- a/pkgs/tools/security/volatility/default.nix
+++ b/pkgs/tools/security/volatility/default.nix
@@ -1,6 +1,6 @@
-{ lib, fetchFromGitHub, pythonPackages }:
+{ lib, fetchFromGitHub, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
pname = "volatility";
version = "2.6.1";
@@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
doCheck = false;
- propagatedBuildInputs = with pythonPackages; [ pycrypto distorm3 pillow ];
+ propagatedBuildInputs = with python2Packages; [ pycrypto distorm3 pillow ];
meta = with lib; {
homepage = "https://www.volatilityfoundation.org/";
diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix
index 50ea70ae48dd..7002976e3d05 100644
--- a/pkgs/tools/system/btop/default.nix
+++ b/pkgs/tools/system/btop/default.nix
@@ -8,13 +8,14 @@
stdenv.mkDerivation rec {
pname = "btop";
- version = "1.1.4";
+ version = "1.2.0";
+ hash = "qNm0mzPPh6jYIJX1W+macIDiGyWT+0jk7O0jCmvV/S4=";
src = fetchFromGitHub {
owner = "aristocratos";
repo = pname;
rev = "v${version}";
- sha256 = "1q8rp34fjbg9abbw5v6l5h9cmvzqq05cmkgavh8qd5xyimsx3xyh";
+ sha256 = hash;
};
hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix
index 6438a545a485..de8948db6c91 100644
--- a/pkgs/tools/system/collectd/plugins.nix
+++ b/pkgs/tools/system/collectd/plugins.nix
@@ -31,7 +31,7 @@
, perl
, postgresql
, protobufc
-, python
+, python2
, rabbitmq-c
, rdkafka
, riemann_c_client
@@ -102,7 +102,7 @@ let
pinba.buildInputs = [ protobufc ];
ping.buildInputs = [ liboping ];
postgresql.buildInputs = [ postgresql ];
- python.buildInputs = [ python ];
+ python.buildInputs = [ python2 ];
redis.buildInputs = [ hiredis ];
rrdcached.buildInputs = [ rrdtool libxml2 ];
rrdtool.buildInputs = [ rrdtool libxml2 ];
diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix
index 1752aba240f3..073a0921f98e 100644
--- a/pkgs/tools/system/ps_mem/default.nix
+++ b/pkgs/tools/system/ps_mem/default.nix
@@ -1,9 +1,9 @@
-{ lib, pythonPackages, fetchFromGitHub }:
+{ lib, python2Packages, fetchFromGitHub }:
let
version = "3.13";
pname = "ps_mem";
-in pythonPackages.buildPythonApplication {
+in python2Packages.buildPythonApplication {
name = "${pname}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index acf56b1558f1..d27985edbc4d 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
+{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, libestr, json_c, zlib, docutils, fastJson
, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null
, libdbi ? null, net-snmp ? null, libuuid ? null, curl ? null, gnutls ? null
, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [
- fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc
+ fastJson libestr json_c zlib docutils libkrb5 jemalloc
postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl
librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq
rabbitmq-c hiredis mongoc libmaxminddb
diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix
index 0f8db091d616..affb4bca6cec 100644
--- a/pkgs/tools/system/syslog-ng-incubator/default.nix
+++ b/pkgs/tools/system/syslog-ng-incubator/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, syslogng
-, eventlog, perl, python, bison, protobufc, libivykis, libcap, czmq
+, eventlog, perl, python2, bison, protobufc, libivykis, libcap, czmq
}:
stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook bison ];
buildInputs = [
- glib syslogng eventlog perl python protobufc libivykis libcap czmq
+ glib syslogng eventlog perl python2 protobufc libivykis libcap czmq
];
configureFlags = [
diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 51f8cd94da1e..d0a22203aa9c 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, openssl, libcap, curl, which
-, eventlog, pkg-config, glib, python, systemd, perl
+, eventlog, pkg-config, glib, python2, systemd, perl
, riemann_c_client, protobufc, pcre, libnet
, json_c, libuuid, libivykis, mongoc, rabbitmq-c
, libesmtp
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
eventlog
glib
perl
- python
+ python2
systemd
riemann_c_client
protobufc
diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix
index cbb055323a68..5ad14295e872 100644
--- a/pkgs/tools/text/opencc/default.nix
+++ b/pkgs/tools/text/opencc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, python }:
+{ lib, stdenv, fetchFromGitHub, cmake, python2 }:
stdenv.mkDerivation rec {
pname = "opencc";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-q/y4tRov/BYCAiE4i7fT6ysTerxxOHMZUWT2Jlo/0rI=";
};
- nativeBuildInputs = [ cmake python ];
+ nativeBuildInputs = [ cmake python2 ];
# let intermediate tools find intermediate library
preBuild = lib.optionalString stdenv.isLinux ''
diff --git a/pkgs/tools/text/shocco/default.nix b/pkgs/tools/text/shocco/default.nix
index 11d8194bb702..1359db98978c 100644
--- a/pkgs/tools/text/shocco/default.nix
+++ b/pkgs/tools/text/shocco/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, perlPackages, pythonPackages }:
+{ lib, stdenv, fetchFromGitHub, perlPackages, python3 }:
stdenv.mkDerivation rec {
pname = "shocco";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace PATH= NIRVANA=
'';
- buildInputs = [ perlPackages.TextMarkdown pythonPackages.pygments ];
+ buildInputs = [ perlPackages.TextMarkdown python3.pkgs.pygments ];
meta = with lib; {
description = "A quick-and-dirty, literate-programming-style documentation generator for / in POSIX shell";
diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix
index eb299caade9c..9f237066d7c1 100644
--- a/pkgs/tools/text/txt2tags/default.nix
+++ b/pkgs/tools/text/txt2tags/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python }:
+{ lib, stdenv, fetchurl, python2 }:
stdenv.mkDerivation rec {
version = "2.6";
@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
dontBuild = true;
# Python script, needs the interpreter
- propagatedBuildInputs = [ python ];
+ propagatedBuildInputs = [ python2 ];
installPhase = ''
mkdir -p "$out/bin"
mkdir -p "$out/share/doc"
mkdir -p "$out/share/man/man1/"
- sed '1s|/usr/bin/env python|${python}/bin/python|' < txt2tags > "$out/bin/txt2tags"
+ sed '1s|/usr/bin/env python|${python2}/bin/python|' < txt2tags > "$out/bin/txt2tags"
chmod +x "$out/bin/txt2tags"
gzip - < doc/manpage.man > "$out/share/man/man1/txt2tags.1.gz"
cp doc/userguide.pdf "$out/share/doc"
diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix
index 85dcece956fb..252167fcea97 100644
--- a/pkgs/tools/typesetting/odpdown/default.nix
+++ b/pkgs/tools/typesetting/odpdown/default.nix
@@ -1,6 +1,6 @@
-{ lib, fetchFromGitHub, pythonPackages, libreoffice }:
+{ lib, fetchFromGitHub, python2Packages, libreoffice }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
pname = "odpdown";
version = "0.4.1";
@@ -12,9 +12,9 @@ pythonPackages.buildPythonApplication rec {
sha256 = "r2qbgD9PAalbypt+vjp2YcYggUGPQMEG2FDxMtohqG4=";
};
- propagatedBuildInputs = with pythonPackages; [ libreoffice lpod lxml mistune pillow pygments ];
+ propagatedBuildInputs = with python2Packages; [ libreoffice lpod lxml mistune pillow pygments ];
- checkInputs = with pythonPackages; [
+ checkInputs = with python2Packages; [
nose
];
diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix
index fdaf2ee27466..f32078f0b8a0 100644
--- a/pkgs/tools/video/vnc2flv/default.nix
+++ b/pkgs/tools/video/vnc2flv/default.nix
@@ -1,6 +1,6 @@
-{ lib, fetchurl, pythonPackages }:
+{ lib, fetchurl, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
pname = "vnc2flv";
version = "20100207";
diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix
index 16a7ecffa043..846e2ee27944 100644
--- a/pkgs/tools/virtualization/cri-tools/default.nix
+++ b/pkgs/tools/virtualization/cri-tools/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cri-tools";
- version = "1.22.0";
+ version = "1.23.0";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-+36lGLpNnTQnwwmXoVNPt3RMcnE46AdXOpghvhP0Bq0=";
+ sha256 = "sha256-b65GY08vykVp/PUBmBXKIfykyPEJRgGjgu7zBoXx3K0=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix
index ab3c9b1e71cd..2497cc6a9df0 100644
--- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix
+++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }:
+{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python2, gnutar, gnused, gnugrep, which }:
stdenv.mkDerivation (rec {
pname = "xe-guest-utilities";
@@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {
url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz";
sha256 = "f9593cd9588188f80253e736f48d8dd94c5b517abb18316085f86acffab48794";
};
- buildInputs = [ bzip2 gnutar gnused python lzo zlib xz stdenv gnugrep which ];
+ buildInputs = [ bzip2 gnutar gnused python2 lzo zlib xz stdenv gnugrep which ];
patches = [ ./ip-address.patch ];
postPatch = ''
tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8b90cbf2b7e1..94d6a4761ab6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -656,6 +656,7 @@ mapAliases ({
nmap-unfree = nmap; # added 2021-04-06
nologin = shadow; # added 2018-04-25
nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27
+ noto-fonts-cjk = noto-fonts-cjk-sans; # added 2021-12-16
now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # added 2021-08-05
nxproxy = nx-libs; # added 2019-02-15
nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream";
@@ -817,8 +818,11 @@ mapAliases ({
pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12
pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12
pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-01
+ python = python2; # added 2022-01-11
python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08
python-swiftclient = swiftclient; # added 2021-09-09
+ pythonFull = python2Full; # added 2022-01-11
+ pythonPackages = python.pkgs; # added 2022-01-11
quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1ab10bd97b7..203a6e9ea12d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4662,7 +4662,7 @@ with pkgs;
diffutils = callPackage ../tools/text/diffutils { };
dir2opus = callPackage ../tools/audio/dir2opus {
- inherit (pythonPackages) mutagen python wrapPython;
+ inherit (python2Packages) mutagen python wrapPython;
};
dirdiff = callPackage ../tools/text/dirdiff {
@@ -10698,7 +10698,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) OpenCL;
};
- wakatime = pythonPackages.callPackage ../tools/misc/wakatime { };
+ wakatime = python2Packages.callPackage ../tools/misc/wakatime { };
weather = callPackage ../applications/misc/weather { };
@@ -13251,7 +13251,6 @@ with pkgs;
vala-lint = callPackage ../development/tools/vala-lint { };
inherit (callPackage ../development/compilers/vala { })
- vala_0_40
vala_0_48
vala_0_52
vala_0_54
@@ -13654,7 +13653,6 @@ with pkgs;
# Python interpreters. All standard library modules are included except for tkinter, which is
# available as `pythonPackages.tkinter` and can be used as any other Python package.
# When switching these sets, please update docs at ../../doc/languages-frameworks/python.md
- python = python2;
python2 = python27;
python3 = python39;
pypy = pypy2;
@@ -13663,11 +13661,6 @@ with pkgs;
# Python interpreter that is build with all modules, including tkinter.
# These are for compatibility and should not be used inside Nixpkgs.
- pythonFull = python.override {
- self = pythonFull;
- pythonAttr = "pythonFull";
- x11Support = true;
- };
python2Full = python2.override {
self = python2Full;
pythonAttr = "python2Full";
@@ -13704,7 +13697,6 @@ with pkgs;
};
# pythonPackages further below, but assigned here because they need to be in sync
- pythonPackages = python.pkgs;
python2Packages = python2.pkgs;
python3Packages = python3.pkgs;
@@ -19126,7 +19118,9 @@ with pkgs;
openbabel2 = callPackage ../development/libraries/openbabel/2.nix { };
- openbabel3 = callPackage ../development/libraries/openbabel { };
+ openbabel3 = callPackage ../development/libraries/openbabel {
+ python = python3;
+ };
opencascade = callPackage ../development/libraries/opencascade {
inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa;
@@ -21689,7 +21683,7 @@ with pkgs;
qpid-cpp = callPackage ../servers/amqp/qpid-cpp {
boost = boost155;
- inherit (pythonPackages) buildPythonPackage qpid-python;
+ inherit (python2Packages) buildPythonPackage qpid-python;
};
qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { };
@@ -23731,7 +23725,12 @@ with pkgs;
nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { };
inherit (callPackages ../data/fonts/noto-fonts {})
- noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra;
+ noto-fonts
+ noto-fonts-cjk-sans
+ noto-fonts-cjk-serif
+ noto-fonts-emoji
+ noto-fonts-emoji-blob-bin
+ noto-fonts-extra;
nuclear = callPackage ../applications/audio/nuclear { };
@@ -28365,6 +28364,10 @@ with pkgs;
rofi-unwrapped = callPackage ../applications/misc/rofi { };
rofi = callPackage ../applications/misc/rofi/wrapper.nix { };
+ rofi-wayland-unwrapped = callPackage ../applications/misc/rofi/wayland.nix { };
+ rofi-wayland = callPackage ../applications/misc/rofi/wrapper.nix {
+ rofi-unwrapped = rofi-wayland-unwrapped;
+ };
rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { };
@@ -28511,7 +28514,9 @@ with pkgs;
spideroak = callPackage ../applications/networking/spideroak { };
- split2flac = callPackage ../applications/audio/split2flac { };
+ split2flac = callPackage ../applications/audio/split2flac {
+ inherit (python3.pkgs) mutagen;
+ };
spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { };
@@ -29023,9 +29028,7 @@ with pkgs;
topydo = callPackage ../applications/misc/topydo {};
- torchat = callPackage ../applications/networking/instant-messengers/torchat {
- inherit (pythonPackages) wrapPython wxPython;
- };
+ torchat = callPackage ../applications/networking/instant-messengers/torchat { };
torrential = callPackage ../applications/networking/p2p/torrential { };
@@ -31707,7 +31710,7 @@ with pkgs;
useMpi = true;
});
- neuron-full = neuron-mpi.override { inherit python; };
+ neuron-full = neuron-mpi.override { python = python2; };
mrbayes = callPackage ../applications/science/biology/mrbayes { };
@@ -33210,7 +33213,7 @@ with pkgs;
nix-script = callPackage ../tools/nix/nix-script {};
- nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; };
+ nix-template-rpm = callPackage ../build-support/templaterpm { inherit (python2Packages) python toposort; };
nix-top = callPackage ../tools/package-management/nix-top { };
@@ -33261,7 +33264,7 @@ with pkgs;
disnix = callPackage ../tools/package-management/disnix { };
dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {
- inherit (pythonPackages) supervisor;
+ inherit (python2Packages) supervisor;
});
dydisnix = callPackage ../tools/package-management/disnix/dydisnix { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 85259288bd5a..e02cdeee1b4f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2746,14 +2746,14 @@ in {
fastjet = toPythonModule (pkgs.fastjet.override {
withPython = true;
- inherit python;
+ inherit (self) python;
});
fastjsonschema = callPackage ../development/python-modules/fastjsonschema { };
fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override {
withPython = true;
- inherit python;
+ inherit (self) python;
});
fastnumbers = callPackage ../development/python-modules/fastnumbers { };
@@ -3953,6 +3953,8 @@ in {
insegel = callPackage ../development/python-modules/insegel { };
+ installer = callPackage ../development/python-modules/installer { };
+
intake = callPackage ../development/python-modules/intake { };
intake-parquet = callPackage ../development/python-modules/intake-parquet { };
@@ -5841,6 +5843,8 @@ in {
pdfx = callPackage ../development/python-modules/pdfx { };
+ pdm-pep517 = callPackage ../development/python-modules/pdm-pep517 { };
+
pdoc3 = callPackage ../development/python-modules/pdoc3 { };
pebble = callPackage ../development/python-modules/pebble { };
@@ -6100,6 +6104,8 @@ in {
python-tado = callPackage ../development/python-modules/python-tado { };
+ pythonfinder = callPackage ../development/python-modules/pythonfinder { };
+
pyutil = callPackage ../development/python-modules/pyutil { };
pkutils = callPackage ../development/python-modules/pkutils { };
@@ -9076,6 +9082,8 @@ in {
usePython = true;
});
+ socketio-client = callPackage ../development/python-modules/socketio-client { };
+
socialscan = callPackage ../development/python-modules/socialscan { };
socid-extractor = callPackage ../development/python-modules/socid-extractor { };
@@ -9927,6 +9935,8 @@ in {
types-decorator = callPackage ../development/python-modules/types-decorator { };
+ types-freezegun = callPackage ../development/python-modules/types-freezegun { };
+
types-futures = callPackage ../development/python-modules/types-futures { };
types-protobuf = callPackage ../development/python-modules/types-protobuf { };
@@ -9937,6 +9947,8 @@ in {
types-setuptools = callPackage ../development/python-modules/types-setuptools { };
+ types-tabulate = callPackage ../development/python-modules/types-tabulate { };
+
types-toml = callPackage ../development/python-modules/types-toml { };
types-typed-ast = callPackage ../development/python-modules/types-typed-ast { };
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 4ef13ef604f6..4a15b64da09f 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -174,10 +174,6 @@ with self; with super; {
vcrpy = callPackage ../development/python2-modules/vcrpy { };
- yenc = callPackage ../development/python2-modules/yenc { };
-
- yt = callPackage ../development/python2-modules/yt { };
-
zeek = disabled super.zeek;
zipp = callPackage ../development/python2-modules/zipp { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 13526349dfc5..5980d88b01f9 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -25,7 +25,10 @@ let
systemsWithAnySupport = supportedSystems ++ limitedSupportedSystems;
- supportDarwin = builtins.elem "x86_64-darwin" systemsWithAnySupport;
+ supportDarwin = lib.genAttrs [
+ "x86_64"
+ "aarch64"
+ ] (arch: builtins.elem "${arch}-darwin" systemsWithAnySupport);
jobs =
{ tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease supportedSystems; };
@@ -36,7 +39,7 @@ let
lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; };
- darwin-tested = if supportDarwin then pkgs.releaseTools.aggregate
+ darwin-tested = if supportDarwin.x86_64 then pkgs.releaseTools.aggregate
{ name = "nixpkgs-darwin-${jobs.tarball.version}";
meta.description = "Release-critical builds for the Nixpkgs darwin channel";
constituents =
@@ -54,7 +57,7 @@ let
jobs.openssl.x86_64-darwin
jobs.pandoc.x86_64-darwin
jobs.postgresql.x86_64-darwin
- jobs.python.x86_64-darwin
+ jobs.python2.x86_64-darwin
jobs.python3.x86_64-darwin
jobs.ruby.x86_64-darwin
jobs.rustc.x86_64-darwin
@@ -99,7 +102,7 @@ let
jobs.go.x86_64-linux
jobs.linux.x86_64-linux
jobs.pandoc.x86_64-linux
- jobs.python.x86_64-linux
+ jobs.python2.x86_64-linux
jobs.python3.x86_64-linux
# Needed by contributors to test PRs (by inclusion of the PR template)
jobs.nixpkgs-review.x86_64-linux
@@ -130,11 +133,11 @@ let
*/
]
++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools
- ++ lib.optionals supportDarwin [
+ ++ lib.optionals supportDarwin.x86_64 [
jobs.stdenv.x86_64-darwin
jobs.cargo.x86_64-darwin
jobs.go.x86_64-darwin
- jobs.python.x86_64-darwin
+ jobs.python2.x86_64-darwin
jobs.python3.x86_64-darwin
jobs.nixpkgs-review.x86_64-darwin
jobs.nix-info.x86_64-darwin
@@ -171,7 +174,7 @@ let
dist test;
})
# darwin is special in this
- // optionalAttrs supportDarwin {
+ // optionalAttrs supportDarwin.x86_64 {
x86_64-darwin =
let
bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };
@@ -181,7 +184,7 @@ let
# Test a full stdenv bootstrap from the bootstrap tools definition
inherit (bootstrap.test-pkgs) stdenv;
};
-
+ } // optionalAttrs supportDarwin.aarch64 {
# Cross compiled bootstrap tools
aarch64-darwin =
let