commit 972652b656c306d3ca5c74b0d499a6fd3ebc87d4 · pyrox.dev/nixpkgs

+12

maintainers/maintainer-list.nix

···

       5630
       5630
        
           githubId = 609279;

     

       5631
       5631
        
           name = "Isaac Shapira";

     

       5632
       5632
        
         };

     

       5633
       5633
       +
         freyacodes = {

     

       5634
       5634
       +
           email = "freya@arbjerg.dev";

     

       5635
       5635
       +
           github = "freyacodes";

     

       5636
       5636
       +
           githubId = 2582617;

     

       5637
       5637
       +
           name = "Freya Arbjerg";

     

       5638
       5638
       +
         };

     

       5633
       5639
        
         fricklerhandwerk = {

     

       5634
       5640
        
           email = "valentin@fricklerhandwerk.de";

     

       5635
       5641
        
           github = "fricklerhandwerk";

     
···

       13015
       13021
        
           github = "piperswe";

     

       13016
       13022
        
           githubId = 1830959;

     

       13017
       13023
        
           name = "Piper McCorkle";

     

       13024
       13024
       +
         };

     

       13025
       13025
       +
         piturnah = {

     

       13026
       13026
       +
           email = "peterhebden6@gmail.com";

     

       13027
       13027
       +
           github = "piturnah";

     

       13028
       13028
       +
           githubId = 20472367;

     

       13029
       13029
       +
           name = "Peter Hebden";

     

       13018
       13030
        
         };

     

       13019
       13031
        
         pjbarnoy = {

     

       13020
       13032
        
           email = "pjbarnoy@gmail.com";

+2

nixos/doc/manual/release-notes/rl-2311.section.md

···

82
82

83
83

- mdraid support is now optional. This reduces initramfs size and prevents the potentially undesired automatic detection and activation of software RAID pools. It is disabled by default in new configurations (determined by `stateVersion`), but the appropriate settings will be generated by `nixos-generate-config` when installing to a software RAID device, so the standard installation procedure should be unaffected. If you have custom configs relying on mdraid, ensure that you use `stateVersion` correctly or set `boot.swraid.enable` manually.

84
84

85
85
+
- The `go-ethereum` package has been updated to v1.12.0. This drops support for proof-of-work. Its GraphQL API now encodes all numeric values as hex strings and the GraphQL UI is updated to version 2.0. The default database has changed from `leveldb` to `pebble` but `leveldb` can be forced with the --db.engine=leveldb flag. The `checkpoint-admin` command was [removed along with trusted checkpoints](https://github.com/ethereum/go-ethereum/pull/27147).

86
86
+

85
87

## Other Notable Changes {#sec-release-23.11-notable-changes}

86
88

87
89

- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.

+1

nixos/modules/module-list.nix

···

       646
       646
        
         ./services/misc/greenclip.nix

     

       647
       647
        
         ./services/misc/headphones.nix

     

       648
       648
        
         ./services/misc/heisenbridge.nix

     

       649
       649
       +
         ./services/misc/homepage-dashboard.nix

     

       649
       650
        
         ./services/misc/ihaskell.nix

     

       650
       651
        
         ./services/misc/input-remapper.nix

     

       651
       652
        
         ./services/misc/irkerd.nix

+55

nixos/modules/services/misc/homepage-dashboard.nix

···

       1
       1
       +
       { config

     

       2
       2
       +
       , pkgs

     

       3
       3
       +
       , lib

     

       4
       4
       +
       , ...

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       let

     

       8
       8
       +
         cfg = config.services.homepage-dashboard;

     

       9
       9
       +
       in

     

       10
       10
       +
       {

     

       11
       11
       +
         options = {

     

       12
       12
       +
           services.homepage-dashboard = {

     

       13
       13
       +
             enable = lib.mkEnableOption (lib.mdDoc "Homepage Dashboard");

     

       14
       14
       +
       

     

       15
       15
       +
             package = lib.mkPackageOptionMD pkgs "homepage-dashboard" { };

     

       16
       16
       +
       

     

       17
       17
       +
             openFirewall = lib.mkOption {

     

       18
       18
       +
               type = lib.types.bool;

     

       19
       19
       +
               default = false;

     

       20
       20
       +
               description = lib.mdDoc "Open ports in the firewall for Homepage.";

     

       21
       21
       +
             };

     

       22
       22
       +
       

     

       23
       23
       +
             listenPort = lib.mkOption {

     

       24
       24
       +
               type = lib.types.int;

     

       25
       25
       +
               default = 8082;

     

       26
       26
       +
               description = lib.mdDoc "Port for Homepage to bind to.";

     

       27
       27
       +
             };

     

       28
       28
       +
           };

     

       29
       29
       +
         };

     

       30
       30
       +
       

     

       31
       31
       +
         config = lib.mkIf cfg.enable {

     

       32
       32
       +
           systemd.services.homepage-dashboard = {

     

       33
       33
       +
             description = "Homepage Dashboard";

     

       34
       34
       +
             after = [ "network.target" ];

     

       35
       35
       +
             wantedBy = [ "multi-user.target" ];

     

       36
       36
       +
       

     

       37
       37
       +
             environment = {

     

       38
       38
       +
               HOMEPAGE_CONFIG_DIR = "/var/lib/homepage-dashboard";

     

       39
       39
       +
               PORT = "${toString cfg.listenPort}";

     

       40
       40
       +
             };

     

       41
       41
       +
       

     

       42
       42
       +
             serviceConfig = {

     

       43
       43
       +
               Type = "simple";

     

       44
       44
       +
               DynamicUser = true;

     

       45
       45
       +
               StateDirectory = "homepage-dashboard";

     

       46
       46
       +
               ExecStart = "${lib.getExe cfg.package}";

     

       47
       47
       +
               Restart = "on-failure";

     

       48
       48
       +
             };

     

       49
       49
       +
           };

     

       50
       50
       +
       

     

       51
       51
       +
           networking.firewall = lib.mkIf cfg.openFirewall {

     

       52
       52
       +
             allowedTCPPorts = [ cfg.listenPort ];

     

       53
       53
       +
           };

     

       54
       54
       +
         };

     

       55
       55
       +
       }

+3 -1

nixos/modules/services/misc/prowlarr.nix

···

       11
       11
        
           services.prowlarr = {

     

       12
       12
        
             enable = mkEnableOption (lib.mdDoc "Prowlarr");

     

       13
       13
        
       

     

       14
       14
       +
             package = mkPackageOptionMD pkgs "prowlarr" { };

     

       15
       15
       +
       

     

       14
       16
        
             openFirewall = mkOption {

     

       15
       17
        
               type = types.bool;

     

       16
       18
        
               default = false;

     
···

       29
       31
        
               Type = "simple";

     

       30
       32
        
               DynamicUser = true;

     

       31
       33
        
               StateDirectory = "prowlarr";

     

       32
       32
       -
               ExecStart = "${pkgs.prowlarr}/bin/Prowlarr -nobrowser -data=/var/lib/prowlarr";

     

       34
       34
       +
               ExecStart = "${cfg.package}/bin/Prowlarr -nobrowser -data=/var/lib/prowlarr";

     

       33
       35
        
               Restart = "on-failure";

     

       34
       36
        
             };

     

       35
       37
        
           };

+19 -19

nixos/modules/services/web-apps/peering-manager.nix

···

       1
       1
        
       { config, lib, pkgs, buildEnv, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       let

     

       6
       4
        
         cfg = config.services.peering-manager;

     

       7
       5
        
         configFile = pkgs.writeTextFile {

     
···

       41
       39
        
         pkg = (pkgs.peering-manager.overrideAttrs (old: {

     

       42
       40
        
           postInstall = ''

     

       43
       41
        
             ln -s ${configFile} $out/opt/peering-manager/peering_manager/configuration.py

     

       44
       44
       -
           '' + optionalString cfg.enableLdap ''

     

       42
       42
       +
           '' + lib.optionalString cfg.enableLdap ''

     

       45
       43
        
             ln -s ${cfg.ldapConfigPath} $out/opt/peering-manager/peering_manager/ldap_config.py

     

       46
       44
        
           '';

     

       47
       45
        
         })).override {

     

       48
       46
        
           inherit (cfg) plugins;

     

       49
       47
        
         };

     

       50
       50
       -
         peeringManagerManageScript = with pkgs; (writeScriptBin "peering-manager-manage" ''

     

       51
       51
       -
           #!${stdenv.shell}

     

       48
       48
       +
         peeringManagerManageScript = pkgs.writeScriptBin "peering-manager-manage" ''

     

       49
       49
       +
           #!${pkgs.stdenv.shell}

     

       52
       50
        
           export PYTHONPATH=${pkg.pythonPath}

     

       53
       51
        
           sudo -u peering-manager ${pkg}/bin/peering-manager "$@"

     

       54
       54
       -
         '');

     

       52
       52
       +
         '';

     

       55
       53
        
       

     

       56
       54
        
       in {

     

       57
       57
       -
         options.services.peering-manager = {

     

       55
       55
       +
         options.services.peering-manager = with lib; {

     

       58
       56
        
           enable = mkOption {

     

       59
       59
       -
             type = lib.types.bool;

     

       57
       57
       +
             type = types.bool;

     

       60
       58
        
             default = false;

     

       61
       61
       -
             description = lib.mdDoc ''

     

       59
       59
       +
             description = mdDoc ''

     

       62
       60
        
               Enable Peering Manager.

     

       63
       61
        
       

     

       64
       62
        
               This module requires a reverse proxy that serves `/static` separately.

     
···

       69
       67
        
           listenAddress = mkOption {

     

       70
       68
        
             type = types.str;

     

       71
       69
        
             default = "[::1]";

     

       72
       72
       -
             description = lib.mdDoc ''

     

       70
       70
       +
             description = mdDoc ''

     

       73
       71
        
               Address the server will listen on.

     

       74
       72
        
             '';

     

       75
       73
        
           };

     
···

       77
       75
        
           port = mkOption {

     

       78
       76
        
             type = types.port;

     

       79
       77
        
             default = 8001;

     

       80
       80
       -
             description = lib.mdDoc ''

     

       78
       78
       +
             description = mdDoc ''

     

       81
       79
        
               Port the server will listen on.

     

       82
       80
        
             '';

     

       83
       81
        
           };

     
···

       88
       86
        
             defaultText = literalExpression ''

     

       89
       87
        
               python3Packages: with python3Packages; [];

     

       90
       88
        
             '';

     

       91
       91
       -
             description = lib.mdDoc ''

     

       89
       89
       +
             description = mdDoc ''

     

       92
       90
        
               List of plugin packages to install.

     

       93
       91
        
             '';

     

       94
       92
        
           };

     

       95
       93
        
       

     

       96
       94
        
           secretKeyFile = mkOption {

     

       97
       95
        
             type = types.path;

     

       98
       98
       -
             description = lib.mdDoc ''

     

       96
       96
       +
             description = mdDoc ''

     

       99
       97
        
               Path to a file containing the secret key.

     

       100
       98
        
             '';

     

       101
       99
        
           };

     
···

       103
       101
        
           peeringdbApiKeyFile = mkOption {

     

       104
       102
        
             type = with types; nullOr path;

     

       105
       103
        
             default = null;

     

       106
       106
       -
             description = lib.mdDoc ''

     

       104
       104
       +
             description = mdDoc ''

     

       107
       105
        
               Path to a file containing the PeeringDB API key.

     

       108
       106
        
             '';

     

       109
       107
        
           };

     
···

       111
       109
        
           extraConfig = mkOption {

     

       112
       110
        
             type = types.lines;

     

       113
       111
        
             default = "";

     

       114
       114
       -
             description = lib.mdDoc ''

     

       112
       112
       +
             description = mdDoc ''

     

       115
       113
        
               Additional lines of configuration appended to the `configuration.py`.

     

       116
       114
        
               See the [documentation](https://peering-manager.readthedocs.io/en/stable/configuration/optional-settings/) for more possible options.

     

       117
       115
        
             '';

     
···

       120
       118
        
           enableLdap = mkOption {

     

       121
       119
        
             type = types.bool;

     

       122
       120
        
             default = false;

     

       123
       123
       -
             description = lib.mdDoc ''

     

       121
       121
       +
             description = mdDoc ''

     

       124
       122
        
               Enable LDAP-Authentication for Peering Manager.

     

       125
       123
        
       

     

       126
       124
        
               This requires a configuration file being pass through `ldapConfigPath`.

     
···

       129
       127
        
       

     

       130
       128
        
           ldapConfigPath = mkOption {

     

       131
       129
        
             type = types.path;

     

       132
       132
       -
             description = lib.mdDoc ''

     

       130
       130
       +
             description = mdDoc ''

     

       133
       131
        
               Path to the Configuration-File for LDAP-Authentication, will be loaded as `ldap_config.py`.

     

       134
       132
        
               See the [documentation](https://peering-manager.readthedocs.io/en/stable/setup/6-ldap/#configuration) for possible options.

     

       135
       133
        
             '';

     

       136
       134
        
           };

     

       137
       135
        
         };

     

       138
       136
        
       

     

       139
       139
       -
         config = mkIf cfg.enable {

     

       140
       140
       -
           services.peering-manager.plugins = mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]);

     

       137
       137
       +
         config = lib.mkIf cfg.enable {

     

       138
       138
       +
           services.peering-manager.plugins = lib.mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]);

     

       141
       139
        
       

     

       142
       140
        
           system.build.peeringManagerPkg = pkg;

     

       143
       141
        
       

     
···

       262
       260
        
           users.groups.peering-manager = {};

     

       263
       261
        
           users.groups."${config.services.redis.servers.peering-manager.user}".members = [ "peering-manager" ];

     

       264
       262
        
         };

     

       263
       263
       +
       

     

       264
       264
       +
         meta.maintainers = with lib.maintainers; [ yuka ];

     

       265
       265
        
       }

+1

nixos/tests/all-tests.nix

···

       337
       337
        
         hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; };

     

       338
       338
        
         hedgedoc = handleTest ./hedgedoc.nix {};

     

       339
       339
        
         herbstluftwm = handleTest ./herbstluftwm.nix {};

     

       340
       340
       +
         homepage-dashboard = handleTest ./homepage-dashboard.nix {};

     

       340
       341
        
         installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {});

     

       341
       342
        
         invidious = handleTest ./invidious.nix {};

     

       342
       343
        
         oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {};

+14

nixos/tests/homepage-dashboard.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ lib, ... }: {

     

       2
       2
       +
         name = "homepage-dashboard";

     

       3
       3
       +
         meta.maintainers = with lib.maintainers; [ jnsgruk ];

     

       4
       4
       +
       

     

       5
       5
       +
         nodes.machine = { pkgs, ... }: {

     

       6
       6
       +
           services.homepage-dashboard.enable = true;

     

       7
       7
       +
         };

     

       8
       8
       +
       

     

       9
       9
       +
         testScript = ''

     

       10
       10
       +
           machine.wait_for_unit("homepage-dashboard.service")

     

       11
       11
       +
           machine.wait_for_open_port(8082)

     

       12
       12
       +
           machine.succeed("curl --fail http://localhost:8082/")

     

       13
       13
       +
         '';

     

       14
       14
       +
       })

+1 -1

nixos/tests/web-apps/peering-manager.nix

···

       34
       34
        
                   "sudo -u postgres psql -c 'ALTER USER \"peering-manager\" WITH SUPERUSER;'"

     

       35
       35
        
               )

     

       36
       36
        
               machine.succeed(

     

       37
       37
       -
                   "cd ${nodes.machine.config.system.build.peeringManagerPkg}/opt/peering-manager ; peering-manager-manage test --no-input"

     

       37
       37
       +
                   "cd ${nodes.machine.system.build.peeringManagerPkg}/opt/peering-manager ; peering-manager-manage test --no-input"

     

       38
       38
        
               )

     

       39
       39
        
         '';

     

       40
       40
        
       })

+4 -5

pkgs/applications/blockchains/go-ethereum/default.nix

···

       9
       9
        
       

     

       10
       10
        
       in buildGoModule rec {

     

       11
       11
        
         pname = "go-ethereum";

     

       12
       12
       -
         version = "1.11.6";

     

       12
       12
       +
         version = "1.12.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "ethereum";

     

       16
       16
        
           repo = pname;

     

       17
       17
        
           rev = "v${version}";

     

       18
       18
       -
           sha256 = "sha256-mZ11xan3MGgaUORbiQczKrXSrxzjvQMhZbpHnEal11Y=";

     

       18
       18
       +
           sha256 = "sha256-u1p9k12tY79kA/2Hu109czQZnurHuDJQf/w7J0c8SuU=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         vendorHash = "sha256-rjSGR2ie5sFK2OOo4HUZ6+hrDlQuUDtyTKn0sh8jFBY=";

     

       21
       21
       +
         vendorHash = "sha256-k5MbOiJDvWFnaAPViNRHeqFa64XPZ3ImkkvkmTTscNA=";

     

       22
       22
        
       

     

       23
       23
        
         doCheck = false;

     

       24
       24
        
       

     
···

       33
       33
        
           "cmd/abidump"

     

       34
       34
        
           "cmd/abigen"

     

       35
       35
        
           "cmd/bootnode"

     

       36
       36
       -
           "cmd/checkpoint-admin"

     

       37
       36
        
           "cmd/clef"

     

       38
       37
        
           "cmd/devp2p"

     

       39
       38
        
           "cmd/ethkey"

     
···

       58
       57
        
           homepage = "https://geth.ethereum.org/";

     

       59
       58
        
           description = "Official golang implementation of the Ethereum protocol";

     

       60
       59
        
           license = with licenses; [ lgpl3Plus gpl3Plus ];

     

       61
       61
       -
           maintainers = with maintainers; [ adisbladis RaghavSood ];

     

       60
       60
       +
           maintainers = with maintainers; [ RaghavSood ];

     

       62
       61
        
         };

     

       63
       62
        
       }

-2

pkgs/applications/editors/jetbrains/default.nix

···

       77
       77
        
                   --replace-needed libcrypto.so.10 libcrypto.so

     

       78
       78
        
       

     

       79
       79
        
                 autoPatchelf $PWD/bin

     

       80
       80
       -
                 wrapProgram $out/bin/clion \

     

       81
       81
       -
                   --set CL_JDK "${jdk}"

     

       82
       80
        
               )

     

       83
       81
        
             '';

     

       84
       82
        
           });

+2

pkgs/applications/editors/jetbrains/linux.nix

···

       71
       71
        
           }

     

       72
       72
        
       

     

       73
       73
        
           rm -rf jbr

     

       74
       74
       +
           # When using the IDE as a remote backend using gateway, it expects the jbr directory to contain the jdk

     

       75
       75
       +
           ln -s ${jdk.home} jbr

     

       74
       76
        
       

     

       75
       77
        
           interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)

     

       76
       78
        
           if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then

+2 -9

pkgs/applications/emulators/vbam/default.nix

···

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
        
         pname = "visualboyadvance-m";

     

       21
       21
       -
         version = "2.1.5";

     

       21
       21
       +
         version = "2.1.6";

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "visualboyadvance-m";

     

       24
       24
        
           repo = "visualboyadvance-m";

     

       25
       25
        
           rev = "v${version}";

     

       26
       26
       -
           sha256 = "1sc3gdn7dqkipjsvlzchgd98mia9ic11169dw8v341vr9ppb1b6m";

     

       26
       26
       +
           sha256 = "1fph8phbswq6d9lgw1y1767wdp316w5hn5bws6h2dj75gvsqf221";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [ cmake pkg-config ];

     
···

       41
       41
        
           zlib

     

       42
       42
        
           wxGTK32

     

       43
       43
        
           gtk3

     

       44
       44
       -
         ];

     

       45
       45
       -
       

     

       46
       46
       -
         patches = [

     

       47
       47
       -
           (fetchpatch {

     

       48
       48
       -
             url = "https://github.com/visualboyadvance-m/visualboyadvance-m/commit/1d7e8ae4edc53a3380dfea88329b8b8337db1c52.patch";

     

       49
       49
       -
             sha256 = "sha256-SV1waz2JSKiM6itwkqwlE3aOZCcOl8iyBr06tyYlefo=";

     

       50
       50
       -
           })

     

       51
       44
        
         ];

     

       52
       45
        
       

     

       53
       46
        
         cmakeFlags = [

+3 -3

pkgs/applications/graphics/darktable/default.nix

···

       58
       58
        
       }:

     

       59
       59
        
       

     

       60
       60
        
       stdenv.mkDerivation rec {

     

       61
       61
       -
         version = "4.4.0";

     

       61
       61
       +
         version = "4.4.1";

     

       62
       62
        
         pname = "darktable";

     

       63
       63
        
       

     

       64
       64
        
         src = fetchurl {

     

       65
       65
        
           url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";

     

       66
       66
       -
           sha256 = "8887fc34abd97c4998b0888c3197e0c509d63bdeab2238906915319811f3b080";

     

       66
       66
       +
           sha256 = "e043d38d2e8adb67af7690b12b535a40e8ec7bea05cfa8684db8b21a626e0f0d";

     

       67
       67
        
         };

     

       68
       68
        
       

     

       69
       69
        
         nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ];

     
···

       147
       147
        
           homepage = "https://www.darktable.org";

     

       148
       148
        
           license = licenses.gpl3Plus;

     

       149
       149
        
           platforms = platforms.linux ++ platforms.darwin;

     

       150
       150
       -
           maintainers = with maintainers; [ goibhniu flosse mrVanDalo paperdigits ];

     

       150
       150
       +
           maintainers = with maintainers; [ goibhniu flosse mrVanDalo paperdigits freyacodes ];

     

       151
       151
        
         };

     

       152
       152
        
       }

+56

pkgs/applications/graphics/komorebi/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , meson

     

       5
       5
       +
       , vala

     

       6
       6
       +
       , pkg-config

     

       7
       7
       +
       , glib

     

       8
       8
       +
       , gtk3

     

       9
       9
       +
       , libgee

     

       10
       10
       +
       , webkitgtk

     

       11
       11
       +
       , clutter-gtk

     

       12
       12
       +
       , clutter-gst

     

       13
       13
       +
       , ninja

     

       14
       14
       +
       , wrapGAppsHook

     

       15
       15
       +
       , testers

     

       16
       16
       +
       , komorebi

     

       17
       17
       +
       }:

     

       18
       18
       +
       

     

       19
       19
       +
       stdenv.mkDerivation rec {

     

       20
       20
       +
         pname = "komorebi";

     

       21
       21
       +
         version = "2.2.1";

     

       22
       22
       +
       

     

       23
       23
       +
         src = fetchFromGitHub {

     

       24
       24
       +
           owner = "Komorebi-Fork";

     

       25
       25
       +
           repo = "komorebi";

     

       26
       26
       +
           rev = "v${version}";

     

       27
       27
       +
           hash = "sha256-vER69dSxu4JuWNAADpkxHE/zjOMhQp+Fc21J+JHQ8xk=";

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         nativeBuildInputs = [

     

       31
       31
       +
           meson

     

       32
       32
       +
           vala

     

       33
       33
       +
           pkg-config

     

       34
       34
       +
           ninja

     

       35
       35
       +
           wrapGAppsHook

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         buildInputs = [

     

       39
       39
       +
           glib

     

       40
       40
       +
           gtk3

     

       41
       41
       +
           libgee

     

       42
       42
       +
           webkitgtk

     

       43
       43
       +
           clutter-gtk

     

       44
       44
       +
           clutter-gst

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       47
       47
       +
         passthru.tests.version = testers.testVersion { package = komorebi; };

     

       48
       48
       +
       

     

       49
       49
       +
         meta = with lib; {

     

       50
       50
       +
           description = "A beautiful and customizable wallpaper manager for Linux";

     

       51
       51
       +
           homepage = "https://github.com/Komorebi-Fork/komorebi";

     

       52
       52
       +
           license = licenses.gpl3Only;

     

       53
       53
       +
           maintainers = with maintainers; [ kranzes ];

     

       54
       54
       +
           platforms = platforms.linux;

     

       55
       55
       +
         };

     

       56
       56
       +
       }

+33 -33

pkgs/applications/networking/cluster/terraform-providers/providers.json

···

       28
       28
        
           "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="

     

       29
       29
        
         },

     

       30
       30
        
         "aiven": {

     

       31
       31
       -
           "hash": "sha256-rmXfUMP1CWKV7ahxfmCr2FvWYcEWKh+V3fWSQWvcUDU=",

     

       31
       31
       +
           "hash": "sha256-T9d1iMuFqewDVK4EOsF4uCsqZAsThMHaRa7ilGnYXCo=",

     

       32
       32
        
           "homepage": "https://registry.terraform.io/providers/aiven/aiven",

     

       33
       33
        
           "owner": "aiven",

     

       34
       34
        
           "repo": "terraform-provider-aiven",

     

       35
       35
       -
           "rev": "v4.6.0",

     

       35
       35
       +
           "rev": "v4.7.0",

     

       36
       36
        
           "spdx": "MIT",

     

       37
       37
       -
           "vendorHash": "sha256-oUUl7m7+r10xSklrcsTYOU8wk8n7TLu6Qt50wTKLULk="

     

       37
       37
       +
           "vendorHash": "sha256-Fcu4RWgbVyAUr72h8q91HT+LbUh9+4SPDz8Vc4/u5RM="

     

       38
       38
        
         },

     

       39
       39
        
         "akamai": {

     

       40
       40
        
           "hash": "sha256-gQZ5yH3sV5DTpSE+/bZM12+PHitmUm/TtpAdPijF+Lk=",

     
···

       110
       110
        
           "vendorHash": null

     

       111
       111
        
         },

     

       112
       112
        
         "aws": {

     

       113
       113
       -
           "hash": "sha256-LFOlSmsnV7opt9Z3b15Lyi8sFYjx2WkvvB8vpJBjfWQ=",

     

       113
       113
       +
           "hash": "sha256-VDet4IGyd0RXCzlQ+s08QwX9eby5oYfwq2eVRfSS9ME=",

     

       114
       114
        
           "homepage": "https://registry.terraform.io/providers/hashicorp/aws",

     

       115
       115
        
           "owner": "hashicorp",

     

       116
       116
        
           "repo": "terraform-provider-aws",

     

       117
       117
       -
           "rev": "v5.7.0",

     

       117
       117
       +
           "rev": "v5.8.0",

     

       118
       118
        
           "spdx": "MPL-2.0",

     

       119
       119
       -
           "vendorHash": "sha256-x8f1sTVB1FaoPKgTGEoZaNVKCpNbTrQ7F0PVfwEWe/I="

     

       119
       119
       +
           "vendorHash": "sha256-oNPWz/0jcSL0FYuIW9wnj8Jp94vm9dJdiC9gfhtbQiU="

     

       120
       120
        
         },

     

       121
       121
        
         "azuread": {

     

       122
       122
       -
           "hash": "sha256-wBNS2a6O1QJgssbAWhSRSfxaVZ35zgT/qNdpE++NQ8U=",

     

       122
       122
       +
           "hash": "sha256-6LSvqMi79HW1GdEG0lSVwLF2nWft/JnKyj9EQO4pMW4=",

     

       123
       123
        
           "homepage": "https://registry.terraform.io/providers/hashicorp/azuread",

     

       124
       124
        
           "owner": "hashicorp",

     

       125
       125
        
           "repo": "terraform-provider-azuread",

     

       126
       126
       -
           "rev": "v2.39.0",

     

       126
       126
       +
           "rev": "v2.40.0",

     

       127
       127
        
           "spdx": "MPL-2.0",

     

       128
       128
        
           "vendorHash": null

     

       129
       129
        
         },

     

       130
       130
        
         "azurerm": {

     

       131
       131
       -
           "hash": "sha256-PwAwVpLoMq5DNIiY5wt+n9oqNGInJ+C0JfiFagtrAEA=",

     

       131
       131
       +
           "hash": "sha256-4cJal4GrL8OwoFNMjN0AKlicq2mC0ba3N8bYISMaY3A=",

     

       132
       132
        
           "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",

     

       133
       133
        
           "owner": "hashicorp",

     

       134
       134
        
           "repo": "terraform-provider-azurerm",

     

       135
       135
       -
           "rev": "v3.64.0",

     

       135
       135
       +
           "rev": "v3.65.0",

     

       136
       136
        
           "spdx": "MPL-2.0",

     

       137
       137
        
           "vendorHash": null

     

       138
       138
        
         },

     
···

       182
       182
        
           "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="

     

       183
       183
        
         },

     

       184
       184
        
         "buildkite": {

     

       185
       185
       -
           "hash": "sha256-yxL08Eysj/w9uLmuqDKx1ZcYQZSy91pDgR84BdpsF88=",

     

       185
       185
       +
           "hash": "sha256-1cKRsOuwYu3DV8uArrrf1hJdJ+C54D2awKmJm5ECEG4=",

     

       186
       186
        
           "homepage": "https://registry.terraform.io/providers/buildkite/buildkite",

     

       187
       187
        
           "owner": "buildkite",

     

       188
       188
        
           "repo": "terraform-provider-buildkite",

     

       189
       189
       -
           "rev": "v0.19.2",

     

       189
       189
       +
           "rev": "v0.20.0",

     

       190
       190
        
           "spdx": "MIT",

     

       191
       191
       -
           "vendorHash": "sha256-AJcPxiuglHpsHUIa5sJMtY7MRN5JrW/tfkz3+5Bv9AU="

     

       191
       191
       +
           "vendorHash": "sha256-QJ8bZU6K0UAduUjFmyGHjsaHm2e5U8rlPqlK6xM8m3I="

     

       192
       192
        
         },

     

       193
       193
        
         "checkly": {

     

       194
       194
        
           "hash": "sha256-UXIni594P85sgS8XVLoJ0+UTBeUS0XC+oj98KJUfghg=",

     
···

       445
       445
        
           "vendorHash": "sha256-XgGNz+yP+spRA2+qFxwiZFcBRv2GQWhiYY9zoC8rZPc="

     

       446
       446
        
         },

     

       447
       447
        
         "google": {

     

       448
       448
       -
           "hash": "sha256-2c50Ul57IeI7NzH0qYRIw8aKoB/5edCEsurc7JcojgQ=",

     

       448
       448
       +
           "hash": "sha256-FlBTLc3QUsPAO1OIr8aOlb7ppePsAjtKKrBOTS+JYFI=",

     

       449
       449
        
           "homepage": "https://registry.terraform.io/providers/hashicorp/google",

     

       450
       450
        
           "owner": "hashicorp",

     

       451
       451
        
           "proxyVendor": true,

     

       452
       452
        
           "repo": "terraform-provider-google",

     

       453
       453
       -
           "rev": "v4.73.0",

     

       453
       453
       +
           "rev": "v4.73.1",

     

       454
       454
        
           "spdx": "MPL-2.0",

     

       455
       455
        
           "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A="

     

       456
       456
        
         },

     

       457
       457
        
         "google-beta": {

     

       458
       458
       -
           "hash": "sha256-2fiwPrmd/PHFNksfpo/TQQsuFz7RttAea5C8LJTrMAg=",

     

       458
       458
       +
           "hash": "sha256-GYX0tmNut04NbpqbfXCy/5Rabn3leWf1VH+yGHTsCek=",

     

       459
       459
        
           "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",

     

       460
       460
        
           "owner": "hashicorp",

     

       461
       461
        
           "proxyVendor": true,

     

       462
       462
        
           "repo": "terraform-provider-google-beta",

     

       463
       463
       -
           "rev": "v4.73.0",

     

       463
       463
       +
           "rev": "v4.73.1",

     

       464
       464
        
           "spdx": "MPL-2.0",

     

       465
       465
        
           "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A="

     

       466
       466
        
         },

     
···

       700
       700
        
           "vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ="

     

       701
       701
        
         },

     

       702
       702
        
         "lxd": {

     

       703
       703
       -
           "hash": "sha256-qJp/RekJBsXx5Ic6J6CKs/oBcyqHB/sSjpzjAZUf2iE=",

     

       703
       703
       +
           "hash": "sha256-mZ2ptpgpyNXZAS19MVxOq3cfmSjTJvTP60fbpEgk6kE=",

     

       704
       704
        
           "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd",

     

       705
       705
        
           "owner": "terraform-lxd",

     

       706
       706
        
           "repo": "terraform-provider-lxd",

     

       707
       707
       -
           "rev": "v1.10.0",

     

       707
       707
       +
           "rev": "v1.10.1",

     

       708
       708
        
           "spdx": "MPL-2.0",

     

       709
       709
        
           "vendorHash": "sha256-zGVatrMqYsbGahEGJ/Gt9ub76R49m7RbLLs2XeKwQJw="

     

       710
       710
        
         },

     
···

       745
       745
        
           "vendorHash": "sha256-4OVNcAG+/JhVQX4eW5jUkrJeIPPZatq3SvQERdRPtl0="

     

       746
       746
        
         },

     

       747
       747
        
         "mongodbatlas": {

     

       748
       748
       -
           "hash": "sha256-z/bRdyXrjMn98DtQAnEuuJX4dr3SItbOQlvST/p7jCY=",

     

       748
       748
       +
           "hash": "sha256-vhzidHQzWrLQ2fGZ0A7aGKwvrqWi6GJ3JCdoCX/dZkc=",

     

       749
       749
        
           "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",

     

       750
       750
        
           "owner": "mongodb",

     

       751
       751
        
           "repo": "terraform-provider-mongodbatlas",

     

       752
       752
       -
           "rev": "v1.10.0",

     

       752
       752
       +
           "rev": "v1.10.1",

     

       753
       753
        
           "spdx": "MPL-2.0",

     

       754
       754
       -
           "vendorHash": "sha256-QSRo/lloloaUtGTv8fauO+6biroTlIteM1KsadvFZtg="

     

       754
       754
       +
           "vendorHash": "sha256-7wrN2BoFY0I9dV52x9LJ43PgUSOVnhJULm1EY+LEZOI="

     

       755
       755
        
         },

     

       756
       756
        
         "namecheap": {

     

       757
       757
        
           "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",

     
···

       863
       863
        
           "vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI="

     

       864
       864
        
         },

     

       865
       865
        
         "opentelekomcloud": {

     

       866
       866
       -
           "hash": "sha256-VPXuM1w6A/dNJcdpEQsi9wmp93urJclWN5jLMBme9h8=",

     

       866
       866
       +
           "hash": "sha256-SM6WG7igvFlIbi5AYj/1JXxjbpGgBkz2dKUnR4ZjQb8=",

     

       867
       867
        
           "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",

     

       868
       868
        
           "owner": "opentelekomcloud",

     

       869
       869
        
           "repo": "terraform-provider-opentelekomcloud",

     

       870
       870
       -
           "rev": "v1.35.2",

     

       870
       870
       +
           "rev": "v1.35.3",

     

       871
       871
        
           "spdx": "MPL-2.0",

     

       872
       872
       -
           "vendorHash": "sha256-TKYKKw6Mrq7hhM+at9VAiVxIpjYeg7AmEIEzfDIJA5M="

     

       872
       872
       +
           "vendorHash": "sha256-zlviJb2EYw/9NiD64xLFY8cd4H9Nb63tSbBUzFhW8Qo="

     

       873
       873
        
         },

     

       874
       874
        
         "opsgenie": {

     

       875
       875
       -
           "hash": "sha256-3W53oONyPoXSp7fnB2EG512rBXac07nGVevdZ9gezig=",

     

       875
       875
       +
           "hash": "sha256-fZidZFpusgO1PTXArsxn/omo+DC1nfVu6649BvBzj+k=",

     

       876
       876
        
           "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie",

     

       877
       877
        
           "owner": "opsgenie",

     

       878
       878
        
           "repo": "terraform-provider-opsgenie",

     

       879
       879
       -
           "rev": "v0.6.27",

     

       879
       879
       +
           "rev": "v0.6.28",

     

       880
       880
        
           "spdx": "MPL-2.0",

     

       881
       881
        
           "vendorHash": null

     

       882
       882
        
         },

     
···

       971
       971
        
           "vendorHash": null

     

       972
       972
        
         },

     

       973
       973
        
         "scaleway": {

     

       974
       974
       -
           "hash": "sha256-coscd4w+x7+Klp4j1Wb9z092WqWUhZTnREEq+RdgFLw=",

     

       974
       974
       +
           "hash": "sha256-AA9ctS5YQ36mvxfXSU77rfOWL5UXynVN+TUjpjBR40I=",

     

       975
       975
        
           "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",

     

       976
       976
        
           "owner": "scaleway",

     

       977
       977
        
           "repo": "terraform-provider-scaleway",

     

       978
       978
       -
           "rev": "v2.23.0",

     

       978
       978
       +
           "rev": "v2.24.0",

     

       979
       979
        
           "spdx": "MPL-2.0",

     

       980
       980
       -
           "vendorHash": "sha256-8MjVOibZuPlZHP3fIIcr17Siz0VAZ5SX8TUpj5L/YXc="

     

       980
       980
       +
           "vendorHash": "sha256-g/hNdUharGRTOIJZMk8lRAwO9PdMAbwJYTNcxTpfaV0="

     

       981
       981
        
         },

     

       982
       982
        
         "secret": {

     

       983
       983
        
           "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",

     
···

       1261
       1261
        
           "vendorHash": "sha256-itSr5HHjus6G0t5/KFs0sNiredH9m3JnQ3siLtm+NHs="

     

       1262
       1262
        
         },

     

       1263
       1263
        
         "yandex": {

     

       1264
       1264
       -
           "hash": "sha256-FsbwylRyUFDZ9n40D36bnchYCax9hKyDLTPF7UV85y4=",

     

       1264
       1264
       +
           "hash": "sha256-03lZMLD2Iq9o9ijvMD7JNnaGNdn5OpB/s3509YdYRfQ=",

     

       1265
       1265
        
           "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",

     

       1266
       1266
        
           "owner": "yandex-cloud",

     

       1267
       1267
        
           "repo": "terraform-provider-yandex",

     

       1268
       1268
       -
           "rev": "v0.94.0",

     

       1268
       1268
       +
           "rev": "v0.95.0",

     

       1269
       1269
        
           "spdx": "MPL-2.0",

     

       1270
       1270
       -
           "vendorHash": "sha256-/HrijkUpJmeCjk6SCH2TE9MThjnimskOjztzRygd5fE="

     

       1270
       1270
       +
           "vendorHash": "sha256-IdRgtPUAYYR55MiT/2wqGzYhuMfThUmhnGGYoPQlHW0="

     

       1271
       1271
        
         }

     

       1272
       1272
        
       }

+19 -7

pkgs/applications/networking/instant-messengers/webcord/default.nix

···

       1
       1
       -
       { lib, stdenv, buildNpmPackage, fetchFromGitHub, copyDesktopItems

     

       2
       2
       -
       , python3, pipewire, libpulseaudio, xdg-utils, electron_24, makeDesktopItem }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildNpmPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , copyDesktopItems

     

       5
       5
       +
       , python3

     

       6
       6
       +
       , pipewire

     

       7
       7
       +
       , libpulseaudio

     

       8
       8
       +
       , xdg-utils

     

       9
       9
       +
       , electron_25

     

       10
       10
       +
       , makeDesktopItem

     

       11
       11
       +
       , nix-update-script

     

       12
       12
       +
       }:

     

       3
       13
        
       

     

       4
       14
        
       buildNpmPackage rec {

     

       5
       15
        
         pname = "webcord";

     

       6
       6
       -
         version = "4.2.0";

     

       16
       16
       +
         version = "4.3.0";

     

       7
       17
        
       

     

       8
       18
        
         src = fetchFromGitHub {

     

       9
       19
        
           owner = "SpacingBat3";

     

       10
       20
        
           repo = "WebCord";

     

       11
       21
        
           rev = "v${version}";

     

       12
       12
       -
           sha256 = "sha256-530iWNvehImwSYt5HnZaqa4TAslrwxAOZi3gRm1K2/w=";

     

       22
       22
       +
           hash = "sha256-E/WXAVSCNTDEDaz71LXOHUf/APFO2uSpkTRhlZfQp0E=";

     

       13
       23
        
         };

     

       14
       24
        
       

     

       15
       15
       -
         npmDepsHash = "sha256-YguZtGn8CT4EqOQWS0GeNGBdZSC3Lj1gFR0ZiegWTJU=";

     

       25
       25
       +
         npmDepsHash = "sha256-vGaYjM13seVmRbVPyDIM+qhGTCj6rw/el6Dq3KMzDks=";

     

       16
       26
        
       

     

       17
       27
        
         nativeBuildInputs = [

     

       18
       28
        
           copyDesktopItems

     
···

       46
       56
        
           install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png

     

       47
       57
        
       

     

       48
       58
        
           # Add xdg-utils to path via suffix, per PR #181171

     

       49
       49
       -
           makeWrapper '${electron_24}/bin/electron' $out/bin/webcord \

     

       59
       59
       +
           makeWrapper '${electron_25}/bin/electron' $out/bin/webcord \

     

       50
       60
        
             --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \

     

       51
       61
        
             --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \

     

       52
       62
        
             --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \

     
···

       66
       76
        
           })

     

       67
       77
        
         ];

     

       68
       78
        
       

     

       79
       79
       +
         passthru.updateScript = nix-update-script { };

     

       80
       80
       +
       

     

       69
       81
        
         meta = with lib; {

     

       70
       82
        
           description = "A Discord and Fosscord electron-based client implemented without Discord API";

     

       71
       83
        
           homepage = "https://github.com/SpacingBat3/WebCord";

     
···

       73
       85
        
           changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}";

     

       74
       86
        
           license = licenses.mit;

     

       75
       87
        
           maintainers = with maintainers; [ huantian ];

     

       76
       76
       -
           platforms = electron_24.meta.platforms;

     

       88
       88
       +
           platforms = electron_25.meta.platforms;

     

       77
       89
        
         };

     

       78
       90
        
       }

+8 -2

pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix

···

       2
       2
        
       , substituteAll

     

       3
       3
        
       , lib

     

       4
       4
        
       , vencord-web-extension

     

       5
       5
       +
       , electron_24

     

       5
       6
        
       }:

     

       6
       6
       -
       webcord.overrideAttrs (old: {

     

       7
       7
       +
       

     

       8
       8
       +
       (webcord.overrideAttrs (old: {

     

       7
       9
        
         patches = (old.patches or [ ]) ++ [

     

       8
       10
        
           (substituteAll {

     

       9
       11
        
             src = ./add-extension.patch;

     
···

       15
       17
        
           description = "Webcord with Vencord web extension";

     

       16
       18
        
           maintainers = with maintainers; [ FlafyDev NotAShelf ];

     

       17
       19
        
         };

     

       18
       18
       -
       })

     

       20
       20
       +
       })).override {

     

       21
       21
       +
         # Webcord has updated to electron 25, but that causes a segfault

     

       22
       22
       +
         # when launching webcord-vencord on wayland, so downgrade it for now.

     

       23
       23
       +
         electron_25 = electron_24;

     

       24
       24
       +
       }

+3 -3

pkgs/applications/networking/irc/weechat/scripts/multiline/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         pname = "multiline";

     

       5
       5
       -
         version = "0.6.3";

     

       5
       5
       +
         version = "0.6.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url = "https://raw.githubusercontent.com/weechat/scripts/945315bed4bc2beaf1e47f9b946ffe8f638f77fe/perl/multiline.pl";

     

       9
       9
       -
           sha256 = "1smialb21ny7brhij4sbw46xvsmrdv6ig2da0ip63ga2afngwsy4";

     

       8
       8
       +
           url = "https://raw.githubusercontent.com/weechat/scripts/5f073d966e98d54344a91be4f5afc0ec9e2697dc/perl/multiline.pl";

     

       9
       9
       +
           sha256 = "sha256-TXbU2Q7Tm8iTwOQqrWpqHXuKrjoBFLyUWRsH+TsR9Lo=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         dontUnpack = true;

+5 -4

pkgs/applications/version-management/gex/default.nix

···

       8
       8
        
       

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "gex";

     

       11
       11
       -
         version = "0.4.0";

     

       11
       11
       +
         version = "0.5.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "Piturnah";

     

       15
       15
        
           repo = pname;

     

       16
       16
        
           rev = "v${version}";

     

       17
       17
       -
           hash = "sha256-eRforLvRVSrFWnI5UZEWr1L4UM3ABjAIvui1E1hzk5s=";

     

       17
       17
       +
           hash = "sha256-//sQ0s8bBQzuu5aO3RjPRjFuVYiGW6BwSPoCWKAx9DQ=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ pkg-config ];

     

       21
       21
        
         buildInputs = [ libgit2 ];

     

       22
       22
        
       

     

       23
       23
       -
         cargoHash = "sha256-OEaNERozmJL8gYe33V/m4HQNHi2I4KHpI6PTwFQkPSs=";

     

       23
       23
       +
         cargoHash = "sha256-rkhkFnRDtMTWFM+E5C4jR7TWtHdy3WUtIzvGDDLHqtE=";

     

       24
       24
        
       

     

       25
       25
        
         meta = with lib; {

     

       26
       26
        
           description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit";

     

       27
       27
        
           homepage = "https://github.com/Piturnah/gex";

     

       28
       28
       +
           changelog = "https://github.com/Piturnah/gex/releases/tag/${src.rev}";

     

       28
       29
        
           license = with licenses; [ asl20 /* or */ mit ];

     

       29
       29
       -
           maintainers = with maintainers; [ azd325 Br1ght0ne ];

     

       30
       30
       +
           maintainers = with maintainers; [ azd325 evanrichter piturnah ];

     

       30
       31
        
         };

     

       31
       32
        
       }

+1

pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix

···

       44
       44
        
       

     

       45
       45
        
         postUnpack = ''

     

       46
       46
        
           cp -r ${libremidi.src}/* $sourceRoot/deps/libremidi

     

       47
       47
       +
           chmod -R +w $sourceRoot/deps/libremidi

     

       47
       48
        
         '';

     

       48
       49
        
       

     

       49
       50
        
         postInstall = ''

+3 -3

pkgs/data/fonts/iosevka/default.nix

···

       55
       55
        
       

     

       56
       56
        
       buildNpmPackage rec {

     

       57
       57
        
         pname = if set != null then "iosevka-${set}" else "iosevka";

     

       58
       58
       -
         version = "24.1.4";

     

       58
       58
       +
         version = "25.0.1";

     

       59
       59
        
       

     

       60
       60
        
         src = fetchFromGitHub {

     

       61
       61
        
           owner = "be5invis";

     

       62
       62
        
           repo = "iosevka";

     

       63
       63
        
           rev = "v${version}";

     

       64
       64
       -
           hash = "sha256-+b+13D6dKHx9kvAKeN/ePcWGtDPpFB/dVwHTTprw7Co=";

     

       64
       64
       +
           hash = "sha256-clbqr4hGtIkbgPYovYXHGW+FUTEjAn3Oq7aoPFMgGJU=";

     

       65
       65
        
         };

     

       66
       66
        
       

     

       67
       67
       -
         npmDepsHash = "sha256-+LZQY64SdcEx+Mqb5qGelC7zbXdStJkDvcFWgUVTDnE=";

     

       67
       67
       +
         npmDepsHash = "sha256-TxMmUgwQPbSV+1qe0FEtSPAYwJRnpuQ+qOmWvrq9xKY=";

     

       68
       68
        
       

     

       69
       69
        
         nativeBuildInputs = [

     

       70
       70
        
           remarshal

+2 -1

pkgs/development/compilers/gcc/11/default.nix

···

       176
       176
        
       

     

       177
       177
        
         libc_dev = stdenv.cc.libc_dev;

     

       178
       178
        
       

     

       179
       179
       -
         hardeningDisable = [ "format" "pie" ];

     

       179
       179
       +
         hardeningDisable = [ "format" "pie" ]

     

       180
       180
       +
           ++ optional langAda "fortify3";

     

       180
       181
        
       

     

       181
       182
        
         postPatch = ''

     

       182
       183
        
           configureScripts=$(find . -name configure)

+18 -5

pkgs/development/compilers/pforth/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , buildPackages

     

       4
       5
        
       }:

     

       5
       6
        
       

     

       6
       7
        
       stdenv.mkDerivation (finalAttrs: {

     
···

       14
       15
        
           hash = "sha256-vEjFeHSJl+yAtatYJEnu+r9hmOr/kZOgIbSUXR/c8WU=";

     

       15
       16
        
         };

     

       16
       17
        
       

     

       17
       17
       -
         dontConfigure = true;

     

       18
       18
       -
       

     

       19
       19
       -
         preBuild = ''

     

       20
       20
       -
           cd platforms/unix

     

       18
       18
       +
         # We build the dictionary in a cross-compile compatible way.

     

       19
       19
       +
         # For that, we perform steps, that the Makefile would otherwise do.

     

       20
       20
       +
         buildPhase = ''

     

       21
       21
       +
           runHook preBuild

     

       22
       22
       +
           make -C platforms/unix pfdicapp

     

       23
       23
       +
           pushd fth/

     

       24
       24
       +
           ${stdenv.hostPlatform.emulator buildPackages} ../platforms/unix/pforth -i system.fth

     

       25
       25
       +
           ${stdenv.hostPlatform.emulator buildPackages} ../platforms/unix/pforth -d pforth.dic <<< "include savedicd.fth sdad bye"

     

       26
       26
       +
           mv pforth.dic pfdicdat.h ../platforms/unix/

     

       27
       27
       +
           popd

     

       28
       28
       +
           make -C platforms/unix pforthapp

     

       29
       29
       +
           runHook postBuild

     

       21
       30
        
         '';

     

       22
       31
        
       

     

       23
       32
        
         installPhase = ''

     

       24
       24
       -
           install -Dm755 pforth_standalone $out/bin/pforth

     

       33
       33
       +
           runHook preInstall

     

       34
       34
       +
           install -Dm755 platforms/unix/pforth_standalone $out/bin/pforth

     

       35
       35
       +
           mkdir -p $out/share/pforth

     

       36
       36
       +
           cp -r fth/* $out/share/pforth/

     

       37
       37
       +
           runHook postInstall

     

       25
       38
        
         '';

     

       26
       39
        
       

     

       27
       40
        
         meta = {

+4 -4

pkgs/development/libraries/libremidi/default.nix

···

       9
       9
        
       , stdenv

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
       -
       stdenv.mkDerivation {

     

       12
       12
       +
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "libremidi";

     

       14
       14
       -
         version = "unstable-2023-05-05";

     

       14
       14
       +
         version = "3.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "jcelerier";

     

       18
       18
        
           repo = "libremidi";

     

       19
       19
       -
           rev = "cd2e52d59c8ecc97d751619072c4f4271fa82455";

     

       20
       20
       -
           hash = "sha256-CydoCprxqDl5FXjtgT+AckaRTqQAlCDwwrnPDK17A6o=";

     

       19
       19
       +
           rev = "v${version}";

     

       20
       20
       +
           hash = "sha256-aO83a0DmzwjYXDlPIsn136EkDF0406HadTXPoGuVF6I=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ cmake ];

+2 -2

pkgs/development/python-modules/androidtvremote2/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "androidtvremote2";

     

       13
       13
       -
         version = "0.0.10";

     

       13
       13
       +
         version = "0.0.11";

     

       14
       14
        
         format = "pyproject";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     
···

       19
       19
        
           owner = "tronikos";

     

       20
       20
        
           repo = "androidtvremote2";

     

       21
       21
        
           rev = "refs/tags/v${version}";

     

       22
       22
       -
           hash = "sha256-LjYXQTPTFS80gI3WeJOLrKZ0C0JhGb5p1M70P7n29hc=";

     

       22
       22
       +
           hash = "sha256-mjhohkAC6g2UJgPbq/29Awyy6c4M8SnLqr5v5g7+IeE=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

+35

pkgs/development/python-modules/before-after/default.nix

···

       1
       1
       +
       { buildPythonPackage, fetchPypi, fetchpatch, pytestCheckHook, lib }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "before-after";

     

       5
       5
       +
         version = "1.0.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchPypi {

     

       8
       8
       +
           pname = "before_after";

     

       9
       9
       +
           inherit version;

     

       10
       10
       +
           hash = "sha256-x9T5uLi7UgldoUxLnFnqaz9bnqn9zop7/HLsrg9aP4U=";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         patches = [

     

       14
       14
       +
           # drop 'mock' dependency for python >=3.3

     

       15
       15
       +
           (fetchpatch {

     

       16
       16
       +
             url = "https://github.com/c-oreills/before_after/commit/cf3925148782c8c290692883d1215ae4d2c35c3c.diff";

     

       17
       17
       +
             hash = "sha256-FYCpLxcOLolNPiKzHlgrArCK/QKCwzag+G74wGhK4dc=";

     

       18
       18
       +
           })

     

       19
       19
       +
           (fetchpatch {

     

       20
       20
       +
             url = "https://github.com/c-oreills/before_after/commit/11c0ecc7e8a2f90a762831e216c1bc40abfda43a.diff";

     

       21
       21
       +
             hash = "sha256-8YJumF/U8H+hc7rLZLy3UhXHdYJmcuN+O8kMx8yqMJ0=";

     

       22
       22
       +
           })

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       26
       26
       +
       

     

       27
       27
       +
         pythonImportsCheck = [ "before_after" ];

     

       28
       28
       +
       

     

       29
       29
       +
         meta = with lib; {

     

       30
       30
       +
           description = "sugar over the Mock library to help test race conditions";

     

       31
       31
       +
           homepage = "https://github.com/c-oreills/before_after";

     

       32
       32
       +
           maintainers = with maintainers; [ yuka ];

     

       33
       33
       +
           license = licenses.gpl2Only;

     

       34
       34
       +
         };

     

       35
       35
       +
       }

+2 -2

pkgs/development/python-modules/devolo-plc-api/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "devolo-plc-api";

     

       18
       18
       -
         version = "1.3.1";

     

       18
       18
       +
         version = "1.3.2";

     

       19
       19
        
         format = "pyproject";

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.8";

     
···

       24
       24
        
           owner = "2Fake";

     

       25
       25
        
           repo = "devolo_plc_api";

     

       26
       26
        
           rev = "refs/tags/v${version}";

     

       27
       27
       -
           hash = "sha256-wJyBCQ9rk+UwjWhMIeqsIbMR8cXA9Xu+lmubJoOauEg=";

     

       27
       27
       +
           hash = "sha256-viOyxgFydPrTPFz6JsjJT6IiUIeoIwd+bcrAJfomDI8=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         postPatch = ''

+33 -23

pkgs/development/python-modules/django-cacheops/default.nix

···

       1
       1
       -
       { lib

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       2
       3
        
       , buildPythonPackage

     

       3
       4
        
       , fetchPypi

     

       5
       5
       +
       , pythonRelaxDepsHook

     

       4
       6
        
       , django

     

       5
       7
        
       , funcy

     

       6
       8
        
       , redis

     

       9
       9
       +
       , six

     

       10
       10
       +
       , pytestCheckHook

     

       7
       11
        
       , pytest-django

     

       8
       8
       -
       , pytestCheckHook

     

       12
       12
       +
       , mock

     

       13
       13
       +
       , dill

     

       14
       14
       +
       , jinja2

     

       15
       15
       +
       , before-after

     

       9
       16
        
       , pythonOlder

     

       10
       10
       -
       , six

     

       17
       17
       +
       , nettools

     

       18
       18
       +
       , pkgs

     

       11
       19
        
       }:

     

       12
       20
        
       

     

       13
       21
        
       buildPythonPackage rec {

     

       14
       22
        
         pname = "django-cacheops";

     

       15
       15
       -
         version = "6.2";

     

       23
       23
       +
         version = "7.0.1";

     

       16
       24
        
         format = "setuptools";

     

       17
       25
        
       

     

       18
       26
        
         disabled = pythonOlder "3.7";

     

       19
       27
        
       

     

       20
       28
        
         src = fetchPypi {

     

       21
       29
        
           inherit pname version;

     

       22
       22
       -
           hash = "sha256-zHP9ChwUeZJT/yCopFeRo8jSgCIXswHnDPoIroGeQ48=";

     

       30
       30
       +
           hash = "sha256-Ed3qh90DlWiXikCD2JyJ37hm6lWnpI+2haaPwZiotlA=";

     

       23
       31
        
         };

     

       24
       32
        
       

     

       33
       33
       +
         nativeBuildInputs = [

     

       34
       34
       +
           pythonRelaxDepsHook

     

       35
       35
       +
         ];

     

       36
       36
       +
         pythonRelaxDeps = [ "funcy" ];

     

       37
       37
       +
       

     

       25
       38
        
         propagatedBuildInputs = [

     

       26
       39
        
           django

     

       27
       40
        
           funcy

     
···

       32
       45
        
         nativeCheckInputs = [

     

       33
       46
        
           pytestCheckHook

     

       34
       47
        
           pytest-django

     

       48
       48
       +
           mock

     

       49
       49
       +
           dill

     

       50
       50
       +
           jinja2

     

       51
       51
       +
           before-after

     

       52
       52
       +
           nettools

     

       53
       53
       +
           pkgs.redis

     

       35
       54
        
         ];

     

       36
       55
        
       

     

       37
       37
       -
         disabledTests = [

     

       38
       38
       -
           # Tests require networking

     

       39
       39
       -
           "test_cached_as"

     

       40
       40
       -
           "test_invalidation_signal"

     

       41
       41
       -
           "test_queryset"

     

       42
       42
       -
           "test_queryset_empty"

     

       43
       43
       -
           "test_lock"

     

       44
       44
       -
           "test_context_manager"

     

       45
       45
       -
           "test_decorator"

     

       46
       46
       -
           "test_in_transaction"

     

       47
       47
       -
           "test_nested"

     

       48
       48
       -
           "test_unhashable_args"

     

       49
       49
       -
           "test_db_agnostic_by_default"

     

       50
       50
       -
           "test_db_agnostic_disabled"

     

       51
       51
       -
         ];

     

       56
       56
       +
         preCheck = ''

     

       57
       57
       +
           redis-server &

     

       58
       58
       +
           while ! redis-cli --scan ; do

     

       59
       59
       +
             echo waiting for redis to be ready

     

       60
       60
       +
             sleep 1

     

       61
       61
       +
           done

     

       62
       62
       +
         '';

     

       52
       63
        
       

     

       53
       64
        
         DJANGO_SETTINGS_MODULE = "tests.settings";

     

       54
       65
        
       

     
···

       58
       69
        
           changelog = "https://github.com/Suor/django-cacheops/blob/${version}/CHANGELOG";

     

       59
       70
        
           license = licenses.bsd3;

     

       60
       71
        
           maintainers = with maintainers; [ onny ];

     

       61
       61
       -
           # No support for funcy > 2

     

       62
       62
       -
           # https://github.com/Suor/django-cacheops/issues/454

     

       63
       63
       -
           broken = true;

     

       72
       72
       +
           # Times out for unknown reasons

     

       73
       73
       +
           broken = stdenv.isDarwin;

     

       64
       74
        
         };

     

       65
       75
        
       }

+2 -2

pkgs/development/python-modules/google-cloud-pubsub/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "google-cloud-pubsub";

     

       19
       19
       -
         version = "2.17.1";

     

       19
       19
       +
         version = "2.18.0";

     

       20
       20
        
         format = "setuptools";

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.7";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchPypi {

     

       25
       25
        
           inherit pname version;

     

       26
       26
       -
           hash = "sha256-BZNCjsuwJJy150G0A+lcPUIbRpfIPrftTBaE3/F2x1M=";

     

       26
       26
       +
           hash = "sha256-enDfQRHZy2lKJc7N0jKIJxWcUhOuHmMEyzq7OPN53Sk=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs = [

+19 -13

pkgs/development/python-modules/maxminddb/default.nix

···

       1
       1
       -
       { stdenv

     

       2
       2
       -
       , lib

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
       -
       , pythonOlder

     

       5
       5
       -
       , pythonAtLeast

     

       6
       4
        
       , fetchPypi

     

       7
       5
        
       , libmaxminddb

     

       8
       8
       -
       , mock

     

       9
       9
       -
       , nose

     

       6
       6
       +
       , pytestCheckHook

     

       7
       7
       +
       , pythonOlder

     

       10
       8
        
       }:

     

       11
       9
        
       

     

       12
       10
        
       buildPythonPackage rec {

     

       13
       11
        
         pname = "maxminddb";

     

       14
       14
       -
         version = "2.3.0";

     

       15
       15
       -
         disabled = pythonOlder "3.6";

     

       12
       12
       +
         version = "2.4.0";

     

       13
       13
       +
         format = "setuptools";

     

       14
       14
       +
       

     

       15
       15
       +
         disabled = pythonOlder "3.7";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "sha256-Egkg3d2VXzKuSMIHxs72/V3Ih0qIm6lLDywfc27N8wg=";

     

       19
       19
       +
           hash = "sha256-geVOU0CL1QJlDllpzLoWeAr2WewdscRLLJl+QzCl7ZY=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         buildInputs = [ libmaxminddb ];

     

       22
       22
       +
         buildInputs = [

     

       23
       23
       +
           libmaxminddb

     

       24
       24
       +
         ];

     

       23
       25
        
       

     

       24
       24
       -
         nativeCheckInputs = [ nose mock ];

     

       26
       26
       +
         nativeCheckInputs = [

     

       27
       27
       +
           pytestCheckHook

     

       28
       28
       +
         ];

     

       25
       29
        
       

     

       26
       26
       -
         # Tests are broken for macOS on python38

     

       27
       27
       -
         doCheck = !(stdenv.isDarwin && pythonAtLeast "3.8");

     

       30
       30
       +
         pythonImportsCheck = [

     

       31
       31
       +
           "maxminddb"

     

       32
       32
       +
         ];

     

       28
       33
        
       

     

       29
       34
        
         meta = with lib; {

     

       30
       35
        
           description = "Reader for the MaxMind DB format";

     

       31
       36
        
           homepage = "https://github.com/maxmind/MaxMind-DB-Reader-python";

     

       37
       37
       +
           changelog = "https://github.com/maxmind/MaxMind-DB-Reader-python/blob/v${version}/HISTORY.rst";

     

       32
       38
        
           license = licenses.asl20;

     

       33
       39
        
           maintainers = with maintainers; [ ];

     

       34
       40
        
         };

+2 -2

pkgs/development/python-modules/metar/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "metar";

     

       10
       10
       -
         version = "1.10.0";

     

       10
       10
       +
         version = "1.11.0";

     

       11
       11
        
         format = "setuptools";

     

       12
       12
        
       

     

       13
       13
        
         disabled = pythonOlder "3.7";

     
···

       16
       16
        
           owner = "python-metar";

     

       17
       17
        
           repo = "python-metar";

     

       18
       18
        
           rev = "refs/tags/v${version}";

     

       19
       19
       -
           hash = "sha256-53vgnViEYuMVKEnIZ2BNyIUrURR2rwopx7RWyFmF5PA=";

     

       19
       19
       +
           hash = "sha256-ZDjlXcSTUcSP7oRdhzLpXf/fLUA7Nkc6nj2I6vovbHg=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeCheckInputs = [

+2 -2

pkgs/development/python-modules/mypy-boto3-s3/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "mypy-boto3-s3";

     

       11
       11
       -
         version = "1.28.0";

     

       11
       11
       +
         version = "1.28.3";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.7";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           hash = "sha256-J4Z8oyWoRXAKAI8/yplQBrMvLg0Yr+Z2NStJRT9HfWk=";

     

       18
       18
       +
           hash = "sha256-wrRUQTEmB5pkNKPgWnXLTK2UfHYk5TujhGy4KaIjDEs=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/opower/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "opower";

     

       14
       14
       -
         version = "0.0.13";

     

       14
       14
       +
         version = "0.0.14";

     

       15
       15
        
         format = "pyproject";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.7";

     
···

       20
       20
        
           owner = "tronikos";

     

       21
       21
        
           repo = "opower";

     

       22
       22
        
           rev = "refs/tags/v${version}";

     

       23
       23
       -
           hash = "sha256-WZRJnvZYycOoLNhtShXQ3HPNqyoJymUx+Xwg5gPWGKg=";

     

       23
       23
       +
           hash = "sha256-eTlFb/v88jaEzx5H8ofHMNkqPunDvXcXGvg5ThripeA=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         pythonRemoveDeps = [

+3 -3

pkgs/development/python-modules/xarray-einstats/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "xarray-einstats";

     

       17
       17
       -
         version = "0.5.1";

     

       17
       17
       +
         version = "0.6.0";

     

       18
       18
        
         format = "pyproject";

     

       19
       19
        
       

     

       20
       20
       -
         disabled = pythonOlder "3.7";

     

       20
       20
       +
         disabled = pythonOlder "3.9";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "arviz-devs";

     

       24
       24
        
           repo = pname;

     

       25
       25
        
           rev = "refs/tags/v${version}";

     

       26
       26
       -
           hash = "sha256-oDrNR7iVDg7Piti6JNaXGekfrUfK5GWJYbH/g6m4570=";

     

       26
       26
       +
           hash = "sha256-TXuNqXsny7VpJqV5/3riKzXLheZl+qF+zf4SCMipzmw=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/yalexs-ble/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "yalexs-ble";

     

       17
       17
       -
         version = "2.1.18";

     

       17
       17
       +
         version = "2.2.0";

     

       18
       18
        
         format = "pyproject";

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.9";

     
···

       23
       23
        
           owner = "bdraco";

     

       24
       24
        
           repo = pname;

     

       25
       25
        
           rev = "refs/tags/v${version}";

     

       26
       26
       -
           hash = "sha256-bLxKq/MNbVIv9CV67NeOqn49cYu7gwcBnbZEtlreQzQ=";

     

       26
       26
       +
           hash = "sha256-ei/+QfDjuzbKFZ8Nl+KnCJB6xu7xZh0m6LnzHUEg790=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

+72

pkgs/development/tools/melange/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildGoModule

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , installShellFiles

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildGoModule rec {

     

       8
       8
       +
         pname = "melange";

     

       9
       9
       +
         version = "0.4.0";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "chainguard-dev";

     

       13
       13
       +
           repo = pname;

     

       14
       14
       +
           rev = "v${version}";

     

       15
       15
       +
           hash = "sha256-sEmbfX7W1juymAxcWwDNxI8d/o7NS2S+0TJM6Vi9aQo=";

     

       16
       16
       +
           # populate values that require us to use git. By doing this in postFetch we

     

       17
       17
       +
           # can delete .git afterwards and maintain better reproducibility of the src.

     

       18
       18
       +
           leaveDotGit = true;

     

       19
       19
       +
           postFetch = ''

     

       20
       20
       +
             cd "$out"

     

       21
       21
       +
             git rev-parse HEAD > $out/COMMIT

     

       22
       22
       +
             # in format of 0000-00-00T00:00:00Z

     

       23
       23
       +
             date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH

     

       24
       24
       +
             find "$out" -name .git -print0 | xargs -0 rm -rf

     

       25
       25
       +
           '';

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         vendorHash = "sha256-IkbXZu6iHRXjWFsLtRBDxwJio5sVVZvHylk1al0S+/c=";

     

       29
       29
       +
       

     

       30
       30
       +
         subPackages = [ "." ];

     

       31
       31
       +
       

     

       32
       32
       +
         nativeBuildInputs = [ installShellFiles ];

     

       33
       33
       +
       

     

       34
       34
       +
         ldflags = [

     

       35
       35
       +
           "-s"

     

       36
       36
       +
           "-w"

     

       37
       37
       +
           "-X sigs.k8s.io/release-utils/version.gitVersion=v${version}"

     

       38
       38
       +
           "-X sigs.k8s.io/release-utils/version.gitTreeState=clean"

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         # ldflags based on metadata from git and source

     

       42
       42
       +
         preBuild = ''

     

       43
       43
       +
           ldflags+=" -X sigs.k8s.io/release-utils/version.gitCommit=$(cat COMMIT)"

     

       44
       44
       +
           ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)"

     

       45
       45
       +
         '';

     

       46
       46
       +
       

     

       47
       47
       +
         postInstall = ''

     

       48
       48
       +
           installShellCompletion --cmd melange \

     

       49
       49
       +
             --bash <($out/bin/melange completion bash) \

     

       50
       50
       +
             --fish <($out/bin/melange completion fish) \

     

       51
       51
       +
             --zsh <($out/bin/melange completion zsh)

     

       52
       52
       +
         '';

     

       53
       53
       +
       

     

       54
       54
       +
         doInstallCheck = true;

     

       55
       55
       +
       

     

       56
       56
       +
         installCheckPhase = ''

     

       57
       57
       +
           runHook preInstallCheck

     

       58
       58
       +
       

     

       59
       59
       +
           $out/bin/melange --help

     

       60
       60
       +
           $out/bin/melange version 2>&1 | grep "v${version}"

     

       61
       61
       +
       

     

       62
       62
       +
           runHook postInstallCheck

     

       63
       63
       +
         '';

     

       64
       64
       +
       

     

       65
       65
       +
         meta = with lib; {

     

       66
       66
       +
           homepage = "https://github.com/chainguard-dev/melange";

     

       67
       67
       +
           changelog = "https://github.com/chainguard-dev/melange/blob/${src.rev}/NEWS.md";

     

       68
       68
       +
           description = "Build APKs from source code";

     

       69
       69
       +
           license = licenses.asl20;

     

       70
       70
       +
           maintainers = with maintainers; [ developer-guy ];

     

       71
       71
       +
         };

     

       72
       72
       +
       }

+4

pkgs/development/tools/mold/default.nix

···

       33
       33
        
           mimalloc

     

       34
       34
        
         ];

     

       35
       35
        
       

     

       36
       36
       +
         patches = [

     

       37
       37
       +
           ./fix-debug-strip.patch # fix --debug-strip; https://github.com/rui314/mold/pull/1038

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       36
       40
        
         postPatch = ''

     

       37
       41
        
           sed -i CMakeLists.txt -e '/.*set(DEST\ .*/d'

     

       38
       42
        
         '';

+23

pkgs/development/tools/mold/fix-debug-strip.patch

···

       1
       1
       +
       From b699b73451c57ac01c2680c0b86e1f56ca19e51c Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Jakub Konka <kubkon@jakubkonka.com>

     

       3
       3
       +
       Date: Sat, 6 May 2023 07:55:46 +0200

     

       4
       4
       +
       Subject: [PATCH] Fix handling of --debug-strip

     

       5
       5
       +
       

     

       6
       6
       +
       Signed-off-by: Jakub Konka <kubkon@jakubkonka.com>

     

       7
       7
       +
       ---

     

       8
       8
       +
        elf/cmdline.cc | 2 +-

     

       9
       9
       +
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       10
       10
       +
       

     

       11
       11
       +
       diff --git a/elf/cmdline.cc b/elf/cmdline.cc

     

       12
       12
       +
       index 3ac19f237..731af63ab 100644

     

       13
       13
       +
       --- a/elf/cmdline.cc

     

       14
       14
       +
       +++ b/elf/cmdline.cc

     

       15
       15
       +
       @@ -994,7 +994,7 @@ std::vector<std::string> parse_nonpositional_args(Context<E> &ctx) {

     

       16
       16
       +
            } else if (read_flag("strip-all") || read_flag("s")) {

     

       17
       17
       +
              ctx.arg.strip_all = true;

     

       18
       18
       +
            } else if (read_flag("strip-debug") || read_flag("S")) {

     

       19
       19
       +
       -      ctx.arg.strip_all = true;

     

       20
       20
       +
       +      ctx.arg.strip_debug = true;

     

       21
       21
       +
            } else if (read_flag("warn-unresolved-symbols")) {

     

       22
       22
       +
              ctx.arg.unresolved_symbols = UNRESOLVED_WARN;

     

       23
       23
       +
            } else if (read_flag("error-unresolved-symbols")) {

+31 -30

pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix

···

       71
       71
        
           yarnFlags ? [ ],

     

       72
       72
        
           ignoreScripts ? true,

     

       73
       73
        
           nodejs ? inputs.nodejs,

     

       74
       74
       -
           yarn ? inputs.yarn.override { nodejs = nodejs; },

     

       74
       74
       +
           yarn ? inputs.yarn.override { inherit nodejs; },

     

       75
       75
        
           pkgConfig ? {},

     

       76
       76
        
           preBuild ? "",

     

       77
       77
        
           postBuild ? "",

     
···

       88
       88
        
                 (key: pkgConfig.${key}.buildInputs or [])

     

       89
       89
        
                 (builtins.attrNames pkgConfig);

     

       90
       90
        
       

     

       91
       91
       -
             postInstall = (builtins.map (key:

     

       91
       91
       +
             postInstall = builtins.map (key:

     

       92
       92
        
               if (pkgConfig.${key} ? postInstall) then

     

       93
       93
        
                 ''

     

       94
       94
        
                   for f in $(find -L -path '*/node_modules/${key}' -type d); do

     
···

       97
       97
        
                 ''

     

       98
       98
        
               else

     

       99
       99
        
                 ""

     

       100
       100
       -
             ) (builtins.attrNames pkgConfig));

     

       100
       100
       +
             ) (builtins.attrNames pkgConfig);

     

       101
       101
        
       

     

       102
       102
        
             # build-time JSON generation to avoid IFD

     

       103
       103
        
             # see https://nixos.wiki/wiki/Import_From_Derivation

     
···

       180
       180
        
           packageJSON ? src + "/package.json",

     

       181
       181
        
           yarnLock ? src + "/yarn.lock",

     

       182
       182
        
           nodejs ? inputs.nodejs,

     

       183
       183
       -
           yarn ? inputs.yarn.override { nodejs = nodejs; },

     

       183
       183
       +
           yarn ? inputs.yarn.override { inherit nodejs; },

     

       184
       184
        
           packageOverrides ? {},

     

       185
       185
        
           ...

     

       186
       186
        
         }@attrs:

     
···

       254
       254
        
           yarnNix ? mkYarnNix { inherit yarnLock; },

     

       255
       255
        
           offlineCache ? importOfflineCache yarnNix,

     

       256
       256
        
           nodejs ? inputs.nodejs,

     

       257
       257
       -
           yarn ? inputs.yarn.override { nodejs = nodejs; },

     

       257
       257
       +
           yarn ? inputs.yarn.override { inherit nodejs; },

     

       258
       258
        
           yarnFlags ? [ ],

     

       259
       259
        
           yarnPreBuild ? "",

     

       260
       260
        
           yarnPostBuild ? "",

     
···

       267
       267
        
         }@attrs:

     

       268
       268
        
           let

     

       269
       269
        
             package = lib.importJSON packageJSON;

     

       270
       270
       -
             pname = package.name;

     

       271
       271
       -
             safeName = reformatPackageName pname;

     

       270
       270
       +
             pname = attrs.pname or package.name;

     

       271
       271
       +
             safeName = reformatPackageName package.name;

     

       272
       272
        
             version = attrs.version or package.version;

     

       273
       273
        
             baseName = unlessNull name "${safeName}-${version}";

     

       274
       274
        
       

     
···

       278
       278
        
             );

     

       279
       279
        
       

     

       280
       280
        
             deps = mkYarnModules {

     

       281
       281
       +
               pname = package.name;

     

       281
       282
        
               name = "${safeName}-modules-${version}";

     

       282
       283
        
               preBuild = yarnPreBuild;

     

       283
       284
        
               postBuild = yarnPostBuild;

     

       284
       285
        
               workspaceDependencies = workspaceDependenciesTransitive;

     

       285
       285
       -
               inherit packageJSON pname version yarnLock offlineCache nodejs yarn yarnFlags pkgConfig packageResolutions;

     

       286
       286
       +
               inherit packageJSON version yarnLock offlineCache nodejs yarn yarnFlags pkgConfig packageResolutions;

     

       286
       287
        
             };

     

       287
       288
        
       

     

       288
       288
       -
             publishBinsFor_ = unlessNull publishBinsFor [pname];

     

       289
       289
       +
             publishBinsFor_ = unlessNull publishBinsFor [ package.name ];

     

       289
       290
        
       

     

       290
       291
        
             linkDirFunction = ''

     

       291
       292
        
               linkDirToDirLinks() {

     
···

       307
       308
        
             workspaceDependencyCopy = lib.concatMapStringsSep "\n"

     

       308
       309
        
               (dep: ''

     

       309
       310
        
                 # ensure any existing scope directory is not a symlink

     

       310
       310
       -
                 linkDirToDirLinks "$(dirname node_modules/${dep.pname})"

     

       311
       311
       -
                 mkdir -p "deps/${dep.pname}"

     

       312
       312
       -
                 tar -xf "${dep}/tarballs/${dep.name}.tgz" --directory "deps/${dep.pname}" --strip-components=1

     

       313
       313
       -
                 if [ ! -e "deps/${dep.pname}/node_modules" ]; then

     

       314
       314
       -
                   ln -s "${deps}/deps/${dep.pname}/node_modules" "deps/${dep.pname}/node_modules"

     

       311
       311
       +
                 linkDirToDirLinks "$(dirname node_modules/${dep.package.name})"

     

       312
       312
       +
                 mkdir -p "deps/${dep.package.name}"

     

       313
       313
       +
                 tar -xf "${dep}/tarballs/${dep.name}.tgz" --directory "deps/${dep.package.name}" --strip-components=1

     

       314
       314
       +
                 if [ ! -e "deps/${dep.package.name}/node_modules" ]; then

     

       315
       315
       +
                   ln -s "${deps}/deps/${dep.package.name}/node_modules" "deps/${dep.package.name}/node_modules"

     

       315
       316
        
                 fi

     

       316
       317
        
               '')

     

       317
       318
        
               workspaceDependenciesTransitive;

     

       318
       319
        
       

     

       319
       320
        
           in stdenv.mkDerivation (builtins.removeAttrs attrs ["yarnNix" "pkgConfig" "workspaceDependencies" "packageResolutions"] // {

     

       320
       320
       -
             inherit src version pname;

     

       321
       321
       +
             inherit pname version src;

     

       321
       322
        
       

     

       322
       323
        
             name = baseName;

     

       323
       324
        
       

     
···

       335
       336
        
                 fi

     

       336
       337
        
               done

     

       337
       338
        
       

     

       338
       338
       -
               # move convent of . to ./deps/${pname}

     

       339
       339
       +
               # move convent of . to ./deps/${package.name}

     

       339
       340
        
               mv $PWD $NIX_BUILD_TOP/temp

     

       340
       340
       -
               mkdir -p "$PWD/deps/${pname}"

     

       341
       341
       -
               rm -fd "$PWD/deps/${pname}"

     

       342
       342
       -
               mv $NIX_BUILD_TOP/temp "$PWD/deps/${pname}"

     

       341
       341
       +
               mkdir -p "$PWD/deps/${package.name}"

     

       342
       342
       +
               rm -fd "$PWD/deps/${package.name}"

     

       343
       343
       +
               mv $NIX_BUILD_TOP/temp "$PWD/deps/${package.name}"

     

       343
       344
        
               cd $PWD

     

       344
       345
        
       

     

       345
       345
       -
               ln -s ${deps}/deps/${pname}/node_modules "deps/${pname}/node_modules"

     

       346
       346
       +
               ln -s ${deps}/deps/${package.name}/node_modules "deps/${package.name}/node_modules"

     

       346
       347
        
       

     

       347
       348
        
               cp -r $node_modules node_modules

     

       348
       349
        
               chmod -R +w node_modules

     

       349
       350
        
       

     

       350
       351
        
               ${linkDirFunction}

     

       351
       352
        
       

     

       352
       352
       -
               linkDirToDirLinks "$(dirname node_modules/${pname})"

     

       353
       353
       -
               ln -s "deps/${pname}" "node_modules/${pname}"

     

       353
       353
       +
               linkDirToDirLinks "$(dirname node_modules/${package.name})"

     

       354
       354
       +
               ln -s "deps/${package.name}" "node_modules/${package.name}"

     

       354
       355
        
       

     

       355
       356
        
               ${workspaceDependencyCopy}

     

       356
       357
        
       

     

       357
       358
        
               # Help yarn commands run in other phases find the package

     

       358
       358
       -
               echo "--cwd deps/${pname}" > .yarnrc

     

       359
       359
       +
               echo "--cwd deps/${package.name}" > .yarnrc

     

       359
       360
        
               runHook postConfigure

     

       360
       361
        
             '';

     

       361
       362
        
       

     
···

       364
       365
        
             installPhase = attrs.installPhase or ''

     

       365
       366
        
               runHook preInstall

     

       366
       367
        
       

     

       367
       367
       -
               mkdir -p $out/{bin,libexec/${pname}}

     

       368
       368
       -
               mv node_modules $out/libexec/${pname}/node_modules

     

       369
       369
       -
               mv deps $out/libexec/${pname}/deps

     

       368
       368
       +
               mkdir -p $out/{bin,libexec/${package.name}}

     

       369
       369
       +
               mv node_modules $out/libexec/${package.name}/node_modules

     

       370
       370
       +
               mv deps $out/libexec/${package.name}/deps

     

       370
       371
        
       

     

       371
       371
       -
               node ${./internal/fixup_bin.js} $out/bin $out/libexec/${pname}/node_modules ${lib.concatStringsSep " " publishBinsFor_}

     

       372
       372
       +
               node ${./internal/fixup_bin.js} $out/bin $out/libexec/${package.name}/node_modules ${lib.concatStringsSep " " publishBinsFor_}

     

       372
       373
        
       

     

       373
       374
        
               runHook postInstall

     

       374
       375
        
             '';

     
···

       378
       379
        
             distPhase = attrs.distPhase or ''

     

       379
       380
        
               # pack command ignores cwd option

     

       380
       381
        
               rm -f .yarnrc

     

       381
       381
       -
               cd $out/libexec/${pname}/deps/${pname}

     

       382
       382
       +
               cd $out/libexec/${package.name}/deps/${package.name}

     

       382
       383
        
               mkdir -p $out/tarballs/

     

       383
       384
        
               yarn pack --offline --ignore-scripts --filename $out/tarballs/${baseName}.tgz

     

       384
       385
        
             '';

     

       385
       386
        
       

     

       386
       387
        
             passthru = {

     

       387
       387
       -
               inherit pname package packageJSON deps;

     

       388
       388
       +
               inherit package packageJSON deps;

     

       388
       389
        
               workspaceDependencies = workspaceDependenciesTransitive;

     

       389
       390
        
             } // (attrs.passthru or {});

     

       390
       391
        
       

     
···

       403
       404
        
       

     

       404
       405
        
               mkFilter = { dirsToInclude, filesToInclude, root }: path: type:

     

       405
       406
        
                 let

     

       406
       406
       -
                   inherit (pkgs.lib) any flip elem hasSuffix hasPrefix elemAt splitString;

     

       407
       407
       +
                   inherit (lib) elem elemAt splitString;

     

       407
       408
        
       

     

       408
       409
        
                   subpath = elemAt (splitString "${toString root}/" path) 1;

     

       409
       410
        
                   spdir = elemAt (splitString "/" subpath) 0;

+3

pkgs/games/doom-ports/rbdoom-3-bfg/default.nix

···

       59
       59
        
           "-DUSE_SYSTEM_ZLIB=ON"

     

       60
       60
        
         ];

     

       61
       61
        
       

     

       62
       62
       +
         # it caused build failure

     

       63
       63
       +
         hardeningDisable = [ "fortify3" ];

     

       64
       64
       +
       

     

       62
       65
        
         installPhase = ''

     

       63
       66
        
           runHook preInstall

     

       64
       67

+2 -2

pkgs/games/gemrb/default.nix

···

       27
       27
        
       in

     

       28
       28
        
       stdenv.mkDerivation rec {

     

       29
       29
        
         pname = "gemrb";

     

       30
       30
       -
         version = "0.9.1.1";

     

       30
       30
       +
         version = "0.9.2";

     

       31
       31
        
       

     

       32
       32
        
         src = fetchFromGitHub {

     

       33
       33
        
           owner = "gemrb";

     

       34
       34
        
           repo = "gemrb";

     

       35
       35
        
           rev = "v${version}";

     

       36
       36
       -
           hash = "sha256-pC83LgAy1aQxUhS2qa57hm03B37bj6dcRVRn7SI5I+k=";

     

       36
       36
       +
           hash = "sha256-riea48Jc9zYb19mf5sBunTp5l27PGRFd/B5KdCUWr6Y=";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         buildInputs = [

+3

pkgs/os-specific/linux/intel-compute-runtime/default.nix

···

       35
       35
        
       

     

       36
       36
        
         outputs = [ "out" "drivers" ];

     

       37
       37
        
       

     

       38
       38
       +
         # causes redefinition of _FORTIFY_SOURCE

     

       39
       39
       +
         hardeningDisable = [ "fortify3" ];

     

       40
       40
       +
       

     

       38
       41
        
         postInstall = ''

     

       39
       42
        
           # Avoid clash with intel-ocl

     

       40
       43
        
           mv $out/etc/OpenCL/vendors/intel.icd $out/etc/OpenCL/vendors/intel-neo.icd

+3 -3

pkgs/servers/dendrite/default.nix

···

       3
       3
        
       

     

       4
       4
        
       buildGoModule rec {

     

       5
       5
        
         pname = "matrix-dendrite";

     

       6
       6
       -
         version = "0.12.0";

     

       6
       6
       +
         version = "0.13.1";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "matrix-org";

     

       10
       10
        
           repo = "dendrite";

     

       11
       11
        
           rev = "v${version}";

     

       12
       12
       -
           hash = "sha256-syOLrw4ig8rmFDkxJ9KSAuzUVO8UokekV17mT1bJNNM=";

     

       12
       12
       +
           hash = "sha256-2DqEfTXD3W6MxfBb6aHaKH+zpxLc2tHaGuWGQuncySo=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         vendorHash = "sha256-nvGhKCUiyHSD0VpE4OtT9YQSHxv0d7iwOChCJl2D3zk=";

     

       15
       15
       +
         vendorHash = "sha256-dc0zpKh7J+fi2b5GD/0BQ120UXbBvJLUF74RmYMSOMw=";

     

       16
       16
        
       

     

       17
       17
        
         subPackages = [

     

       18
       18
        
           # The server

+2 -2

pkgs/servers/dns/pdns-recursor/default.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         pname = "pdns-recursor";

     

       8
       8
       -
         version = "4.8.4";

     

       8
       8
       +
         version = "4.9.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";

     

       12
       12
       -
           sha256 = "sha256-8KY/0I4D2oL6INMz6lF50bkln0JkVGz0mVKGZ32UWMc=";

     

       12
       12
       +
           sha256 = "sha256-028WKEPjZ2RqZhp4XKC+zem2hVKFW/QFMq66+hA5ZvM=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ pkg-config ];

+2 -2

pkgs/servers/dns/pdns/default.nix

···

       23
       23
        
       

     

       24
       24
        
       stdenv.mkDerivation (finalAttrs: {

     

       25
       25
        
         pname = "pdns";

     

       26
       26
       -
         version = "4.8.0";

     

       26
       26
       +
         version = "4.8.1";

     

       27
       27
        
       

     

       28
       28
        
         src = fetchurl {

     

       29
       29
        
           url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2";

     

       30
       30
       -
           hash = "sha256-YalruviwykmpIloiVLlEPE/44FDTN0N9ha9N6InhASc=";

     

       30
       30
       +
           hash = "sha256-Zt0+4mVPQrTrgCYPlOy0jjE6gYF/WBJc5IwUwtJuMJ4=";

     

       31
       31
        
         };

     

       32
       32
        
         # redact configure flags from version output to reduce closure size

     

       33
       33
        
         patches = [ ./version.patch ];

+82

pkgs/servers/homepage-dashboard/default.nix

···

       1
       1
       +
       { buildNpmPackage

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , nodePackages

     

       4
       4
       +
       , python3

     

       5
       5
       +
       , lib

     

       6
       6
       +
       , fetchpatch

     

       7
       7
       +
       , makeBinaryWrapper

     

       8
       8
       +
       , nixosTests

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildNpmPackage rec {

     

       12
       12
       +
         pname = "homepage-dashboard";

     

       13
       13
       +
         version = "0.6.21";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "benphelps";

     

       17
       17
       +
           repo = "homepage";

     

       18
       18
       +
           rev = "v${version}";

     

       19
       19
       +
           hash = "sha256-kjxA02hJj/GAQ0fM1xTtXAnZSQgVyE+EMRrXis1Vr+o=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         npmDepsHash = "sha256-O6SQYx5vxscMsbWv0ynUYqdUkOp/nMtdvlZ/Mp95sBY=";

     

       23
       23
       +
       

     

       24
       24
       +
         patches = [

     

       25
       25
       +
           (fetchpatch {

     

       26
       26
       +
             name = "env-config-dir.patch";

     

       27
       27
       +
             url = "https://github.com/benphelps/homepage/commit/ca396ce96bce52f6c06a321f292aa94a66ceeb97.patch";

     

       28
       28
       +
             hash = "sha256-eNnW/ce4ytoKR6jH1Ztc4UTWOmL0uGRdY6nYBIVYM6k=";

     

       29
       29
       +
           })

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         preBuild = ''

     

       33
       33
       +
           mkdir -p config

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       36
       36
       +
         postBuild = ''

     

       37
       37
       +
           # Add a shebang to the server js file, then patch the shebang.

     

       38
       38
       +
           sed -i '1s|^|#!/usr/bin/env node\n|' .next/standalone/server.js

     

       39
       39
       +
           patchShebangs .next/standalone/server.js

     

       40
       40
       +
         '';

     

       41
       41
       +
       

     

       42
       42
       +
         buildInputs = [

     

       43
       43
       +
           nodePackages.node-gyp-build

     

       44
       44
       +
         ];

     

       45
       45
       +
       

     

       46
       46
       +
         env.PYTHON = "${python3}/bin/python";

     

       47
       47
       +
       

     

       48
       48
       +
         installPhase = ''

     

       49
       49
       +
           runHook preInstall

     

       50
       50
       +
       

     

       51
       51
       +
           mkdir -p $out

     

       52
       52
       +
           cp -r .next/standalone $out/bin

     

       53
       53
       +
           cp -r public $out/bin/public

     

       54
       54
       +
       

     

       55
       55
       +
           mkdir -p $out/bin/.next

     

       56
       56
       +
           cp -r .next/static $out/bin/.next/static

     

       57
       57
       +
       

     

       58
       58
       +
           mv $out/bin/server.js $out/bin/homepage

     

       59
       59
       +
           chmod +x $out/bin/homepage

     

       60
       60
       +
       

     

       61
       61
       +
           wrapProgram $out/bin/homepage \

     

       62
       62
       +
             --set-default PORT 3000 \

     

       63
       63
       +
             --set-default HOMEPAGE_CONFIG_DIR /var/lib/homepage-dashboard

     

       64
       64
       +
       

     

       65
       65
       +
           runHook postInstall

     

       66
       66
       +
         '';

     

       67
       67
       +
       

     

       68
       68
       +
         doDist = false;

     

       69
       69
       +
       

     

       70
       70
       +
         passthru.tests = {

     

       71
       71
       +
           inherit (nixosTests) homepage;

     

       72
       72
       +
         };

     

       73
       73
       +
       

     

       74
       74
       +
         meta = {

     

       75
       75
       +
           description = "A highly customisable dashboard with Docker and service API integrations.";

     

       76
       76
       +
           mainProgram = "homepage";

     

       77
       77
       +
           homepage = "https://gethomepage.dev";

     

       78
       78
       +
           license = lib.licenses.gpl3;

     

       79
       79
       +
           maintainers = with lib.maintainers; [ jnsgruk ];

     

       80
       80
       +
           platforms = lib.platforms.all;

     

       81
       81
       +
         };

     

       82
       82
       +
       }

+9

pkgs/servers/web-apps/peering-manager/default.nix

···

       2
       2
        
       , fetchFromGitHub

     

       3
       3
        
       , fetchpatch

     

       4
       4
        
       , nixosTests

     

       5
       5
       +
       , lib

     

       5
       6
        
       

     

       6
       7
        
       , plugins ? ps: []

     

       7
       8
        
       }:

     
···

       92
       93
        
           tests = {

     

       93
       94
        
             inherit (nixosTests) peering-manager;

     

       94
       95
        
           };

     

       96
       96
       +
         };

     

       97
       97
       +
       

     

       98
       98
       +
         meta = with lib; {

     

       99
       99
       +
           homepage = "https://peering-manager.net/";

     

       100
       100
       +
           license = licenses.asl20;

     

       101
       101
       +
           description = "BGP sessions management tool";

     

       102
       102
       +
           maintainers = with maintainers; [ yuka ];

     

       103
       103
       +
           platforms = platforms.linux;

     

       95
       104
        
         };

     

       96
       105
        
       }

+6 -7

pkgs/tools/graphics/astc-encoder/default.nix

···

       16
       16
        
           else if isAarch64 then [ "NEON" ]

     

       17
       17
        
           else [ "NONE" ];

     

       18
       18
        
       

     

       19
       19
       -
         archFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "-DARCH=aarch64" ];

     

       20
       20
       -
       

     

       21
       19
        
         # CMake Build flags for the selected ISAs. For a list of flags, see

     

       22
       20
        
         # https://github.com/ARM-software/astc-encoder/blob/main/Docs/Building.md

     

       23
       23
       -
         isaFlags = map ( isa: "-DISA_${isa}=ON" ) isas;

     

       21
       21
       +
         isaFlags = map ( isa: "-DASTCENC_ISA_${isa}=ON" ) isas;

     

       24
       22
        
       

     

       25
       23
        
         # The suffix of the binary to link as 'astcenc'

     

       26
       24
        
         mainBinary = builtins.replaceStrings

     
···

       31
       29
        
       

     

       32
       30
        
       stdenv.mkDerivation rec {

     

       33
       31
        
         pname = "astc-encoder";

     

       34
       34
       -
         version = "4.4.0";

     

       32
       32
       +
         version = "4.5.0";

     

       35
       33
        
       

     

       36
       34
        
         src = fetchFromGitHub {

     

       37
       35
        
           owner = "ARM-software";

     

       38
       36
        
           repo = "astc-encoder";

     

       39
       37
        
           rev = version;

     

       40
       40
       -
           sha256 = "sha256-pJmMquORG+vN2uLPywAZY1iZTuHB4SdMP/eriAjnyUU=";

     

       38
       38
       +
           sha256 = "sha256-pNoBOp//xa5F6/T1cwtdHsAWLZeIHgxZ7UKaB60fg4M=";

     

       41
       39
        
         };

     

       42
       40
        
       

     

       43
       41
        
         nativeBuildInputs = [ cmake ];

     

       44
       42
        
       

     

       45
       45
       -
         cmakeFlags = isaFlags ++ archFlags ++ [

     

       43
       43
       +
         cmakeFlags = isaFlags ++ [

     

       46
       44
        
           "-DCMAKE_BUILD_TYPE=RelWithDebInfo"

     

       45
       45
       +
           "-DASTCENC_UNIVERSAL_BUILD=OFF"

     

       47
       46
        
         ];

     

       48
       47
        
       

     

       49
       48
        
         # Set a fixed build year to display within help output (otherwise, it would be 1980)

     

       50
       49
        
         postPatch = ''

     

       51
       50
        
           substituteInPlace Source/cmake_core.cmake \

     

       52
       52
       -
             --replace 'string(TIMESTAMP astcencoder_YEAR "%Y")' 'set(astcencoder_YEAR "2022")'

     

       51
       51
       +
             --replace 'string(TIMESTAMP astcencoder_YEAR "%Y")' 'set(astcencoder_YEAR "2023")'

     

       53
       52
        
         '';

     

       54
       53
        
       

     

       55
       54
        
         # Provide 'astcenc' link to main executable

+24

pkgs/tools/misc/invoice/default.nix

···

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
       +
         pname = "invoice";

     

       5
       5
       +
         version = "0.1.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "maaslalani";

     

       9
       9
       +
           repo = "invoice";

     

       10
       10
       +
           rev = "v${version}";

     

       11
       11
       +
           hash = "sha256-WtQ4nF31uIoplY18GZNs41ZOCxmbIu71YpEGk8aTGww=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         vendorHash = "sha256-8VhBflnpsJ5h8S6meDFZKCcS2nz5u4kPE9W710gJG4U=";

     

       15
       15
       +
       

     

       16
       16
       +
         ldflags = [ "-s" "-w" ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with lib; {

     

       19
       19
       +
           description = "Command line invoice generator";

     

       20
       20
       +
           homepage = "https://github.com/maaslalani/invoice";

     

       21
       21
       +
           license = licenses.mit;

     

       22
       22
       +
           maintainers = with maintainers; [ dit7ya ];

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+2 -9

pkgs/tools/misc/rauc/default.nix

···

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
        
         pname = "rauc";

     

       21
       21
       -
         version = "1.9";

     

       21
       21
       +
         version = "1.10";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = pname;

     

       25
       25
        
           repo = pname;

     

       26
       26
        
           rev = "v${version}";

     

       27
       27
       -
           sha256 = "sha256-VpHcJUTRZ5aJyfYypjVsYyRNrK0+9ci42mmlZQSkWAk=";

     

       27
       27
       +
           sha256 = "sha256-WiN2lTS6LCVCeVyX0/2rSDLL2tKsAhWSMa95fK05UOg=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
       -
         patches = [

     

       31
       31
       -
           (fetchpatch {

     

       32
       32
       -
             # Patch to install the man page when using meson, remove on package bump

     

       33
       33
       -
             url = "https://github.com/rauc/rauc/commit/756c677d031c435070a6900e6778d06961822261.patch";

     

       34
       34
       -
             hash = "sha256-QgIUagioRo61PeC0JyKjZtnauFiYP1Fz9wrxGEikBGI=";

     

       35
       35
       -
           })

     

       36
       36
       -
         ];

     

       37
       30
        
         passthru = {

     

       38
       31
        
           updateScript = nix-update-script { };

     

       39
       32
        
         };

+27

pkgs/tools/networking/tunwg/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildGoModule

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildGoModule rec {

     

       7
       7
       +
         pname = "tunwg";

     

       8
       8
       +
         version = "23.06.14+dbfe3aa";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "ntnj";

     

       12
       12
       +
           repo = "tunwg";

     

       13
       13
       +
           rev = "v${version}";

     

       14
       14
       +
           hash = "sha256-w7rx2Q0VXQBETmHROcVWzh0TIEjiITpI5CR9jvtXF7E=";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         vendorHash = "sha256-3vDcCOrhYTHvr8ck0WxZPRUQNsKtEVyUKTD5Epbno6I=";

     

       18
       18
       +
       

     

       19
       19
       +
         ldflags = [ "-s" "-w" ];

     

       20
       20
       +
       

     

       21
       21
       +
         meta = with lib; {

     

       22
       22
       +
           description = "Secure private tunnel to your local servers";

     

       23
       23
       +
           homepage = "https://github.com/ntnj/tunwg";

     

       24
       24
       +
           license = licenses.mit;

     

       25
       25
       +
           maintainers = with maintainers; [ dit7ya ];

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+5 -5

pkgs/tools/security/honeytrap/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       buildGoModule {

     

       6
       6
        
         pname = "honeytrap";

     

       7
       7
       -
         version = "unstable-2020-12-10";

     

       7
       7
       +
         version = "unstable-2021-12-20";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "honeytrap";

     

       11
       11
        
           repo = "honeytrap";

     

       12
       12
       -
           rev = "affd7b21a5aa1b57f086e6871753cb98ce088d76";

     

       13
       13
       -
           sha256 = "y1SWlBFgX3bFoSRGJ45DdC1DoIK5BfO9Vpi2h57wWtU=";

     

       12
       12
       +
           rev = "05965fc67deab17b48e43873abc5f509067ef098";

     

       13
       13
       +
           hash = "sha256-KSVqjHlXl85JaqKiW5R86HCMdtFBwTMJkxFoySOcahs=";

     

       14
       14
        
         };

     

       15
       15
       +
       

     

       16
       16
       +
         vendorHash = "sha256-W8w66weYzCpZ+hmFyK2F6wdFz6aAZ9UxMhccNy1X1R8=";

     

       15
       17
        
       

     

       16
       18
        
         # Otherwise, will try to install a "scripts" binary; it's only used in

     

       17
       19
        
         # dockerize.sh, which we don't care about.

     

       18
       20
        
         subPackages = [ "." ];

     

       19
       19
       -
       

     

       20
       20
       -
         vendorSha256 = "W8w66weYzCpZ+hmFyK2F6wdFz6aAZ9UxMhccNy1X1R8=";

     

       21
       21
        
       

     

       22
       22
        
         meta = with lib; {

     

       23
       23
        
           description = "Advanced Honeypot framework";

+10

pkgs/top-level/all-packages.nix

···

       290
       290
        
       

     

       291
       291
        
         apko = callPackage ../development/tools/apko { };

     

       292
       292
        
       

     

       293
       293
       +
         melange = callPackage ../development/tools/melange { };

     

       294
       294
       +
       

     

       293
       295
        
         appthreat-depscan = callPackage ../development/tools/appthreat-depscan { };

     

       294
       296
        
       

     

       295
       297
        
         activate-linux = callPackage ../applications/misc/activate-linux { };

     
···

       5374
       5376
        
       

     

       5375
       5377
        
         home-manager = callPackage ../tools/package-management/home-manager { };

     

       5376
       5378
        
       

     

       5379
       5379
       +
         homepage-dashboard = callPackage ../servers/homepage-dashboard { };

     

       5380
       5380
       +
       

     

       5377
       5381
        
         hostsblock = callPackage ../tools/misc/hostsblock { };

     

       5378
       5382
        
       

     

       5379
       5383
        
         hottext = callPackage ../tools/text/hottext { };

     
···

       5427
       5431
        
         interactsh = callPackage ../tools/misc/interactsh { };

     

       5428
       5432
        
       

     

       5429
       5433
        
         interlock = callPackage ../servers/interlock { };

     

       5434
       5434
       +
       

     

       5435
       5435
       +
         invoice = callPackage ../tools/misc/invoice { };

     

       5430
       5436
        
       

     

       5431
       5437
        
         invoiceplane = callPackage ../servers/web-apps/invoiceplane { };

     

       5432
       5438
        
       

     
···

       5507
       5513
        
         klog = qt5.callPackage ../applications/radio/klog { };

     

       5508
       5514
        
       

     

       5509
       5515
        
         komga = callPackage ../servers/komga { };

     

       5516
       5516
       +
       

     

       5517
       5517
       +
         komorebi = callPackage ../applications/graphics/komorebi { };

     

       5510
       5518
        
       

     

       5511
       5519
        
         krapslog = callPackage ../tools/misc/krapslog { };

     

       5512
       5520
        
       

     
···

       13568
       13576
        
         tun2socks = callPackage ../tools/networking/tun2socks { };

     

       13569
       13577
        
       

     

       13570
       13578
        
         tuntox = callPackage ../tools/networking/tuntox { };

     

       13579
       13579
       +
       

     

       13580
       13580
       +
         tunwg = callPackage ../tools/networking/tunwg { };

     

       13571
       13581
        
       

     

       13572
       13582
        
         omapd = callPackage ../tools/security/omapd { };

     

       13573
       13583

+2

pkgs/top-level/python-packages.nix

···

       1274
       1274
        
       

     

       1275
       1275
        
         beaker = callPackage ../development/python-modules/beaker { };

     

       1276
       1276
        
       

     

       1277
       1277
       +
         before-after = callPackage ../development/python-modules/before-after { };

     

       1278
       1278
       +
       

     

       1277
       1279
        
         beancount = callPackage ../development/python-modules/beancount { };

     

       1278
       1280
        
       

     

       1279
       1281
        
         beancount-black = callPackage ../development/python-modules/beancount-black { };