Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
4312247c 9dee72dd

+789 -141
+2
nixos/doc/manual/release-notes/rl-2311.section.md
··· 493 493 - The `electron` packages now places its application files in `$out/libexec/electron` instead of `$out/lib/electron`. Packages using electron-builder will fail to build and need to be adjusted by changing `lib` to `libexec`. 494 494 495 495 - `teleport` has been upgraded from major version 12 to major version 14. Please see upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) and release notes for versions [13](https://goteleport.com/docs/changelog/#1300-050823) and [14](https://goteleport.com/docs/changelog/#1400-092023). Note that Teleport does not officially support upgrades across more than one major version at a time. If you're running Teleport server components, it is recommended to first upgrade to an intermediate 13.x version by setting `services.teleport.package = pkgs.teleport_13`. Afterwards, this option can be removed to upgrade to the default version (14). 496 + 497 + - The Linux kernel module `msr` (see [`msr(4)`](https://man7.org/linux/man-pages/man4/msr.4.html)), which provides an interface to read and write the model-specific registers (MSRs) of an x86 CPU, can now be configured via `hardware.cpu.x86.msr`.
+91
nixos/modules/hardware/cpu/x86-msr.nix
··· 1 + { lib 2 + , config 3 + , options 4 + , ... 5 + }: 6 + let 7 + inherit (builtins) hasAttr; 8 + inherit (lib) mkIf mdDoc; 9 + cfg = config.hardware.cpu.x86.msr; 10 + opt = options.hardware.cpu.x86.msr; 11 + defaultGroup = "msr"; 12 + isDefaultGroup = cfg.group == defaultGroup; 13 + set = "to set for devices of the `msr` kernel subsystem."; 14 + 15 + # Generates `foo=bar` parameters to pass to the kernel. 16 + # If `module = baz` is passed, generates `baz.foo=bar`. 17 + # Adds double quotes on demand to handle `foo="bar baz"`. 18 + kernelParam = { module ? null }: name: value: 19 + assert lib.asserts.assertMsg (!lib.strings.hasInfix "=" name) "kernel parameter cannot have '=' in name"; 20 + let 21 + key = (if module == null then "" else module + ".") + name; 22 + valueString = lib.generators.mkValueStringDefault {} value; 23 + quotedValueString = if lib.strings.hasInfix " " valueString 24 + then lib.strings.escape ["\""] valueString 25 + else valueString; 26 + in "${key}=${quotedValueString}"; 27 + msrKernelParam = kernelParam { module = "msr"; }; 28 + in 29 + { 30 + options.hardware.cpu.x86.msr = with lib.options; with lib.types; { 31 + enable = mkEnableOption (mdDoc "the `msr` (Model-Specific Registers) kernel module and configure `udev` rules for its devices (usually `/dev/cpu/*/msr`)"); 32 + owner = mkOption { 33 + type = str; 34 + default = "root"; 35 + example = "nobody"; 36 + description = mdDoc "Owner ${set}"; 37 + }; 38 + group = mkOption { 39 + type = str; 40 + default = defaultGroup; 41 + example = "nobody"; 42 + description = mdDoc "Group ${set}"; 43 + }; 44 + mode = mkOption { 45 + type = str; 46 + default = "0640"; 47 + example = "0660"; 48 + description = mdDoc "Mode ${set}"; 49 + }; 50 + settings = mkOption { 51 + type = submodule { 52 + freeformType = attrsOf (oneOf [ bool int str ]); 53 + options.allow-writes = mkOption { 54 + type = nullOr (enum ["on" "off"]); 55 + default = null; 56 + description = "Whether to allow writes to MSRs (`\"on\"`) or not (`\"off\"`)."; 57 + }; 58 + }; 59 + default = {}; 60 + description = "Parameters for the `msr` kernel module."; 61 + }; 62 + }; 63 + 64 + config = mkIf cfg.enable { 65 + assertions = [ 66 + { 67 + assertion = hasAttr cfg.owner config.users.users; 68 + message = "Owner '${cfg.owner}' set in `${opt.owner}` is not configured via `${options.users.users}.\"${cfg.owner}\"`."; 69 + } 70 + { 71 + assertion = isDefaultGroup || (hasAttr cfg.group config.users.groups); 72 + message = "Group '${cfg.group}' set in `${opt.group}` is not configured via `${options.users.groups}.\"${cfg.group}\"`."; 73 + } 74 + ]; 75 + 76 + boot = { 77 + kernelModules = [ "msr" ]; 78 + kernelParams = lib.attrsets.mapAttrsToList msrKernelParam (lib.attrsets.filterAttrs (_: value: value != null) cfg.settings); 79 + }; 80 + 81 + users.groups.${cfg.group} = mkIf isDefaultGroup { }; 82 + 83 + services.udev.extraRules = '' 84 + SUBSYSTEM=="msr", OWNER="${cfg.owner}", GROUP="${cfg.group}", MODE="${cfg.mode}" 85 + ''; 86 + }; 87 + 88 + meta = with lib; { 89 + maintainers = with maintainers; [ lorenzleutgeb ]; 90 + }; 91 + }
+2
nixos/modules/module-list.nix
··· 55 55 ./hardware/cpu/amd-sev.nix 56 56 ./hardware/cpu/intel-microcode.nix 57 57 ./hardware/cpu/intel-sgx.nix 58 + ./hardware/cpu/x86-msr.nix 58 59 ./hardware/decklink.nix 59 60 ./hardware/device-tree.nix 60 61 ./hardware/digitalbitbox.nix ··· 723 724 ./services/misc/ripple-data-api.nix 724 725 ./services/misc/rippled.nix 725 726 ./services/misc/rmfakecloud.nix 727 + ./services/misc/rkvm.nix 726 728 ./services/misc/rshim.nix 727 729 ./services/misc/safeeyes.nix 728 730 ./services/misc/sdrplay.nix
+1 -1
nixos/modules/security/acme/default.nix
··· 592 592 description = lib.mdDoc '' 593 593 Key type to use for private keys. 594 594 For an up to date list of supported values check the --key-type option 595 - at <https://go-acme.github.io/lego/usage/cli/#usage>. 595 + at <https://go-acme.github.io/lego/usage/cli/options/>. 596 596 ''; 597 597 }; 598 598
+2 -3
nixos/modules/services/hardware/throttled.nix
··· 29 29 30 30 # Kernel 5.9 spams warnings whenever userspace writes to CPU MSRs. 31 31 # See https://github.com/erpalma/throttled/issues/215 32 - boot.kernelParams = 33 - optional (versionAtLeast config.boot.kernelPackages.kernel.version "5.9") 34 - "msr.allow_writes=on"; 32 + hardware.cpu.x86.msr.settings.allow-writes = 33 + mkIf (versionAtLeast config.boot.kernelPackages.kernel.version "5.9") "on"; 35 34 }; 36 35 }
+1 -1
nixos/modules/services/hardware/tlp.nix
··· 47 47 48 48 ###### implementation 49 49 config = mkIf cfg.enable { 50 - boot.kernelModules = [ "msr" ]; 50 + hardware.cpu.x86.msr.enable = true; 51 51 52 52 warnings = optional (cfg.extraConfig != "") '' 53 53 Using config.services.tlp.extraConfig is deprecated and will become unsupported in a future release. Use config.services.tlp.settings instead.
+1 -1
nixos/modules/services/hardware/undervolt.nix
··· 159 159 }; 160 160 161 161 config = mkIf cfg.enable { 162 - boot.kernelModules = [ "msr" ]; 162 + hardware.cpu.x86.msr.enable = true; 163 163 164 164 environment.systemPackages = [ cfg.package ]; 165 165
+164
nixos/modules/services/misc/rkvm.nix
··· 1 + { options, config, pkgs, lib, ... }: 2 + 3 + with lib; 4 + let 5 + opt = options.services.rkvm; 6 + cfg = config.services.rkvm; 7 + toml = pkgs.formats.toml { }; 8 + in 9 + { 10 + meta.maintainers = with maintainers; [ ckie ]; 11 + 12 + options.services.rkvm = { 13 + enable = mkOption { 14 + default = cfg.server.enable || cfg.client.enable; 15 + defaultText = literalExpression "config.${opt.server.enable} || config.${opt.client.enable}"; 16 + type = types.bool; 17 + description = mdDoc '' 18 + Whether to enable rkvm, a Virtual KVM switch for Linux machines. 19 + ''; 20 + }; 21 + 22 + package = mkPackageOption pkgs "rkvm" { }; 23 + 24 + server = { 25 + enable = mkEnableOption "the rkvm server daemon (input transmitter)"; 26 + 27 + settings = mkOption { 28 + type = types.submodule 29 + { 30 + freeformType = toml.type; 31 + options = { 32 + listen = mkOption { 33 + type = types.str; 34 + default = "0.0.0.0:5258"; 35 + description = mdDoc '' 36 + An internet socket address to listen on, either IPv4 or IPv6. 37 + ''; 38 + }; 39 + 40 + switch-keys = mkOption { 41 + type = types.listOf types.str; 42 + default = [ "left-alt" "left-ctrl" ]; 43 + description = mdDoc '' 44 + A key list specifying a host switch combination. 45 + 46 + _A list of key names is available in <https://github.com/htrefil/rkvm/blob/master/switch-keys.md>._ 47 + ''; 48 + }; 49 + 50 + certificate = mkOption { 51 + type = types.path; 52 + default = "/etc/rkvm/certificate.pem"; 53 + description = mdDoc '' 54 + TLS certificate path. 55 + 56 + ::: {.note} 57 + This should be generated with {command}`rkvm-certificate-gen`. 58 + ::: 59 + ''; 60 + }; 61 + 62 + key = mkOption { 63 + type = types.path; 64 + default = "/etc/rkvm/key.pem"; 65 + description = mdDoc '' 66 + TLS key path. 67 + 68 + ::: {.note} 69 + This should be generated with {command}`rkvm-certificate-gen`. 70 + ::: 71 + ''; 72 + }; 73 + 74 + password = mkOption { 75 + type = types.str; 76 + description = mdDoc '' 77 + Shared secret token to authenticate the client. 78 + Make sure this matches your client's config. 79 + ''; 80 + }; 81 + }; 82 + }; 83 + 84 + default = { }; 85 + description = mdDoc "Structured server daemon configuration"; 86 + }; 87 + }; 88 + 89 + client = { 90 + enable = mkEnableOption "the rkvm client daemon (input receiver)"; 91 + 92 + settings = mkOption { 93 + type = types.submodule 94 + { 95 + freeformType = toml.type; 96 + options = { 97 + server = mkOption { 98 + type = types.str; 99 + example = "192.168.0.123:5258"; 100 + description = mdDoc '' 101 + An RKVM server's internet socket address, either IPv4 or IPv6. 102 + ''; 103 + }; 104 + 105 + certificate = mkOption { 106 + type = types.path; 107 + default = "/etc/rkvm/certificate.pem"; 108 + description = mdDoc '' 109 + TLS ceritficate path. 110 + 111 + ::: {.note} 112 + This should be generated with {command}`rkvm-certificate-gen`. 113 + ::: 114 + ''; 115 + }; 116 + 117 + password = mkOption { 118 + type = types.str; 119 + description = mdDoc '' 120 + Shared secret token to authenticate the client. 121 + Make sure this matches your server's config. 122 + ''; 123 + }; 124 + }; 125 + }; 126 + 127 + default = {}; 128 + description = mdDoc "Structured client daemon configuration"; 129 + }; 130 + }; 131 + 132 + }; 133 + 134 + config = mkIf cfg.enable { 135 + environment.systemPackages = [ cfg.package ]; 136 + 137 + systemd.services = 138 + let 139 + mkBase = component: { 140 + description = "RKVM ${component}"; 141 + wantedBy = [ "multi-user.target" ]; 142 + after = { 143 + server = [ "network.target" ]; 144 + client = [ "network-online.target" ]; 145 + }.${component}; 146 + wants = { 147 + server = [ ]; 148 + client = [ "network-online.target" ]; 149 + }.${component}; 150 + serviceConfig = { 151 + ExecStart = "${cfg.package}/bin/rkvm-${component} ${toml.generate "rkvm-${component}.toml" cfg.${component}.settings}"; 152 + Restart = "always"; 153 + RestartSec = 5; 154 + Type = "simple"; 155 + }; 156 + }; 157 + in 158 + { 159 + rkvm-server = mkIf cfg.server.enable (mkBase "server"); 160 + rkvm-client = mkIf cfg.client.enable (mkBase "client"); 161 + }; 162 + }; 163 + 164 + }
+1 -1
nixos/modules/services/misc/xmrig.nix
··· 52 52 }; 53 53 54 54 config = mkIf cfg.enable { 55 - boot.kernelModules = [ "msr" ]; 55 + hardware.cpu.x86.msr.enable = true; 56 56 57 57 systemd.services.xmrig = { 58 58 wantedBy = [ "multi-user.target" ];
+9
nixos/modules/system/boot/systemd/repart.nix
··· 74 74 }; 75 75 76 76 config = lib.mkIf (cfg.enable || initrdCfg.enable) { 77 + assertions = [ 78 + { 79 + assertion = initrdCfg.enable -> config.boot.initrd.systemd.enable; 80 + message = '' 81 + 'boot.initrd.systemd.repart.enable' requires 'boot.initrd.systemd.enable' to be enabled. 82 + ''; 83 + } 84 + ]; 85 + 77 86 boot.initrd.systemd = lib.mkIf initrdCfg.enable { 78 87 additionalUpstreamUnits = [ 79 88 "systemd-repart.service"
+1 -1
nixos/modules/virtualisation/lxc-container.nix
··· 66 66 67 67 system.build.installBootLoader = pkgs.writeScript "install-lxd-sbin-init.sh" '' 68 68 #!${pkgs.runtimeShell} 69 - ln -fs "$1/init" /sbin/init 69 + ${pkgs.coreutils}/bin/ln -fs "$1/init" /sbin/init 70 70 ''; 71 71 72 72 systemd.additionalUpstreamSystemUnits = lib.mkIf cfg.nestedContainer ["systemd-udev-trigger.service"];
+1
nixos/release-combined.nix
··· 79 79 80 80 (onFullSupported "nixos.tests.firewall") 81 81 (onFullSupported "nixos.tests.fontconfig-default-fonts") 82 + (onFullSupported "nixos.tests.gitlab") 82 83 (onFullSupported "nixos.tests.gnome") 83 84 (onFullSupported "nixos.tests.gnome-xorg") 84 85 (onSystems ["x86_64-linux"] "nixos.tests.hibernate")
+1
nixos/tests/all-tests.nix
··· 699 699 restartByActivationScript = handleTest ./restart-by-activation-script.nix {}; 700 700 restic = handleTest ./restic.nix {}; 701 701 retroarch = handleTest ./retroarch.nix {}; 702 + rkvm = handleTest ./rkvm {}; 702 703 robustirc-bridge = handleTest ./robustirc-bridge.nix {}; 703 704 roundcube = handleTest ./roundcube.nix {}; 704 705 rshim = handleTest ./rshim.nix {};
+18
nixos/tests/rkvm/cert.pem
··· 1 + -----BEGIN CERTIFICATE----- 2 + MIIC3jCCAcagAwIBAgIUWW1hb9xdRtxAhA42jkS89goW9LUwDQYJKoZIhvcNAQEL 3 + BQAwDzENMAsGA1UEAwwEcmt2bTAeFw0yMzA4MjIxOTI1NDlaFw0zMzA4MTkxOTI1 4 + NDlaMA8xDTALBgNVBAMMBHJrdm0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK 5 + AoIBAQCuBsh0+LDXN4b2o/PJjzuiZ9Yv9Pz1Oho9WRiXtNIuHTRdBCcht/iu3PGF 6 + ICIX+H3dqQOziGSCTAQGJD2p+1ik8d+boJbpa0oxXuHuomsMAT3mib3GpipQoBLP 7 + KaEbWEsvQbr3RMx8WOtG4dmRQFzSVVtmAXyM0pNyisd4eUCplyIl9gsRJIvsO/0M 8 + OkgOZW9XLfKiAWlZoyXEkBmPAshg3EkwQtmwxPA/NgWbAOW3zJKSChxnnGYiuIIu 9 + R/wJ8OQXHP6boQLQGUhCWBKa1uK1gEBmV3Pj6uK8RzTkQq6/47F5sPa6VfqQYdyl 10 + TCs9bSqHXZjqMBoiSp22uH6+Lh9RAgMBAAGjMjAwMA8GA1UdEQQIMAaHBAoAAAEw 11 + HQYDVR0OBBYEFEh9HEsnY3dfNKVyPWDbwfR0qHopMA0GCSqGSIb3DQEBCwUAA4IB 12 + AQB/r+K20JqegUZ/kepPxIU95YY81aUUoxvLbu4EAgh8o46Fgm75qrTZPg4TaIZa 13 + wtVejekrF+p3QVf0ErUblh/iCjTZPSzCmKHZt8cc9OwTH7bt3bx7heknzLDyIa5z 14 + szAL+6241UggQ5n5NUGn5+xZHA7TMe47xAZPaRMlCQ/tp5pWFjH6WSSQSP5t4Ag9 15 + ObhY+uudFjmWi3QIBTr3iIscbWx7tD8cjus7PzM7+kszSDRV04xb6Ox8JzW9MKIN 16 + GwgwVgs3zCuyqBmTGnR1og3aMk6VtlyZUYE78uuc+fMBxqoBZ0mykeOp0Tbzgtf7 17 + gPkYcQ6vonoQhuTXYj/NrY+b 18 + -----END CERTIFICATE-----
+104
nixos/tests/rkvm/default.nix
··· 1 + import ../make-test-python.nix ({ pkgs, ... }: 2 + let 3 + # Generated with 4 + # 5 + # nix shell .#rkvm --command "rkvm-certificate-gen --ip-addresses 10.0.0.1 cert.pem key.pem" 6 + # 7 + snakeoil-cert = ./cert.pem; 8 + snakeoil-key = ./key.pem; 9 + in 10 + { 11 + name = "rkvm"; 12 + 13 + nodes = { 14 + server = { pkgs, ... }: { 15 + imports = [ ../common/user-account.nix ]; 16 + 17 + virtualisation.vlans = [ 1 ]; 18 + 19 + networking = { 20 + useNetworkd = true; 21 + useDHCP = false; 22 + firewall.enable = false; 23 + }; 24 + 25 + systemd.network.networks."01-eth1" = { 26 + name = "eth1"; 27 + networkConfig.Address = "10.0.0.1/24"; 28 + }; 29 + 30 + services.getty.autologinUser = "alice"; 31 + 32 + services.rkvm.server = { 33 + enable = true; 34 + settings = { 35 + certificate = snakeoil-cert; 36 + key = snakeoil-key; 37 + password = "snakeoil"; 38 + switch-keys = [ "left-alt" "right-alt" ]; 39 + }; 40 + }; 41 + }; 42 + 43 + client = { pkgs, ... }: { 44 + imports = [ ../common/user-account.nix ]; 45 + 46 + virtualisation.vlans = [ 1 ]; 47 + 48 + networking = { 49 + useNetworkd = true; 50 + useDHCP = false; 51 + firewall.enable = false; 52 + }; 53 + 54 + systemd.network.networks."01-eth1" = { 55 + name = "eth1"; 56 + networkConfig.Address = "10.0.0.2/24"; 57 + }; 58 + 59 + services.getty.autologinUser = "alice"; 60 + 61 + services.rkvm.client = { 62 + enable = true; 63 + settings = { 64 + server = "10.0.0.1:5258"; 65 + certificate = snakeoil-cert; 66 + key = snakeoil-key; 67 + password = "snakeoil"; 68 + }; 69 + }; 70 + }; 71 + }; 72 + 73 + testScript = '' 74 + server.wait_for_unit("getty@tty1.service") 75 + server.wait_until_succeeds("pgrep -f 'agetty.*tty1'") 76 + server.wait_for_unit("rkvm-server") 77 + server.wait_for_open_port(5258) 78 + 79 + client.wait_for_unit("getty@tty1.service") 80 + client.wait_until_succeeds("pgrep -f 'agetty.*tty1'") 81 + client.wait_for_unit("rkvm-client") 82 + 83 + server.sleep(1) 84 + 85 + # Switch to client 86 + server.send_key("alt-alt_r", delay=0.2) 87 + server.send_chars("echo 'hello client' > /tmp/test.txt\n") 88 + 89 + # Switch to server 90 + server.send_key("alt-alt_r", delay=0.2) 91 + server.send_chars("echo 'hello server' > /tmp/test.txt\n") 92 + 93 + server.sleep(1) 94 + 95 + client.systemctl("stop rkvm-client.service") 96 + server.systemctl("stop rkvm-server.service") 97 + 98 + server_file = server.succeed("cat /tmp/test.txt") 99 + assert server_file.strip() == "hello server" 100 + 101 + client_file = client.succeed("cat /tmp/test.txt") 102 + assert client_file.strip() == "hello client" 103 + ''; 104 + })
+28
nixos/tests/rkvm/key.pem
··· 1 + -----BEGIN PRIVATE KEY----- 2 + MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCuBsh0+LDXN4b2 3 + o/PJjzuiZ9Yv9Pz1Oho9WRiXtNIuHTRdBCcht/iu3PGFICIX+H3dqQOziGSCTAQG 4 + JD2p+1ik8d+boJbpa0oxXuHuomsMAT3mib3GpipQoBLPKaEbWEsvQbr3RMx8WOtG 5 + 4dmRQFzSVVtmAXyM0pNyisd4eUCplyIl9gsRJIvsO/0MOkgOZW9XLfKiAWlZoyXE 6 + kBmPAshg3EkwQtmwxPA/NgWbAOW3zJKSChxnnGYiuIIuR/wJ8OQXHP6boQLQGUhC 7 + WBKa1uK1gEBmV3Pj6uK8RzTkQq6/47F5sPa6VfqQYdylTCs9bSqHXZjqMBoiSp22 8 + uH6+Lh9RAgMBAAECggEABo2V1dBu5E51zsAiFCMdypdLZEyUNphvWC5h3oXowONz 9 + pH8ICYfXyEnkma/kk2+ALy0dSRDn6/94dVIUX7Fpx0hJCcoJyhSysK+TJWfIonqX 10 + ffYOMeFG8vicIgs+GFKs/hoPtB5LREbFkUqRj/EoWE6Y3aX3roaCwTZC8vaUk0OK 11 + 54gExcNXRwQtFmfM9BiPT76F2J641NVsddgKumrryMi605CgZ57OFfSYEena6T3t 12 + JbQ1TKB3SH1LvSQIspyp56E3bjh8bcwSh72g88YxWZI9yarOesmyU+fXnmVqcBc+ 13 + CiJDX3Te1C2GIkBiH3HZJo4P88aXrkJ7J8nub/812QKBgQDfCHjBy5uWzzbDnqZc 14 + cllIyUqMHq1iY2/btdZQbz83maZhQhH2UL4Zvoa7qgMX7Ou5jn1xpDaMeXNaajGK 15 + Fz66nmqQEUFX1i+2md2J8TeKD37yUJRdlrMiAc+RNp5wiOH9EI18g2m6h/nj3s/P 16 + MdNyxsz+wqOiJT0sZatarKiFhQKBgQDHv+lPy4OPH1MeSv5vmv3Pa41O/CeiPy+T 17 + gi6nEZayVRVog3zF9T6gNIHrZ1fdIppWPiPXv9fmC3s/IVEftLG6YC+MAfigYhiz 18 + Iceoal0iJJ8DglzOhlKgHEnxEwENCz8aJxjpvbxHHcpvgXdBSEVfHvVqDkAFTsvF 19 + JA5YTmqGXQKBgQCL6uqm2S7gq1o12p+PO4VbrjwAL3aiVLNl6Gtsxn2oSdIhDavr 20 + FLhNukMYFA4gwlcXb5au5k/6TG7bd+dgNDj8Jkm/27NcgVgpe9mJojQvfo0rQvXw 21 + yIvUd8JZ3SQEgTsU4X+Bb4eyp39TPwKrfxyh0qnj4QN6w1XfNmELX2nRaQKBgEq6 22 + a0ik9JTovSnKGKIcM/QTYow4HYO/a8cdnuJ13BDfb+DnwBg3BbTdr/UndmGOfnrh 23 + SHuAk/7GMNePWVApQ4xcS61vV1p5GJB7hLxm/my1kp+3d4z0B5lKvAbqeywsFvFr 24 + yxA3IWbhqEhLARh1Ny684EdLCXxy3Bzmvk8fFw8pAoGAGkt9pJC2wkk9fnJIHq+f 25 + h/WnEO0YrGzYnVA+RyCNKrimRd+GylGHJ/Ev6PRZvMwyGE7RCB+fHVrrEcEJAcxL 26 + SaOg5NA8cwrG+UpTQqi4gt6tCW87afVCyL6dC/E8giJlzI0LY9DnFGoVqYL0qJvm 27 + Sj4SU0fyLsW/csOLd5T+Bf8= 28 + -----END PRIVATE KEY-----
+5 -5
pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
··· 5 5 , substituteAll 6 6 , acm 7 7 , markdown-mode 8 - , posframe 9 8 , git 10 9 , go 11 10 , gopls ··· 17 16 }: 18 17 19 18 let 20 - rev = "6f93deb32ebb3799dfedd896a17a0428a9b461bb"; 19 + rev = "0b30d95c6de95b150d93ecee325b95e04ff09e46"; 21 20 python = python3.withPackages (ps: with ps; [ 22 21 epc 23 22 orjson 23 + paramiko 24 + rapidfuzz 24 25 sexpdata 25 26 six 26 27 ]); 27 28 in 28 29 melpaBuild { 29 30 pname = "lsp-bridge"; 30 - version = "20230607.135"; # 1:35 UTC 31 + version = "20231021.309"; # 3:09 UTC 31 32 32 33 src = fetchFromGitHub { 33 34 owner = "manateelazycat"; 34 35 repo = "lsp-bridge"; 35 36 inherit rev; 36 - hash = "sha256-4AKKsU+yuLA9qv6mhYPpjBJ8wrbGPMuzN98JXcVPAHg="; 37 + hash = "sha256-hR7bZh0ElJ8F9ToJ4dkazF19T8PE01MTcxKrjeaEp4o="; 37 38 }; 38 39 39 40 commit = rev; ··· 50 51 packageRequires = [ 51 52 acm 52 53 markdown-mode 53 - posframe 54 54 ]; 55 55 56 56 checkInputs = [
+14 -8
pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/hardcode-dependencies.patch
··· 1 1 diff --git a/lsp-bridge.el b/lsp-bridge.el 2 - index 3a7ff0b..ea5e496 100644 2 + index 278c27e..f0c67c2 100644 3 3 --- a/lsp-bridge.el 4 4 +++ b/lsp-bridge.el 5 - @@ -326,13 +326,7 @@ Setting this to nil or 0 will turn off the indicator." 5 + @@ -340,19 +340,7 @@ Setting this to nil or 0 will turn off the indicator." 6 6 "Name of LSP-Bridge buffer." 7 7 :type 'string) 8 8 9 9 -(defcustom lsp-bridge-python-command (cond ((memq system-type '(cygwin windows-nt ms-dos)) 10 - - (if (executable-find "pypy3.exe") 11 - - "pypy3.exe" 12 - - "python3.exe")) 13 - - (t (if (executable-find "pypy3") 14 - - "pypy3" 15 - - "python3"))) 10 + - (cond ((executable-find "pypy3.exe") 11 + - "pypy3.exe") 12 + - ((executable-find "python3.exe") 13 + - "python3.exe") 14 + - ((executable-find "python.exe") 15 + - "python.exe"))) 16 + - (t (cond ((executable-find "pypy3") 17 + - "pypy3") 18 + - ((executable-find "python3") 19 + - "python3") 20 + - ((executable-find "python") 21 + - "python")))) 16 22 +(defcustom lsp-bridge-python-command "@python@" 17 23 "The Python interpreter used to run lsp_bridge.py." 18 24 :type 'string)
+2 -2
pkgs/applications/misc/remnote/default.nix
··· 6 6 in 7 7 { 8 8 pname = "remnote"; 9 - version = "1.12.43"; 9 + version = "1.12.64"; 10 10 11 11 src = fetchurl { 12 12 url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; 13 - hash = "sha256-3GNp+0ZUZbUcBkE8DbIEDRYlWfG3HDTTS6wK3u42jJg="; 13 + hash = "sha256-Pvz3bBpv4wN2NXxuKNNraCuOqvvtYOyg5PTSwMpL3cw="; 14 14 }; 15 15 appexec = appimageTools.wrapType2 { 16 16 inherit pname version src;
+9
pkgs/applications/networking/cluster/terraform-providers/providers.json
··· 961 961 "spdx": "Apache-2.0", 962 962 "vendorHash": "sha256-Tj+NefCIacwpPS9rNPPxV2lLeKsXJMZhf9Xo+Rzz6gI=" 963 963 }, 964 + "proxmox": { 965 + "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", 966 + "homepage": "https://registry.terraform.io/providers/Telmate/proxmox", 967 + "owner": "Telmate", 968 + "repo": "terraform-provider-proxmox", 969 + "rev": "v2.9.14", 970 + "spdx": "MIT", 971 + "vendorHash": "sha256-um4iOwYO6ASv9wpu5Jua9anUZBKly4yVgI224Fk2dOM=" 972 + }, 964 973 "rabbitmq": { 965 974 "hash": "sha256-ArteHTNNUxgiBJamnR1bJFDrvNnqjbJ6D3mj1XlpVUA=", 966 975 "homepage": "https://registry.terraform.io/providers/cyrilgdn/rabbitmq",
+2 -2
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
··· 44 44 45 45 thunderbird-115 = (buildMozillaMach rec { 46 46 pname = "thunderbird"; 47 - version = "115.3.2"; 47 + version = "115.3.3"; 48 48 application = "comm/mail"; 49 49 applicationName = "Mozilla Thunderbird"; 50 50 binaryName = pname; 51 51 src = fetchurl { 52 52 url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; 53 - sha512 = "e94bdb940327296754324d8fcb055813247a79d377399b84184e0ff80123240d923aa3745c3076d37f06296c8cc49373db2d8e8a6ac4edeaf63cd56ca4652e35"; 53 + sha512 = "631042a3cdbcbae91d93eb71c0d4f6a1122e8bc7000d75fcc7d3cbdd0e82a4b31abac590c75771e77ab08d5700582b6dedacf62ce8e21a91e9ea81aedf1bbeaa"; 54 54 }; 55 55 extraPatches = [ 56 56 # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
+3 -3
pkgs/applications/version-management/gh/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "gh"; 5 - version = "2.36.0"; 5 + version = "2.37.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "cli"; 9 9 repo = "cli"; 10 10 rev = "v${version}"; 11 - hash = "sha256-ya+Iuhe+vXNqt6mfpZ3h8jq++82AGMj+Zd4ozGFjuqY="; 11 + hash = "sha256-EAvBPUm2U31gzpfyjEPClT1lbBYiITXpdc+T3nUMOeg="; 12 12 }; 13 13 14 - vendorHash = "sha256-tJDn3pyX5iTIa61OQXbErdBprqxu1N2LXqyJtpDQnBE="; 14 + vendorHash = "sha256-G3cpR5S+upk3js5anZHXxcRayTEGMqnBpmtp4HO0pjQ="; 15 15 16 16 nativeBuildInputs = [ installShellFiles ]; 17 17
pkgs/applications/video/manim/conftest-

This is a binary file and will not be displayed.

+8 -5
pkgs/applications/video/manim/default.nix
··· 68 68 69 69 in python.pkgs.buildPythonApplication rec { 70 70 pname = "manim"; 71 - format = "pyproject"; 72 - version = "0.16.0.post0"; 71 + pyproject = true; 72 + version = "0.17.3"; 73 73 disabled = python3.pythonOlder "3.8"; 74 74 75 75 src = fetchFromGitHub { 76 76 owner = "ManimCommunity"; 77 77 repo = pname; 78 78 rev = "refs/tags/v${version}"; 79 - sha256 = "sha256-iXiPnI6lTP51P1X3iLp75ArRP66o8WAANBLoStPrz4M="; 79 + sha256 = "sha256-TU/b5nwk5Xc9wmFKAIMeBwC4YBy7HauGeGV9/n4Y64c="; 80 80 }; 81 81 82 82 nativeBuildInputs = with python.pkgs; [ 83 83 poetry-core 84 84 ]; 85 85 86 + patches = [ 87 + ./pytest-report-header.patch 88 + ]; 89 + 86 90 postPatch = '' 87 91 substituteInPlace pyproject.toml \ 88 92 --replace "--no-cov-on-fail --cov=manim --cov-report xml --cov-report term" "" \ 89 93 --replace 'cloup = "^0.13.0"' 'cloup = "*"' \ 90 - --replace 'mapbox-earcut = "^0.12.10"' 'mapbox-earcut = "*"' \ 91 - --replace 'click = ">=7.2<=9.0"' 'click = ">=7.2,<=9.0"' # https://github.com/ManimCommunity/manim/pull/2954 92 94 ''; 93 95 94 96 buildInputs = [ cairo ]; ··· 119 121 screeninfo 120 122 skia-pathops 121 123 srt 124 + svgelements 122 125 tqdm 123 126 watchdog 124 127 ];
+21
pkgs/applications/video/manim/pytest-report-header.patch
··· 1 + diff --git a/conftest.py b/conftest.py 2 + index da37e19b..d9f850d8 100644 3 + --- a/conftest.py 4 + +++ b/conftest.py 5 + @@ -32,16 +32,3 @@ def temp_media_dir(tmpdir, monkeypatch, request): 6 + with tempconfig({"media_dir": str(tmpdir)}): 7 + assert config.media_dir == str(tmpdir) 8 + yield tmpdir 9 + - 10 + - 11 + -def pytest_report_header(config): 12 + - ctx = moderngl.create_standalone_context() 13 + - info = ctx.info 14 + - ctx.release() 15 + - return ( 16 + - "\nOpenGL information", 17 + - "------------------", 18 + - f"vendor: {info['GL_VENDOR'].strip()}", 19 + - f"renderer: {info['GL_RENDERER'].strip()}", 20 + - f"version: {info['GL_VERSION'].strip()}\n", 21 + - )
+2 -2
pkgs/applications/video/ustreamer/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "ustreamer"; 5 - version = "5.41"; 5 + version = "5.42"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "pikvm"; 9 9 repo = "ustreamer"; 10 10 rev = "v${version}"; 11 - hash = "sha256-N70wBKiKfOhlAR9qOSkc6dlO44lJXHWiUYb8nwXMKxo="; 11 + hash = "sha256-V4ScXzZwh3fWCWmeGeb1hce+INYBmf3wtemwNch5FjY="; 12 12 }; 13 13 14 14 buildInputs = [ libbsd libevent libjpeg ];
+2 -2
pkgs/applications/video/vdr/markad/default.nix
··· 19 19 }: 20 20 stdenv.mkDerivation rec { 21 21 pname = "vdr-markad"; 22 - version = "3.3.3"; 22 + version = "3.3.5"; 23 23 24 24 src = fetchFromGitHub { 25 25 repo = "vdr-plugin-markad"; 26 26 owner = "kfb77"; 27 - sha256 = "sha256-wU8hfNss0Lxvf9CqFhDAPOxIVaG/9vNR620xpEJkxWI="; 27 + sha256 = "sha256-5D4nlGZfmPaNaLx2PoqLRqlbcukpM6DHpCtqmee+cww="; 28 28 rev = "V${version}"; 29 29 }; 30 30
+7
pkgs/build-support/expand-response-params/default.nix
··· 1 1 { stdenv }: 2 2 3 + # A "response file" is a sequence of arguments that is passed via a 4 + # file, rather than via argv[]. 5 + 6 + # For more information see: 7 + # https://gcc.gnu.org/wiki/Response_Files 8 + # https://www.intel.com/content/www/us/en/docs/dpcpp-cpp-compiler/developer-guide-reference/2023-0/use-response-files.html 9 + 3 10 stdenv.mkDerivation { 4 11 name = "expand-response-params"; 5 12 src = ./expand-response-params.c;
+66
pkgs/by-name/kc/kconfig-frontends/package.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , bash 5 + , bison 6 + , flex 7 + , gperf 8 + , ncurses 9 + , pkg-config 10 + , python3 11 + }: 12 + 13 + stdenv.mkDerivation (finalAttrs: { 14 + pname = "kconfig-frontends"; 15 + version = "4.11.0.1"; 16 + 17 + src = fetchurl { 18 + url = "https://bitbucket.org/nuttx/tools/downloads/kconfig-frontends-${finalAttrs.version}.tar.bz2"; 19 + hash = "sha256-yxg4z+Lwl7oJyt4n1HUncg1bKeK3FcCpbDPQtqELqxM="; 20 + }; 21 + 22 + patches = [ 23 + # This patch is a fixed file, there is no need to normalize it 24 + (fetchurl { 25 + url = "https://bitbucket.org/nuttx/tools/downloads/gperf3.1_kconfig_id_lookup.patch"; 26 + hash = "sha256-cqAWjRnMA/fJ8wnEfUxoPEW0hIJY/mprE6/TQMY6NPI="; 27 + }) 28 + ]; 29 + 30 + outputs = [ "out" "lib" "dev" "doc" ]; 31 + 32 + nativeBuildInputs = [ 33 + bison 34 + flex 35 + gperf 36 + pkg-config 37 + ]; 38 + 39 + buildInputs = [ 40 + bash 41 + ncurses 42 + python3 43 + ]; 44 + 45 + strictDeps = true; 46 + 47 + configureFlags = [ 48 + "--enable-frontends=conf,mconf,nconf" 49 + ]; 50 + 51 + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; 52 + 53 + meta = { 54 + description = "Out of Linux tree packaging of the kconfig infrastructure"; 55 + longDescription = '' 56 + Configuration language and system for the Linux kernel and other 57 + projects. Features simple syntax and grammar, limited yet adequate option 58 + types, simple organization of options, and direct and reverse 59 + dependencies. 60 + ''; 61 + homepage = "https://bitbucket.org/nuttx/tools/"; 62 + license = lib.licenses.gpl2Plus; 63 + maintainers = with lib.maintainers; [ AndersonTorres ]; 64 + platforms = lib.platforms.unix; 65 + }; 66 + })
+35
pkgs/by-name/na/namespace-cli/package.nix
··· 1 + { lib 2 + , fetchFromGitHub 3 + , buildGoModule 4 + }: 5 + 6 + buildGoModule rec { 7 + pname = "namespace-cli"; 8 + version = "0.0.301"; 9 + 10 + src = fetchFromGitHub { 11 + owner = "namespacelabs"; 12 + repo = "foundation"; 13 + rev = "v${version}"; 14 + hash = "sha256-e2le7yIzgb3dReniU7grR814xDWhGgckuyzx4omeRYI="; 15 + }; 16 + 17 + vendorHash = "sha256-jYkEXoCxqlxLF7oRc7H+/pMwkphOEwt2qUFkg+JOKVA="; 18 + 19 + subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"]; 20 + 21 + ldflags = [ 22 + "-s" 23 + "-w" 24 + "-X namespacelabs.dev/foundation/internal/cli/version.Tag=v${version}" 25 + ]; 26 + 27 + meta = with lib; { 28 + mainProgram = "nsc"; 29 + maintainers = with maintainers; [ techknowlogick ]; 30 + license = licenses.asl20; 31 + changelog = "https://github.com/namespacelabs/foundation/releases/tag/v${version}"; 32 + homepage = "https://github.com/namespacelabs/foundation"; 33 + description = "A command line interface for the Namespaces platform"; 34 + }; 35 + }
+3 -3
pkgs/by-name/ux/uxn/package.nix
··· 7 7 8 8 stdenv.mkDerivation (finalAttrs: { 9 9 pname = "uxn"; 10 - version = "unstable-2023-09-06"; 10 + version = "unstable-2023-09-29"; 11 11 12 12 src = fetchFromSourcehut { 13 13 owner = "~rabbits"; 14 14 repo = "uxn"; 15 - rev = "d7f96acb93742744fec32ba667a4b4438dcf90cf"; 16 - hash = "sha256-kaYT61qDSPtpNd0M3IHxR8EzhnsB5uNH075+Xag1Vv8="; 15 + rev = "c71842aa8472f26c0ea7fbf92624659313c038ba"; 16 + hash = "sha256-Lo1AkK81Hv8A0jBfpR4lxlBJcWkh9LttURiXVoibKSs="; 17 17 }; 18 18 19 19 outputs = [ "out" "projects" ];
+9 -3
pkgs/desktops/mate/libmateweather/default.nix
··· 4 4 , pkg-config 5 5 , gettext 6 6 , glib 7 + , glib-networking 7 8 , libxml2 8 9 , gtk3 9 10 , libsoup ··· 13 14 14 15 stdenv.mkDerivation rec { 15 16 pname = "libmateweather"; 16 - version = "1.26.1"; 17 + version = "1.26.2"; 17 18 18 19 src = fetchurl { 19 20 url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 20 - sha256 = "wgCZD0uOnU0OLG99MaWHY3TD0qNsa4y1kEQAQ6hg7zo="; 21 + sha256 = "ylCoFYZlXPU6j5Z2a5zpCk0H7Q/hYr1eFdra3QBgx/Y="; 21 22 }; 22 23 23 24 strictDeps = true; ··· 30 31 ]; 31 32 32 33 buildInputs = [ 33 - gtk3 34 34 libsoup 35 35 tzdata 36 + ]; 37 + 38 + propagatedBuildInputs = [ 39 + glib 40 + glib-networking # for obtaining IWIN forecast data 41 + gtk3 36 42 ]; 37 43 38 44 configureFlags = [
+10 -2
pkgs/desktops/mate/mate-indicator-applet/default.nix
··· 4 4 , pkg-config 5 5 , gettext 6 6 , gtk3 7 - , libindicator-gtk3 7 + , libayatana-indicator 8 8 , mate 9 9 , hicolor-icon-theme 10 10 , wrapGAppsHook ··· 20 20 sha256 = "144fh9f3lag2cqnmb6zxlh8k83ya8kha6rmd7r8gg3z5w3nzpyz4"; 21 21 }; 22 22 23 + postPatch = '' 24 + # Find installed Unity & Ayatana (new-style) indicators 25 + substituteInPlace src/applet-main.c \ 26 + --replace '/usr/share' '/run/current-system/sw/share' 27 + ''; 28 + 23 29 nativeBuildInputs = [ 24 30 pkg-config 25 31 gettext ··· 28 34 29 35 buildInputs = [ 30 36 gtk3 31 - libindicator-gtk3 37 + libayatana-indicator 32 38 mate.mate-panel 33 39 hicolor-icon-theme 34 40 ]; 41 + 42 + configureFlags = [ "--with-ayatana-indicators" ]; 35 43 36 44 enableParallelBuilding = true; 37 45
+3 -3
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
··· 18 18 19 19 stdenv.mkDerivation rec { 20 20 pname = "switchboard-plug-network"; 21 - version = "2.4.4"; 21 + version = "unstable-2023-09-05"; # 2.4.4 does not support networkmanager 1.44 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "elementary"; 25 25 repo = pname; 26 - rev = version; 27 - sha256 = "sha256-g62+DF84eEI+TvUr1OkeqLnCLz/b7e+xwuTNZS0WJQA="; 26 + rev = "3b69132788ff8734a481d498b49207e05a4f7d70"; 27 + hash = "sha256-XWiihU/FK6oeWQWRYsc/IxqafuvwA89ZE3o/WzaxudE="; 28 28 }; 29 29 30 30 patches = [
+19 -4
pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix
··· 31 31 # 32 32 SHLIB_LC = lib.optionalString stdenv.targetPlatform.isPower "-mnewlib"; 33 33 34 - in '' 35 - echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in 36 - echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in 37 - '' 34 + in 35 + '' 36 + echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in 37 + echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in 38 + '' 39 + 40 + # Meanwhile, crt{i,n}.S are not present on certain platforms 41 + # (e.g. LoongArch64), resulting in the following error: 42 + # 43 + # No rule to make target '../../../gcc-xx.x.x/libgcc/config/loongarch/crti.S', needed by 'crti.o'. Stop. 44 + # 45 + # For LoongArch64, a hacky workaround is to simply touch them, 46 + # as the platform forces .init_array support. 47 + # 48 + # https://www.openwall.com/lists/musl/2022/11/09/3 49 + # 50 + + lib.optionalString stdenv.targetPlatform.isLoongArch64 '' 51 + touch libgcc/config/loongarch/crt{i,n}.S 52 + ''
+2 -4
pkgs/development/python-modules/agate-sql/default.nix
··· 11 11 12 12 buildPythonPackage rec { 13 13 pname = "agate-sql"; 14 - version = "0.5.9"; 14 + version = "0.7.0"; 15 15 16 16 disabled = isPy27; 17 17 18 18 src = fetchPypi { 19 19 inherit pname version; 20 - hash = "sha256-MLZCoypbZxFhq++ejsNjUvLniiTOhJBU7axpRti53cY="; 20 + hash = "sha256-uyHkkc3KzuYulOtod9KkHQmszVh2mrrCOLwvQt6JTMk="; 21 21 }; 22 22 23 23 propagatedBuildInputs = [ agate sqlalchemy ]; ··· 27 27 pythonImportsCheck = [ "agatesql" ]; 28 28 29 29 meta = with lib; { 30 - # https://github.com/wireservice/agate-sql/commit/74af1badd85408909ea72cb6ca8c0b223d178c6f 31 - broken = lib.versionAtLeast sqlalchemy.version "2.0"; 32 30 description = "Adds SQL read/write support to agate."; 33 31 homepage = "https://github.com/wireservice/agate-sql"; 34 32 license = with licenses; [ mit ];
+2 -2
pkgs/development/python-modules/huggingface-hub/default.nix
··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "huggingface-hub"; 16 - version = "0.17.3"; 16 + version = "0.18.0"; 17 17 format = "setuptools"; 18 18 19 19 disabled = pythonOlder "3.8"; ··· 22 22 owner = "huggingface"; 23 23 repo = "huggingface_hub"; 24 24 rev = "refs/tags/v${version}"; 25 - hash = "sha256-zoZIxp9+4FVPLCiikKussC34rwWBQzWMDlZx9S7NnqQ="; 25 + hash = "sha256-/KbD3TNSbQ9ueXYFLoXnIRIoi/y3l0w72GZ1+JC8ULk="; 26 26 }; 27 27 28 28 propagatedBuildInputs = [
+39
pkgs/development/python-modules/lxml-stubs/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + , setuptools 5 + , pytestCheckHook 6 + , pytest-mypy-plugins 7 + , lxml 8 + }: 9 + 10 + buildPythonPackage rec { 11 + pname = "lxml-stubs"; 12 + version = "0.4.0"; 13 + pyproject = true; 14 + 15 + src = fetchFromGitHub { 16 + owner = "lxml"; 17 + repo = "lxml-stubs"; 18 + rev = version; 19 + hash = "sha256-RRH/taLtgaXOl0G/ve2Ad7Xy8WRDUG2/k26EFMv1PRM="; 20 + }; 21 + 22 + nativeBuildInputs = [ 23 + setuptools 24 + ]; 25 + propagatedBuildInputs = [ 26 + lxml 27 + ]; 28 + nativeCheckInputs = [ 29 + pytestCheckHook 30 + pytest-mypy-plugins 31 + ]; 32 + 33 + meta = with lib; { 34 + description = "Type stubs for the lxml package"; 35 + homepage = "https://github.com/lxml/lxml-stubs"; 36 + license = licenses.asl20; 37 + maintainers = with maintainers; [ doronbehar ]; 38 + }; 39 + }
+10 -5
pkgs/development/python-modules/moderngl_window/default.nix
··· 2 2 , stdenv 3 3 , buildPythonPackage 4 4 , fetchFromGitHub 5 + , setuptools 5 6 , glfw 6 7 , moderngl 7 8 , numpy ··· 19 20 20 21 buildPythonPackage rec { 21 22 pname = "moderngl-window"; 22 - version = "2.4.4"; 23 - format = "setuptools"; 23 + version = "2.4.5"; 24 + pyproject = true; 24 25 25 - disabled = pythonOlder "3.7"; 26 + disabled = pythonOlder "3.8"; 26 27 27 28 src = fetchFromGitHub { 28 29 owner = "moderngl"; 29 30 repo = "moderngl_window"; 30 31 rev = "refs/tags/${version}"; 31 - hash = "sha256-mg3j5ZoMwdk39L5xjcoEJo9buqssM1VLJtndSFsuCB0="; 32 + hash = "sha256-OfvIxezeZyuv5LLbe+4o1X2UCGnXT2DNvAF7t2Isw6Y="; 32 33 }; 34 + 35 + nativeBuildInputs = [ 36 + setuptools 37 + ]; 33 38 34 39 propagatedBuildInputs = [ 35 40 numpy ··· 75 80 license = licenses.mit; 76 81 maintainers = with maintainers; [ c0deaddict ]; 77 82 platforms = platforms.mesaPlatforms; 78 - broken = versionAtLeast pillow.version "2" || stdenv.isDarwin; 83 + broken = stdenv.isDarwin; 79 84 }; 80 85 }
+10 -10
pkgs/development/python-modules/wled/default.nix
··· 15 15 16 16 buildPythonPackage rec { 17 17 pname = "wled"; 18 - version = "0.16.0"; 18 + version = "0.17.0"; 19 19 format = "pyproject"; 20 20 21 - disabled = pythonOlder "3.8"; 21 + disabled = pythonOlder "3.11"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "frenck"; 25 25 repo = "python-wled"; 26 26 rev = "refs/tags/v${version}"; 27 - hash = "sha256-esINtvctvgl8AqNwCDVnGU+3j/UzEHqY8H1Rws1kQfs="; 27 + hash = "sha256-y32zynkVsn5vWw+BZ6ZRf9zemGOWJMN4yfNQZ0bRpos="; 28 28 }; 29 + 30 + postPatch = '' 31 + # Upstream doesn't set a version for the pyproject.toml 32 + substituteInPlace pyproject.toml \ 33 + --replace "0.0.0" "${version}" \ 34 + --replace "--cov" "" 35 + ''; 29 36 30 37 nativeBuildInputs = [ 31 38 poetry-core ··· 44 51 pytest-asyncio 45 52 pytestCheckHook 46 53 ]; 47 - 48 - postPatch = '' 49 - # Upstream doesn't set a version for the pyproject.toml 50 - substituteInPlace pyproject.toml \ 51 - --replace "0.0.0" "${version}" \ 52 - --replace "--cov" "" 53 - ''; 54 54 55 55 pythonImportsCheck = [ 56 56 "wled"
-36
pkgs/development/tools/misc/kconfig-frontends/default.nix
··· 1 - { lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, python3, bash }: 2 - 3 - stdenv.mkDerivation rec { 4 - pname = "kconfig-frontends"; 5 - version = "4.11.0.1"; 6 - 7 - src = fetchurl { 8 - sha256 = "1xircdw3k7aaz29snf96q2fby1cs48bidz5l1kkj0a5gbivw31i3"; 9 - url = "http://ymorin.is-a-geek.org/download/kconfig-frontends/kconfig-frontends-${version}.tar.xz"; 10 - }; 11 - 12 - nativeBuildInputs = [ bison flex gperf pkg-config ]; 13 - buildInputs = [ bash ncurses python3 ]; 14 - 15 - strictDeps = true; 16 - 17 - configureFlags = [ 18 - "--enable-frontends=conf,mconf,nconf" 19 - ]; 20 - 21 - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; 22 - 23 - meta = with lib; { 24 - description = "Out of Linux tree packaging of the kconfig infrastructure"; 25 - longDescription = '' 26 - Configuration language and system for the Linux kernel and other 27 - projects. Features simple syntax and grammar, limited yet adequate option 28 - types, simple organization of options, and direct and reverse 29 - dependencies. 30 - ''; 31 - homepage = "http://ymorin.is-a-geek.org/projects/kconfig-frontends"; 32 - license = licenses.gpl2; 33 - platforms = platforms.unix; 34 - maintainers = with maintainers; [ mbe ]; 35 - }; 36 - }
+2 -2
pkgs/os-specific/darwin/sketchybar/default.nix
··· 21 21 in 22 22 stdenv.mkDerivation (finalAttrs: { 23 23 pname = "sketchybar"; 24 - version = "2.17.0"; 24 + version = "2.17.1"; 25 25 26 26 src = fetchFromGitHub { 27 27 owner = "FelixKratz"; 28 28 repo = "SketchyBar"; 29 29 rev = "v${finalAttrs.version}"; 30 - hash = "sha256-FntWC180wpUyxP5iYdo/p2LbP0dbv1y6CXersfBT5b4="; 30 + hash = "sha256-QilZurp4QkwOo4jbYXMs4SesqyXXsEgF8dDwt/Kv94s="; 31 31 }; 32 32 33 33 buildInputs = [
+3 -3
pkgs/servers/akkoma/admin-fe/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitea, fetchYarnDeps 4 - , fixup_yarn_lock, yarn, nodejs 4 + , prefetch-yarn-deps, yarn, nodejs 5 5 , python3, pkg-config, libsass 6 6 }: 7 7 ··· 25 25 }; 26 26 27 27 nativeBuildInputs = [ 28 - fixup_yarn_lock 28 + prefetch-yarn-deps 29 29 yarn 30 30 nodejs 31 31 pkg-config ··· 43 43 export HOME="$(mktemp -d)" 44 44 45 45 yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg offlineCache} 46 - fixup_yarn_lock yarn.lock 46 + fixup-yarn-lock yarn.lock 47 47 48 48 yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive 49 49 patchShebangs node_modules/cross-env
+3 -3
pkgs/servers/akkoma/akkoma-fe/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitea, fetchYarnDeps 4 - , fixup_yarn_lock, yarn, nodejs 4 + , prefetch-yarn-deps, yarn, nodejs 5 5 , jpegoptim, oxipng, nodePackages 6 6 }: 7 7 ··· 23 23 }; 24 24 25 25 nativeBuildInputs = [ 26 - fixup_yarn_lock 26 + prefetch-yarn-deps 27 27 yarn 28 28 nodejs 29 29 jpegoptim ··· 43 43 export HOME="$(mktemp -d)" 44 44 45 45 yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg offlineCache} 46 - fixup_yarn_lock yarn.lock 46 + fixup-yarn-lock yarn.lock 47 47 48 48 yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive 49 49
+2 -2
pkgs/servers/dns/knot-dns/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "knot-dns"; 10 - version = "3.3.1"; 10 + version = "3.3.2"; 11 11 12 12 src = fetchurl { 13 13 url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; 14 - sha256 = "f3f4b1d49ec9b81113b14a38354b823bd4a470356ed7e8e555595b6fd1ac80c9"; 14 + sha256 = "0d65d4b59f5df69b78c6295ade0a2ea7931831de7ef5eeee3e00f8a20af679e4"; 15 15 }; 16 16 17 17 outputs = [ "bin" "out" "dev" ];
+2 -2
pkgs/servers/web-apps/moodle/default.nix
··· 1 1 { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }: 2 2 3 3 let 4 - version = "4.1.4"; 4 + version = "4.3"; 5 5 6 6 versionParts = lib.take 2 (lib.splitVersion version); 7 7 # 4.2 -> 402, 3.11 -> 311 ··· 15 15 16 16 src = fetchurl { 17 17 url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz"; 18 - hash = "sha256-mfJV5KHOG401N8gHFWYygsRRVnlWyn0SojD1H5KAvPQ="; 18 + hash = "sha256-zLBFUyadpsqGeEhBCPrh3KKWn6f3zCy64YxTBMLIGsk="; 19 19 }; 20 20 21 21 phpConfig = writeText "config.php" ''
+47
pkgs/tools/misc/rkvm/default.nix
··· 1 + { lib 2 + , fetchFromGitHub 3 + , rustPlatform 4 + , pkg-config 5 + , libevdev 6 + , openssl 7 + , makeWrapper 8 + , nixosTests 9 + }: 10 + 11 + rustPlatform.buildRustPackage rec { 12 + pname = "rkvm"; 13 + version = "0.5.1"; 14 + 15 + src = fetchFromGitHub { 16 + owner = "htrefil"; 17 + repo = pname; 18 + rev = version; 19 + hash = "sha256-3IdwBMN+VZBrcoT5vF7pF6xoNWZBn4k/jRJqADlpM7k="; 20 + }; 21 + 22 + cargoHash = "sha256-/SZKJI4gMkike2m8UVzbwfMqj697A8zbJEKAnnbSx3s="; 23 + 24 + nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook makeWrapper ]; 25 + buildInputs = [ libevdev ]; 26 + 27 + postInstall = '' 28 + install -Dm444 -t "$out/lib/systemd/system" systemd/rkvm-*.service 29 + install -Dm444 example/server.toml "$out/etc/rkvm/server.example.toml" 30 + install -Dm444 example/client.toml "$out/etc/rkvm/client.example.toml" 31 + 32 + wrapProgram $out/bin/rkvm-certificate-gen --prefix PATH : ${lib.makeBinPath [ openssl ]} 33 + ''; 34 + 35 + passthru.tests = { 36 + inherit (nixosTests) rkvm; 37 + }; 38 + 39 + meta = with lib; { 40 + description = "Virtual KVM switch for Linux machines"; 41 + homepage = "https://github.com/htrefil/rkvm"; 42 + changelog = "https://github.com/htrefil/rkvm/releases/tag/${version}"; 43 + license = licenses.mit; 44 + platforms = platforms.linux; 45 + maintainers = with maintainers; [ ckie ]; 46 + }; 47 + }
+2 -2
pkgs/tools/security/exploitdb/default.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "exploitdb"; 9 - version = "2023-10-20"; 9 + version = "2023-10-21"; 10 10 11 11 src = fetchFromGitLab { 12 12 owner = "exploit-database"; 13 13 repo = pname; 14 14 rev = "refs/tags/${version}"; 15 - hash = "sha256-v9myewSoa0U/1EjmBejHj7M2iL8k8xNpFzi74IN4dS0="; 15 + hash = "sha256-Un8Wnctd8943JXA9GlKlaR2b6mP8BfcYLHSjxpysg3U="; 16 16 }; 17 17 18 18 nativeBuildInputs = [
+3 -3
pkgs/tools/security/vault-ssh-plus/default.nix
··· 8 8 }: 9 9 buildGoModule rec { 10 10 pname = "vault-ssh-plus"; 11 - version = "0.7.2"; 11 + version = "0.7.3"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "isometry"; 15 15 repo = pname; 16 16 rev = "v${version}"; 17 - hash = "sha256-t987QIMXrG+p+mmRnVrYnhvsmkqCFe/qe1AEtzKArnY="; 17 + hash = "sha256-IRmFC5WsLmHfPjS/jW5V7dNF5rNvmsh3YKwW7rGII24="; 18 18 }; 19 19 20 - vendorHash = "sha256-VUsy4z1kIK6TDb5RYNwgDsoqjO6bsTNrXVMO7IXkjO4="; 20 + vendorHash = "sha256-cuU7rEpJrwrbiXLajdv4h6GePbpZclweyB9qZ3SIjP0="; 21 21 22 22 nativeBuildInputs = [ makeWrapper ]; 23 23
+3 -3
pkgs/tools/system/netdata/default.nix
··· 18 18 19 19 stdenv.mkDerivation rec { 20 20 # Don't forget to update go.d.plugin.nix as well 21 - version = "1.42.4"; 21 + version = "1.43.0"; 22 22 pname = "netdata"; 23 23 24 24 src = fetchFromGitHub { ··· 26 26 repo = "netdata"; 27 27 rev = "v${version}"; 28 28 hash = if withCloudUi 29 - then "sha256-MaU9sOQD+Y03M+yoSWt1GuV+DrBlD7+r/Qm2JJ9s8EU=" 30 - else "sha256-41QntBt0MoO1hAsDb8LhHgvvNMzt9R1ZdgiPaR7NrPU="; 29 + then "sha256-hrwuJLO9/K5QT3j8d5RYHcpBHChpKvwajaCoUfikw88=" 30 + else "sha256-+bX6pVpW6N1ms04k63sJg0E9XMOai5K9IjEQPeVCzs8="; 31 31 fetchSubmodules = true; 32 32 33 33 # Remove v2 dashboard distributed under NCUL1. Make sure an empty
+5 -5
pkgs/tools/system/netdata/go.d.plugin.nix
··· 1 - { lib, fetchFromGitHub, buildGoModule, nixosTests }: 1 + { lib, fetchFromGitHub, buildGo121Module, nixosTests }: 2 2 3 - buildGoModule rec { 3 + buildGo121Module rec { 4 4 pname = "netdata-go-plugins"; 5 - version = "0.56.1"; 5 + version = "0.56.3"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "netdata"; 9 9 repo = "go.d.plugin"; 10 10 rev = "v${version}"; 11 - hash = "sha256-OA//50j7MWCNyQ85DzSkk0kI8XonBOMpEmsIJ7QLbHY="; 11 + hash = "sha256-T7UB7qrcMTqIFRzBxbXmSqtcEFgZd0/z4EYuH/ydVi4="; 12 12 }; 13 13 14 - vendorHash = "sha256-1ir6paAz4NyJDPivBrHyiTrNwJMJ00Q4/sWBLBnwqPM="; 14 + vendorHash = "sha256-N0p03urHC3d17VQ4TIs7mAemW9ZSpQw20EwwD6lSLLc="; 15 15 16 16 doCheck = false; 17 17
+3 -3
pkgs/tools/text/vale/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "vale"; 5 - version = "2.29.1"; 5 + version = "2.29.6"; 6 6 7 7 subPackages = [ "cmd/vale" ]; 8 8 outputs = [ "out" "data" ]; ··· 11 11 owner = "errata-ai"; 12 12 repo = "vale"; 13 13 rev = "v${version}"; 14 - hash = "sha256-bvj0K7d23E5QKree+PLfA9AgKFqL6YDtlmh/nEtrPbE="; 14 + hash = "sha256-0btFCTpVB50097yQEggpm1rmm4aciTgfdLAkczQ1mj4="; 15 15 }; 16 16 17 - vendorHash = "sha256-YUazrbTeioRV+L6Ku+oJRJzp16WCLPzlAH6F25TT6Dg="; 17 + vendorHash = "sha256-EbhLz4agDWAlALfBcGUbVNz+teUvgroxzaSN8T19AJY="; 18 18 19 19 postInstall = '' 20 20 mkdir -p $data/share/vale
+2 -4
pkgs/top-level/all-packages.nix
··· 12787 12787 12788 12788 rkflashtool = callPackage ../tools/misc/rkflashtool { }; 12789 12789 12790 + rkvm = callPackage ../tools/misc/rkvm { }; 12791 + 12790 12792 rkrlv2 = callPackage ../applications/audio/rkrlv2 { }; 12791 12793 12792 12794 rmlint = callPackage ../tools/misc/rmlint { ··· 19512 19514 kcat = callPackage ../development/tools/kcat { }; 19513 19515 19514 19516 kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; 19515 - 19516 - kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { 19517 - gperf = gperf_3_0; 19518 - }; 19519 19517 19520 19518 kcgi = callPackage ../development/web/kcgi { }; 19521 19519
+2
pkgs/top-level/python-packages.nix
··· 6452 6452 inherit (pkgs) libxml2 libxslt zlib; 6453 6453 }; 6454 6454 6455 + lxml-stubs = callPackage ../development/python-modules/lxml-stubs { }; 6456 + 6455 6457 lyricwikia = callPackage ../development/python-modules/lyricwikia { }; 6456 6458 6457 6459 lz4 = callPackage ../development/python-modules/lz4 { };