lol

Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
d6df2992 8cb00441

+759 -275
+150 -10
doc/build-helpers/fetchers.chapter.md
··· 283 283 284 284 _Default value:_ `""`. 285 285 286 - `recursiveHash` (Boolean; _optional_) 286 + `recursiveHash` (Boolean; _optional_) []{#sec-pkgs-fetchers-fetchurl-inputs-recursiveHash} 287 287 : If set to `true`, will signal to Nix that the hash given to `fetchurl` was calculated using the `"recursive"` mode. 288 288 See [the documentation on the Nix manual](https://nixos.org/manual/nix/stable/language/advanced-attributes.html#adv-attr-outputHashMode) for more information about the existing modes. 289 289 ··· 296 296 297 297 _Default value_: `false`. 298 298 299 - `downloadToTemp` (Boolean; _optional_) 299 + `downloadToTemp` (Boolean; _optional_) []{#sec-pkgs-fetchers-fetchurl-inputs-downloadToTemp} 300 300 : If `true`, saves the downloaded file to a temporary location instead of the expected Nix store location. 301 301 This is useful when used in conjunction with `postFetch` attribute, otherwise `fetchurl` will not produce any meaningful output. 302 302 ··· 519 519 520 520 ## `fetchzip` {#sec-pkgs-fetchers-fetchzip} 521 521 522 - Downloads content from a given URL (which is assumed to be an archive), and decompresses the archive for you, making files and directories directly accessible. 523 - `fetchzip` can only be used with archives. 524 - Despite its name, `fetchzip` is not limited to `.zip` files and can also be used with any tarball. 522 + Returns a [fixed-output derivation](https://nixos.org/manual/nix/stable/glossary.html#gloss-fixed-output-derivation) which downloads an archive from a given URL and decompresses it. 523 + 524 + Despite its name, `fetchzip` is not limited to `.zip` files but can also be used with [various compressed tarball formats](#tar-files) by default. 525 + This can extended by specifying additional attributes, see [](#ex-fetchers-fetchzip-rar-archive) to understand how to do that. 526 + 527 + ### Inputs {#sec-pkgs-fetchers-fetchzip-inputs} 528 + 529 + `fetchzip` requires an attribute set, and most attributes are passed to the underlying call to [`fetchurl`](#sec-pkgs-fetchers-fetchurl). 530 + 531 + The attributes below are treated differently by `fetchzip` when compared to what `fetchurl` expects: 532 + 533 + `name` (String; _optional_) 534 + : Works as defined in `fetchurl`, but has a different default value than `fetchurl`. 535 + 536 + _Default value:_ `"source"`. 537 + 538 + `nativeBuildInputs` (List of Attribute Set; _optional_) 539 + : Works as defined in `fetchurl`, but it is also augmented by `fetchzip` to include packages to deal with additional archives (such as `.zip`). 540 + 541 + _Default value:_ `[]`. 542 + 543 + `postFetch` (String; _optional_) 544 + : Works as defined in `fetchurl`, but it is also augmented with the code needed to make `fetchzip` work. 545 + 546 + :::{.caution} 547 + It is only safe to modify files in `$out` in `postFetch`. 548 + Consult the implementation of `fetchzip` for anything more involved. 549 + ::: 525 550 526 - It has two required arguments, a URL and a hash. 527 - The hash is typically `hash`, although many more hash algorithms are supported. 528 - Nixpkgs contributors are currently recommended to use `hash`. 529 - This hash will be used by Nix to identify your source. 530 - A typical usage of `fetchzip` is provided below. 551 + _Default value:_ `""`. 552 + 553 + `stripRoot` (Boolean; _optional_) 554 + : If `true`, the decompressed contents are moved one level up the directory tree. 555 + 556 + This is useful for archives that decompress into a single directory which commonly includes some values that change with time, such as version numbers. 557 + When this is the case (and `stripRoot` is `true`), `fetchzip` will remove this directory and make the decompressed contents available in the top-level directory. 558 + 559 + [](#ex-fetchers-fetchzip-simple-striproot) shows what this attribute does. 560 + 561 + This attribute is **not** passed through to `fetchurl`. 562 + 563 + _Default value:_ `true`. 564 + 565 + `extension` (String or Null; _optional_) 566 + : If set, the archive downloaded by `fetchzip` will be renamed to a filename with the extension specified in this attribute. 567 + 568 + This is useful when making `fetchzip` support additional types of archives, because the implementation may use the extension of an archive to determine whether they can decompress it. 569 + If the URL you're using to download the contents doesn't end with the extension associated with the archive, use this attribute to fix the filename of the archive. 570 + 571 + This attribute is **not** passed through to `fetchurl`. 572 + 573 + _Default value:_ `null`. 574 + 575 + `recursiveHash` (Boolean; _optional_) 576 + : Works [as defined in `fetchurl`](#sec-pkgs-fetchers-fetchurl-inputs-recursiveHash), but its default value is different than for `fetchurl`. 577 + 578 + _Default value:_ `true`. 579 + 580 + `downloadToTemp` (Boolean; _optional_) 581 + : Works [as defined in `fetchurl`](#sec-pkgs-fetchers-fetchurl-inputs-downloadToTemp), but its default value is different than for `fetchurl`. 582 + 583 + _Default value:_ `true`. 584 + 585 + `extraPostFetch` **DEPRECATED** 586 + : This attribute is deprecated. 587 + Please use `postFetch` instead. 588 + 589 + This attribute is **not** passed through to `fetchurl`. 590 + 591 + ### Examples {#sec-pkgs-fetchers-fetchzip-examples} 592 + 593 + ::::{.example #ex-fetchers-fetchzip-simple-striproot} 594 + # Using `fetchzip` to output contents directly 595 + 596 + The following recipe shows how to use `fetchzip` to decompress a `.tar.gz` archive: 531 597 532 598 ```nix 533 599 { fetchzip }: ··· 536 602 hash = "sha256-3ABYlME9R8klcpJ7MQpyFEFwHmxDDEzIYBqu/CpDYmg="; 537 603 } 538 604 ``` 605 + 606 + This archive has all its contents in a directory named `patchelf-0.18.0`. 607 + This means that after decompressing, you'd have to enter this directory to see the contents of the archive. 608 + However, `fetchzip` makes this easier through the attribute `stripRoot` (enabled by default). 609 + 610 + After building the recipe, the derivation output will show all the files in the archive at the top level: 611 + 612 + ```shell 613 + $ nix-build 614 + (output removed for clarity) 615 + /nix/store/1b7h3fvmgrcddvs0m299hnqxlgli1yjw-source 616 + 617 + $ ls /nix/store/1b7h3fvmgrcddvs0m299hnqxlgli1yjw-source 618 + aclocal.m4 completions configure.ac m4 Makefile.in patchelf.spec README.md tests 619 + build-aux configure COPYING Makefile.am patchelf.1 patchelf.spec.in src version 620 + ``` 621 + 622 + If `stripRoot` is set to `false`, the derivation output will be the decompressed archive as-is: 623 + 624 + ```nix 625 + { fetchzip }: 626 + fetchzip { 627 + url = "https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0.tar.gz"; 628 + hash = "sha256-uv3FuKE4DqpHT3yfE0qcnq0gYjDNQNKZEZt2+PUAneg="; 629 + stripRoot = false; 630 + } 631 + ``` 632 + 633 + :::{.caution} 634 + The hash changed! 635 + Whenever changing attributes of a Nixpkgs fetcher, [remember to invalidate the hash](#chap-pkgs-fetchers-caveats), otherwise you won't get the results you're expecting! 636 + ::: 637 + 638 + After building the recipe: 639 + 640 + ```shell 641 + $ nix-build 642 + (output removed for clarity) 643 + /nix/store/2hy5bxw7xgbgxkn0i4x6hjr8w3dbx16c-source 644 + 645 + $ ls /nix/store/2hy5bxw7xgbgxkn0i4x6hjr8w3dbx16c-source 646 + patchelf-0.18.0 647 + ``` 648 + :::: 649 + 650 + ::::{.example #ex-fetchers-fetchzip-rar-archive} 651 + # Using `fetchzip` to decompress a `.rar` file 652 + 653 + The `unrar` package provides a [setup hook](#ssec-setup-hooks) to decompress `.rar` archives during the [unpack phase](#ssec-unpack-phase), which can be used with `fetchzip` to decompress those archives: 654 + 655 + ```nix 656 + { fetchzip, unrar }: 657 + fetchzip { 658 + url = "https://archive.org/download/SpaceCadet_Plus95/Space_Cadet.rar"; 659 + hash = "sha256-fC+zsR8BY6vXpUkVd6i1jF0IZZxVKVvNi6VWCKT+pA4="; 660 + stripRoot = false; 661 + nativeBuildInputs = [ unrar ]; 662 + } 663 + ``` 664 + 665 + Since this particular `.rar` file doesn't put its contents in a directory inside the archive, `stripRoot` must be set to `false`. 666 + 667 + After building the recipe, the derivation output will show the decompressed files: 668 + 669 + ```shell 670 + $ nix-build 671 + (output removed for clarity) 672 + /nix/store/zpn7knxfva6rfjja2gbb4p3l9w1f0d36-source 673 + 674 + $ ls /nix/store/zpn7knxfva6rfjja2gbb4p3l9w1f0d36-source 675 + FONT.DAT PINBALL.DAT PINBALL.EXE PINBALL2.MID TABLE.BMP WMCONFIG.EXE 676 + MSCREATE.DIR PINBALL.DOC PINBALL.MID Sounds WAVEMIX.INF 677 + ``` 678 + :::: 539 679 540 680 ## `fetchpatch` {#fetchpatch} 541 681
+6
maintainers/maintainer-list.nix
··· 15508 15508 fingerprint = "7756 E88F 3C6A 47A5 C5F0 CDFB AB54 6777 F93E 20BF"; 15509 15509 }]; 15510 15510 }; 15511 + phdyellow = { 15512 + name = "Phil Dyer"; 15513 + email = "phildyer@protonmail.com"; 15514 + github = "PhDyellow"; 15515 + githubId = 7740661; 15516 + }; 15511 15517 phfroidmont = { 15512 15518 name = "Paul-Henri Froidmont"; 15513 15519 email = "nix.contact-j9dw4d@froidmont.org";
+1
maintainers/team-list.nix
··· 484 484 ryantm 485 485 lassulus 486 486 yayayayaka 487 + asymmetric 487 488 ]; 488 489 scope = "Maintain Jitsi."; 489 490 shortName = "Jitsi";
+4 -3
nixos/doc/manual/release-notes/rl-2405.section.md
··· 90 90 91 91 - [maubot](https://github.com/maubot/maubot), a plugin-based Matrix bot framework. Available as [services.maubot](#opt-services.maubot.enable). 92 92 93 + - [ryzen-monitor-ng](https://github.com/mann1x/ryzen_monitor_ng), a desktop AMD CPU power monitor and controller, similar to Ryzen Master but for Linux. Available as [programs.ryzen-monitor-ng](#opt-programs.ryzen-monitor-ng.enable) 94 + 95 + - [ryzen-smu](https://gitlab.com/leogx9r/ryzen_smu), Linux kernel driver to expose the SMU (System Management Unit) for certain AMD Ryzen Processors. Includes the userspace program `monitor_cpu`. Available at [hardward.cpu.amd.ryzen-smu](#opt-hardware.cpu.amd.ryzen-smu.enable) 96 + 93 97 - systemd's gateway, upload, and remote services, which provides ways of sending journals across the network. Enable using [services.journald.gateway](#opt-services.journald.gateway.enable), [services.journald.upload](#opt-services.journald.upload.enable), and [services.journald.remote](#opt-services.journald.remote.enable). 94 98 95 99 - [GNS3](https://www.gns3.com/), a network software emulator. Available as [services.gns3-server](#opt-services.gns3-server.enable). ··· 497 501 non-child processes. This means you will not be able to attach gdb to an 498 502 existing process, but will need to start that process from gdb (so it is a 499 503 child). Or you can set `boot.kernel.sysctl."kernel.yama.ptrace_scope"` to 0. 500 - 501 - - The new option `services.getty.autologinOnce` was added to limit the automatic login to once per boot and on the first tty only. 502 - When using full disk encryption, this option allows to unlock the system without retyping the passphrase while keeping the other ttys protected. 503 504 504 505 - The netbird module now allows running multiple tunnels in parallel through [`services.netbird.tunnels`](#opt-services.netbird.tunnels). 505 506
+26
nixos/modules/hardware/cpu/amd-ryzen-smu.nix
··· 1 + { config 2 + , lib 3 + , ... 4 + }: 5 + let 6 + inherit (lib) mkEnableOption mkIf; 7 + cfg = config.hardware.cpu.amd.ryzen-smu; 8 + ryzen-smu = config.boot.kernelPackages.ryzen-smu; 9 + in 10 + { 11 + options.hardware.cpu.amd.ryzen-smu = { 12 + enable = mkEnableOption '' 13 + ryzen_smu, a linux kernel driver that exposes access to the SMU (System Management Unit) for certain AMD Ryzen Processors. 14 + 15 + WARNING: Damage cause by use of your AMD processor outside of official AMD specifications or outside of factory settings are not covered under any AMD product warranty and may not be covered by your board or system manufacturer's warranty 16 + ''; 17 + }; 18 + 19 + config = mkIf cfg.enable { 20 + boot.kernelModules = [ "ryzen-smu" ]; 21 + boot.extraModulePackages = [ ryzen-smu ]; 22 + environment.systemPackages = [ ryzen-smu ]; 23 + }; 24 + 25 + meta.maintainers = with lib.maintainers; [ Cryolitia phdyellow ]; 26 + }
+2
nixos/modules/module-list.nix
··· 54 54 ./hardware/corectrl.nix 55 55 ./hardware/cpu/amd-microcode.nix 56 56 ./hardware/cpu/amd-sev.nix 57 + ./hardware/cpu/amd-ryzen-smu.nix 57 58 ./hardware/cpu/intel-microcode.nix 58 59 ./hardware/cpu/intel-sgx.nix 59 60 ./hardware/cpu/x86-msr.nix ··· 251 252 ./programs/regreet.nix 252 253 ./programs/rog-control-center.nix 253 254 ./programs/rust-motd.nix 255 + ./programs/ryzen-monitor-ng.nix 254 256 ./programs/screen.nix 255 257 ./programs/seahorse.nix 256 258 ./programs/sedutil.nix
+35
nixos/modules/programs/ryzen-monitor-ng.nix
··· 1 + { pkgs 2 + , config 3 + , lib 4 + , ... 5 + }: 6 + let 7 + inherit (lib) mkEnableOption mkPackageOption mkIf; 8 + cfg = config.programs.ryzen-monitor-ng; 9 + in 10 + { 11 + options = { 12 + programs.ryzen-monitor-ng = { 13 + enable = mkEnableOption '' 14 + ryzen_monitor_ng, a userspace application for setting and getting Ryzen SMU (System Management Unit) parameters via the ryzen_smu kernel driver. 15 + 16 + Monitor power information of Ryzen processors via the PM table of the SMU. 17 + 18 + SMU Set and Get for many parameters and CO counts. 19 + 20 + https://github.com/mann1x/ryzen_monitor_ng 21 + 22 + WARNING: Damage cause by use of your AMD processor outside of official AMD specifications or outside of factory settings are not covered under any AMD product warranty and may not be covered by your board or system manufacturer's warranty 23 + ''; 24 + 25 + package = mkPackageOption pkgs "ryzen-monitor-ng" {}; 26 + }; 27 + }; 28 + 29 + config = mkIf cfg.enable { 30 + environment.systemPackages = [ cfg.package ]; 31 + hardware.cpu.amd.ryzen-smu.enable = true; 32 + }; 33 + 34 + meta.maintainers = with lib.maintainers; [ Cryolitia phdyellow ]; 35 + }
+1 -1
nixos/modules/services/networking/cloudflared.nix
··· 11 11 default = null; 12 12 example = "30s"; 13 13 description = lib.mdDoc '' 14 - Timeout for establishing a new TCP connection to your origin server. This excludes the time taken to establish TLS, which is controlled by [https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/configuration/local-management/ingress/#tlstimeout](tlsTimeout). 14 + Timeout for establishing a new TCP connection to your origin server. This excludes the time taken to establish TLS, which is controlled by [tlsTimeout](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/configuration/local-management/ingress/#tlstimeout). 15 15 ''; 16 16 }; 17 17
+3 -2
nixos/modules/services/networking/i2p.nix
··· 5 5 let 6 6 cfg = config.services.i2p; 7 7 homeDir = "/var/lib/i2p"; 8 - in { 8 + in 9 + { 9 10 ###### interface 10 11 options.services.i2p.enable = mkEnableOption (lib.mdDoc "I2P router"); 11 12 ··· 27 28 User = "i2p"; 28 29 WorkingDirectory = homeDir; 29 30 Restart = "on-abort"; 30 - ExecStart = "${pkgs.i2p}/bin/i2prouter-plain"; 31 + ExecStart = "${pkgs.i2p}/bin/i2prouter"; 31 32 }; 32 33 }; 33 34 };
+4 -28
nixos/modules/services/ttys/getty.nix
··· 7 7 8 8 baseArgs = [ 9 9 "--login-program" "${cfg.loginProgram}" 10 - ] ++ optionals (cfg.autologinUser != null && !cfg.autologinOnce) [ 10 + ] ++ optionals (cfg.autologinUser != null) [ 11 11 "--autologin" cfg.autologinUser 12 12 ] ++ optionals (cfg.loginOptions != null) [ 13 13 "--login-options" cfg.loginOptions 14 14 ] ++ cfg.extraArgs; 15 15 16 16 gettyCmd = args: 17 - "${pkgs.util-linux}/sbin/agetty ${escapeShellArgs baseArgs} ${args}"; 18 - 19 - autologinScript = '' 20 - otherArgs="--noclear --keep-baud $TTY 115200,38400,9600 $TERM"; 21 - ${lib.optionalString cfg.autologinOnce '' 22 - autologged="/run/agetty.autologged" 23 - if test "$TTY" = tty1 && ! test -f "$autologged"; then 24 - touch "$autologged" 25 - exec ${gettyCmd "$otherArgs --autologin ${cfg.autologinUser}"} 26 - fi 27 - ''} 28 - exec ${gettyCmd "$otherArgs"} 29 - ''; 17 + "@${pkgs.util-linux}/sbin/agetty agetty ${escapeShellArgs baseArgs} ${args}"; 30 18 31 19 in 32 20 ··· 49 37 description = lib.mdDoc '' 50 38 Username of the account that will be automatically logged in at the console. 51 39 If unspecified, a login prompt is shown as usual. 52 - ''; 53 - }; 54 - 55 - autologinOnce = mkOption { 56 - type = types.bool; 57 - default = false; 58 - description = '' 59 - If enabled the automatic login will only happen in the first tty 60 - once per boot. This can be useful to avoid retyping the account 61 - password on systems with full disk encrypted. 62 40 ''; 63 41 }; 64 42 ··· 128 106 129 107 systemd.services."getty@" = 130 108 { serviceConfig.ExecStart = [ 131 - # override upstream default with an empty ExecStart 132 - "" 133 - (pkgs.writers.writeDash "getty" autologinScript) 109 + "" # override upstream default with an empty ExecStart 110 + (gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM") 134 111 ]; 135 - environment.TTY = "%I"; 136 112 restartIfChanged = false; 137 113 }; 138 114
+3 -1
nixos/modules/services/x11/desktop-managers/budgie.nix
··· 43 43 budgie-control-center = pkgs.budgie.budgie-control-center.override { 44 44 enableSshSocket = config.services.openssh.startWhenNeeded; 45 45 }; 46 + 47 + notExcluded = pkg: (!(lib.elem pkg config.environment.budgie.excludePackages)); 46 48 in { 47 49 meta.maintainers = lib.teams.budgie.members; 48 50 ··· 160 162 ++ cfg.sessionPath; 161 163 162 164 # Both budgie-desktop-view and nemo defaults to this emulator. 163 - programs.gnome-terminal.enable = mkDefault true; 165 + programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal); 164 166 165 167 # Fonts. 166 168 fonts.packages = [
+5 -5
nixos/modules/services/x11/desktop-managers/cinnamon.nix
··· 95 95 ''; 96 96 97 97 # Default services 98 - services.blueman.enable = mkDefault true; 98 + services.blueman.enable = mkDefault (notExcluded pkgs.blueman); 99 99 hardware.bluetooth.enable = mkDefault true; 100 100 hardware.pulseaudio.enable = mkDefault true; 101 101 security.polkit.enable = true; ··· 228 228 }) 229 229 230 230 (mkIf serviceCfg.apps.enable { 231 - programs.geary.enable = mkDefault true; 232 - programs.gnome-disks.enable = mkDefault true; 233 - programs.gnome-terminal.enable = mkDefault true; 234 - programs.file-roller.enable = mkDefault true; 231 + programs.geary.enable = mkDefault (notExcluded pkgs.gnome.geary); 232 + programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome.gnome-disk-utility); 233 + programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal); 234 + programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller); 235 235 236 236 environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [ 237 237 # cinnamon team apps
+3 -2
nixos/modules/services/x11/desktop-managers/pantheon.nix
··· 12 12 extraGSettingsOverrides = cfg.extraGSettingsOverrides; 13 13 }; 14 14 15 + notExcluded = pkg: (!(lib.elem pkg config.environment.pantheon.excludePackages)); 15 16 in 16 17 17 18 { ··· 288 289 }) 289 290 290 291 (mkIf serviceCfg.apps.enable { 291 - programs.evince.enable = mkDefault true; 292 - programs.file-roller.enable = mkDefault true; 292 + programs.evince.enable = mkDefault (notExcluded pkgs.gnome.evince); 293 + programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller); 293 294 294 295 environment.systemPackages = utils.removePackagesByName ([ 295 296 pkgs.gnome.gnome-font-viewer
+4
nixos/tests/budgie.nix
··· 18 18 }; 19 19 }; 20 20 21 + # We don't ship gnome-text-editor in Budgie module, we add this line mainly 22 + # to catch eval issues related to this option. 23 + environment.budgie.excludePackages = [ pkgs.gnome-text-editor ]; 24 + 21 25 services.xserver.desktopManager.budgie = { 22 26 enable = true; 23 27 extraPlugins = [
+4
nixos/tests/cinnamon.nix
··· 8 8 services.xserver.enable = true; 9 9 services.xserver.desktopManager.cinnamon.enable = true; 10 10 11 + # We don't ship gnome-text-editor in Cinnamon module, we add this line mainly 12 + # to catch eval issues related to this option. 13 + environment.cinnamon.excludePackages = [ pkgs.gnome-text-editor ]; 14 + 11 15 # For the sessionPath subtest. 12 16 services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ]; 13 17 };
+7
nixos/tests/pantheon.nix
··· 13 13 services.xserver.enable = true; 14 14 services.xserver.desktopManager.pantheon.enable = true; 15 15 16 + # We ship pantheon.appcenter by default when this is enabled. 17 + services.flatpak.enable = true; 18 + 19 + # We don't ship gnome-text-editor in Pantheon module, we add this line mainly 20 + # to catch eval issues related to this option. 21 + environment.pantheon.excludePackages = [ pkgs.gnome-text-editor ]; 22 + 16 23 environment.systemPackages = [ pkgs.xdotool ]; 17 24 }; 18 25
+2 -2
pkgs/applications/editors/vscode/extensions/default.nix
··· 941 941 mktplcRef = { 942 942 name = "coder-remote"; 943 943 publisher = "coder"; 944 - version = "0.1.18"; 945 - sha256 = "soNGZuyvG5+haWRcwYmYB+0OcyDAm4UQ419UnEd8waA="; 944 + version = "0.1.36"; 945 + hash = "sha256-N1X8wB2n6JYoFHCP5iHBXHnEaRa9S1zooQZsR5mUeh8="; 946 946 }; 947 947 meta = { 948 948 description = "An extension for Visual Studio Code to open any Coder workspace in VS Code with a single click.";
+3 -3
pkgs/applications/networking/cluster/helm/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "kubernetes-helm"; 5 - version = "3.14.3"; 5 + version = "3.14.4"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "helm"; 9 9 repo = "helm"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-GC9rkB35m+a/9pEvD7aNjE4z3qrv33NES842crrzD3I="; 11 + sha256 = "sha256-Wt5ovKa2CHrD0VSxvReYAwoC4SsuZHAhi/P6Kn1H7So="; 12 12 }; 13 - vendorHash = "sha256-f5tLyq9tP5tdE73Mlee9vAUSHqkUAtAJkwjZP/K6wPM="; 13 + vendorHash = "sha256-b25LUyr4B4fF/WF4Q+zzrDo78kuSTEPBklKkA4o+DBo="; 14 14 15 15 subPackages = [ "cmd/helm" ]; 16 16 ldflags = [
+3 -3
pkgs/applications/networking/cluster/terragrunt/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "terragrunt"; 8 - version = "0.56.2"; 8 + version = "0.56.5"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "gruntwork-io"; 12 12 repo = pname; 13 13 rev = "refs/tags/v${version}"; 14 - hash = "sha256-FbuXdng2pGd1Wi4GdFzQjk4quP5yz3APNXm6dcfGO7U="; 14 + hash = "sha256-aKgcXLxFZBoomrKJFmUr/XfxHmNrkvK2IlfTR2dJNY0="; 15 15 }; 16 16 17 - vendorHash = "sha256-ijAg0Y/dfNxDS/Jov7QYjlTZ4N4/jDMH/zCV0jdVXRc="; 17 + vendorHash = "sha256-joEmkFtoVxqlVrgl2mtJN9Cyr3YdnT6tBjaSXj9z2WU="; 18 18 19 19 doCheck = false; 20 20
+3 -3
pkgs/applications/science/math/eigenmath/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "eigenmath"; 10 - version = "unstable-2024-03-20"; 10 + version = "unstable-2024-04-08"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "georgeweigt"; 14 14 repo = pname; 15 - rev = "262a6525225be7bcef52c3072b1061db3c238055"; 16 - hash = "sha256-QH8mLlcCOuq77vLer8RsSnD9VeJu9kAVv2qWAH3ky6I="; 15 + rev = "c0be6c47309aa40d44784a3a4c4c07bc4e8fb6fa"; 16 + hash = "sha256-UVCazX0P03+e1exnpXrGNc/1vHxLH04Xtvgsy00UAoI="; 17 17 }; 18 18 19 19 checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
+3 -3
pkgs/applications/version-management/git-cliff/default.nix
··· 8 8 9 9 rustPlatform.buildRustPackage rec { 10 10 pname = "git-cliff"; 11 - version = "2.2.0"; 11 + version = "2.2.1"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "orhun"; 15 15 repo = "git-cliff"; 16 16 rev = "v${version}"; 17 - hash = "sha256-pOmSVySn8QUpFLTXFXBVm1KTX9ny221t1xSxBRHkljQ="; 17 + hash = "sha256-FRcreSnSO65m9h9+SUg4qdFELvpVX1+HkWH3dI2RR/M="; 18 18 }; 19 19 20 - cargoHash = "sha256-y0XTvSV8JE6nmSJfJKLw2Gt/D/yX12kbx2+RHqVCVWI="; 20 + cargoHash = "sha256-RlcZvyFi7fc8eJYB5X64axAnNp8Z1h0WOV4hM1SLoRk="; 21 21 22 22 # attempts to run the program on .git in src which is not deterministic 23 23 doCheck = false;
+3 -3
pkgs/applications/version-management/git-mit/default.nix
··· 10 10 }: 11 11 12 12 let 13 - version = "5.12.191"; 13 + version = "5.12.194"; 14 14 in 15 15 rustPlatform.buildRustPackage { 16 16 pname = "git-mit"; ··· 20 20 owner = "PurpleBooth"; 21 21 repo = "git-mit"; 22 22 rev = "v${version}"; 23 - hash = "sha256-aSEoAs0s7zyALf3s77eVlrjkCrn7ihW/4OW5hN8YL8k="; 23 + hash = "sha256-9ITy2VPLIunSLSNx4EXbvxZ7V/Kr+DwmjzDVj/QVGHs="; 24 24 }; 25 25 26 - cargoHash = "sha256-pm+XreLGxZJKRcrmU1ooMjN7MTRJqgKOy2J1OqdodxE="; 26 + cargoHash = "sha256-6R+T0BSgT6IivugkXXsX5xJ2c3/J3FnLY3ZvcfYW53E="; 27 27 28 28 nativeBuildInputs = [ pkg-config ]; 29 29
+3 -3
pkgs/by-name/gi/gitu/package.nix
··· 12 12 13 13 rustPlatform.buildRustPackage rec { 14 14 pname = "gitu"; 15 - version = "0.13.1"; 15 + version = "0.15.0"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "altsem"; 19 19 repo = "gitu"; 20 20 rev = "v${version}"; 21 - hash = "sha256-1wfc3n3uSkox2wa5i+Qiv7PZ0d2dXXbwjWw8NMXJXj8="; 21 + hash = "sha256-/yPP8GzeaVMauhcYLDAgXzOafUpOhJF2tyHOyD6KWS8="; 22 22 }; 23 23 24 - cargoHash = "sha256-JwNyzA6D8mIzp/+egjD2C7T9mGbcCKKtwFRXBuXMQ+U="; 24 + cargoHash = "sha256-eKRFPnH9MvSykrnPo4dc5DtEfb79s0hBtmYfERGQbWg="; 25 25 26 26 nativeBuildInputs = [ 27 27 pkg-config
+122
pkgs/by-name/i2/i2p/package.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchzip 4 + , jdk 5 + , ant 6 + , gettext 7 + , which 8 + , dbip-country-lite 9 + , java-service-wrapper 10 + , makeWrapper 11 + , gmp 12 + }: 13 + 14 + stdenv.mkDerivation (finalAttrs: { 15 + pname = "i2p"; 16 + version = "2.4.0"; 17 + 18 + src = fetchzip { 19 + urls = map (mirror: "${mirror}${finalAttrs.version}/i2psource_${finalAttrs.version}.tar.bz2") [ 20 + "https://github.com/i2p/i2p.i2p/releases/download/i2p-" 21 + "https://download.i2p2.de/releases/" 22 + "https://files.i2p-projekt.de/" 23 + "https://download.i2p2.no/releases/" 24 + ]; 25 + hash = "sha256-RESN1qA/SD9MajUSJyXssNZnph2XZge7xr2kTgOp5V4="; 26 + }; 27 + 28 + strictDeps = true; 29 + 30 + nativeBuildInputs = [ 31 + makeWrapper 32 + ant 33 + gettext 34 + jdk 35 + which 36 + ]; 37 + 38 + buildInputs = [ gmp ]; 39 + 40 + postConfigure = '' 41 + rm -r installer/lib 42 + mkdir -p installer/lib/wrapper/all/ 43 + # The java-service-wrapper is needed for build but not really used in runtime 44 + ln -s ${java-service-wrapper}/lib/wrapper.jar installer/lib/wrapper/all/wrapper.jar 45 + # Don't use the bundled geoip data 46 + echo "with-geoip-database=true" >> override.properties 47 + ''; 48 + 49 + buildPhase = '' 50 + # When this variable exists we can build the .so files only. 51 + export DEBIANVERSION=1 52 + pushd core/c/jcpuid 53 + ./build.sh 54 + popd 55 + pushd core/c/jbigi 56 + ./build_jbigi.sh dynamic 57 + popd 58 + export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" 59 + SOURCE_DATE_EPOCH=0 ant preppkg-unix 60 + ''; 61 + 62 + installPhase = '' 63 + mkdir -p $out/{bin,share,geoip} 64 + mv pkg-temp/* $out 65 + mv core/c/jbigi/*.so $out/lib 66 + mv $out/man $out/share/ 67 + rm $out/{osid,postinstall.sh,INSTALL-headless.txt} 68 + 69 + for jar in $out/lib/*.jar; do 70 + if [ ! -z $CP ]; then 71 + CP=$CP:$jar; 72 + else 73 + CP=$jar 74 + fi 75 + done 76 + 77 + makeWrapper ${jdk}/bin/java $out/bin/i2prouter \ 78 + --add-flags "-cp $CP -Djava.library.path=$out/lib/ -Di2p.dir.base=$out -DloggerFilenameOverride=logs/log-router-@.txt" \ 79 + --add-flags "net.i2p.router.RouterLaunch" 80 + 81 + ln -s ${dbip-country-lite.mmdb} $out/geoip/GeoLite2-Country.mmdb 82 + ''; 83 + 84 + doInstallCheck = true; 85 + 86 + installCheckPhase = '' 87 + runHook preInstallCheck 88 + 89 + # Check if jbigi is used 90 + java -cp $out/lib/i2p.jar -Djava.library.path=$out/lib/ net.i2p.util.NativeBigInteger \ 91 + | tee /dev/stderr | grep -Fw "Found native library" || exit 1 92 + 93 + runHook postInstallCheck 94 + ''; 95 + 96 + meta = with lib; { 97 + description = "Applications and router for I2P, anonymity over the Internet"; 98 + homepage = "https://geti2p.net"; 99 + sourceProvenance = with sourceTypes; [ 100 + fromSource 101 + binaryBytecode # source bundles dependencies as jars 102 + ]; 103 + license = with licenses; [ 104 + asl20 105 + boost 106 + bsd2 107 + bsd3 108 + cc-by-30 109 + cc0 110 + epl10 111 + gpl2 112 + gpl3 113 + lgpl21Only 114 + lgpl3Only 115 + mit 116 + publicDomain 117 + ]; 118 + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; 119 + maintainers = with maintainers; [ linsui ]; 120 + mainProgram = "i2prouter-plain"; 121 + }; 122 + })
+2 -2
pkgs/by-name/na/namespace-cli/package.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "namespace-cli"; 8 - version = "0.0.354"; 8 + version = "0.0.355"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "namespacelabs"; 12 12 repo = "foundation"; 13 13 rev = "v${version}"; 14 - hash = "sha256-wO1ygoaqgCkvtVJ+ATxNGSiJpAZAqe2LXyPg8r4osQk="; 14 + hash = "sha256-St/zZqfoate9TwYo7q9Za+T6q4kRw9vSzcBfMW7AXkw="; 15 15 }; 16 16 17 17 vendorHash = "sha256-a/e+xPOD9BDSlKknmfcX2tTMyIUrzKxqtUpFXcFIDSE=";
+41
pkgs/by-name/ry/ryzen-monitor-ng/package.nix
··· 1 + { lib, stdenv, fetchFromGitHub }: 2 + 3 + stdenv.mkDerivation { 4 + pname = "ryzen-monitor-ng"; 5 + version = "2.0.5-unstable-2023-11-05"; 6 + 7 + # Upstream has not updated ryzen_smu header version 8 + # This fork corrects ryzen_smu header version and 9 + # adds support for Matisse AMD CPUs. 10 + src = fetchFromGitHub { 11 + owner = "plasmin"; 12 + repo = "ryzen_monitor_ng"; 13 + rev = "8b7854791d78de731a45ce7d30dd17983228b7b1"; 14 + hash = "sha256-fcW2fEsCFliRnMFnboR0jchzVIlCYbr2AE6AS06cb6o="; 15 + }; 16 + 17 + ## Remove binaries committed into upstream repo 18 + preBuild = '' 19 + rm src/ryzen_monitor 20 + ''; 21 + 22 + makeTargets = [ "clean" "install" ]; 23 + 24 + installPhase = '' 25 + runHook preInstall 26 + 27 + mkdir -p $out/bin 28 + mv ./src/ryzen_monitor $out/bin 29 + 30 + runHook postInstall 31 + ''; 32 + 33 + meta = with lib; { 34 + description = "Access Ryzen SMU information exposed by the ryzen_smu driver"; 35 + homepage = "https://github.com/mann1x/ryzen_monitor_ng"; 36 + license = licenses.agpl3Only; 37 + platforms = [ "x86_64-linux" ]; 38 + maintainers = with maintainers; [ phdyellow ]; 39 + mainProgram = "ryzen_monitor"; 40 + }; 41 + }
+3 -2
pkgs/by-name/sc/scrutiny/package.nix
··· 7 7 }: 8 8 let 9 9 pname = "scrutiny"; 10 - version = "0.8.0"; 10 + version = "0.8.1"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "AnalogJ"; 14 14 repo = "scrutiny"; 15 15 rev = "refs/tags/v${version}"; 16 - hash = "sha256-ysjE2nn1WwhEiFIvJ5cRCJQf9mECTgiGUyenwf3mKTA="; 16 + hash = "sha256-WoU5rdsIEhZQ+kPoXcestrGXC76rFPvhxa0msXjFsNg="; 17 17 }; 18 18 19 19 frontend = buildNpmPackage { ··· 64 64 meta = { 65 65 description = "Hard Drive S.M.A.R.T Monitoring, Historical Trends & Real World Failure Thresholds."; 66 66 homepage = "https://github.com/AnalogJ/scrutiny"; 67 + changelog = "https://github.com/AnalogJ/scrutiny/releases/tag/v${version}"; 67 68 license = lib.licenses.mit; 68 69 maintainers = with lib.maintainers; [ jnsgruk ]; 69 70 mainProgram = "scrutiny";
+35
pkgs/by-name/to/tootik/package.nix
··· 1 + { lib, stdenv, buildGoModule, fetchFromGitHub, openssl }: 2 + 3 + buildGoModule rec { 4 + pname = "tootik"; 5 + version = "0.9.6"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "dimkr"; 9 + repo = "tootik"; 10 + rev = version; 11 + hash = "sha256-RcuioFb0+mvZupwgaCN6qbcOy7gHp9KjJxRwaPI55yo="; 12 + }; 13 + 14 + vendorHash = "sha256-/52VjfoecXaML1cDRIEe1EQPYU8xeP9lu4lY3cMV3VE="; 15 + 16 + nativeBuildInputs = [ openssl ]; 17 + 18 + preBuild = '' 19 + go generate ./migrations 20 + ''; 21 + 22 + ldflags = [ "-X github.com/dimkr/tootik/buildinfo.Version=${version}" ]; 23 + 24 + tags = [ "fts5" ]; 25 + 26 + doCheck = !(stdenv.isDarwin && stdenv.isAarch64); 27 + 28 + meta = { 29 + description = "A federated nanoblogging service with a Gemini frontend"; 30 + homepage = "https://github.com/dimkr/tootik"; 31 + license = lib.licenses.asl20; 32 + maintainers = with lib.maintainers; [ sikmir ]; 33 + mainProgram = "tootik"; 34 + }; 35 + }
+2 -2
pkgs/by-name/ws/wslu/package.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "wslu"; 9 - version = "4.1.2"; 9 + version = "4.1.3"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "wslutilities"; 13 13 repo = "wslu"; 14 14 rev = "v${version}"; 15 - hash = "sha256-rmNGKayg8Y872yICilveMpDFBLkDZ6Ox8rqtWrK2om8="; 15 + hash = "sha256-lyJk8nOADq+s7GkZXsd1T4ilrDzMRsoALOesG8NxYK8="; 16 16 }; 17 17 18 18 nativeBuildInputs = [ copyDesktopItems ];
+63
pkgs/by-name/xe/xevd/package.nix
··· 1 + { 2 + lib, 3 + fetchFromGitHub, 4 + fetchpatch2, 5 + stdenv, 6 + gitUpdater, 7 + cmake, 8 + }: 9 + 10 + stdenv.mkDerivation (finalAttrs: { 11 + pname = "xevd"; 12 + version = "0.4.1"; 13 + 14 + src = fetchFromGitHub { 15 + owner = "mpeg5"; 16 + repo = "xevd"; 17 + rev = "v${finalAttrs.version}"; 18 + hash = "sha256-+qC/BnP8o/kfl5ax+g1PohvXIJBL2gin/QZ9Gkvi0WU="; 19 + }; 20 + 21 + patches = [ 22 + (fetchpatch2 { 23 + name = "fix dangling pointer error"; 24 + url = "https://github.com/mpeg5/xevd/commit/13b86a74e26df979dd1cc3a1cb19bf1ac828e197.patch"; 25 + sha256 = "sha256-CeSfhN78ldooyZ9H4F2ex9wTBFXuNZdBcnLdk7GqDXI="; 26 + }) 27 + (fetchpatch2 { 28 + name = "fix invalid comparison of c_buf in write_y4m_header "; 29 + url = "https://github.com/mpeg5/xevd/commit/e4ae0c567a6ec5e10c9f5ed44c61e4e3b6816c16.patch"; 30 + sha256 = "sha256-9bG6hyIV/AZ0mRbd3Fc/c137Xm1i6NJ1IfuGadG0vUU="; 31 + }) 32 + ]; 33 + 34 + postPatch = '' 35 + echo v$version > version.txt 36 + ''; 37 + 38 + nativeBuildInputs = [ cmake ]; 39 + 40 + postInstall = '' 41 + ln $dev/include/xevd/* $dev/include/ 42 + ''; 43 + 44 + env.NIX_CFLAGS_COMPILE = toString [ "-lm" ]; 45 + 46 + outputs = [ 47 + "out" 48 + "lib" 49 + "dev" 50 + ]; 51 + 52 + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; 53 + 54 + meta = { 55 + homepage = "https://github.com/mpeg5/xevd"; 56 + description = "eXtra-fast Essential Video Decoder, MPEG-5 EVC"; 57 + license = lib.licenses.bsd3; 58 + mainProgram = "xevd_app"; 59 + maintainers = with lib.maintainers; [ jopejoe1 ]; 60 + platforms = lib.platforms.all; 61 + broken = !stdenv.hostPlatform.isx86; 62 + }; 63 + })
+49
pkgs/by-name/xe/xeve/package.nix
··· 1 + { 2 + lib, 3 + fetchFromGitHub, 4 + gitUpdater, 5 + stdenv, 6 + cmake, 7 + }: 8 + 9 + stdenv.mkDerivation (finalAttrs: { 10 + pname = "xeve"; 11 + version = "0.4.3"; 12 + 13 + src = fetchFromGitHub { 14 + owner = "mpeg5"; 15 + repo = "xeve"; 16 + rev = "v${finalAttrs.version}"; 17 + hash = "sha256-8YueEx2oIh24jV38bzpDlCVHNZB7HDOXeP5MANM8zBc="; 18 + }; 19 + 20 + postPatch = '' 21 + echo v$version > version.txt 22 + ''; 23 + 24 + nativeBuildInputs = [ cmake ]; 25 + 26 + postInstall = '' 27 + ln $dev/include/xeve/* $dev/include/ 28 + ''; 29 + 30 + env.NIX_CFLAGS_COMPILE = toString [ "-lm" ]; 31 + 32 + outputs = [ 33 + "out" 34 + "lib" 35 + "dev" 36 + ]; 37 + 38 + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; 39 + 40 + meta = { 41 + homepage = "https://github.com/mpeg5/xeve"; 42 + description = "eXtra-fast Essential Video Encoder, MPEG-5 EVC"; 43 + license = lib.licenses.bsd3; 44 + mainProgram = "xeve_app"; 45 + maintainers = with lib.maintainers; [ jopejoe1 ]; 46 + platforms = lib.platforms.all; 47 + broken = !stdenv.hostPlatform.isx86; 48 + }; 49 + })
+2 -2
pkgs/desktops/mate/mate-themes/default.nix
··· 15 15 16 16 stdenv.mkDerivation rec { 17 17 pname = "mate-themes"; 18 - version = "3.22.24"; 18 + version = "3.22.26"; 19 19 20 20 src = fetchurl { 21 21 url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 22 - sha256 = "PYs6KihTMd4kxM9djJ3YRtqhFpXyBnZdjxaT68rPbko="; 22 + sha256 = "Ik6J02TrO3Pxz3VtBUlKmEIak8v1Q0miyF/GB+t1Xtc="; 23 23 }; 24 24 25 25 nativeBuildInputs = [
+1 -4
pkgs/development/compilers/orc/default.nix
··· 25 25 sha256 = "sha256-g7B0y2cxfVi+8ejQzIYveuinekW7/wVqH5h8ZIiy9f0="; 26 26 }; 27 27 28 - postPatch = lib.optionalString stdenv.isAarch32 '' 29 - # https://gitlab.freedesktop.org/gstreamer/orc/-/issues/20 30 - sed -i '/exec_opcodes_sys/d' testsuite/meson.build 31 - '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' 28 + postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' 32 29 # This benchmark times out on Hydra.nixos.org 33 30 sed -i '/memcpy_speed/d' testsuite/meson.build 34 31 '';
+20
pkgs/development/libraries/ffmpeg/generic.nix
··· 80 80 , withOpus ? withHeadlessDeps # Opus de/encoder 81 81 , withPlacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library 82 82 , withPulse ? withSmallDeps && stdenv.isLinux # Pulseaudio input support 83 + , withQrencode ? withFullDeps && lib.versionAtLeast version "7" # QR encode generation 84 + , withQuirc ? withFullDeps && lib.versionAtLeast version "7" # QR decoding 83 85 , withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety) 84 86 , withRtmp ? false # RTMP[E] support 85 87 , withSamba ? withFullDeps && !stdenv.isDarwin && withGPLv3 # Samba protocol ··· 112 114 , withXcbShape ? withFullDeps # X11 grabbing shape rendering 113 115 , withXcbShm ? withFullDeps # X11 grabbing shm communication 114 116 , withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering 117 + , withXevd ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 # MPEG-5 EVC decoding 118 + , withXeve ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 # MPEG-5 EVC encoding 115 119 , withXlib ? withFullDeps # Xlib support 116 120 , withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers 117 121 , withXvid ? withHeadlessDeps && withGPL # Xvid encoder, native encoder exists ··· 263 267 , opencore-amr 264 268 , openh264 265 269 , openjpeg 270 + , qrencode 271 + , quirc 266 272 , rav1e 267 273 , rtmpdump 268 274 , samba ··· 279 285 , x264 280 286 , x265 281 287 , xavs 288 + , xevd 289 + , xeve 282 290 , xvidcore 283 291 , xz 284 292 , zeromq4 ··· 551 559 (enableFeature withPlacebo "libplacebo") 552 560 ] ++ [ 553 561 (enableFeature withPulse "libpulse") 562 + ] ++ optionals (versionAtLeast version "7") [ 563 + (enableFeature withQrencode "libqrencode") 564 + (enableFeature withQuirc "libquirc") 565 + ] ++ [ 554 566 (enableFeature withRav1e "librav1e") 555 567 (enableFeature withRtmp "librtmp") 556 568 (enableFeature withSamba "libsmbclient") ··· 587 599 (enableFeature withXcbShape "libxcb-shape") 588 600 (enableFeature withXcbShm "libxcb-shm") 589 601 (enableFeature withXcbxfixes "libxcb-xfixes") 602 + ] ++ optionals (versionAtLeast version "7") [ 603 + (enableFeature withXevd "libxevd") 604 + (enableFeature withXeve "libxeve") 605 + ] ++ [ 590 606 (enableFeature withXlib "xlib") 591 607 (enableFeature withXml2 "libxml2") 592 608 (enableFeature withXvid "libxvid") ··· 668 684 ++ optionals withOpus [ libopus ] 669 685 ++ optionals withPlacebo [ (if (lib.versionAtLeast version "6.1") then libplacebo else libplacebo_5) vulkan-headers ] 670 686 ++ optionals withPulse [ libpulseaudio ] 687 + ++ optionals withQrencode [ qrencode ] 688 + ++ optionals withQuirc [ quirc ] 671 689 ++ optionals withRav1e [ rav1e ] 672 690 ++ optionals withRtmp [ rtmpdump ] 673 691 ++ optionals withSamba [ samba ] ··· 696 714 ++ optionals withX265 [ x265 ] 697 715 ++ optionals withXavs [ xavs ] 698 716 ++ optionals withXcb [ libxcb ] 717 + ++ optionals withXevd [ xevd ] 718 + ++ optionals withXeve [ xeve ] 699 719 ++ optionals withXlib [ libX11 libXv libXext ] 700 720 ++ optionals withXml2 [ libxml2 ] 701 721 ++ optionals withXvid [ xvidcore ]
+2 -2
pkgs/development/python-modules/graphene-django/default.nix
··· 22 22 23 23 buildPythonPackage rec { 24 24 pname = "graphene-django"; 25 - version = "3.2.0"; 25 + version = "3.2.1"; 26 26 format = "setuptools"; 27 27 28 28 disabled = pythonOlder "3.6"; ··· 31 31 owner = "graphql-python"; 32 32 repo = pname; 33 33 rev = "refs/tags/v${version}"; 34 - hash = "sha256-SOLY3NogovwQ5gr2gnvOcROWpbk9p134wI2f9FKr+5M="; 34 + hash = "sha256-wzU9U4mYvBf43qBQi20ewKtmw1eFskQk+nnsdaM7HQM="; 35 35 }; 36 36 37 37 postPatch = ''
+3 -3
pkgs/development/python-modules/mypy-boto3/default.nix
··· 133 133 134 134 mypy-boto3-chime-sdk-voice = buildMypyBoto3Package "chime-sdk-voice" "1.34.0" "sha256-9fQQgWFKeabSblJIhP6mN0CEnSixkz1r3mf/k6IL/BE="; 135 135 136 - mypy-boto3-cleanrooms = buildMypyBoto3Package "cleanrooms" "1.34.78" "sha256-76zy6rTsSqmKdwrZwBsf7m6qPZXSdi6GpQEXMvN82Tw="; 136 + mypy-boto3-cleanrooms = buildMypyBoto3Package "cleanrooms" "1.34.82" "sha256-KaCs/P3NM3IeZ9V9khIwysyBXBG/8RuGFBAlrbMYn4Y="; 137 137 138 138 mypy-boto3-cloud9 = buildMypyBoto3Package "cloud9" "1.34.24" "sha256-fryD7UfO5cdFS7vMxmZaT9LW4nNSGTQCd3NyD60f9wA="; 139 139 ··· 197 197 198 198 mypy-boto3-config = buildMypyBoto3Package "config" "1.34.45" "sha256-LN1CcIOj9cgzSNCvnUVwLRNPXlitHAlt+5jj6wu6i8E="; 199 199 200 - mypy-boto3-connect = buildMypyBoto3Package "connect" "1.34.67" "sha256-kWjC/FacCsC0xevx2dOs67UxaKG1WM3xMahcO3CqZL8="; 200 + mypy-boto3-connect = buildMypyBoto3Package "connect" "1.34.82" "sha256-QyZteRrk1d+Qwqj87uUb4f2ZK5SjPdMJV4NGv6kwrl4="; 201 201 202 202 mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.34.0" "sha256-Wx9vcjlgXdWZ2qP3Y/hTY2LAeTd+hyyV5JSIuKQ5I5k="; 203 203 ··· 591 591 592 592 mypy-boto3-redshift-serverless = buildMypyBoto3Package "redshift-serverless" "1.34.16" "sha256-ag5tKb1+4cHiG99OszDNGdnX9RPRPraaqM8p3IqgLBg="; 593 593 594 - mypy-boto3-rekognition = buildMypyBoto3Package "rekognition" "1.34.20" "sha256-zKJX/AlDoDKUbrI1LZq2kk5fr+SNqES6gniM0FQGeaM="; 594 + mypy-boto3-rekognition = buildMypyBoto3Package "rekognition" "1.34.82" "sha256-qy7yacSuG6cARR2L/YjBGWYM1BU5/qtMr/H08x3XFIM="; 595 595 596 596 mypy-boto3-resiliencehub = buildMypyBoto3Package "resiliencehub" "1.34.0" "sha256-F/ZRCp/M/6kBI4Apb3mISzqe1Zi4Y7gq/vu0dvyyTvM="; 597 597
+34 -26
pkgs/development/python-modules/pytorch-pfn-extras/default.nix
··· 1 1 { buildPythonPackage 2 2 , fetchFromGitHub 3 + , fetchpatch 3 4 , lib 4 - , setuptools 5 5 , numpy 6 6 , onnx 7 7 , packaging 8 8 , pytestCheckHook 9 + , pythonAtLeast 10 + , setuptools 11 + , stdenv 9 12 , torch 10 13 , torchvision 11 14 , typing-extensions 12 - , pythonAtLeast 13 15 }: 14 16 15 17 buildPythonPackage rec { ··· 24 26 hash = "sha256-vSon/0GxQfaRtSPsQbYAvE3s/F0HEN59VpzE3w1PnVE="; 25 27 }; 26 28 27 - nativeBuildInputs = [ 29 + patches = [ 30 + (fetchpatch { 31 + name = "relax-setuptools.patch"; 32 + url = "https://github.com/pfnet/pytorch-pfn-extras/commit/96abe38c4baa6a144d604bdd4744c55627e55440.patch"; 33 + hash = "sha256-85UDGcgJyQS5gINbgpNM58b3XJGvf+ArtGhwJ5EXdhk="; 34 + }) 35 + ]; 36 + 37 + build-system = [ 28 38 setuptools 29 39 ]; 30 40 31 - propagatedBuildInputs = [ numpy packaging torch typing-extensions ]; 41 + dependencies = [ numpy packaging torch typing-extensions ]; 32 42 33 43 nativeCheckInputs = [ onnx pytestCheckHook torchvision ]; 34 44 35 - # ignore all pytest warnings 36 - preCheck = '' 37 - rm pytest.ini 38 - ''; 45 + pytestFlagsArray = [ 46 + # Requires CUDA access which is not possible in the nix environment. 47 + "-m 'not gpu and not mpi'" 48 + "-Wignore::DeprecationWarning" 49 + ]; 39 50 40 51 pythonImportsCheck = [ "pytorch_pfn_extras" ]; 41 52 ··· 45 56 46 57 # requires onnxruntime which was removed because of poor maintainability 47 58 # See https://github.com/NixOS/nixpkgs/pull/105951 https://github.com/NixOS/nixpkgs/pull/155058 59 + "tests/pytorch_pfn_extras_tests/onnx_tests/test_annotate.py" 60 + "tests/pytorch_pfn_extras_tests/onnx_tests/test_as_output.py" 48 61 "tests/pytorch_pfn_extras_tests/onnx_tests/test_export.py" 62 + "tests/pytorch_pfn_extras_tests/onnx_tests/test_export_testcase.py" 63 + "tests/pytorch_pfn_extras_tests/onnx_tests/test_lax.py" 64 + "tests/pytorch_pfn_extras_tests/onnx_tests/test_load_model.py" 49 65 "tests/pytorch_pfn_extras_tests/onnx_tests/test_torchvision.py" 50 66 "tests/pytorch_pfn_extras_tests/onnx_tests/utils.py" 51 - "tests/pytorch_pfn_extras_tests/onnx_tests/test_lax.py" 52 67 53 68 # RuntimeError: No Op registered for Gradient with domain_version of 9 54 69 "tests/pytorch_pfn_extras_tests/onnx_tests/test_grad.py" 55 - 56 - # Requires CUDA access which is not possible in the nix environment. 57 - "tests/pytorch_pfn_extras_tests/cuda_tests/test_allocator.py" 58 - "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_batchnorm.py" 59 - "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_conv.py" 60 - "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_linear.py" 61 - "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy.py" 62 - "tests/pytorch_pfn_extras_tests/profiler_tests/test_record.py" 63 - "tests/pytorch_pfn_extras_tests/runtime_tests/test_to.py" 64 - "tests/pytorch_pfn_extras_tests/handler_tests/test_handler.py" 65 - "tests/pytorch_pfn_extras_tests/test_reporter.py" 66 - "tests/pytorch_pfn_extras_tests/training_tests/test_trainer.py" 67 - "tests/pytorch_pfn_extras_tests/utils_tests/test_checkpoint.py" 68 - "tests/pytorch_pfn_extras_tests/utils_tests/test_comparer.py" 69 - "tests/pytorch_pfn_extras_tests/utils_tests/test_new_comparer.py" 70 - ] ++ lib.optionals (pythonAtLeast "3.11") [ 71 - # Remove this when https://github.com/NixOS/nixpkgs/pull/259068 is merged 70 + ] ++ lib.optionals (pythonAtLeast "3.12") [ 71 + # RuntimeError: Dynamo is not supported on Python 3.12+ 72 72 "tests/pytorch_pfn_extras_tests/dynamo_tests/test_compile.py" 73 + "tests/pytorch_pfn_extras_tests/test_ops/test_register.py" 74 + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ 75 + # torch.distributed is not available on darwin 76 + "tests/pytorch_pfn_extras_tests/training_tests/extensions_tests/test_sharded_snapshot.py" 77 + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ 78 + # RuntimeError: internal error 79 + # convolution (e.g. F.conv3d) causes runtime error 80 + "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_conv.py" 73 81 ]; 74 82 75 83 meta = with lib; {
+2 -2
pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "sphinxcontrib-confluencebuilder"; 13 - version = "2.5.0"; 13 + version = "2.5.1"; 14 14 format = "pyproject"; 15 15 16 16 src = fetchPypi { 17 17 pname = "sphinxcontrib_confluencebuilder"; 18 18 inherit version; 19 - hash = "sha256-rE9tWUie9ZaeWnKR+ojwS9A6BHEtsgVpwzXAuWoxknQ="; 19 + hash = "sha256-PQpkwQ95UVJwDGTAq1xdcSvd07FZpZfA/4jq3ywlMas="; 20 20 }; 21 21 22 22 nativeBuildInputs = [
+2 -2
pkgs/development/tools/faas-cli/default.nix
··· 18 18 in 19 19 buildGoModule rec { 20 20 pname = "faas-cli"; 21 - version = "0.16.23"; 21 + version = "0.16.25"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "openfaas"; 25 25 repo = "faas-cli"; 26 26 rev = version; 27 - sha256 = "sha256-QbMwokFHaISvsNuHy/Do90bvXtwaJmie/hDLybuy2qk="; 27 + sha256 = "sha256-6HX+n3OXSA2gJ0LW5zlH3FboM5RNaOI72EmnEI9wbFE="; 28 28 }; 29 29 30 30 vendorHash = null;
+2 -2
pkgs/development/tools/micronaut/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "micronaut"; 5 - version = "4.3.7"; 5 + version = "4.3.8"; 6 6 7 7 src = fetchzip { 8 8 url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; 9 - sha256 = "sha256-TP7Ccv/Krc5l35AxyrkRmeRMSgQP9Q3BpNiHxlqLD4I="; 9 + sha256 = "sha256-8sUXJExg1CApMbF95Lx3B/mnOJ5Y6HAck8+0UgF0bdc="; 10 10 }; 11 11 12 12 nativeBuildInputs = [ makeWrapper installShellFiles ];
+2 -2
pkgs/development/tools/templ/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "templ"; 8 - version = "0.2.648"; 8 + version = "0.2.663"; 9 9 10 10 subPackages = [ "cmd/templ" ]; 11 11 ··· 21 21 owner = "a-h"; 22 22 repo = "templ"; 23 23 rev = "refs/tags/v${version}"; 24 - hash = "sha256-9Co3yvfy8X69PIffPg2lDjVCVTjDhiFnSsJd4MQ6cf4="; 24 + hash = "sha256-TU8QG6OmUzSNDAX9W0Ntmz5cucLqVQeTskfnJbm/YM0="; 25 25 }; 26 26 27 27 vendorHash = "sha256-Upd5Wq4ajsyOMDiAWS2g2iNO1sm1XJc43AFQLIo5eDM=";
+2 -2
pkgs/os-specific/linux/ndiswrapper/default.nix
··· 1 - { lib, stdenv, fetchurl, kernel, perl, kmod, libelf }: 1 + { lib, stdenv, fetchurl, kernel, perl, kmod, elfutils }: 2 2 let 3 3 version = "1.63"; 4 4 in ··· 34 34 sha256 = "1v6b66jhisl110jfl00hm43lmnrav32vs39d85gcbxrjqnmcx08g"; 35 35 }; 36 36 37 - buildInputs = [ perl libelf ]; 37 + buildInputs = [ perl elfutils ]; 38 38 39 39 meta = { 40 40 description = "Ndis driver wrapper for the Linux kernel";
+69
pkgs/os-specific/linux/ryzen-smu/default.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , kernel 5 + }: 6 + 7 + let 8 + version = "0.1.5-unstable-2024-01-03"; 9 + 10 + ## Upstream has not been merging PRs. 11 + ## Nixpkgs maintainers are providing a 12 + ## repo with PRs merged until upstream is 13 + ## updated. 14 + src = fetchFromGitHub { 15 + owner = "Cryolitia"; 16 + repo = "ryzen_smu"; 17 + rev = "ce1aa918efa33ca79998f0f7d467c04d4b07016c"; 18 + hash = "sha256-s9SSmbL6ixWqZUKEhrZdxN4xoWgk+8ClZPoKq2FDAAE="; 19 + }; 20 + 21 + monitor-cpu = stdenv.mkDerivation { 22 + pname = "monitor-cpu"; 23 + inherit version src; 24 + 25 + makeFlags = [ 26 + "-C userspace" 27 + ]; 28 + 29 + installPhase = '' 30 + runHook preInstall 31 + 32 + install userspace/monitor_cpu -Dm755 -t $out/bin 33 + 34 + runHook postInstall 35 + ''; 36 + }; 37 + 38 + in 39 + stdenv.mkDerivation { 40 + pname = "ryzen-smu-${kernel.version}"; 41 + inherit version src; 42 + 43 + hardeningDisable = [ "pic" ]; 44 + 45 + nativeBuildInputs = kernel.moduleBuildDependencies; 46 + 47 + makeFlags = [ 48 + "TARGET=${kernel.modDirVersion}" 49 + "KERNEL_BUILD=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" 50 + ]; 51 + 52 + installPhase = '' 53 + runHook preInstall 54 + 55 + install ryzen_smu.ko -Dm444 -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/ryzen_smu 56 + install ${monitor-cpu}/bin/monitor_cpu -Dm755 -t $out/bin 57 + 58 + runHook postInstall 59 + ''; 60 + 61 + meta = with lib; { 62 + description = "A Linux kernel driver that exposes access to the SMU (System Management Unit) for certain AMD Ryzen Processors"; 63 + homepage = "https://gitlab.com/leogx9r/ryzen_smu"; 64 + license = licenses.gpl2Plus; 65 + maintainers = with maintainers; [ Cryolitia phdyellow ]; 66 + platforms = [ "x86_64-linux" ]; 67 + mainProgram = "monitor_cpu"; 68 + }; 69 + }
+2 -2
pkgs/servers/search/weaviate/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "weaviate"; 8 - version = "1.24.7"; 8 + version = "1.24.8"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "weaviate"; 12 12 repo = "weaviate"; 13 13 rev = "v${version}"; 14 - hash = "sha256-KLKzHB+MzaLifMNdMCziFNawFBMUWJ75Xozu53yvJFU="; 14 + hash = "sha256-OydGohfsS2/Wb9uuFP+6IogmfiWMFLBIEdooFJwS3TU="; 15 15 }; 16 16 17 17 vendorHash = "sha256-DMzwIxtF267C2OLyVdZ6CrCz44sy6ZeKL2qh8AkhS2I=";
+2 -2
pkgs/servers/spicedb/default.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "spicedb"; 9 - version = "1.30.0"; 9 + version = "1.30.1"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "authzed"; 13 13 repo = "spicedb"; 14 14 rev = "v${version}"; 15 - hash = "sha256-enMUGLOoVy56PCAqfW6jTOgEr/Me6kbuUvq3YmlxMPs="; 15 + hash = "sha256-4hxIDdmPXU+wnD6O7S/H30YIAroOWAQobAPimwwxxv0="; 16 16 }; 17 17 18 18 vendorHash = "sha256-lMhfCkuLuA8aj3Q+I/v/Ohof/htBJjPRmQ3c9QXsioc=";
+2 -2
pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
··· 13 13 14 14 stdenv.mkDerivation rec { 15 15 pname = "ibus-m17n"; 16 - version = "1.4.28"; 16 + version = "1.4.29"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "ibus"; 20 20 repo = "ibus-m17n"; 21 21 rev = version; 22 - sha256 = "sha256-3/AnytPIIi1Q2i/25rkqOZWgUCtouO+cS+TByp9neOI="; 22 + sha256 = "sha256-KHAdGTlRdTNpSuYbT6rocbT9rSNhxCdt4Z6QSLlbBsg="; 23 23 }; 24 24 25 25 nativeBuildInputs = [
+2 -2
pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
··· 13 13 14 14 stdenv.mkDerivation rec { 15 15 pname = "ibus-typing-booster"; 16 - version = "2.25.4"; 16 + version = "2.25.6"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "mike-fabian"; 20 20 repo = "ibus-typing-booster"; 21 21 rev = version; 22 - hash = "sha256-uTq+/g2DtiftfQvNVYIKtARyxA9Y8LE6VCeGFcWs5SQ="; 22 + hash = "sha256-HFC6VhlA3Kt1oZd1R5bOHRMQrNiNu4J0Op1uCKOXj9w="; 23 23 }; 24 24 25 25 nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ];
+3 -3
pkgs/tools/networking/grpcui/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "grpcui"; 5 - version = "1.3.3"; 5 + version = "1.4.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "fullstorydev"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-G4lVYwx8fYxuyHI2CzAfBQHQV/G4lf7zBwL8JTpnscA="; 11 + sha256 = "sha256-OIwfLuWY7Y0t85v+P/0F55vEe0hNohlqMl16Omr8AF0="; 12 12 }; 13 13 14 - vendorHash = "sha256-lw8HildV1RFTGLOf6FaitbXPxr4FtVGg7GxdzBVFiTM="; 14 + vendorHash = "sha256-dEek7q8OjFgCn+f/qyiQL/5qu8RJp38vZk3OrBREHx4="; 15 15 16 16 doCheck = false; 17 17
+3 -3
pkgs/tools/networking/grpcurl/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "grpcurl"; 5 - version = "1.8.9"; 5 + version = "1.9.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "fullstorydev"; 9 9 repo = "grpcurl"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-zN/vleCph919HXZZ9wsXoJBXRT6y7gjyuQxnjRMzq00="; 11 + sha256 = "sha256-OVlFOZD4+ZXRKl0Q0Dh5Etij/zeB1jTGoY8n13AyLa4="; 12 12 }; 13 13 14 14 subPackages = [ "cmd/grpcurl" ]; 15 15 16 - vendorHash = "sha256-g5G966CuaVILGAgWunHAPrrkLjSv8pBj9R4bcLzyI+A="; 16 + vendorHash = "sha256-KsPrJC4hGrGEny8wVWE1EG00qn+b1Rrvh4qK27VzgLU="; 17 17 18 18 ldflags = [ "-s" "-w" "-X main.version=${version}" ]; 19 19
-86
pkgs/tools/networking/i2p/default.nix
··· 1 - { lib 2 - , stdenv 3 - , ps 4 - , coreutils 5 - , fetchurl 6 - , jdk 7 - , jre 8 - , ant 9 - , gettext 10 - , which 11 - , java-service-wrapper 12 - }: 13 - 14 - stdenv.mkDerivation (finalAttrs: { 15 - pname = "i2p"; 16 - version = "2.4.0"; 17 - 18 - src = fetchurl { 19 - urls = map (mirror: "${mirror}/${finalAttrs.version}/i2psource_${finalAttrs.version}.tar.bz2") [ 20 - "https://download.i2p2.de/releases" 21 - "https://files.i2p-projekt.de" 22 - "https://download.i2p2.no/releases" 23 - ]; 24 - sha256 = "sha256-MO+K/K0P/6/ZTTCsMH+GtaazGOLB9EoCMAWEGh/NB3w="; 25 - }; 26 - 27 - buildInputs = [ jdk ant gettext which ]; 28 - patches = [ ./i2p.patch ]; 29 - 30 - buildPhase = '' 31 - export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" 32 - ant preppkg-linux-only 33 - ''; 34 - 35 - installPhase = '' 36 - set -B 37 - mkdir -p $out/{bin,share} 38 - cp -r pkg-temp/* $out 39 - 40 - cp ${java-service-wrapper}/bin/wrapper $out/i2psvc 41 - cp ${java-service-wrapper}/lib/wrapper.jar $out/lib 42 - cp ${java-service-wrapper}/lib/libwrapper.so $out/lib 43 - 44 - sed -i $out/i2prouter -i $out/runplain.sh \ 45 - -e "s#uname#${coreutils}/bin/uname#" \ 46 - -e "s#which#${which}/bin/which#" \ 47 - -e "s#%gettext%#${gettext}/bin/gettext#" \ 48 - -e "s#/usr/ucb/ps#${ps}/bin/ps#" \ 49 - -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \ 50 - -e "s#%INSTALL_PATH#$out#" \ 51 - -e 's#%USER_HOME#$HOME#' \ 52 - -e "s#%SYSTEM_java_io_tmpdir#/tmp#" \ 53 - -e "s#%JAVA%#${jre}/bin/java#" 54 - mv $out/runplain.sh $out/bin/i2prouter-plain 55 - mv $out/man $out/share/ 56 - chmod +x $out/bin/* $out/i2psvc 57 - rm $out/{osid,postinstall.sh,INSTALL-headless.txt} 58 - ''; 59 - 60 - meta = with lib; { 61 - description = "Applications and router for I2P, anonymity over the Internet"; 62 - homepage = "https://geti2p.net"; 63 - sourceProvenance = with sourceTypes; [ 64 - fromSource 65 - binaryBytecode # source bundles dependencies as jars 66 - ]; 67 - license = with licenses; [ 68 - asl20 69 - boost 70 - bsd2 71 - bsd3 72 - cc-by-30 73 - cc0 74 - epl10 75 - gpl2 76 - gpl3 77 - lgpl21Only 78 - lgpl3Only 79 - mit 80 - publicDomain 81 - ]; 82 - platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; 83 - maintainers = with maintainers; [ joelmo ]; 84 - mainProgram = "i2prouter-plain"; 85 - }; 86 - })
-43
pkgs/tools/networking/i2p/i2p.patch
··· 1 - diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter 2 - index 365737d89..2ea14db3e 100644 3 - --- a/installer/resources/i2prouter 4 - +++ b/installer/resources/i2prouter 5 - @@ -49,7 +49,7 @@ APP_LONG_NAME="I2P Service" 6 - 7 - # gettext - we look for it in the path 8 - # fallback to echo is below, we can't set it to echo here. 9 - -GETTEXT=$(which gettext > /dev/null 2>&1) 10 - +GETTEXT=%gettext% 11 - 12 - # Where to install the systemd service 13 - SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service" 14 - diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh 15 - index eb4995dfe..0186cede3 100644 16 - --- a/installer/resources/runplain.sh 17 - +++ b/installer/resources/runplain.sh 18 - @@ -25,7 +25,7 @@ CP= 19 - 20 - # Try using the Java binary that I2P was installed with. 21 - # If it's not found, try looking in the system PATH. 22 - -JAVA=$(which "%JAVA_HOME"/bin/java || which java) 23 - +JAVA=%JAVA% 24 - 25 - if [ -z $JAVA ] || [ ! -x $JAVA ]; then 26 - echo "Error: Cannot find java." >&2 27 - @@ -44,15 +44,4 @@ if [ $(uname -s) = "Darwin" ]; then 28 - export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true" 29 - fi 30 - JAVAOPTS="${MAXMEMOPT} -Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt" 31 - -( 32 - - nohup ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1 33 - -) & 34 - -PID=$! 35 - - 36 - -if [ ! -z $PID ] && kill -0 $PID > /dev/null 2>&1 ; then 37 - - echo "I2P started [$PID]" >&2 38 - - echo $PID > "${I2PTEMP}/router.pid" 39 - -else 40 - - echo "I2P failed to start." >&2 41 - - exit 1 42 - -fi 43 - +exec ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch
+3 -2
pkgs/tools/security/chipsec/default.nix
··· 2 2 , stdenv 3 3 , fetchFromGitHub 4 4 , kernel ? null 5 - , libelf 5 + , elfutils 6 6 , nasm 7 7 , python3 8 8 , withDriver ? false ··· 26 26 KSRC = lib.optionalString withDriver "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; 27 27 28 28 nativeBuildInputs = [ 29 - libelf 30 29 nasm 30 + ] ++ lib.optionals (lib.meta.availableOn stdenv.buildPlatform elfutils) [ 31 + elfutils 31 32 ] ++ lib.optionals withDriver kernel.moduleBuildDependencies; 32 33 33 34 nativeCheckInputs = with python3.pkgs; [
+2 -2
pkgs/tools/security/tor/default.nix
··· 30 30 in 31 31 stdenv.mkDerivation rec { 32 32 pname = "tor"; 33 - version = "0.4.8.10"; 33 + version = "0.4.8.11"; 34 34 35 35 src = fetchurl { 36 36 url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; 37 - sha256 = "sha256-5ii0+rcO20cncVsjzykxN1qfdoWsCPLFnqSYoXhGOoY="; 37 + sha256 = "sha256-jyvfkOYzgHgSNap9YE4VlXDyg+zuZ0Zwhz2LtwUsjgc="; 38 38 }; 39 39 40 40 outputs = [ "out" "geoip" ];
+2 -1
pkgs/tools/security/trufflehog/default.nix
··· 17 17 hash = "sha256-2xgvXHeltoODr5Rok7yaUqdVcO2crtdPvvRrN+DDGr4="; 18 18 }; 19 19 20 - vendorHash = "sha256-dQ/oKVy5RZ5R8cbNom1msSbuzrQ7VbtK7m+8aS33u7Y="; 20 + vendorHash = "sha256-zpHrwQ1egD2juWkQicHl2HVzXGr3DCmAyRdUgm5jdGg="; 21 + proxyVendor = true; 21 22 22 23 ldflags = [ 23 24 "-s"
-2
pkgs/top-level/all-packages.nix
··· 9183 9183 9184 9184 i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; 9185 9185 9186 - i2p = callPackage ../tools/networking/i2p { }; 9187 - 9188 9186 i2pd = callPackage ../tools/networking/i2pd { }; 9189 9187 9190 9188 iannix = libsForQt5.callPackage ../applications/audio/iannix { };
+2
pkgs/top-level/linux-kernels.nix
··· 548 548 549 549 ithc = callPackage ../os-specific/linux/ithc { }; 550 550 551 + ryzen-smu = callPackage ../os-specific/linux/ryzen-smu { }; 552 + 551 553 zenpower = callPackage ../os-specific/linux/zenpower { }; 552 554 553 555 zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix {