mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-08 06:13:55 +00:00
Compare commits
72 Commits
staging-ni
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
96d3bf73c9 | ||
|
|
42d9acd643 | ||
|
|
2b0a550cc2 | ||
|
|
7b858fd065 | ||
|
|
ed0d55fd58 | ||
|
|
0265069a40 | ||
|
|
e206210cfe | ||
|
|
6fba49ee87 | ||
|
|
0fc400be24 | ||
|
|
b0b3f01fbb | ||
|
|
56fd6d1ded | ||
|
|
1418b6f52f | ||
|
|
1971b78994 | ||
|
|
68fd179ccb | ||
|
|
09da9da0a8 | ||
|
|
a84a630831 | ||
|
|
9be6f24be4 | ||
|
|
b90d17a6b9 | ||
|
|
5544a79511 | ||
|
|
ea40fb8a55 | ||
|
|
ee7009f335 | ||
|
|
27cd6c9d5e | ||
|
|
8111465ca0 | ||
|
|
a497b39678 | ||
|
|
d48d679cb4 | ||
|
|
dbf58bd4db | ||
|
|
2e83078807 | ||
|
|
e0a2666bf4 | ||
|
|
97697dea79 | ||
|
|
e008358476 | ||
|
|
8e8a6b9d5c | ||
|
|
7bae0dbe04 | ||
|
|
1dbf73526c | ||
|
|
d50fab2157 | ||
|
|
0e401dd6e1 | ||
|
|
e044842dc5 | ||
|
|
40cd6629f3 | ||
|
|
2988efedfb | ||
|
|
9da8e381ee | ||
|
|
a4bb1c91fb | ||
|
|
94fe78dfcc | ||
|
|
a9c4b44467 | ||
|
|
f69fcb6642 | ||
|
|
6136b0f3fc | ||
|
|
b9889d35d3 | ||
|
|
f016482361 | ||
|
|
d6461e376f | ||
|
|
5b86405adc | ||
|
|
259ad945e9 | ||
|
|
4c34fd1a45 | ||
|
|
cf31d4eb32 | ||
|
|
0febaeb18b | ||
|
|
a0a4aba280 | ||
|
|
6de5ce1715 | ||
|
|
09d3443b49 | ||
|
|
48184bfa15 | ||
|
|
5ac5c54385 | ||
|
|
05ac4bdd10 | ||
|
|
b177033e62 | ||
|
|
1b1c3cff53 | ||
|
|
a69e6bbde8 | ||
|
|
14f6089d54 | ||
|
|
266b2ef8f7 | ||
|
|
545e5841f3 | ||
|
|
0530770a86 | ||
|
|
54ea0dec2b | ||
|
|
8f2ae1d2b5 | ||
|
|
3e4c3fdebd | ||
|
|
9101b36c67 | ||
|
|
ccc29ad84e | ||
|
|
b439fd07ab | ||
|
|
311f4fd078 |
@@ -5150,6 +5150,13 @@
|
||||
githubId = 68239;
|
||||
name = "Christine Koppelt";
|
||||
};
|
||||
ckruse = {
|
||||
email = "cjk@defunct.ch";
|
||||
github = "ckruse";
|
||||
githubId = 175095;
|
||||
name = "Christian Kruse";
|
||||
keys = [ { fingerprint = "BC5D 9F4E F7FB 4382 6056 E834 B8E0 F342 A99A 9D73"; } ];
|
||||
};
|
||||
clacke = {
|
||||
email = "claes.wallin@greatsinodevelopment.com";
|
||||
github = "clacke";
|
||||
|
||||
@@ -24,8 +24,6 @@
|
||||
|
||||
- Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use.
|
||||
|
||||
- `systemd.user.extraConfig` has been removed in favor of the structured [](#opt-systemd.user.settings.Manager) option. Use `systemd.user.settings.Manager` to set any `systemd-user.conf(5)` option directly. For example, replace `systemd.user.extraConfig = "DefaultTimeoutStartSec=60";` with `systemd.user.settings.Manager.DefaultTimeoutStartSec = 60;`.
|
||||
|
||||
- `services.timesyncd.extraConfig` has been removed in favor of the structured [](#opt-services.timesyncd.settings.Time) option. Use `services.timesyncd.settings.Time` to set any `timesyncd.conf(5)` option directly. For example, replace `services.timesyncd.extraConfig = "PollIntervalMaxSec=180";` with `services.timesyncd.settings.Time.PollIntervalMaxSec = 180;`.
|
||||
|
||||
## Other Notable Changes {#sec-release-26.11-notable-changes}
|
||||
|
||||
@@ -14,7 +14,7 @@ let
|
||||
|
||||
inherit (config) sshBackdoor;
|
||||
|
||||
inherit (hostPkgs.stdenv.hostPlatform) isLinux isAarch64;
|
||||
inherit (hostPkgs.stdenv.hostPlatform) isLinux;
|
||||
|
||||
# Reifies and correctly wraps the python test driver for
|
||||
# the respective qemu version and with or without ocr support
|
||||
@@ -256,10 +256,6 @@ in
|
||||
#
|
||||
# If needed, this can still be turned off.
|
||||
virtualisation.qemu.enableSharedMemory = lib.mkDefault isLinux;
|
||||
# Needed for screenshots to work (in e.g `nixosTests.login`)
|
||||
virtualisation.qemu.options = lib.optionals (isLinux && isAarch64) [
|
||||
"-device virtio-gpu-pci"
|
||||
];
|
||||
|
||||
assertions = [
|
||||
{
|
||||
|
||||
@@ -40,7 +40,6 @@ let
|
||||
"network-online.target"
|
||||
"nss-lookup.target"
|
||||
"nss-user-lookup.target"
|
||||
"time-set.target"
|
||||
"time-sync.target"
|
||||
"first-boot-complete.target"
|
||||
]
|
||||
@@ -809,7 +808,7 @@ in
|
||||
systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
|
||||
systemd.services.systemd-importd = lib.mkIf cfg.package.withImportd {
|
||||
environment = proxy_env;
|
||||
path = [ pkgs.gnupgMinimal ];
|
||||
path = [ pkgs.gnupg ];
|
||||
};
|
||||
systemd.services.systemd-pstore.wantedBy = [ "sysinit.target" ]; # see #81138
|
||||
|
||||
|
||||
@@ -64,13 +64,13 @@
|
||||
environment.etc."systemd/logind.conf".text =
|
||||
utils.systemdUtils.lib.settingsToSections config.services.logind.settings;
|
||||
|
||||
# Restarting systemd-logind breaks X11 and other user sessions.
|
||||
# However, reloading the service seems to do the trick of loading new configuration without breaking anything.
|
||||
# Restarting systemd-logind breaks X11
|
||||
# - upstream commit: https://cgit.freedesktop.org/xorg/xserver/commit/?id=dc48bd653c7e101
|
||||
# - systemd announcement: https://github.com/systemd/systemd/blob/22043e4317ecd2bc7834b48a6d364de76bb26d91/NEWS#L103-L112
|
||||
# - this might be addressed in the future by xorg
|
||||
#systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ];
|
||||
systemd.services.systemd-logind.reloadIfChanged = true;
|
||||
systemd.services.systemd-logind.restartIfChanged = false;
|
||||
systemd.services.systemd-logind.stopIfChanged = false;
|
||||
|
||||
# The user-runtime-dir@ service is managed by systemd-logind we should not touch it or else we break the users' sessions.
|
||||
systemd.services."user-runtime-dir@".stopIfChanged = false;
|
||||
|
||||
@@ -138,7 +138,7 @@ in
|
||||
|
||||
systemd.services.systemd-sysupdated = {
|
||||
aliases = [ "dbus-org.freedesktop.sysupdate1.service" ];
|
||||
path = [ pkgs.gnupgMinimal ];
|
||||
path = [ pkgs.gnupg ];
|
||||
};
|
||||
|
||||
systemd.timers = {
|
||||
|
||||
@@ -5,13 +5,16 @@
|
||||
utils,
|
||||
...
|
||||
}:
|
||||
with utils;
|
||||
with systemdUtils.unitOptions;
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.systemd.user;
|
||||
|
||||
systemd = config.systemd.package;
|
||||
|
||||
inherit (utils.systemdUtils.lib)
|
||||
inherit (systemdUtils.lib)
|
||||
generateUnits
|
||||
targetToUnit
|
||||
serviceToUnit
|
||||
@@ -50,7 +53,7 @@ let
|
||||
user ? null,
|
||||
}:
|
||||
let
|
||||
suffix = lib.optionalString (user != null) "-${user}";
|
||||
suffix = optionalString (user != null) "-${user}";
|
||||
in
|
||||
pkgs.writeTextFile {
|
||||
name = "nixos-user-tmpfiles.d${suffix}";
|
||||
@@ -58,86 +61,74 @@ let
|
||||
text = ''
|
||||
# This file is created automatically and should not be modified.
|
||||
# Please change the options ‘systemd.user.tmpfiles’ instead.
|
||||
${lib.concatStringsSep "\n" rules}
|
||||
${concatStringsSep "\n" rules}
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [
|
||||
"systemd"
|
||||
"user"
|
||||
"extraConfig"
|
||||
] "Use systemd.user.settings.Manager instead.")
|
||||
];
|
||||
|
||||
options = {
|
||||
systemd.user.settings.Manager = lib.mkOption {
|
||||
default = { };
|
||||
type = lib.types.submodule {
|
||||
freeformType = lib.types.attrsOf utils.systemdUtils.unitOptions.unitOption;
|
||||
};
|
||||
example = {
|
||||
DefaultTimeoutStartSec = 60;
|
||||
};
|
||||
systemd.user.extraConfig = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
example = "DefaultTimeoutStartSec=60";
|
||||
description = ''
|
||||
Settings for systemd user instances. See {manpage}`systemd-user.conf(5)`
|
||||
for available options.
|
||||
Extra config options for systemd user instances. See {manpage}`systemd-user.conf(5)` for
|
||||
available options.
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.user.units = lib.mkOption {
|
||||
systemd.user.units = mkOption {
|
||||
description = "Definition of systemd per-user units.";
|
||||
default = { };
|
||||
type = utils.systemdUtils.types.units;
|
||||
type = systemdUtils.types.units;
|
||||
};
|
||||
|
||||
systemd.user.paths = lib.mkOption {
|
||||
systemd.user.paths = mkOption {
|
||||
default = { };
|
||||
type = utils.systemdUtils.types.paths;
|
||||
type = systemdUtils.types.paths;
|
||||
description = "Definition of systemd per-user path units.";
|
||||
};
|
||||
|
||||
systemd.user.services = lib.mkOption {
|
||||
systemd.user.services = mkOption {
|
||||
default = { };
|
||||
type = utils.systemdUtils.types.services;
|
||||
type = systemdUtils.types.services;
|
||||
description = "Definition of systemd per-user service units.";
|
||||
};
|
||||
|
||||
systemd.user.slices = lib.mkOption {
|
||||
systemd.user.slices = mkOption {
|
||||
default = { };
|
||||
type = utils.systemdUtils.types.slices;
|
||||
type = systemdUtils.types.slices;
|
||||
description = "Definition of systemd per-user slice units.";
|
||||
};
|
||||
|
||||
systemd.user.sockets = lib.mkOption {
|
||||
systemd.user.sockets = mkOption {
|
||||
default = { };
|
||||
type = utils.systemdUtils.types.sockets;
|
||||
type = systemdUtils.types.sockets;
|
||||
description = "Definition of systemd per-user socket units.";
|
||||
};
|
||||
|
||||
systemd.user.targets = lib.mkOption {
|
||||
systemd.user.targets = mkOption {
|
||||
default = { };
|
||||
type = utils.systemdUtils.types.targets;
|
||||
type = systemdUtils.types.targets;
|
||||
description = "Definition of systemd per-user target units.";
|
||||
};
|
||||
|
||||
systemd.user.timers = lib.mkOption {
|
||||
systemd.user.timers = mkOption {
|
||||
default = { };
|
||||
type = utils.systemdUtils.types.timers;
|
||||
type = systemdUtils.types.timers;
|
||||
description = "Definition of systemd per-user timer units.";
|
||||
};
|
||||
|
||||
systemd.user.tmpfiles = {
|
||||
enable =
|
||||
(lib.mkEnableOption "systemd user units systemd-tmpfiles-setup.service and systemd-tmpfiles-clean.timer")
|
||||
(mkEnableOption "systemd user units systemd-tmpfiles-setup.service and systemd-tmpfiles-clean.timer")
|
||||
// {
|
||||
default = true;
|
||||
example = false;
|
||||
};
|
||||
|
||||
rules = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
rules = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
example = [ "D %C - - - 7d" ];
|
||||
description = ''
|
||||
@@ -148,17 +139,17 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
users = lib.mkOption {
|
||||
users = mkOption {
|
||||
description = ''
|
||||
Per-user rules for creation, deletion and cleaning of volatile and
|
||||
temporary files automatically.
|
||||
'';
|
||||
default = { };
|
||||
type = lib.types.attrsOf (
|
||||
lib.types.submodule {
|
||||
type = types.attrsOf (
|
||||
types.submodule {
|
||||
options = {
|
||||
rules = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
rules = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
example = [ "D %C - - - 7d" ];
|
||||
description = ''
|
||||
@@ -174,8 +165,8 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.generators = lib.mkOption {
|
||||
type = lib.types.attrsOf lib.types.path;
|
||||
systemd.user.generators = mkOption {
|
||||
type = types.attrsOf types.path;
|
||||
default = { };
|
||||
example = {
|
||||
systemd-gpt-auto-generator = "/dev/null";
|
||||
@@ -188,9 +179,9 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.additionalUpstreamUserUnits = lib.mkOption {
|
||||
systemd.additionalUpstreamUserUnits = mkOption {
|
||||
default = [ ];
|
||||
type = lib.types.listOf lib.types.str;
|
||||
type = types.listOf types.str;
|
||||
example = [ ];
|
||||
description = ''
|
||||
Additional units shipped with systemd that should be enabled for per-user systemd instances.
|
||||
@@ -212,26 +203,29 @@ in
|
||||
upstreamWants = [ ];
|
||||
};
|
||||
|
||||
"systemd/user.conf".text = utils.systemdUtils.lib.settingsToSections cfg.settings;
|
||||
"systemd/user.conf".text = ''
|
||||
[Manager]
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.user.units =
|
||||
lib.mapAttrs' (n: v: lib.nameValuePair "${n}.path" (pathToUnit v)) cfg.paths
|
||||
// lib.mapAttrs' (n: v: lib.nameValuePair "${n}.service" (serviceToUnit v)) cfg.services
|
||||
// lib.mapAttrs' (n: v: lib.nameValuePair "${n}.slice" (sliceToUnit v)) cfg.slices
|
||||
// lib.mapAttrs' (n: v: lib.nameValuePair "${n}.socket" (socketToUnit v)) cfg.sockets
|
||||
// lib.mapAttrs' (n: v: lib.nameValuePair "${n}.target" (targetToUnit v)) cfg.targets
|
||||
// lib.mapAttrs' (n: v: lib.nameValuePair "${n}.timer" (timerToUnit v)) cfg.timers;
|
||||
mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit v)) cfg.paths
|
||||
// mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit v)) cfg.services
|
||||
// mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit v)) cfg.slices
|
||||
// mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit v)) cfg.sockets
|
||||
// mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit v)) cfg.targets
|
||||
// mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit v)) cfg.timers;
|
||||
|
||||
systemd.user.timers = {
|
||||
# enable systemd user tmpfiles
|
||||
systemd-tmpfiles-clean.wantedBy = lib.optional cfg.tmpfiles.enable "timers.target";
|
||||
systemd-tmpfiles-clean.wantedBy = optional cfg.tmpfiles.enable "timers.target";
|
||||
}
|
||||
# Generate timer units for all services that have a ‘startAt’ value.
|
||||
// (lib.mapAttrs (name: service: {
|
||||
// (mapAttrs (name: service: {
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig.OnCalendar = service.startAt;
|
||||
}) (lib.filterAttrs (name: service: service.startAt != [ ]) cfg.services));
|
||||
}) (filterAttrs (name: service: service.startAt != [ ]) cfg.services));
|
||||
|
||||
# Provide the systemd-user PAM service, required to run systemd
|
||||
# user instances.
|
||||
@@ -250,19 +244,18 @@ in
|
||||
systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions.
|
||||
|
||||
# enable systemd user tmpfiles
|
||||
systemd.user.services.systemd-tmpfiles-setup.wantedBy =
|
||||
lib.optional cfg.tmpfiles.enable "basic.target";
|
||||
systemd.user.services.systemd-tmpfiles-setup.wantedBy = optional cfg.tmpfiles.enable "basic.target";
|
||||
|
||||
# /run/current-system/sw/etc/xdg is in systemd's $XDG_CONFIG_DIRS so we can
|
||||
# write the tmpfiles.d rules for everyone there
|
||||
environment.systemPackages = lib.optional (cfg.tmpfiles.rules != [ ]) (writeTmpfiles {
|
||||
environment.systemPackages = optional (cfg.tmpfiles.rules != [ ]) (writeTmpfiles {
|
||||
inherit (cfg.tmpfiles) rules;
|
||||
});
|
||||
|
||||
# /etc/profiles/per-user/$USER/etc/xdg is in systemd's $XDG_CONFIG_DIRS so
|
||||
# we can write a single user's tmpfiles.d rules there
|
||||
users.users = lib.mapAttrs (user: cfg': {
|
||||
packages = lib.optional (cfg'.rules != [ ]) (writeTmpfiles {
|
||||
users.users = mapAttrs (user: cfg': {
|
||||
packages = optional (cfg'.rules != [ ]) (writeTmpfiles {
|
||||
inherit (cfg') rules;
|
||||
inherit user;
|
||||
});
|
||||
|
||||
@@ -238,11 +238,11 @@ in
|
||||
'';
|
||||
|
||||
systemd.settings.Manager = managerSettings;
|
||||
systemd.user.settings.Manager = {
|
||||
systemd.user.extraConfig = ''
|
||||
# Allow very slow start
|
||||
DefaultTimeoutStartSec = 300;
|
||||
DefaultDeviceTimeoutSec = 300;
|
||||
};
|
||||
DefaultTimeoutStartSec=300
|
||||
DefaultDeviceTimeoutSec=300
|
||||
'';
|
||||
|
||||
boot.consoleLogLevel = 7;
|
||||
|
||||
|
||||
@@ -1379,6 +1379,7 @@ in
|
||||
"-device usb-tablet,bus=usb-bus.0"
|
||||
])
|
||||
(mkIf pkgs.stdenv.hostPlatform.isAarch [
|
||||
"-device virtio-gpu-pci"
|
||||
"-device usb-ehci,id=usb0"
|
||||
"-device usb-kbd"
|
||||
"-device usb-tablet"
|
||||
|
||||
@@ -1670,7 +1670,6 @@ in
|
||||
systemd-timesyncd-nscd-dnssec = runTest ./systemd-timesyncd-nscd-dnssec.nix;
|
||||
systemd-user-linger = runTest ./systemd-user-linger.nix;
|
||||
systemd-user-linger-purge = runTest ./systemd-user-linger-purge.nix;
|
||||
systemd-user-settings = runTest ./systemd-user-settings.nix;
|
||||
systemd-user-tmpfiles-rules = runTest ./systemd-user-tmpfiles-rules.nix;
|
||||
systemd-userdbd = runTest ./systemd-userdbd.nix;
|
||||
systemtap = handleTest ./systemtap.nix { };
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
{
|
||||
name = "systemd-user-settings";
|
||||
meta = {
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
{ lib, ... }:
|
||||
{
|
||||
systemd.user.settings.Manager = {
|
||||
DefaultTimeoutStartSec = lib.mkForce "60";
|
||||
DefaultEnvironment = "FOO=bar";
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
with subtest("settings.Manager renders user.conf"):
|
||||
machine.succeed("grep -F '[Manager]' /etc/systemd/user.conf")
|
||||
machine.succeed("grep -F 'DefaultTimeoutStartSec=60' /etc/systemd/user.conf")
|
||||
machine.succeed("grep -F 'DefaultEnvironment=FOO=bar' /etc/systemd/user.conf")
|
||||
'';
|
||||
}
|
||||
@@ -34,7 +34,7 @@
|
||||
RebootWatchdogSec = "10min";
|
||||
KExecWatchdogSec = "5min";
|
||||
};
|
||||
systemd.user.settings.Manager.DefaultEnvironment = "\"XXX_USER=bar\"";
|
||||
systemd.user.extraConfig = "DefaultEnvironment=\"XXX_USER=bar\"";
|
||||
services.journald.extraConfig = "Storage=volatile";
|
||||
test-support.displayManager.auto.user = "alice";
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "helm-dt";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-labs";
|
||||
repo = "distribution-tooling-for-helm";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+YvYaPTUwRfEYDJ2Mkmgx22loo+Br4m7kcOa7X/5618=";
|
||||
hash = "sha256-KjIlmioDyj79jCnEi+Iimdg0eZruHdeD9JorkJbifJg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dkE3eYZnaS+kC0kDVxaFW/Ev15TY2MY3m5xgPof7Y18=";
|
||||
|
||||
@@ -283,13 +283,13 @@
|
||||
"vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI="
|
||||
},
|
||||
"datadog_datadog": {
|
||||
"hash": "sha256-yyUlJshH6leJbxDcm5lNGhR9pxbBEaEEDXasWeFI6Uw=",
|
||||
"hash": "sha256-HGRv2leNSZleAmlsoTgbEng1W02XUAOaw5nFz6AeckI=",
|
||||
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
||||
"owner": "DataDog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v4.10.0",
|
||||
"rev": "v4.12.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-tgo9FxqMZOZw4ZKULOz6CbZ8oJfEFfjdFffiWjjkc0Y="
|
||||
"vendorHash": "sha256-VBLDf6wkRT2k5ExmpQ1aDKf/BGqossVEQpGmeHsgrcQ="
|
||||
},
|
||||
"datadrivers_nexus": {
|
||||
"hash": "sha256-gwExaFhOoJFrAhH91oZEp1AFvI7kgWekp655zd4tyd8=",
|
||||
@@ -508,13 +508,13 @@
|
||||
"vendorHash": "sha256-ikBqIxD5aTOcwNHCMN6EaOwSHCAP5n/SULuqQXPLpOc="
|
||||
},
|
||||
"hashicorp_aws": {
|
||||
"hash": "sha256-fjQPwnZeqYyP9Dh4QtnzFl6wNmuj/33nZAKPPpyQBcg=",
|
||||
"hash": "sha256-073kfB/vwTtlbjO3I4s+QLPQT127Hvab8jc7/NFvcmk=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v6.47.0",
|
||||
"rev": "v6.49.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-XnVGjEz4mxqkNFrvgpRQ4W9s+j03mk0NTgEx4p5Z6qk="
|
||||
"vendorHash": "sha256-DyYT8SK5/IbkXWvzRTF6TjTi4aIpokLPOz5H/O05YU8="
|
||||
},
|
||||
"hashicorp_awscc": {
|
||||
"hash": "sha256-ywRxQKGrQ+kT08gNgNgdT5FmvsHYucT/W29+uyz1mwg=",
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "obs-source-clone";
|
||||
version = "0.2.1";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exeldro";
|
||||
repo = "obs-source-clone";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-It/TF7vAVzuANcNUG9whK9ZDLXpRHzwpGvV5I/YTVdo=";
|
||||
hash = "sha256-jJC3rbDfmeqE1LoPzfpXSSSX+PZeEU6FC9XBIbBAbck=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "betterleaks";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "betterleaks";
|
||||
repo = "betterleaks";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bDyWTye+OEzgqzJukWCEjl4NsD1udHr+tSP3e1ahj/4=";
|
||||
hash = "sha256-Eq0U4KiL91NW2lxizQ0tZuXxkNnTuSb/pvNSY/+3DZQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RStdC7M0+bPNXwaATxkMOBGf1OrT0pqlNPTJ7TCelfk=";
|
||||
vendorHash = "sha256-zlZNay6srObMfm4iweCezsr/EImCN9rl03DH8qJU/rc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bootdev-cli";
|
||||
version = "1.29.5";
|
||||
version = "1.29.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bootdotdev";
|
||||
repo = "bootdev";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nfgmlKIXtQqiharS1ezES5dFa6IE7Q2TvIhh/qiIB2Q=";
|
||||
hash = "sha256-uoFnhcJvvY+lb8VLv0kPI8hp4H8XfQOY5R83Rj17gfw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZDioEU5uPCkd+kC83cLlpgzyOsnpj2S7N+lQgsQb8uY=";
|
||||
|
||||
@@ -21,12 +21,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "2.8.2";
|
||||
version = "2.8.5";
|
||||
pname = "dar";
|
||||
|
||||
src = fetchzip {
|
||||
url = "mirror://sourceforge/dar/dar-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-x8WTJxpYzxvcN5Y6bAKE+JQ7n9dAbPkEosVnaFe2HoA=";
|
||||
sha256 = "sha256-VPBj5/e67DutuZOBBDkCbM9Hke7gZW8FpvgQH5hcXJ0=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -7,29 +7,29 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2026.5.26-2";
|
||||
version = "2026.5.26-6";
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-unknown-linux.tar.gz";
|
||||
hash = "sha256-5647gIz60Dj/mZ4bALJsWnAyWfXQO33vG6kqy2hHp84=";
|
||||
hash = "sha256-8jEq0X2owEnOdSWzEhDOYahAdq/3G/JIUZShHbYrR2c=";
|
||||
};
|
||||
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-unknown-linux.tar.gz";
|
||||
hash = "sha256-8D61SCYC3VMbSwgRpWm8IKD1PQwbKT/EMejSFq5qsds=";
|
||||
hash = "sha256-i8m05WrmO/KQCt/4jVFkRxz9nIXZEDi8idVhXkXxDig=";
|
||||
};
|
||||
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-apple-darwin.tar.gz";
|
||||
hash = "sha256-1MRFAWZKPCMfEm1zPGDHBoq4zAYXsIGTlrXwTkZH9c0=";
|
||||
hash = "sha256-WPL1kPMSmqh9/n2m9CvNnUcyLfjHz3PC9tAjGrjaZfw=";
|
||||
};
|
||||
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-apple-darwin.tar.gz";
|
||||
hash = "sha256-B3LsnLXyExTagVC7UibsQTxk5u6KmYzgr2LtAJemSyo=";
|
||||
hash = "sha256-HtB5iCT3d3AprPM+1uNkPkX0v4wSerTJlEu5F4P6pp0=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fheroes2";
|
||||
version = "1.1.13";
|
||||
version = "1.1.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihhub";
|
||||
repo = "fheroes2";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ct58Rkc6ORXldINQZVzMuObMl0BMk6QG88oU4tT0WcE=";
|
||||
hash = "sha256-B4gs+uDS9dCkrS1OLn4dUfWTSKKsUrdQJxAAAJCH7Nw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ imagemagick ];
|
||||
|
||||
78
pkgs/by-name/gi/gitte/package.nix
Normal file
78
pkgs/by-name/gi/gitte/package.nix
Normal file
@@ -0,0 +1,78 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromCodeberg,
|
||||
nix-update-script,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
cargo,
|
||||
rustc,
|
||||
wrapGAppsHook4,
|
||||
desktop-file-utils,
|
||||
appstream,
|
||||
gettext,
|
||||
glib,
|
||||
gtk4,
|
||||
libadwaita,
|
||||
openssl,
|
||||
libgit2,
|
||||
zlib,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gitte";
|
||||
version = "0.6.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "ckruse";
|
||||
repo = "Gitte";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ieW/oOFdyJWVR/7B62Rzcyii+/zDj/Xp6KCrVOf6mpA=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-VhcJepTeEjA/ZogqR82Whlyz4NRuI5MLB2HqNjGe8zQ=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
wrapGAppsHook4
|
||||
desktop-file-utils
|
||||
appstream
|
||||
gettext
|
||||
glib
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
libadwaita
|
||||
openssl
|
||||
libgit2
|
||||
zlib
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://codeberg.org/ckruse/Gitte";
|
||||
mainProgram = "gitte";
|
||||
description = "GTK4/libadwaita Git client";
|
||||
license = with lib.licenses; [ agpl3Plus ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
ckruse
|
||||
orzklv
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-jsonschema";
|
||||
version = "0.22.0";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "omissis";
|
||||
repo = "go-jsonschema";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ffrP4L5cfK75Tw/xfcdXAwGUP8WLL+81ltBDb/P5Gwo=";
|
||||
hash = "sha256-BUDxCytvs0Aas8yQwVedy9gYFhPMpNEYFzyOEgmMpJo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mCOJ8GROrbNXH7CSLLMZj/4wTa65hscTt8RzIxzgG+A=";
|
||||
vendorHash = "sha256-NkqAeSGWVKvIkik4j9wE2O5LV9sDP3RE/B0LilYml7A=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=v${finalAttrs.version}"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"branch": "v0.55.2-b",
|
||||
"commit_hash": "39d7e209c79d451efab1b21151d5938289da838d",
|
||||
"commit_message": "version: bump to 0.55.2",
|
||||
"date": "2026-05-16",
|
||||
"tag": "v0.55.2"
|
||||
"branch": "v0.55.3-b",
|
||||
"commit_hash": "fe5fe79a29ac3adaf3e75560b2f4b7a6d58b31c9",
|
||||
"commit_message": "[gha] Nix: update inputs",
|
||||
"date": "2026-06-07",
|
||||
"tag": "v0.55.3"
|
||||
}
|
||||
|
||||
@@ -83,14 +83,14 @@ let
|
||||
in
|
||||
customStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland" + optionalString debug "-debug";
|
||||
version = "0.55.2";
|
||||
version = "0.55.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprland";
|
||||
fetchSubmodules = true;
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RuXKYFqd+yr9ppkbRzq07Jt0IgiNa8nCpyfoBElpSDY=";
|
||||
hash = "sha256-g3kzroSoipkMXv5wJWVYQDL+gI1qRJ7UhOrUzyTk9Zs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hyprwhspr-rs";
|
||||
version = "0.3.28";
|
||||
version = "0.3.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "better-slop";
|
||||
repo = "hyprwhspr-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2o/857vuKk4KzWUtzwkSuSwd4FGlQWstku/zXUCu+kw=";
|
||||
hash = "sha256-vJYE5+4G68CK3hiW6KafO3htWgB6n+JcHVJ/3N8FjSw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Pwp56bu/ajozNby+FrNrdPpSFPo/O0sWG4I7wFvPZyg=";
|
||||
cargoHash = "sha256-ZL3l6ihBWx+y2ErqP13dJyb7lUMbBX7IYf+Di0p5byA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "igsc";
|
||||
version = "0.9.6";
|
||||
version = "1.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "igsc";
|
||||
tag = "V${finalAttrs.version}";
|
||||
hash = "sha256-ecjcDYirbJC2s48+SOwFuJAJQ6eaabTrmgTjgb+dXrA=";
|
||||
hash = "sha256-GdeGGrnkxJQlg+vVQan5rJW/rxlStD4TAmWxfloX0+k=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lagrange";
|
||||
version = "1.20.5";
|
||||
version = "1.20.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-U6SrUmTn43IleeVCLkh9NONyWtUe2Oja3e6VmYKOHvQ=";
|
||||
hash = "sha256-ZKxRcZt5JAO9AOveqXaoqqseZbRguqetdoAKe8c8Il0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libslirp";
|
||||
version = "4.9.3";
|
||||
version = "4.9.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "slirp";
|
||||
repo = "libslirp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Spr3dO5ehuUlzx3EnJi8najANWOirwQcTsWTVRVXYuY=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-MKP3iBExaPQryiahI1l/4bTgVht5Vu8AxaDyMotqmMo=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
@@ -35,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://gitlab.freedesktop.org/slirp/libslirp/-/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "General purpose TCP-IP emulator";
|
||||
homepage = "https://gitlab.freedesktop.org/slirp/libslirp";
|
||||
license = lib.licenses.bsd3;
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mbuffer";
|
||||
version = "20251025";
|
||||
version = "20260511";
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.maier-komor.de/software/mbuffer/mbuffer-${finalAttrs.version}.tgz";
|
||||
sha256 = "sha256-R+UWtBFgOZlnN8T4iV9m563iS37sXpN1SGY3psirNgE=";
|
||||
sha256 = "sha256-E7qzbzlAj3oI+zaJEykK0PEXyTS6tgIJThj8wSPsV4M=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -48,13 +48,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nezha";
|
||||
version = "2.0.14";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nezhahq";
|
||||
repo = "nezha";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dSFwU1p2lAI8CaNoQgdX/pkumIumZpdLgnn1XCkoeKU=";
|
||||
hash = "sha256-40GirWaa03sX5UNL0ZI8qcFqYV2ZuRniWofKluKeW+0=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
@@ -94,7 +94,7 @@ buildGoModule (finalAttrs: {
|
||||
GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d cmd/dashboard -g main.go -o cmd/dashboard/docs
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-y7XvvpLrmoaU1gLtaN38T9rsS3Rpi313XAKaVcia6Q4=";
|
||||
vendorHash = "sha256-rYzkaJqk5r31Uagn1FRFDeICUeK392o1fyP6IBk9zgk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -314,16 +314,13 @@ It must be one of the following:
|
||||
be made using _nixos_ function in nixpkgs or importing and calling
|
||||
nixos/lib/eval-config.nix from nixpkgs. If specified without *--attr*
|
||||
option, builds the configuration from the top-level attribute set of the
|
||||
file. Using this option disables automatic flake detection, same as
|
||||
*--no-flake*.
|
||||
file.
|
||||
|
||||
*--attr* _attrPath_, *-A* _attrPath_
|
||||
Build the NixOS system from a nix file and use the specified
|
||||
attribute path from the file specified by the *--file* option.
|
||||
If specified without *--file* option, uses _system.nix_ in current directory,
|
||||
the system-wide _<nixos-system>_ file, or finally, /etc/nixos/system.nix.
|
||||
Using this option disables automatic flake detection, same as
|
||||
*--no-flake*.
|
||||
|
||||
*--flake* _flake-uri[#name]_, *-F* _flake-uri[#name]_
|
||||
Build the NixOS system from the specified flake. It defaults to the
|
||||
@@ -382,10 +379,6 @@ NIX_SSHOPTS
|
||||
NIX_SUDOOPTS
|
||||
Additional options to be passed to sudo on the command line.
|
||||
|
||||
NIXOS_REBUILD_NO_SYSTEMD_RUN
|
||||
If set, then *nixos-rebuild* will run without the
|
||||
_systemd-run_ wrapper.
|
||||
|
||||
# FILES
|
||||
|
||||
/etc/nixos/system.nix
|
||||
|
||||
@@ -329,10 +329,6 @@ def parse_args(
|
||||
if args.flake and (args.file or args.attr):
|
||||
parser.error("--flake cannot be used with --file or --attr")
|
||||
|
||||
if (args.file or args.attr) and args.flake is None:
|
||||
# Disable flake auto-detection when --file or --attr is used
|
||||
args.flake = False
|
||||
|
||||
if args.store_path:
|
||||
if args.rollback:
|
||||
parser.error("--store-path and --rollback are mutually exclusive")
|
||||
|
||||
@@ -708,8 +708,6 @@ def switch_to_configuration(
|
||||
"not working in target host"
|
||||
)
|
||||
cmd = []
|
||||
elif os.environ.get("NIXOS_REBUILD_NO_SYSTEMD_RUN"):
|
||||
cmd = []
|
||||
|
||||
run_wrapper(
|
||||
[*cmd, path_to_config / "bin/switch-to-configuration", str(action)],
|
||||
|
||||
@@ -89,22 +89,6 @@ def test_parse_args() -> None:
|
||||
assert r_store_path.flake is False
|
||||
assert r_store_path.store_path == "/nix/store/foo"
|
||||
|
||||
# --file and --attr should disable flake auto-detection
|
||||
r_file, _ = nr.parse_args(["nixos-rebuild", "switch", "--file", "foo.nix"])
|
||||
assert r_file.flake is False
|
||||
assert r_file.file == "foo.nix"
|
||||
|
||||
r_attr, _ = nr.parse_args(["nixos-rebuild", "switch", "--attr", "bar"])
|
||||
assert r_attr.flake is False
|
||||
assert r_attr.attr == "bar"
|
||||
|
||||
r_file_attr, _ = nr.parse_args(
|
||||
["nixos-rebuild", "switch", "--file", "foo.nix", "--attr", "bar"]
|
||||
)
|
||||
assert r_file_attr.flake is False
|
||||
assert r_file_attr.file == "foo.nix"
|
||||
assert r_file_attr.attr == "bar"
|
||||
|
||||
r1, g1 = nr.parse_args(
|
||||
[
|
||||
"nixos-rebuild",
|
||||
|
||||
@@ -819,38 +819,6 @@ def test_switch_to_configuration_without_systemd_run(
|
||||
)
|
||||
|
||||
|
||||
@patch(get_qualified_name(n.run_wrapper, n), autospec=True)
|
||||
def test_switch_to_configuration_without_systemd_run_env_var(
|
||||
mock_run: Any, monkeypatch: MonkeyPatch
|
||||
) -> None:
|
||||
profile_path = Path("/path/to/profile")
|
||||
mock_run.return_value = CompletedProcess([], 0)
|
||||
|
||||
with monkeypatch.context() as mp:
|
||||
mp.setenv("LOCALE_ARCHIVE", "")
|
||||
mp.setenv("NIXOS_REBUILD_NO_SYSTEMD_RUN", "1")
|
||||
|
||||
n.switch_to_configuration(
|
||||
profile_path,
|
||||
m.Action.SWITCH,
|
||||
elevate=e.NO_ELEVATOR,
|
||||
target_host=None,
|
||||
specialisation=None,
|
||||
install_bootloader=False,
|
||||
)
|
||||
mock_run.assert_called_with(
|
||||
[profile_path / "bin/switch-to-configuration", "switch"],
|
||||
env={
|
||||
"LOCALE_ARCHIVE": e.PRESERVE_ENV,
|
||||
"NIXOS_NO_CHECK": e.PRESERVE_ENV,
|
||||
"NIXOS_INSTALL_BOOTLOADER": "0",
|
||||
},
|
||||
elevate=e.NO_ELEVATOR,
|
||||
remote=None,
|
||||
stdout=sys.stderr,
|
||||
)
|
||||
|
||||
|
||||
@patch(get_qualified_name(n.run_wrapper, n), autospec=True)
|
||||
def test_switch_to_configuration_with_systemd_run(
|
||||
mock_run: Mock, monkeypatch: MonkeyPatch
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ruff";
|
||||
version = "0.15.16";
|
||||
version = "0.15.15";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -24,12 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "astral-sh";
|
||||
repo = "ruff";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-krmHCLijp+D4gBjKV9cdicPob4ry5I6QwB3MUz0z7zA=";
|
||||
hash = "sha256-WpjOOCYLZ1d8XPUx3qNHD+fuK6t65u/1/ZezABWpBD0=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--package=ruff" ];
|
||||
|
||||
cargoHash = "sha256-d2iV7iWf7lVhj1Bbaxxk5Zao4KK3oC7whppRvk0erzA=";
|
||||
cargoHash = "sha256-SfkoLl43Y1DNqIRW+HljVcEHWhedTS99SGhMvkQ4dmo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "seadrive-gui";
|
||||
version = "3.0.19";
|
||||
version = "3.0.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "seadrive-gui";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-gT0GKDy/tsQex3LNcBgMdZL2obtvU1BE4EAAIvIFiHM=";
|
||||
hash = "sha256-1RvNJMMPqxsHJx61lvbdpuKgmyo0r66cAMj5uk58AT4=";
|
||||
};
|
||||
|
||||
# Fix cmake modernization warning.
|
||||
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Open-source solver, callable library, and development framework for mixed-integer linear programs (MILPs)";
|
||||
homepage = "https://www.coin-or.org/SYMPHONY/index.htm";
|
||||
changelog = "https://github.com/coin-or/SYMPHONY/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/coin-or/SYMPHONY/blob/releases/${finalAttrs.version}/CHANGELOG.md";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.epl20;
|
||||
maintainers = with lib.maintainers; [ b-rodrigues ];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "traefik";
|
||||
version = "3.7.1";
|
||||
version = "3.7.4";
|
||||
|
||||
# Archive with static assets for webui
|
||||
src = fetchzip {
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-LP4V70QvPmeafaArt8AWGkOj9dsKkEPE9dCulP+SmFw=";
|
||||
hash = "sha256-MwxHDujMzPmMh7GyEEoLuTKrzUEr/oT7PYk6YZTCsZk=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UHsgq6B3h6z/TZZpZi6o/KzahBDTiQszFikbpUvH80s=";
|
||||
vendorHash = "sha256-LIGpeuXwtWbLUHcfI4MtfdGhqIdF+Q4Vdln4uqAZ4GU=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ty";
|
||||
version = "0.0.44";
|
||||
version = "0.0.40";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
repo = "ty";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-P19+C6u0mkIrR0H8M/l7Wn3r8JSY4Ul9p64oXaLdWCQ=";
|
||||
hash = "sha256-kdfPnyQXYtf3BDrYCFGfX0bMoPGjRpyH3aUeRZBiUKY=";
|
||||
};
|
||||
|
||||
# For Darwin platforms, remove the integration test for file notifications,
|
||||
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoBuildFlags = [ "--package=ty" ];
|
||||
|
||||
cargoHash = "sha256-d2iV7iWf7lVhj1Bbaxxk5Zao4KK3oC7whppRvk0erzA=";
|
||||
cargoHash = "sha256-yUbHTzUGNdpm3b1s/SkcpFGdp7WjN+xO+CVrPPwrh6A=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = [ rust-jemalloc-sys ];
|
||||
|
||||
@@ -15,17 +15,17 @@ let
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "typescript-go";
|
||||
version = "0-unstable-2026-05-29";
|
||||
version = "0-unstable-2026-06-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "typescript-go";
|
||||
rev = "9a5877538d3a22ea428f045700aa27f75487dc62";
|
||||
hash = "sha256-kJp7QW6KRqlJDV+zezK5ruasGilW5HGWeu6FJbNHKfY=";
|
||||
rev = "254e9a5331fe7e08a8303deecc45521f98e1e5f9";
|
||||
hash = "sha256-a6G86TTxxjWWB3pVM1B5EdRcpwaFQW5RKoi+wWizMdY=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-n2wBDcMSKQGUJlTgCuJbKPTYOCiwkMpbvavqIrRvzS8=";
|
||||
vendorHash = "sha256-9eu1850py6hn0m93ofJ3k7cjFcSaVxpaUStzAE/EtgA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "vja";
|
||||
version = "5.0.0";
|
||||
version = "5.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ce72";
|
||||
repo = "vja";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ny0ZKsAwjHgN/8XBewYRiKt3YK3XyKshmJVQsKJrwog=";
|
||||
hash = "sha256-SLvr5e55XY+Yl3n5H6vvBV0nQ2DRcdIFaM8Wp0BGRrs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -25,6 +25,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
click
|
||||
click-aliases
|
||||
parsedatetime
|
||||
pyjwt
|
||||
python-dateutil
|
||||
requests
|
||||
];
|
||||
|
||||
@@ -39,7 +39,7 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-/f4+xVLsgwT4H25ZWX4Mxl+IE0vWKGrxPXMOfR5c4fU=";
|
||||
x86_64-linux = "sha256-yggdhokSX6H5jZJDawdZ4wft01CTrX6ufDkoyDy3qd4=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
@@ -48,7 +48,7 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "xpipe";
|
||||
version = "22.10";
|
||||
version = "23.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
installFonts,
|
||||
unzip,
|
||||
}:
|
||||
|
||||
@@ -18,16 +19,19 @@ let
|
||||
let
|
||||
Family = lib.toUpper (lib.substring 0 1 family) + lib.substring 1 (lib.stringLength family) family;
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "source-han-${family}";
|
||||
version = lib.removeSuffix "R" rev;
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/${prefix}SourceHan${Family}.ttc${zip}";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals (zip == ".zip") [ unzip ];
|
||||
nativeBuildInputs = [ installFonts ] ++ lib.optionals (zip == ".zip") [ unzip ];
|
||||
|
||||
unpackPhase =
|
||||
lib.optionalString (zip == "") ''
|
||||
@@ -37,14 +41,6 @@ let
|
||||
unzip $src
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm444 *.ttc -t $out/share/fonts/opentype/${pname}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Open source Pan-CJK ${description} typeface";
|
||||
homepage = "https://github.com/adobe-fonts/source-han-${family}";
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kotlin";
|
||||
version = "2.3.21";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${finalAttrs.version}/kotlin-compiler-${finalAttrs.version}.zip";
|
||||
sha256 = "sha256-qM/B1izU0N5NBPQldeQBNb1iBYjBfVaKIOucfCWa8U8=";
|
||||
sha256 = "sha256-uhuebrbdwydQeSJPLp6korAu731Zzi04QE8EsiYTwgo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ];
|
||||
|
||||
@@ -24,13 +24,13 @@ assert (
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simple-dftd3";
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dftd3";
|
||||
repo = "simple-dftd3";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-h9KFqZOfH7c7hntfL/C5WG9HVof64O4U1BNCCOuQhpA=";
|
||||
hash = "sha256-Bv+N9/dQVpSglt/54ay6mt4kRhu4klMTp7+sRP1bP80=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "atproto";
|
||||
version = "0.0.65";
|
||||
version = "0.0.67";
|
||||
pyproject = true;
|
||||
|
||||
# use GitHub, pypi does not include tests
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "MarshalX";
|
||||
repo = "atproto";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0NogKxYO+lCtNhK2ZWwRLQTV7rHU5Oz+lnE4awsoPsM=";
|
||||
hash = "sha256-r/+4DvTjMdu5v0tgbs9YgO3/EOJJqE81rEFrVMzq+x4=";
|
||||
};
|
||||
|
||||
env.POETRY_DYNAMIC_VERSIONING_BYPASS = version;
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "gguf";
|
||||
version = "9222";
|
||||
version = "9538";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-LIGtXaO53Y3Ze0x6uevb2vzcKHbyj2o/8ZHvyZ22uo4=";
|
||||
hash = "sha256-7cE5l+fnVsw72UyqAqKP2UmKg2seMCcqsZSKhHBSKLM=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/gguf-py";
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
buildPythonPackage,
|
||||
cmsis-svd,
|
||||
fetchFromGitHub,
|
||||
future,
|
||||
fetchPypi,
|
||||
ipython,
|
||||
lib,
|
||||
prompt-toolkit,
|
||||
@@ -12,26 +12,51 @@
|
||||
setuptools,
|
||||
tabulate,
|
||||
tqdm,
|
||||
unzip,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "greatfet";
|
||||
version = "2025.0.0";
|
||||
version = "2026.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greatscottgadgets";
|
||||
repo = "greatfet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tY1ZUtjCeb0+EmmbzKbIcPQrjHc3JzgA/6yDuFwwHu4=";
|
||||
hash = "sha256-qXPNatakMVtvl26FG1bx+ngCeqRpg1So6qFamKK8WWk=";
|
||||
};
|
||||
|
||||
# The prebuilt LPC firmware image (greatfet_usb.bin) and the DFU recovery
|
||||
# stub (flash_stub.bin) are release artifacts cross-compiled from firmware/.
|
||||
# They are absent from the git checkout (their build inputs are now-empty
|
||||
# submodules) but are shipped in the upstream wheel. Without them
|
||||
# `greatfet_firmware --autoflash` and DFU-mode firmware recovery are
|
||||
# unavailable, so vendor them from the wheel to match `pip install greatfet`.
|
||||
firmwareAssets = fetchPypi {
|
||||
inherit pname version;
|
||||
format = "wheel";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-sH1FAkfdC0HxRLZjfx7b2AYWMh4rtSijFgsU/YnVKq0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/host";
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail ', "setuptools-git-versioning<2"' "" \
|
||||
--replace-fail 'dynamic = ["version"]' 'version = "${version}"'
|
||||
|
||||
# Restore the prebuilt firmware images shipped in the upstream wheel; the
|
||||
# existing MANIFEST.in (recursive-include greatfet/assets *) then packages
|
||||
# them into greatfet/assets/ where find_greatfet_asset() looks at runtime.
|
||||
unzip -j -o ${firmwareAssets} \
|
||||
'greatfet/assets/greatfet_usb.bin' \
|
||||
'greatfet/assets/flash_stub.bin' \
|
||||
-d greatfet/assets/
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -40,7 +65,6 @@ buildPythonPackage rec {
|
||||
|
||||
dependencies = [
|
||||
cmsis-svd
|
||||
future
|
||||
ipython
|
||||
prompt-toolkit
|
||||
pyfwup
|
||||
|
||||
@@ -27,14 +27,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "langgraph-checkpoint";
|
||||
version = "4.0.3";
|
||||
version = "4.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
tag = "checkpoint==${finalAttrs.version}";
|
||||
hash = "sha256-zdl/WpzNLr3QmQqi2rvFl4dDzy0BRqMRv7I0GUp9Feg=";
|
||||
hash = "sha256-P4SbQK6lFG572WKxisnNn/ZiHcMYBBM/vcBB9N6xpfo=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/libs/checkpoint";
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pricehist";
|
||||
version = "1.4.14";
|
||||
version = "1.4.16";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "chrisberkhout";
|
||||
repo = "pricehist";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-BnyoSYVjs2odnOzSpvgMF860PDkz7tPNnM0s3Fep5G0=";
|
||||
hash = "sha256-klNelb25yfToGUHyFGxNCvCwLhgIeISW46WBWjBZPVA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "lxml" ];
|
||||
|
||||
@@ -37,14 +37,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "torchio";
|
||||
version = "1.0.1";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TorchIO-project";
|
||||
repo = "torchio";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-b6ED3IyQgC0A0dqYiXC0GTf6ZqwE1Ka7ojM7OJu1xfI=";
|
||||
hash = "sha256-GFHTVBt77zcJ3YSldHCpHCPG1MINpvAZWVibRfJRoWk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -55,14 +55,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "viser";
|
||||
version = "1.0.29";
|
||||
version = "1.0.30";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "viser-project";
|
||||
repo = "viser";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OeI/aEhJ0k9U2BtDEvwIimNFj74NZLSh4ieKnugn/hk=";
|
||||
hash = "sha256-f9dUF2zz3KNIt+/Sgpb0MLiCNXoKUmXeyY3XlBblVzk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -82,7 +82,7 @@ buildPythonPackage (finalAttrs: {
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
src = finalAttrs.src + "/src/viser/client/";
|
||||
hash = "sha256-fAFN/JCUVSvRDGfq39E3V+dhqp1i6vFG/j8wKmOva4c=";
|
||||
hash = "sha256-mx5vqgiZRWYruDbjAPgCCc7hewTqH9jsXrerL8XbOMY=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -48,6 +48,13 @@ let
|
||||
for i in _checkouts/* ; do
|
||||
ln -s $(pwd)/$i $(pwd)/_build/default/lib/
|
||||
done
|
||||
''
|
||||
# OTP 29 tests fail on warnings, fixed in https://github.com/erlang/rebar3/pull/2996
|
||||
+ lib.optionalString ((lib.versions.major erlang.version) == "29") ''
|
||||
substituteInPlace rebar.config --replace-fail 'nowarn_deprecated_catch' 'nowarn_deprecated_catch,nowarn_export_var_subexpr'
|
||||
|
||||
substituteInPlace apps/rebar/test/rebar_xref_SUITE.erl \
|
||||
--replace-fail 'xref_test, xref_ignore_test,' 'xref_test,'
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -14,13 +14,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hid-fanatecff";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gotzl";
|
||||
repo = "hid-fanatecff";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-aVuTnrxw7zWMZ1U21DUKDvcYlIp7iHJHaX8ijmUd/TE=";
|
||||
hash = "sha256-lJ+Pn1OLgZK+T1dsV1mwzAwJJgsouFFwDH7bFUD1SGI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
@@ -248,10 +248,6 @@ let
|
||||
BOUNCE = option yes;
|
||||
};
|
||||
|
||||
iommu = lib.optionalAttrs stdenv.hostPlatform.isAarch64 {
|
||||
ARM_SMMU_V3_SVA = whenAtLeast "5.9" yes;
|
||||
};
|
||||
|
||||
memtest = {
|
||||
MEMTEST = yes;
|
||||
};
|
||||
@@ -802,9 +798,7 @@ let
|
||||
FORTIFY_SOURCE = option yes;
|
||||
|
||||
# https://googleprojectzero.blogspot.com/2019/11/bad-binder-android-in-wild-exploit.html
|
||||
DEBUG_LIST = whenOlder "6.6" yes;
|
||||
# https://git.kernel.org/torvalds/c/aebc7b0d8d91bbc69e976909963046bc48bca4fd
|
||||
LIST_HARDENED = whenAtLeast "6.6" yes;
|
||||
DEBUG_LIST = yes;
|
||||
|
||||
HARDENED_USERCOPY = yes;
|
||||
RANDOMIZE_BASE = option yes;
|
||||
|
||||
@@ -142,12 +142,14 @@ optionalAttrs allowAliases aliases
|
||||
runCommand name
|
||||
{
|
||||
nativeBuildInputs = [ jq ];
|
||||
inherit value;
|
||||
value = builtins.toJSON value;
|
||||
preferLocalBuild = true;
|
||||
__structuredAttrs = true;
|
||||
}
|
||||
''
|
||||
jq .value "$NIX_ATTRS_JSON_FILE" > $out
|
||||
valuePath="$TMPDIR/value"
|
||||
printf "%s" "$value" > "$valuePath"
|
||||
jq . "$valuePath" > $out
|
||||
''
|
||||
) { };
|
||||
|
||||
@@ -165,12 +167,14 @@ optionalAttrs allowAliases aliases
|
||||
runCommand name
|
||||
{
|
||||
nativeBuildInputs = [ remarshal_0_17 ];
|
||||
inherit value;
|
||||
value = builtins.toJSON value;
|
||||
preferLocalBuild = true;
|
||||
__structuredAttrs = true;
|
||||
}
|
||||
''
|
||||
json2yaml --unwrap value "$NIX_ATTRS_JSON_FILE" "$out"
|
||||
valuePath="$TMPDIR/value"
|
||||
printf "%s" "$value" > "$valuePath"
|
||||
json2yaml "$valuePath" "$out"
|
||||
''
|
||||
) { };
|
||||
|
||||
@@ -188,12 +192,14 @@ optionalAttrs allowAliases aliases
|
||||
runCommand name
|
||||
{
|
||||
nativeBuildInputs = [ remarshal ];
|
||||
inherit value;
|
||||
value = builtins.toJSON value;
|
||||
preferLocalBuild = true;
|
||||
__structuredAttrs = true;
|
||||
}
|
||||
''
|
||||
json2yaml --unwrap value "$NIX_ATTRS_JSON_FILE" "$out"
|
||||
valuePath="$TMPDIR/value"
|
||||
printf "%s" "$value" > "$valuePath"
|
||||
json2yaml "$valuePath" "$out"
|
||||
''
|
||||
) { };
|
||||
|
||||
@@ -932,8 +938,8 @@ optionalAttrs allowAliases aliases
|
||||
python3
|
||||
black
|
||||
];
|
||||
imports = value._imports or [ ];
|
||||
value = removeAttrs value [ "_imports" ];
|
||||
imports = builtins.toJSON (value._imports or [ ]);
|
||||
value = builtins.toJSON (removeAttrs value [ "_imports" ]);
|
||||
pythonGen = pkgs.writeText "pythonGen" ''
|
||||
import json
|
||||
import os
|
||||
@@ -956,20 +962,26 @@ optionalAttrs allowAliases aliases
|
||||
else:
|
||||
return repr(value)
|
||||
|
||||
with open(os.environ["NIX_ATTRS_JSON_FILE"], "r") as f:
|
||||
attrs = json.load(f)
|
||||
if attrs["imports"] is not None:
|
||||
for i in attrs["imports"]:
|
||||
with open(os.environ["importsPath"], "r") as f:
|
||||
imports = json.load(f)
|
||||
if imports is not None:
|
||||
for i in imports:
|
||||
print(f"import {i}")
|
||||
print()
|
||||
|
||||
for key, value in attrs["value"].items():
|
||||
with open(os.environ["valuePath"], "r") as f:
|
||||
for key, value in json.load(f).items():
|
||||
print(f"{key} = {recursive_repr(value)}")
|
||||
'';
|
||||
preferLocalBuild = true;
|
||||
__structuredAttrs = true;
|
||||
}
|
||||
''
|
||||
export importsPath="$TMPDIR/imports"
|
||||
printf "%s" "$imports" > "$importsPath"
|
||||
export valuePath="$TMPDIR/value"
|
||||
printf "%s" "$value" > "$valuePath"
|
||||
cat "$valuePath"
|
||||
python3 "$pythonGen" > $out
|
||||
black $out
|
||||
''
|
||||
@@ -999,14 +1011,14 @@ optionalAttrs allowAliases aliases
|
||||
python3Packages.xmltodict
|
||||
libxml2Python
|
||||
];
|
||||
inherit value;
|
||||
value = builtins.toJSON value;
|
||||
pythonGen = pkgs.writeText "pythonGen" ''
|
||||
import json
|
||||
import os
|
||||
import xmltodict
|
||||
|
||||
with open(os.environ["NIX_ATTRS_JSON_FILE"], "r") as f:
|
||||
print(xmltodict.unparse(json.load(f)["value"], full_document=${
|
||||
with open(os.environ["valuePath"], "r") as f:
|
||||
print(xmltodict.unparse(json.load(f), full_document=${
|
||||
if withHeader then "True" else "False"
|
||||
}, pretty=True, indent=" " * 2))
|
||||
'';
|
||||
@@ -1014,6 +1026,8 @@ optionalAttrs allowAliases aliases
|
||||
__structuredAttrs = true;
|
||||
}
|
||||
''
|
||||
export valuePath="$TMPDIR/value"
|
||||
printf "%s" "$value" > "$valuePath"
|
||||
python3 "$pythonGen" > $out
|
||||
xmllint $out > /dev/null
|
||||
''
|
||||
|
||||
@@ -2265,10 +2265,6 @@ with pkgs;
|
||||
pinentry = if stdenv.hostPlatform.isDarwin then pinentry_mac else pinentry-gtk2;
|
||||
};
|
||||
gnupg = gnupg24;
|
||||
gnupgMinimal = gnupg.override {
|
||||
enableMinimal = true;
|
||||
guiSupport = false;
|
||||
};
|
||||
|
||||
gnused = callPackage ../tools/text/gnused { };
|
||||
|
||||
|
||||
@@ -9997,11 +9997,11 @@ with self;
|
||||
|
||||
DBI = buildPerlPackage {
|
||||
pname = "DBI";
|
||||
version = "1.648";
|
||||
version = "1.644";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBI-1.648.tgz";
|
||||
hash = "sha256-7yZqrWAQzi6rt+Rl69c8owILxYFQ9pib2Jwrj5usaoY=";
|
||||
url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBI-1.644.tar.gz";
|
||||
hash = "sha256-Ipe5neCeZwhmQLWQaZ4OmC+0adpjqT/ijcFHgtt6U8g=";
|
||||
};
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isGNU {
|
||||
|
||||
Reference in New Issue
Block a user