commit 66bdae437c82d7c386c0f7ba79a5a9dfa0c0813f · pyrox.dev/nixpkgs

ci/OWNERS

···

       102
        
       /nixos/default.nix                                    @infinisil

     

       103
        
       /nixos/lib/from-env.nix                               @infinisil

     

       104
        
       /nixos/lib/eval-config.nix                            @infinisil

     

       0
        
       
     

       105
        
       /nixos/modules/system/activation/bootspec.nix         @grahamc @cole-h @raitobezarius

     

       106
        
       /nixos/modules/system/activation/bootspec.cue         @grahamc @cole-h @raitobezarius

     

       107

···

       102
        
       /nixos/default.nix                                    @infinisil

     

       103
        
       /nixos/lib/from-env.nix                               @infinisil

     

       104
        
       /nixos/lib/eval-config.nix                            @infinisil

     

       105
       +
       /nixos/modules/misc/ids.nix                           @R-VdP

     

       106
        
       /nixos/modules/system/activation/bootspec.nix         @grahamc @cole-h @raitobezarius

     

       107
        
       /nixos/modules/system/activation/bootspec.cue         @grahamc @cole-h @raitobezarius

     

       108

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

···

       55
        
       

     

       56
        
       - [Bat](https://github.com/sharkdp/bat), a {manpage}`cat(1)` clone with wings. Available as [programs.bat](options.html#opt-programs.bat).

     

       57
        
       

     

       0
        
       
     

       0
        
       
     

       58
        
       - [Whoogle Search](https://github.com/benbusby/whoogle-search), a self-hosted, ad-free, privacy-respecting metasearch engine. Available as [services.whoogle-search](options.html#opt-services.whoogle-search.enable).

     

       59
        
       

     

       60
        
       - [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](options.html#opt-services.agorakit.enable).

···

       55
        
       

     

       56
        
       - [Bat](https://github.com/sharkdp/bat), a {manpage}`cat(1)` clone with wings. Available as [programs.bat](options.html#opt-programs.bat).

     

       57
        
       

     

       58
       +
       - [µStreamer](https://github.com/pikvm/ustreamer), a lightweight MJPEG-HTTP streamer. Available as [services.ustreamer](options.html#opt-services.ustreamer).

     

       59
       +
       

     

       60
        
       - [Whoogle Search](https://github.com/benbusby/whoogle-search), a self-hosted, ad-free, privacy-respecting metasearch engine. Available as [services.whoogle-search](options.html#opt-services.whoogle-search.enable).

     

       61
        
       

     

       62
        
       - [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](options.html#opt-services.agorakit.enable).

+1 -1

nixos/modules/hardware/uinput.nix

···

       11
        
         config = lib.mkIf cfg.enable {

     

       12
        
           boot.kernelModules = [ "uinput" ];

     

       13
        
       

     

       14
       -
           users.groups.uinput.gid = config.ids.gids.uinput;

     

       15
        
       

     

       16
        
           services.udev.extraRules = ''

     

       17
        
             SUBSYSTEM=="misc", KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput"

···

       11
        
         config = lib.mkIf cfg.enable {

     

       12
        
           boot.kernelModules = [ "uinput" ];

     

       13
        
       

     

       14
       +
           users.groups.uinput = { };

     

       15
        
       

     

       16
        
           services.udev.extraRules = ''

     

       17
        
             SUBSYSTEM=="misc", KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput"

+9 -9

nixos/modules/misc/ids.nix

···

       2
        
       # central list to prevent id collisions.

     

       3
        
       

     

       4
        
       # IMPORTANT!

     

       5
       -
       # We only add static uids and gids for services where it is not feasible

     

       6
       -
       # to change uids/gids on service start, for example a service with a lot of

     

       7
       -
       # files. Please also check if the service is applicable for systemd's

     

       8
       -
       # DynamicUser option and does not need a uid/gid allocation at all.

     

       9
       -
       # Systemd can also change ownership of service directories using the

     

       10
       -
       # RuntimeDirectory/StateDirectory options.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11
        
       

     

       12
        
       { lib, ... }:

     

       13
        
       

     
···

       355
        
             rstudio-server = 324;

     

       356
        
             localtimed = 325;

     

       357
        
             automatic-timezoned = 326;

     

       358
       -
             whisparr = 328;

     

       359
        
       

     

       360
        
             # When adding a uid, make sure it doesn't match an existing gid.

     

       361
        
             #

     
···

       683
        
             rstudio-server = 324;

     

       684
        
             localtimed = 325;

     

       685
        
             automatic-timezoned = 326;

     

       686
       -
             uinput = 327;

     

       687
       -
             whisparr = 328;

     

       688
        
       

     

       689
        
             # When adding a gid, make sure it doesn't match an existing

     

       690
        
             # uid. Users and groups with the same name should have equal

···

       2
        
       # central list to prevent id collisions.

     

       3
        
       

     

       4
        
       # IMPORTANT!

     

       5
       +
       #

     

       6
       +
       # https://github.com/NixOS/rfcs/blob/master/rfcs/0052-dynamic-ids.md

     

       7
       +
       #

     

       8
       +
       # Use of static ids is deprecated within NixOS. Dynamic allocation is

     

       9
       +
       # required, barring special circumstacnes. Please check if the service

     

       10
       +
       # is applicable for systemd's DynamicUser option and does not need a

     

       11
       +
       # uid/gid allocation at all.  Systemd can also change ownership of

     

       12
       +
       # service directories using the RuntimeDirectory/StateDirectory

     

       13
       +
       # options.

     

       14
        
       

     

       15
        
       { lib, ... }:

     

       16
        
       

     
···

       358
        
             rstudio-server = 324;

     

       359
        
             localtimed = 325;

     

       360
        
             automatic-timezoned = 326;

     

       0
        
       
     

       361
        
       

     

       362
        
             # When adding a uid, make sure it doesn't match an existing gid.

     

       363
        
             #

     
···

       685
        
             rstudio-server = 324;

     

       686
        
             localtimed = 325;

     

       687
        
             automatic-timezoned = 326;

     

       0
        
       
     

       0
        
       
     

       688
        
       

     

       689
        
             # When adding a gid, make sure it doesn't match an existing

     

       690
        
             # uid. Users and groups with the same name should have equal

nixos/modules/module-list.nix

···

       1417
        
         ./services/video/mirakurun.nix

     

       1418
        
         ./services/video/photonvision.nix

     

       1419
        
         ./services/video/mediamtx.nix

     

       0
        
       
     

       1420
        
         ./services/video/v4l2-relayd.nix

     

       1421
        
         ./services/video/wivrn.nix

     

       1422
        
         ./services/wayland/cage.nix

···

       1417
        
         ./services/video/mirakurun.nix

     

       1418
        
         ./services/video/photonvision.nix

     

       1419
        
         ./services/video/mediamtx.nix

     

       1420
       +
         ./services/video/ustreamer.nix

     

       1421
        
         ./services/video/v4l2-relayd.nix

     

       1422
        
         ./services/video/wivrn.nix

     

       1423
        
         ./services/wayland/cage.nix

+2 -2

nixos/modules/services/misc/whisparr.nix

···

       64
        
             whisparr = {

     

       65
        
               group = cfg.group;

     

       66
        
               home = cfg.dataDir;

     

       67
       -
               uid = config.ids.uids.whisparr;

     

       68
        
             };

     

       69
        
           };

     

       70
        
       

     

       71
       -
           users.groups = lib.mkIf (cfg.group == "whisparr") { whisparr.gid = config.ids.gids.whisparr; };

     

       72
        
         };

     

       73
        
       }

···

       64
        
             whisparr = {

     

       65
        
               group = cfg.group;

     

       66
        
               home = cfg.dataDir;

     

       67
       +
               isSystemUser = true;

     

       68
        
             };

     

       69
        
           };

     

       70
        
       

     

       71
       +
           users.groups.whisparr = lib.mkIf (cfg.group == "whisparr") { };

     

       72
        
         };

     

       73
        
       }

+110

nixos/modules/services/video/ustreamer.nix

···

       1
       +
       {

     

       2
       +
         config,

     

       3
       +
         lib,

     

       4
       +
         pkgs,

     

       5
       +
         utils,

     

       6
       +
         ...

     

       7
       +
       }:

     

       8
       +
       let

     

       9
       +
         inherit (lib)

     

       10
       +
           getExe

     

       11
       +
           mkEnableOption

     

       12
       +
           mkIf

     

       13
       +
           mkOption

     

       14
       +
           mkPackageOption

     

       15
       +
           optionals

     

       16
       +
           types

     

       17
       +
           ;

     

       18
       +
       

     

       19
       +
         cfg = config.services.ustreamer;

     

       20
       +
       in

     

       21
       +
       {

     

       22
       +
         options.services.ustreamer = {

     

       23
       +
           enable = mkEnableOption "µStreamer, a lightweight MJPEG-HTTP streamer";

     

       24
       +
       

     

       25
       +
           package = mkPackageOption pkgs "ustreamer" { };

     

       26
       +
       

     

       27
       +
           autoStart = mkOption {

     

       28
       +
             description = ''

     

       29
       +
               Wether to start µStreamer on boot. Disabling this will use socket

     

       30
       +
               activation. The service will stop gracefully after some inactivity.

     

       31
       +
               Disabling this will set `--exit-on-no-clients=300`

     

       32
       +
             '';

     

       33
       +
             type = types.bool;

     

       34
       +
             default = true;

     

       35
       +
             example = false;

     

       36
       +
           };

     

       37
       +
       

     

       38
       +
           listenAddress = mkOption {

     

       39
       +
             description = ''

     

       40
       +
               Address to expose the HTTP server. This accepts values for

     

       41
       +
               ListenStream= defined in {manpage}`systemd.socket(5)`

     

       42
       +
             '';

     

       43
       +
             type = types.str;

     

       44
       +
             default = "0.0.0.0:8080";

     

       45
       +
             example = "/run/ustreamer.sock";

     

       46
       +
           };

     

       47
       +
       

     

       48
       +
           device = mkOption {

     

       49
       +
             description = ''

     

       50
       +
               The v4l2 device to stream.

     

       51
       +
             '';

     

       52
       +
             type = types.path;

     

       53
       +
             default = "/dev/video0";

     

       54
       +
             example = "/dev/v4l/by-id/usb-0000_Dummy_abcdef-video-index0";

     

       55
       +
           };

     

       56
       +
       

     

       57
       +
           extraArgs = mkOption {

     

       58
       +
             description = ''

     

       59
       +
               Extra arguments to pass to `ustreamer`. See {manpage}`ustreamer(1)`

     

       60
       +
             '';

     

       61
       +
             type = with types; listOf str;

     

       62
       +
             default = [ ];

     

       63
       +
             example = [ "--resolution=1920x1080" ];

     

       64
       +
           };

     

       65
       +
         };

     

       66
       +
       

     

       67
       +
         config = mkIf cfg.enable {

     

       68
       +
           services.ustreamer.extraArgs =

     

       69
       +
             [

     

       70
       +
               "--device=${cfg.device}"

     

       71
       +
             ]

     

       72
       +
             ++ optionals (!cfg.autoStart) [

     

       73
       +
               "--exit-on-no-clients=300"

     

       74
       +
             ];

     

       75
       +
       

     

       76
       +
           systemd.services."ustreamer" = {

     

       77
       +
             description = "µStreamer, a lightweight MJPEG-HTTP streamer";

     

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

     

       79
       +
             requires = [ "ustreamer.socket" ];

     

       80
       +
             wantedBy = mkIf cfg.autoStart [ "multi-user.target" ];

     

       81
       +
             serviceConfig = {

     

       82
       +
               ExecStart = utils.escapeSystemdExecArgs (

     

       83
       +
                 [

     

       84
       +
                   (getExe cfg.package)

     

       85
       +
                   "--systemd"

     

       86
       +
                 ]

     

       87
       +
                 ++ cfg.extraArgs

     

       88
       +
               );

     

       89
       +
               Restart = if cfg.autoStart then "always" else "on-failure";

     

       90
       +
       

     

       91
       +
               DynamicUser = true;

     

       92
       +
               SupplementaryGroups = [ "video" ];

     

       93
       +
       

     

       94
       +
               NoNewPrivileges = true;

     

       95
       +
               ProcSubset = "pid";

     

       96
       +
               ProtectProc = "noaccess";

     

       97
       +
               ProtectClock = "yes";

     

       98
       +
               DeviceAllow = [ cfg.device ];

     

       99
       +
             };

     

       100
       +
           };

     

       101
       +
       

     

       102
       +
           systemd.sockets."ustreamer" = {

     

       103
       +
             wantedBy = [ "sockets.target" ];

     

       104
       +
             partOf = [ "ustreamer.service" ];

     

       105
       +
             socketConfig = {

     

       106
       +
               ListenStream = cfg.listenAddress;

     

       107
       +
             };

     

       108
       +
           };

     

       109
       +
         };

     

       110
       +
       }

+18 -21

nixos/modules/virtualisation/podman/default.nix

···

       5
        
       

     

       6
        
         inherit (lib) mkOption types;

     

       7
        
       

     

       8
       -
         podmanPackage = pkgs.podman.override {

     

       9
       -
           extraPackages = cfg.extraPackages ++ [

     

       10
       -
               "/run/wrappers" # setuid shadow

     

       11
       -
               config.systemd.package # To allow systemd-based container healthchecks

     

       12
       -
             ] ++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package;

     

       13
       -
           extraRuntimes = [ pkgs.runc ]

     

       14
       -
             ++ lib.optionals (config.virtualisation.containers.containersConf.settings.network.default_rootless_network_cmd or "" == "slirp4netns") (with pkgs; [

     

       15
       -
             slirp4netns

     

       16
       -
           ]);

     

       17
       -
         };

     

       18
       -
       

     

       19
        
         # Provides a fake "docker" binary mapping to podman

     

       20
       -
         dockerCompat = pkgs.runCommand "${podmanPackage.pname}-docker-compat-${podmanPackage.version}"

     

       21
        
           {

     

       22
        
             outputs = [ "out" "man" ];

     

       23
       -
             inherit (podmanPackage) meta;

     

       24
        
             preferLocalBuild = true;

     

       25
        
           } ''

     

       26
        
           mkdir -p $out/bin

     

       27
       -
           ln -s ${podmanPackage}/bin/podman $out/bin/docker

     

       28
        
       

     

       29
        
           mkdir -p $man/share/man/man1

     

       30
       -
           for f in ${podmanPackage.man}/share/man/man1/*; do

     

       31
        
             basename=$(basename $f | sed s/podman/docker/g)

     

       32
        
             ln -s $f $man/share/man/man1/$basename

     

       33
        
           done

     
···

       137
        
             };

     

       138
        
           };

     

       139
        
       

     

       140
       -
           package = lib.mkOption {

     

       141
       -
             type = types.package;

     

       142
       -
             default = podmanPackage;

     

       143
       -
             internal = true;

     

       144
       -
             description = ''

     

       145
       -
               The final Podman package (including extra packages).

     

       146
        
             '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       147
        
           };

     

       148
        
       

     

       149
        
           defaultNetwork.settings = lib.mkOption {

···

       5
        
       

     

       6
        
         inherit (lib) mkOption types;

     

       7
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8
        
         # Provides a fake "docker" binary mapping to podman

     

       9
       +
         dockerCompat = pkgs.runCommand "${cfg.package.pname}-docker-compat-${cfg.package.version}"

     

       10
        
           {

     

       11
        
             outputs = [ "out" "man" ];

     

       12
       +
             inherit (cfg.package) meta;

     

       13
        
             preferLocalBuild = true;

     

       14
        
           } ''

     

       15
        
           mkdir -p $out/bin

     

       16
       +
           ln -s ${cfg.package}/bin/podman $out/bin/docker

     

       17
        
       

     

       18
        
           mkdir -p $man/share/man/man1

     

       19
       +
           for f in ${cfg.package.man}/share/man/man1/*; do

     

       20
        
             basename=$(basename $f | sed s/podman/docker/g)

     

       21
        
             ln -s $f $man/share/man/man1/$basename

     

       22
        
           done

     
···

       126
        
             };

     

       127
        
           };

     

       128
        
       

     

       129
       +
           package = (lib.mkPackageOption pkgs "podman" {

     

       130
       +
             extraDescription = ''

     

       131
       +
               This package will automatically include extra packages and runtimes.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       132
        
             '';

     

       133
       +
           }) // {

     

       134
       +
             apply = pkg: pkg.override {

     

       135
       +
               extraPackages = cfg.extraPackages ++ [

     

       136
       +
                   "/run/wrappers" # setuid shadow

     

       137
       +
                   config.systemd.package # To allow systemd-based container healthchecks

     

       138
       +
                 ] ++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package;

     

       139
       +
               extraRuntimes = [ pkgs.runc ]

     

       140
       +
                 ++ lib.optionals (config.virtualisation.containers.containersConf.settings.network.default_rootless_network_cmd or "" == "slirp4netns") (with pkgs; [

     

       141
       +
                 slirp4netns

     

       142
       +
               ]);

     

       143
       +
             };

     

       144
        
           };

     

       145
        
       

     

       146
        
           defaultNetwork.settings = lib.mkOption {

+8 -17

nixos/tests/ustreamer.nix

···

       46
        
                 '';

     

       47
        
               in

     

       48
        
               {

     

       49
       -
                 environment.systemPackages = [ pkgs.ustreamer ];

     

       50
       -
                 networking.firewall.enable = false;

     

       51
       -
                 systemd.services.ustreamer = {

     

       52
       -
                   description = "ustreamer service";

     

       53
       -
                   wantedBy = [ "multi-user.target" ];

     

       54
       -
                   serviceConfig = {

     

       55
       -
                     DynamicUser = true;

     

       56
       -
                     ExecStart = "${pkgs.ustreamer}/bin/ustreamer --host=0.0.0.0 --port 8000 --device /dev/video9 --device-timeout=8";

     

       57
       -
                     PrivateTmp = true;

     

       58
       -
                     BindReadOnlyPaths = "/dev/video9";

     

       59
       -
                     SupplementaryGroups = [

     

       60
       -
                       "video"

     

       61
       -
                     ];

     

       62
       -
                     Restart = "always";

     

       63
       -
                   };

     

       64
        
                 };

     

       0
        
       
     

       0
        
       
     

       65
        
                 boot.extraModulePackages = [ config.boot.kernelPackages.akvcam ];

     

       66
        
                 boot.kernelModules = [ "akvcam" ];

     

       67
        
                 boot.extraModprobeConfig = ''

     
···

       74
        
             start_all()

     

       75
        
       

     

       76
        
             camera.wait_for_unit("ustreamer.service")

     

       77
       -
             camera.wait_for_open_port(8000)

     

       78
        
       

     

       79
        
             client.wait_for_unit("multi-user.target")

     

       80
       -
             client.succeed("curl http://camera:8000")

     

       81
        
           '';

     

       82
        
         }

     

       83
        
       )

···

       46
        
                 '';

     

       47
        
               in

     

       48
        
               {

     

       49
       +
                 services.ustreamer = {

     

       50
       +
                   enable = true;

     

       51
       +
                   device = "/dev/video9";

     

       52
       +
                   extraArgs = [ "--device-timeout=8" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       53
        
                 };

     

       54
       +
                 networking.firewall.allowedTCPPorts = [ 8080 ];

     

       55
       +
       

     

       56
        
                 boot.extraModulePackages = [ config.boot.kernelPackages.akvcam ];

     

       57
        
                 boot.kernelModules = [ "akvcam" ];

     

       58
        
                 boot.extraModprobeConfig = ''

     
···

       65
        
             start_all()

     

       66
        
       

     

       67
        
             camera.wait_for_unit("ustreamer.service")

     

       68
       +
             camera.wait_for_open_port(8080)

     

       69
        
       

     

       70
        
             client.wait_for_unit("multi-user.target")

     

       71
       +
             client.succeed("curl http://camera:8080")

     

       72
        
           '';

     

       73
        
         }

     

       74
        
       )

+6 -6

pkgs/applications/editors/vim/plugins/overrides.nix

···

       1381
        
           dependencies = [ self.vim-floaterm ];

     

       1382
        
         };

     

       1383
        
       

     

       1384
       -
         lightline-bufferline = super.lightline-bufferline.overrideAttrs {

     

       1385
        
           # Requires web-devicons but mini.icons can mock them up

     

       1386
       -
           nativeCheckInputs = [ self.nvim-web-devicons ];

     

       1387
       -
         };

     

       1388
        
       

     

       1389
        
         lir-nvim = super.lir-nvim.overrideAttrs {

     

       1390
        
           dependencies = [ self.plenary-nvim ];

     
···

       2118
        
           ];

     

       2119
        
         };

     

       2120
        
       

     

       2121
       -
         nvim-nonicons = super.nvim-nonicons.overrideAttrs {

     

       2122
        
           # Requires web-devicons but mini.icons can mock them up

     

       2123
       -
           nativeCheckInputs = [ self.nvim-web-devicons ];

     

       2124
       -
         };

     

       2125
        
       

     

       2126
        
         nvim-nu = super.nvim-nu.overrideAttrs {

     

       2127
        
           dependencies = with self; [

···

       1381
        
           dependencies = [ self.vim-floaterm ];

     

       1382
        
         };

     

       1383
        
       

     

       1384
       +
         lightline-bufferline = super.lightline-bufferline.overrideAttrs (oa: {

     

       1385
        
           # Requires web-devicons but mini.icons can mock them up

     

       1386
       +
           nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-web-devicons ];

     

       1387
       +
         });

     

       1388
        
       

     

       1389
        
         lir-nvim = super.lir-nvim.overrideAttrs {

     

       1390
        
           dependencies = [ self.plenary-nvim ];

     
···

       2118
        
           ];

     

       2119
        
         };

     

       2120
        
       

     

       2121
       +
         nvim-nonicons = super.nvim-nonicons.overrideAttrs (oa: {

     

       2122
        
           # Requires web-devicons but mini.icons can mock them up

     

       2123
       +
           nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-web-devicons ];

     

       2124
       +
         });

     

       2125
        
       

     

       2126
        
         nvim-nu = super.nvim-nu.overrideAttrs {

     

       2127
        
           dependencies = with self; [

+9 -8

pkgs/applications/networking/gns3/default.nix

···

       12
        
       {

     

       13
        
         guiStable = mkGui {

     

       14
        
           channel = "stable";

     

       15
       -
           version = "2.2.50";

     

       16
       -
           hash = "sha256-A6aLp/fN/0u5VIOX6d0QrZ2zWuNPvhI1xfw7cKU9jRA=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         guiPreview = mkGui {

     

       20
        
           channel = "stable";

     

       21
       -
           version = "2.2.50";

     

       22
       -
           hash = "sha256-A6aLp/fN/0u5VIOX6d0QrZ2zWuNPvhI1xfw7cKU9jRA=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         serverStable = mkServer {

     

       26
        
           channel = "stable";

     

       27
       -
           version = "2.2.50";

     

       28
       -
           hash = "sha256-m5Od3IPn31JaFOtilKh79aISH4lRd+KatSLRqsF8n4Y=";

     

       29
        
         };

     

       30
        
       

     

       31
        
         serverPreview = mkServer {

     

       32
        
           channel = "stable";

     

       33
       -
           version = "2.2.50";

     

       34
       -
           hash = "sha256-m5Od3IPn31JaFOtilKh79aISH4lRd+KatSLRqsF8n4Y=";

     

       35
        
         };

     

       36
        
       }

     

       0

···

       12
        
       {

     

       13
        
         guiStable = mkGui {

     

       14
        
           channel = "stable";

     

       15
       +
           version = "2.2.51";

     

       16
       +
           hash = "sha256-HXuhaJEcr33qYm2v/wFqnO7Ba4lyZgSzvh6dkNZX9XI=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         guiPreview = mkGui {

     

       20
        
           channel = "stable";

     

       21
       +
           version = "2.2.51";

     

       22
       +
           hash = "sha256-HXuhaJEcr33qYm2v/wFqnO7Ba4lyZgSzvh6dkNZX9XI=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         serverStable = mkServer {

     

       26
        
           channel = "stable";

     

       27
       +
           version = "2.2.51";

     

       28
       +
           hash = "sha256-Yw6RvHZzVU2wWXVxvuIu7GLFyqjakwqJ0EV6H0ZdVcQ=";

     

       29
        
         };

     

       30
        
       

     

       31
        
         serverPreview = mkServer {

     

       32
        
           channel = "stable";

     

       33
       +
           version = "2.2.51";

     

       34
       +
           hash = "sha256-Yw6RvHZzVU2wWXVxvuIu7GLFyqjakwqJ0EV6H0ZdVcQ=";

     

       35
        
         };

     

       36
        
       }

     

       37
       +

+1 -11

pkgs/applications/virtualization/qemu/default.nix

···

       56
        
       

     

       57
        
       let

     

       58
        
         hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets;

     

       59
       -
       

     

       60
       -
         buildPlatformStdenv =

     

       61
       -
           if stdenv.buildPlatform.isDarwin then

     

       62
       -
             overrideSDK buildPackages.stdenv {

     

       63
       -
               # Keep these values in sync with `all-packages.nix`.

     

       64
       -
               darwinSdkVersion = "12.3";

     

       65
       -
               darwinMinVersion = "12.0";

     

       66
       -
             }

     

       67
       -
           else

     

       68
       -
             buildPackages.stdenv;

     

       69
        
       in

     

       70
        
       

     

       71
        
       stdenv.mkDerivation (finalAttrs: {

     
···

       82
        
           hash = "sha256-+FnwvGXh9TPQQLvoySvP7O5a8skhpmh8ZS+0TQib2JQ=";

     

       83
        
         };

     

       84
        
       

     

       85
       -
         depsBuildBuild = [ buildPlatformStdenv.cc ]

     

       86
        
           ++ lib.optionals hexagonSupport [ pkg-config ];

     

       87
        
       

     

       88
        
         nativeBuildInputs = [

···

       56
        
       

     

       57
        
       let

     

       58
        
         hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       59
        
       in

     

       60
        
       

     

       61
        
       stdenv.mkDerivation (finalAttrs: {

     
···

       72
        
           hash = "sha256-+FnwvGXh9TPQQLvoySvP7O5a8skhpmh8ZS+0TQib2JQ=";

     

       73
        
         };

     

       74
        
       

     

       75
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ]

     

       76
        
           ++ lib.optionals hexagonSupport [ pkg-config ];

     

       77
        
       

     

       78
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/ac/acpica-tools/package.nix

···

       9
        
       

     

       10
        
       stdenv.mkDerivation (finalAttrs: {

     

       11
        
         pname = "acpica-tools";

     

       12
       -
         version = "R09_27_24";

     

       13
        
       

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           owner = "acpica";

     

       16
        
           repo = "acpica";

     

       17
        
           rev = "refs/tags/${finalAttrs.version}";

     

       18
       -
           hash = "sha256-kjdSCGa/2mmODX0gsY9JzSx9PJqYoKjtJTn8y4uduIQ=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         nativeBuildInputs = [

···

       9
        
       

     

       10
        
       stdenv.mkDerivation (finalAttrs: {

     

       11
        
         pname = "acpica-tools";

     

       12
       +
         version = "R2024_12_12";

     

       13
        
       

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           owner = "acpica";

     

       16
        
           repo = "acpica";

     

       17
        
           rev = "refs/tags/${finalAttrs.version}";

     

       18
       +
           hash = "sha256-vxiWYUAEk54F1M0WrrMTHZ4DNJxxT/GaXetd5LjE808=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         nativeBuildInputs = [

+37

pkgs/by-name/ep/epsonscan2/gcc14.patch

···

       1
       +
       diff --git a/thirdparty/zlib/gzlib.c b/thirdparty/zlib/gzlib.c

     

       2
       +
       index 4105e6a..eae3a38 100644

     

       3
       +
       --- a/thirdparty/zlib/gzlib.c

     

       4
       +
       +++ b/thirdparty/zlib/gzlib.c

     

       5
       +
       @@ -3,6 +3,7 @@

     

       6
       +
         * For conditions of distribution and use, see copyright notice in zlib.h

     

       7
       +
         */

     

       8
       +
        

     

       9
       +
       +#include <unistd.h>

     

       10
       +
        #include "gzguts.h"

     

       11
       +
        

     

       12
       +
        #if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)

     

       13
       +
       diff --git a/thirdparty/zlib/gzread.c b/thirdparty/zlib/gzread.c

     

       14
       +
       index 956b91e..66089b6 100644

     

       15
       +
       --- a/thirdparty/zlib/gzread.c

     

       16
       +
       +++ b/thirdparty/zlib/gzread.c

     

       17
       +
       @@ -3,6 +3,7 @@

     

       18
       +
         * For conditions of distribution and use, see copyright notice in zlib.h

     

       19
       +
         */

     

       20
       +
        

     

       21
       +
       +#include <unistd.h>

     

       22
       +
        #include "gzguts.h"

     

       23
       +
        

     

       24
       +
        /* Local functions */

     

       25
       +
       diff --git a/thirdparty/zlib/gzwrite.c b/thirdparty/zlib/gzwrite.c

     

       26
       +
       index c7b5651..e685f3e 100644

     

       27
       +
       --- a/thirdparty/zlib/gzwrite.c

     

       28
       +
       +++ b/thirdparty/zlib/gzwrite.c

     

       29
       +
       @@ -3,6 +3,7 @@

     

       30
       +
         * For conditions of distribution and use, see copyright notice in zlib.h

     

       31
       +
         */

     

       32
       +
        

     

       33
       +
       +#include <unistd.h>

     

       34
       +
        #include "gzguts.h"

     

       35
       +
        

     

       36
       +
        /* Local functions */

     

       37
       +

+30

pkgs/by-name/jw/jwtinfo/package.nix

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         rustPlatform,

     

       4
       +
         fetchFromGitHub,

     

       5
       +
       }:

     

       6
       +
       let

     

       7
       +
         pname = "jwtinfo";

     

       8
       +
         version = "0.4.4";

     

       9
       +
       in

     

       10
       +
       rustPlatform.buildRustPackage {

     

       11
       +
         inherit pname version;

     

       12
       +
       

     

       13
       +
         src = fetchFromGitHub {

     

       14
       +
           owner = "lmammino";

     

       15
       +
           repo = "jwtinfo";

     

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

     

       17
       +
           hash = "sha256-FDN9K7KnMro2BluHB7I0HTDdT9YXxi8UcOoBhKx/5dA=";

     

       18
       +
         };

     

       19
       +
       

     

       20
       +
         cargoHash = "sha256-iGvwuLiF8yGb4IxBxGH0M79SlNqZ5lpsXTNiVT7VGrU=";

     

       21
       +
       

     

       22
       +
         meta = {

     

       23
       +
           description = "Command-line tool to get information about JWTs";

     

       24
       +
           homepage = "https://github.com/lmammino/jwtinfo";

     

       25
       +
           changelog = "https://github.com/lmammino/jwtinfo/releases/tag/v${version}";

     

       26
       +
           license = lib.licenses.mit;

     

       27
       +
           maintainers = with lib.maintainers; [ luftmensch-luftmensch ];

     

       28
       +
           mainProgram = "jwtinfo";

     

       29
       +
         };

     

       30
       +
       }

+3 -3

pkgs/by-name/mi/mise/package.nix

···

       20
        
       

     

       21
        
       rustPlatform.buildRustPackage rec {

     

       22
        
         pname = "mise";

     

       23
       -
         version = "2024.12.6";

     

       24
        
       

     

       25
        
         src = fetchFromGitHub {

     

       26
        
           owner = "jdx";

     

       27
        
           repo = "mise";

     

       28
        
           rev = "v${version}";

     

       29
       -
           hash = "sha256-VAevON40XWME9L4dHCuatg0ngzNBnhMUy9OAXPdJJdk=";

     

       30
        
         };

     

       31
        
       

     

       32
       -
         cargoHash = "sha256-fmvQNmMk6QMsPRUwLnqSNuJikH0QMNjA088Kb7TzUZ4=";

     

       33
        
       

     

       34
        
         nativeBuildInputs = [

     

       35
        
           installShellFiles

···

       20
        
       

     

       21
        
       rustPlatform.buildRustPackage rec {

     

       22
        
         pname = "mise";

     

       23
       +
         version = "2024.12.17";

     

       24
        
       

     

       25
        
         src = fetchFromGitHub {

     

       26
        
           owner = "jdx";

     

       27
        
           repo = "mise";

     

       28
        
           rev = "v${version}";

     

       29
       +
           hash = "sha256-kdI7GEtUlVUJYN7ch8RjG1aWBMDkvLkdUGfyqWv4yAQ=";

     

       30
        
         };

     

       31
        
       

     

       32
       +
         cargoHash = "sha256-7ORbX2rWZ4tuf7qQo5lwTpHGFNCpo8R5ywJDdBjZcMU=";

     

       33
        
       

     

       34
        
         nativeBuildInputs = [

     

       35
        
           installShellFiles

+3 -3

pkgs/by-name/n8/n8n/package.nix

···

       18
        
       

     

       19
        
       stdenv.mkDerivation (finalAttrs: {

     

       20
        
         pname = "n8n";

     

       21
       -
         version = "1.70.1";

     

       22
        
       

     

       23
        
         src = fetchFromGitHub {

     

       24
        
           owner = "n8n-io";

     

       25
        
           repo = "n8n";

     

       26
        
           rev = "n8n@${finalAttrs.version}";

     

       27
       -
           hash = "sha256-acbC6MO2wM9NsjqUqcs8jPNHfBg/P0wEYF5MxbnFhQQ=";

     

       28
        
         };

     

       29
        
       

     

       30
        
         pnpmDeps = pnpm.fetchDeps {

     

       31
        
           inherit (finalAttrs) pname version src;

     

       32
       -
           hash = "sha256-h2hIOVK9H5OlyhyyoRs113CbE4z4SIxVVPha0Ia9I4A=";

     

       33
        
         };

     

       34
        
       

     

       35
        
         nativeBuildInputs = [

···

       18
        
       

     

       19
        
       stdenv.mkDerivation (finalAttrs: {

     

       20
        
         pname = "n8n";

     

       21
       +
         version = "1.72.1";

     

       22
        
       

     

       23
        
         src = fetchFromGitHub {

     

       24
        
           owner = "n8n-io";

     

       25
        
           repo = "n8n";

     

       26
        
           rev = "n8n@${finalAttrs.version}";

     

       27
       +
           hash = "sha256-GIA2y81nuKWe1zuZQ99oczQtQWStyT1Qh3bZ1oe8me4=";

     

       28
        
         };

     

       29
        
       

     

       30
        
         pnpmDeps = pnpm.fetchDeps {

     

       31
        
           inherit (finalAttrs) pname version src;

     

       32
       +
           hash = "sha256-riuN7o+uUXS5G7fMgE7cZhGWHZtGwSHm4CP7G46R5Cw=";

     

       33
        
         };

     

       34
        
       

     

       35
        
         nativeBuildInputs = [

+26 -10

pkgs/by-name/pf/pfetch/package.nix

···

       1
        
       {

     

       2
       -
         stdenvNoCC,

     

       3
        
         lib,

     

       0
        
       
     

       4
        
         fetchFromGitHub,

     

       0
        
       
     

       0
        
       
     

       5
        
       }:

     

       6
        
       

     

       7
        
       stdenvNoCC.mkDerivation rec {

     

       8
        
         pname = "pfetch";

     

       9
       -
         version = "0.6.0";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
       -
           owner = "dylanaraps";

     

       13
        
           repo = "pfetch";

     

       14
       -
           rev = version;

     

       15
       -
           sha256 = "06z0k1naw3k052p2z7241lx92rp5m07zlr0alx8pdm6mkc3c4v8f";

     

       16
        
         };

     

       17
        
       

     

       18
        
         dontBuild = true;

     
···

       21
        
           install -Dm755 -t $out/bin pfetch

     

       22
        
         '';

     

       23
        
       

     

       24
       -
         meta = with lib; {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       25
        
           description = "Pretty system information tool written in POSIX sh";

     

       26
       -
           homepage = "https://github.com/dylanaraps/pfetch";

     

       27
       -
           license = licenses.mit;

     

       28
       -
           platforms = platforms.all;

     

       29
       -
           maintainers = with maintainers; [ equirosa ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       30
        
           mainProgram = "pfetch";

     

       31
        
         };

     

       32
        
       }

···

       1
        
       {

     

       0
        
       
     

       2
        
         lib,

     

       3
       +
         stdenvNoCC,

     

       4
        
         fetchFromGitHub,

     

       5
       +
         gitUpdater,

     

       6
       +
         versionCheckHook,

     

       7
        
       }:

     

       8
        
       

     

       9
        
       stdenvNoCC.mkDerivation rec {

     

       10
        
         pname = "pfetch";

     

       11
       +
         version = "1.7.0";

     

       12
        
       

     

       13
        
         src = fetchFromGitHub {

     

       14
       +
           owner = "Un1q32";

     

       15
        
           repo = "pfetch";

     

       16
       +
           tag = version;

     

       17
       +
           hash = "sha256-omI1Y1UKxSkg1QUd/GHHuGBwxfNOtxqYpzPbJdG7j3A=";

     

       18
        
         };

     

       19
        
       

     

       20
        
         dontBuild = true;

     
···

       23
        
           install -Dm755 -t $out/bin pfetch

     

       24
        
         '';

     

       25
        
       

     

       26
       +
         nativeInstallCheckInputs = [

     

       27
       +
           versionCheckHook

     

       28
       +
         ];

     

       29
       +
         versionCheckProgramArg = [ "--version" ];

     

       30
       +
         doInstallCheck = true;

     

       31
       +
       

     

       32
       +
         passthru = {

     

       33
       +
           updateScript = gitUpdater { };

     

       34
       +
         };

     

       35
       +
       

     

       36
       +
         meta = {

     

       37
        
           description = "Pretty system information tool written in POSIX sh";

     

       38
       +
           homepage = "https://github.com/Un1q32/pfetch";

     

       39
       +
           changelog = "https://github.com/Un1q32/pfetch/releases/tag/${version}";

     

       40
       +
           license = lib.licenses.mit;

     

       41
       +
           platforms = lib.platforms.all;

     

       42
       +
           maintainers = with lib.maintainers; [

     

       43
       +
             equirosa

     

       44
       +
             phanirithvij

     

       45
       +
           ];

     

       46
        
           mainProgram = "pfetch";

     

       47
        
         };

     

       48
        
       }

+10

pkgs/by-name/po/podman/package.nix

···

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
        
         fetchFromGitHub,

     

       0
        
       
     

       5
        
         pkg-config,

     

       6
        
         installShellFiles,

     

       7
        
         buildGoModule,

     
···

       91
        
       

     

       92
        
           # we intentionally don't build and install the helper so we shouldn't display messages to users about it

     

       93
        
           ./rm-podman-mac-helper-msg.patch

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       94
        
         ];

     

       95
        
       

     

       96
        
         vendorHash = null;

···

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
        
         fetchFromGitHub,

     

       5
       +
         fetchpatch2,

     

       6
        
         pkg-config,

     

       7
        
         installShellFiles,

     

       8
        
         buildGoModule,

     
···

       92
        
       

     

       93
        
           # we intentionally don't build and install the helper so we shouldn't display messages to users about it

     

       94
        
           ./rm-podman-mac-helper-msg.patch

     

       95
       +
       

     

       96
       +
           # backport of fix for https://github.com/containers/storage/issues/2184

     

       97
       +
           # https://github.com/containers/storage/pull/2185

     

       98
       +
           (fetchpatch2 {

     

       99
       +
             url = "https://github.com/containers/storage/commit/99b0d2d423c8093807d8a1464437152cd04d7d95.diff?full_index=1";

     

       100
       +
             hash = "sha256-aahYXnDf3qCOlb6MfVDqFKCcQG257r5sbh5qnL0T40I=";

     

       101
       +
             stripLen = 1;

     

       102
       +
             extraPrefix = "vendor/github.com/containers/storage/";

     

       103
       +
           })

     

       104
        
         ];

     

       105
        
       

     

       106
        
         vendorHash = null;

+3 -3

pkgs/by-name/re/renode-dts2repl/package.nix

···

       7
        
       

     

       8
        
       python3.pkgs.buildPythonApplication {

     

       9
        
         pname = "renode-dts2repl";

     

       10
       -
         version = "0-unstable-2024-12-12";

     

       11
        
         pyproject = true;

     

       12
        
       

     

       13
        
         src = fetchFromGitHub {

     

       14
        
           owner = "antmicro";

     

       15
        
           repo = "dts2repl";

     

       16
       -
           rev = "7030a464003fedd3960f3a9d7810dc9c27d8f11a";

     

       17
       -
           hash = "sha256-saRVU7PPrceoro/vYNRDpfdmghDCWQn2CAukHT5aQcc=";

     

       18
        
         };

     

       19
        
       

     

       20
        
         nativeBuildInputs = [

···

       7
        
       

     

       8
        
       python3.pkgs.buildPythonApplication {

     

       9
        
         pname = "renode-dts2repl";

     

       10
       +
         version = "0-unstable-2024-12-20";

     

       11
        
         pyproject = true;

     

       12
        
       

     

       13
        
         src = fetchFromGitHub {

     

       14
        
           owner = "antmicro";

     

       15
        
           repo = "dts2repl";

     

       16
       +
           rev = "323cc41b6864e53cb1b99bf909c779b739a8fccb";

     

       17
       +
           hash = "sha256-CYgQ5CMVkHqOEPPaG74GVNhm8pa6ZpAtt54JrrDn+2M=";

     

       18
        
         };

     

       19
        
       

     

       20
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/rm/rmpc/package.nix

···

       9
        
       

     

       10
        
       rustPlatform.buildRustPackage rec {

     

       11
        
         pname = "rmpc";

     

       12
       -
         version = "0.6.0";

     

       13
        
       

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           owner = "mierak";

     

       16
        
           repo = "rmpc";

     

       17
        
           rev = "v${version}";

     

       18
       -
           hash = "sha256-hQhcNeGNxUxJ9hO/ukmt6V8V8zQHQLvejeu692pKTwg=";

     

       19
        
         };

     

       20
        
       

     

       21
       -
         cargoHash = "sha256-Y+NmBAcp6lu1dmMo1Gpozmm/YvNYM7mUAvU2C7iO0ew=";

     

       22
        
       

     

       23
        
         nativeBuildInputs = [

     

       24
        
           installShellFiles

···

       9
        
       

     

       10
        
       rustPlatform.buildRustPackage rec {

     

       11
        
         pname = "rmpc";

     

       12
       +
         version = "0.7.0";

     

       13
        
       

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           owner = "mierak";

     

       16
        
           repo = "rmpc";

     

       17
        
           rev = "v${version}";

     

       18
       +
           hash = "sha256-IgkYUl1ccwzFgooqZGxmpJFzACEz3wmblostPsTnzSQ=";

     

       19
        
         };

     

       20
        
       

     

       21
       +
         cargoHash = "sha256-dNmHgPjZL+33kgA04+KQj42LrSXAFVQukml1Wy/HpHQ=";

     

       22
        
       

     

       23
        
         nativeBuildInputs = [

     

       24
        
           installShellFiles

+9 -2

pkgs/by-name/sd/SDL_mixer/package.nix

···

       4
        
         fetchpatch,

     

       5
        
         fetchurl,

     

       6
        
         fluidsynth,

     

       7
       -
         libmikmod,

     

       8
        
         libogg,

     

       9
        
         libvorbis,

     

       10
        
         pkg-config,

     
···

       63
        
           })

     

       64
        
         ];

     

       65
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       66
        
         nativeBuildInputs = [

     

       67
        
           SDL

     

       68
        
           pkg-config

     
···

       72
        
         buildInputs = [

     

       73
        
           SDL

     

       74
        
           fluidsynth

     

       75
       -
           libmikmod

     

       76
        
           libogg

     

       77
        
           libvorbis

     

       78
        
           smpeg

     
···

       81
        
         configureFlags = [

     

       82
        
           (lib.enableFeature false "music-ogg-shared")

     

       83
        
           (lib.enableFeature false "music-mod-shared")

     

       0
        
       
     

       84
        
           (lib.enableFeature enableNativeMidi "music-native-midi-gpl")

     

       85
        
           (lib.enableFeature enableSdltest "sdltest")

     

       86
        
           (lib.enableFeature enableSmpegtest "smpegtest")

···

       4
        
         fetchpatch,

     

       5
        
         fetchurl,

     

       6
        
         fluidsynth,

     

       7
       +
         libopenmpt-modplug,

     

       8
        
         libogg,

     

       9
        
         libvorbis,

     

       10
        
         pkg-config,

     
···

       63
        
           })

     

       64
        
         ];

     

       65
        
       

     

       66
       +
         # Fix location of modplug header

     

       67
       +
         postPatch = ''

     

       68
       +
           substituteInPlace music_modplug.h \

     

       69
       +
             --replace-fail '#include "modplug.h"' '#include <libmodplug/modplug.h>'

     

       70
       +
         '';

     

       71
       +
       

     

       72
        
         nativeBuildInputs = [

     

       73
        
           SDL

     

       74
        
           pkg-config

     
···

       78
        
         buildInputs = [

     

       79
        
           SDL

     

       80
        
           fluidsynth

     

       81
       +
           libopenmpt-modplug

     

       82
        
           libogg

     

       83
        
           libvorbis

     

       84
        
           smpeg

     
···

       87
        
         configureFlags = [

     

       88
        
           (lib.enableFeature false "music-ogg-shared")

     

       89
        
           (lib.enableFeature false "music-mod-shared")

     

       90
       +
           (lib.enableFeature true "music-mod-modplug")

     

       91
        
           (lib.enableFeature enableNativeMidi "music-native-midi-gpl")

     

       92
        
           (lib.enableFeature enableSdltest "sdltest")

     

       93
        
           (lib.enableFeature enableSmpegtest "smpegtest")

+2 -2

pkgs/by-name/si/simdutf/package.nix

···

       8
        
       

     

       9
        
       stdenv.mkDerivation (finalAttrs: {

     

       10
        
         pname = "simdutf";

     

       11
       -
         version = "5.6.4";

     

       12
        
       

     

       13
        
         src = fetchFromGitHub {

     

       14
        
           owner = "simdutf";

     

       15
        
           repo = "simdutf";

     

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

     

       17
       -
           hash = "sha256-5MsNKsqHc4L2hCQW/LuJxKUmye6UV/IUEEMlRRMl2b8=";

     

       18
        
         };

     

       19
        
       

     

       20
        
         # Fix build on darwin

···

       8
        
       

     

       9
        
       stdenv.mkDerivation (finalAttrs: {

     

       10
        
         pname = "simdutf";

     

       11
       +
         version = "5.7.1";

     

       12
        
       

     

       13
        
         src = fetchFromGitHub {

     

       14
        
           owner = "simdutf";

     

       15
        
           repo = "simdutf";

     

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

     

       17
       +
           hash = "sha256-CrWFs8fjgkvElbsvfS3jOyk1G+fBQB1lt63EvU6p11c=";

     

       18
        
         };

     

       19
        
       

     

       20
        
         # Fix build on darwin

+3 -3

pkgs/by-name/te/temporal/package.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "temporal";

     

       5
       -
         version = "1.25.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "temporalio";

     

       9
        
           repo = "temporal";

     

       10
        
           rev = "v${version}";

     

       11
       -
           hash = "sha256-+h/F2OjOD68WEblccl6SsfCkk4Ql53QvK9OIMfIS9Gg=";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         vendorHash = "sha256-Xvh1dDUV8Eb/n8zugdkACGMsA+75wM8uQUwq4j1W1Zw=";

     

       15
        
       

     

       16
        
         excludedPackages = [ "./build" ];

     

       17

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "temporal";

     

       5
       +
         version = "1.26.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "temporalio";

     

       9
        
           repo = "temporal";

     

       10
        
           rev = "v${version}";

     

       11
       +
           hash = "sha256-tyMR0LpZDa1QbSe/Ba8fBhtRc8ZI+gwayfi7ZKDa8gI=";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         vendorHash = "sha256-Ljx0LocoowYwqy7MIumGnOcUwxpy+EY5rdTEehIq8Yo=";

     

       15
        
       

     

       16
        
         excludedPackages = [ "./build" ];

     

       17

+16 -3

pkgs/by-name/us/ustreamer/package.nix

···

       14
        
         jansson,

     

       15
        
         libopus,

     

       16
        
         nixosTests,

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       17
        
         withJanus ? true,

     

       18
        
       }:

     

       19
        
       stdenv.mkDerivation rec {

     

       20
        
         pname = "ustreamer";

     

       21
       -
         version = "6.12";

     

       22
        
       

     

       23
        
         src = fetchFromGitHub {

     

       24
        
           owner = "pikvm";

     

       25
        
           repo = "ustreamer";

     

       26
        
           rev = "v${version}";

     

       27
       -
           hash = "sha256-iaCgPHgklk7tbhJhQmyjKggb1bMWBD+Zurgfk9sCQ3E=";

     

       28
        
         };

     

       29
        
       

     

       30
        
         buildInputs =

     
···

       33
        
             libevent

     

       34
        
             libjpeg

     

       35
        
             libdrm

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       36
        
           ]

     

       37
        
           ++ lib.optionals withJanus [

     

       38
        
             janus-gateway

     
···

       43
        
             libopus

     

       44
        
           ];

     

       45
        
       

     

       46
       -
         nativeBuildInputs = [ pkg-config ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       47
        
       

     

       48
        
         makeFlags =

     

       49
        
           [

     

       50
        
             "PREFIX=${placeholder "out"}"

     

       51
        
             "WITH_V4P=1"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       52
        
           ]

     

       53
        
           ++ lib.optionals withJanus [

     

       54
        
             "WITH_JANUS=1"

     
···

       77
        
             matthewcroughan

     

       78
        
           ];

     

       79
        
           platforms = platforms.linux;

     

       0
        
       
     

       80
        
         };

     

       81
        
       }

···

       14
        
         jansson,

     

       15
        
         libopus,

     

       16
        
         nixosTests,

     

       17
       +
         systemdLibs,

     

       18
       +
         which,

     

       19
       +
         withSystemd ? true,

     

       20
        
         withJanus ? true,

     

       21
        
       }:

     

       22
        
       stdenv.mkDerivation rec {

     

       23
        
         pname = "ustreamer";

     

       24
       +
         version = "6.18";

     

       25
        
       

     

       26
        
         src = fetchFromGitHub {

     

       27
        
           owner = "pikvm";

     

       28
        
           repo = "ustreamer";

     

       29
        
           rev = "v${version}";

     

       30
       +
           hash = "sha256-VzhTfr0Swrv3jZUvBYYy5l0+iSokIztpeyA1CuG/roY=";

     

       31
        
         };

     

       32
        
       

     

       33
        
         buildInputs =

     
···

       36
        
             libevent

     

       37
        
             libjpeg

     

       38
        
             libdrm

     

       39
       +
           ]

     

       40
       +
           ++ lib.optionals withSystemd [

     

       41
       +
             systemdLibs

     

       42
        
           ]

     

       43
        
           ++ lib.optionals withJanus [

     

       44
        
             janus-gateway

     
···

       49
        
             libopus

     

       50
        
           ];

     

       51
        
       

     

       52
       +
         nativeBuildInputs = [

     

       53
       +
           pkg-config

     

       54
       +
           which

     

       55
       +
         ];

     

       56
        
       

     

       57
        
         makeFlags =

     

       58
        
           [

     

       59
        
             "PREFIX=${placeholder "out"}"

     

       60
        
             "WITH_V4P=1"

     

       61
       +
           ]

     

       62
       +
           ++ lib.optionals withSystemd [

     

       63
       +
             "WITH_SYSTEMD=1"

     

       64
        
           ]

     

       65
        
           ++ lib.optionals withJanus [

     

       66
        
             "WITH_JANUS=1"

     
···

       89
        
             matthewcroughan

     

       90
        
           ];

     

       91
        
           platforms = platforms.linux;

     

       92
       +
           mainProgram = "ustreamer";

     

       93
        
         };

     

       94
        
       }

+2 -2

pkgs/by-name/ux/uxplay/package.nix

···

       15
        
       

     

       16
        
       stdenv.mkDerivation (finalAttrs: {

     

       17
        
         pname = "uxplay";

     

       18
       -
         version = "1.70";

     

       19
        
       

     

       20
        
         src = fetchFromGitHub {

     

       21
        
           owner = "FDH2";

     

       22
        
           repo = "UxPlay";

     

       23
        
           rev = "v${finalAttrs.version}";

     

       24
       -
           hash = "sha256-5nKkQxoLe7g+fw65uVG0kiJHAEBB5B562bT3Smck1iA=";

     

       25
        
         };

     

       26
        
       

     

       27
        
         postPatch = ''

···

       15
        
       

     

       16
        
       stdenv.mkDerivation (finalAttrs: {

     

       17
        
         pname = "uxplay";

     

       18
       +
         version = "1.71.1";

     

       19
        
       

     

       20
        
         src = fetchFromGitHub {

     

       21
        
           owner = "FDH2";

     

       22
        
           repo = "UxPlay";

     

       23
        
           rev = "v${finalAttrs.version}";

     

       24
       +
           hash = "sha256-qb/oYTScbHypwyo+znhDw8Mz5u+uhM8Jn6Gff3JK+Bc=";

     

       25
        
         };

     

       26
        
       

     

       27
        
         postPatch = ''

+3 -3

pkgs/by-name/va/vault-ssh-plus/package.nix

···

       9
        
       }:

     

       10
        
       buildGoModule rec {

     

       11
        
         pname = "vault-ssh-plus";

     

       12
       -
         version = "0.7.6";

     

       13
        
       

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           owner = "isometry";

     

       16
        
           repo = pname;

     

       17
        
           rev = "v${version}";

     

       18
       -
           hash = "sha256-bP1edeJj3BXsXZJn7/71AVMEnHvMi8jB4eNc5cpfxyE=";

     

       19
        
         };

     

       20
        
       

     

       21
       -
         vendorHash = "sha256-Xfan2UykDkmndePiyaHpQ050McAreOq0VmDxAm+2K9A=";

     

       22
        
       

     

       23
        
         nativeBuildInputs = [ makeWrapper ];

     

       24

···

       9
        
       }:

     

       10
        
       buildGoModule rec {

     

       11
        
         pname = "vault-ssh-plus";

     

       12
       +
         version = "0.7.7";

     

       13
        
       

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           owner = "isometry";

     

       16
        
           repo = pname;

     

       17
        
           rev = "v${version}";

     

       18
       +
           hash = "sha256-l2Gr4AxikPWbSGeZqmkZa1wTRXNZ0l6fTSAcjl+6P8s=";

     

       19
        
         };

     

       20
        
       

     

       21
       +
         vendorHash = "sha256-AYScvuhsK6GUzOhONBl1C89yvu85SntoW7CxCr7wWmo=";

     

       22
        
       

     

       23
        
         nativeBuildInputs = [ makeWrapper ];

     

       24

-22

pkgs/development/libraries/v8/darwin.patch

···

       1
       -
       diff --git a/toolchain/gcc_toolchain.gni b/toolchain/gcc_toolchain.gni

     

       2
       -
       index 80e2a362a..df138c87b 100644

     

       3
       -
       --- a/build/toolchain/gcc_toolchain.gni

     

       4
       -
       +++ b/build/toolchain/gcc_toolchain.gni

     

       5
       -
       @@ -355,6 +355,8 @@ template("gcc_toolchain") {

     

       6
       -
                # AIX does not support either -D (deterministic output) or response

     

       7
       -
                # files.

     

       8
       -
                command = "$ar -X64 {{arflags}} -r -c -s {{output}} {{inputs}}"

     

       9
       -
       +      } else if (current_os == "mac") {

     

       10
       -
       +        command = "$ar {{arflags}} -r -c -s {{output}} {{inputs}}"

     

       11
       -
              } else {

     

       12
       -
                rspfile = "{{output}}.rsp"

     

       13
       -
                rspfile_content = "{{inputs}}"

     

       14
       -
       @@ -546,7 +548,7 @@ template("gcc_toolchain") {

     

       15
       -
        

     

       16
       -
              start_group_flag = ""

     

       17
       -
              end_group_flag = ""

     

       18
       -
       -      if (current_os != "aix") {

     

       19
       -
       +      if (current_os != "aix" && current_os != "mac") {

     

       20
       -
                # the "--start-group .. --end-group" feature isn't available on the aix ld.

     

       21
       -
                start_group_flag = "-Wl,--start-group"

     

       22
       -
                end_group_flag = "-Wl,--end-group "

-226

pkgs/development/libraries/v8/default.nix

···

       1
       -
       {

     

       2
       -
         stdenv,

     

       3
       -
         lib,

     

       4
       -
         fetchgit,

     

       5
       -
         gn,

     

       6
       -
         ninja,

     

       7
       -
         python3,

     

       8
       -
         glib,

     

       9
       -
         pkg-config,

     

       10
       -
         icu,

     

       11
       -
         xcbuild,

     

       12
       -
         fetchpatch,

     

       13
       -
         llvmPackages,

     

       14
       -
         symlinkJoin,

     

       15
       -
       }:

     

       16
       -
       

     

       17
       -
       # Use update.sh to update all checksums.

     

       18
       -
       

     

       19
       -
       let

     

       20
       -
         version = "9.7.106.18";

     

       21
       -
         v8Src = fetchgit {

     

       22
       -
           url = "https://chromium.googlesource.com/v8/v8";

     

       23
       -
           rev = version;

     

       24
       -
           sha256 = "0cb3w733w1xn6zq9dsr43nx6llcg9hrmb2dkxairarj9c0igpzyh";

     

       25
       -
         };

     

       26
       -
       

     

       27
       -
         git_url = "https://chromium.googlesource.com";

     

       28
       -
       

     

       29
       -
         # This data is from the DEPS file in the root of a V8 checkout.

     

       30
       -
         deps = {

     

       31
       -
           "base/trace_event/common" = fetchgit {

     

       32
       -
             url = "${git_url}/chromium/src/base/trace_event/common.git";

     

       33
       -
             rev = "7f36dbc19d31e2aad895c60261ca8f726442bfbb";

     

       34
       -
             sha256 = "01b2fhbxznqbakxv42ivrzg6w8l7i9yrd9nf72d6p5xx9dm993j4";

     

       35
       -
           };

     

       36
       -
           "build" = fetchgit {

     

       37
       -
             url = "${git_url}/chromium/src/build.git";

     

       38
       -
             rev = "cf325916d58a194a935c26a56fcf6b525d1e2bf4";

     

       39
       -
             sha256 = "1ix4h1cpx9bvgln8590xh7lllhsd9w1hd5k9l1gx5yxxrmywd3s4";

     

       40
       -
           };

     

       41
       -
           "third_party/googletest/src" = fetchgit {

     

       42
       -
             url = "${git_url}/external/github.com/google/googletest.git";

     

       43
       -
             rev = "16f637fbf4ffc3f7a01fa4eceb7906634565242f";

     

       44
       -
             sha256 = "11012k3c3mxzdwcw2iparr9lrckafpyhqzclsj26hmfbgbdi0rrh";

     

       45
       -
           };

     

       46
       -
           "third_party/icu" = fetchgit {

     

       47
       -
             url = "${git_url}/chromium/deps/icu.git";

     

       48
       -
             rev = "eedbaf76e49d28465d9119b10c30b82906e606ff";

     

       49
       -
             sha256 = "0mppvx7wf9zlqjsfaa1cf06brh1fjb6nmiib0lhbb9hd55mqjdjj";

     

       50
       -
           };

     

       51
       -
           "third_party/zlib" = fetchgit {

     

       52
       -
             url = "${git_url}/chromium/src/third_party/zlib.git";

     

       53
       -
             rev = "6da1d53b97c89b07e47714d88cab61f1ce003c68";

     

       54
       -
             sha256 = "0v7ylmbwfwv6w6wp29qdf77kjjnfr2xzin08n0v1yvbhs01h5ppy";

     

       55
       -
           };

     

       56
       -
           "third_party/jinja2" = fetchgit {

     

       57
       -
             url = "${git_url}/chromium/src/third_party/jinja2.git";

     

       58
       -
             rev = "ee69aa00ee8536f61db6a451f3858745cf587de6";

     

       59
       -
             sha256 = "1fsnd5h0gisfp8bdsfd81kk5v4mkqf8z368c7qlm1qcwc4ri4x7a";

     

       60
       -
           };

     

       61
       -
           "third_party/markupsafe" = fetchgit {

     

       62
       -
             url = "${git_url}/chromium/src/third_party/markupsafe.git";

     

       63
       -
             rev = "1b882ef6372b58bfd55a3285f37ed801be9137cd";

     

       64
       -
             sha256 = "1jnjidbh03lhfaawimkjxbprmsgz4snr0jl06630dyd41zkdw5kr";

     

       65
       -
           };

     

       66
       -
         };

     

       67
       -
       

     

       68
       -
         # See `gn_version` in DEPS.

     

       69
       -
         gnSrc = fetchgit {

     

       70
       -
           url = "https://gn.googlesource.com/gn";

     

       71
       -
           rev = "8926696a4186279489cc2b8d768533e61bba73d7";

     

       72
       -
           sha256 = "1084lnyb0a1khbgjvak05fcx6jy973wqvsf77n0alxjys18sg2yk";

     

       73
       -
         };

     

       74
       -
       

     

       75
       -
         myGn = gn.overrideAttrs (oldAttrs: {

     

       76
       -
           version = "for-v8";

     

       77
       -
           src = gnSrc;

     

       78
       -
         });

     

       79
       -
       

     

       80
       -
       in

     

       81
       -
       

     

       82
       -
       stdenv.mkDerivation rec {

     

       83
       -
         pname = "v8";

     

       84
       -
         inherit version;

     

       85
       -
       

     

       86
       -
         doCheck = true;

     

       87
       -
       

     

       88
       -
         patches = [

     

       89
       -
           ./darwin.patch

     

       90
       -
       

     

       91
       -
           # gcc-13 build fix for mixxign <cstdint> includes

     

       92
       -
           (fetchpatch {

     

       93
       -
             name = "gcc-13.patch";

     

       94
       -
             url = "https://chromium.googlesource.com/v8/v8/+/c2792e58035fcbaa16d0cb70998852fbeb5df4cc^!?format=TEXT";

     

       95
       -
             decode = "base64 -d";

     

       96
       -
             hash = "sha256-hoPAkSaCmzXflPFXaKUwVPLECMpt6N6/8m8mBSTAHbU=";

     

       97
       -
           })

     

       98
       -
         ];

     

       99
       -
       

     

       100
       -
         src = v8Src;

     

       101
       -
       

     

       102
       -
         postUnpack = ''

     

       103
       -
           ${lib.concatStringsSep "\n" (

     

       104
       -
             lib.mapAttrsToList (n: v: ''

     

       105
       -
               mkdir -p $sourceRoot/${n}

     

       106
       -
               cp -r ${v}/* $sourceRoot/${n}

     

       107
       -
             '') deps

     

       108
       -
           )}

     

       109
       -
           chmod u+w -R .

     

       110
       -
         '';

     

       111
       -
       

     

       112
       -
         postPatch = ''

     

       113
       -
           ${lib.optionalString stdenv.hostPlatform.isAarch64 ''

     

       114
       -
             substituteInPlace build/toolchain/linux/BUILD.gn \

     

       115
       -
               --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'

     

       116
       -
           ''}

     

       117
       -
           ${lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       118
       -
             substituteInPlace build/config/compiler/compiler.gni \

     

       119
       -
               --replace 'strip_absolute_paths_from_debug_symbols = true' \

     

       120
       -
                         'strip_absolute_paths_from_debug_symbols = false'

     

       121
       -
             substituteInPlace build/config/compiler/BUILD.gn \

     

       122
       -
               --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \

     

       123
       -
                         'false'

     

       124
       -
           ''}

     

       125
       -
           ${lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       126
       -
             substituteInPlace build/config/compiler/BUILD.gn \

     

       127
       -
               --replace "-Wl,-fatal_warnings" ""

     

       128
       -
           ''}

     

       129
       -
           touch build/config/gclient_args.gni

     

       130
       -
           sed '1i#include <utility>' -i src/heap/cppgc/prefinalizer-handler.h # gcc12

     

       131
       -
         '';

     

       132
       -
       

     

       133
       -
         llvmCcAndBintools = symlinkJoin {

     

       134
       -
           name = "llvmCcAndBintools";

     

       135
       -
           paths = [

     

       136
       -
             stdenv.cc

     

       137
       -
             llvmPackages.llvm

     

       138
       -
           ];

     

       139
       -
         };

     

       140
       -
       

     

       141
       -
         gnFlags =

     

       142
       -
           [

     

       143
       -
             "use_custom_libcxx=false"

     

       144
       -
             "is_clang=${lib.boolToString stdenv.cc.isClang}"

     

       145
       -
             "use_sysroot=false"

     

       146
       -
             # "use_system_icu=true"

     

       147
       -
             "clang_use_chrome_plugins=false"

     

       148
       -
             "is_component_build=false"

     

       149
       -
             "v8_use_external_startup_data=false"

     

       150
       -
             "v8_monolithic=true"

     

       151
       -
             "is_debug=true"

     

       152
       -
             "is_official_build=false"

     

       153
       -
             "treat_warnings_as_errors=false"

     

       154
       -
             "v8_enable_i18n_support=true"

     

       155
       -
             "use_gold=false"

     

       156
       -
             # ''custom_toolchain="//build/toolchain/linux/unbundle:default"''

     

       157
       -
             ''host_toolchain="//build/toolchain/linux/unbundle:default"''

     

       158
       -
             ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"''

     

       159
       -
           ]

     

       160
       -
           ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"''

     

       161
       -
           ++ lib.optional stdenv.hostPlatform.isDarwin ''use_lld=false'';

     

       162
       -
       

     

       163
       -
         env.NIX_CFLAGS_COMPILE = toString (

     

       164
       -
           [

     

       165
       -
             "-O2"

     

       166
       -
           ]

     

       167
       -
           ++ lib.optionals stdenv.cc.isClang [

     

       168
       -
             "-Wno-error=enum-constexpr-conversion"

     

       169
       -
           ]

     

       170
       -
         );

     

       171
       -
         FORCE_MAC_SDK_MIN = stdenv.hostPlatform.sdkVer or "10.12";

     

       172
       -
       

     

       173
       -
         nativeBuildInputs =

     

       174
       -
           [

     

       175
       -
             myGn

     

       176
       -
             ninja

     

       177
       -
             pkg-config

     

       178
       -
             python3

     

       179
       -
           ]

     

       180
       -
           ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       181
       -
             xcbuild

     

       182
       -
             llvmPackages.llvm

     

       183
       -
             python3.pkgs.setuptools

     

       184
       -
           ];

     

       185
       -
         buildInputs = [

     

       186
       -
           glib

     

       187
       -
           icu

     

       188
       -
         ];

     

       189
       -
       

     

       190
       -
         ninjaFlags = [

     

       191
       -
           ":d8"

     

       192
       -
           "v8_monolith"

     

       193
       -
         ];

     

       194
       -
       

     

       195
       -
         enableParallelBuilding = true;

     

       196
       -
       

     

       197
       -
         installPhase = ''

     

       198
       -
           install -D d8 $out/bin/d8

     

       199
       -
           install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a

     

       200
       -
           install -D -m644 icudtl.dat $out/share/v8/icudtl.dat

     

       201
       -
           ln -s libv8.a $out/lib/libv8_monolith.a

     

       202
       -
           cp -r ../../include $out

     

       203
       -
       

     

       204
       -
           mkdir -p $out/lib/pkgconfig

     

       205
       -
           cat > $out/lib/pkgconfig/v8.pc << EOF

     

       206
       -
           Name: v8

     

       207
       -
           Description: V8 JavaScript Engine

     

       208
       -
           Version: ${version}

     

       209
       -
           Libs: -L$out/lib -lv8 -pthread

     

       210
       -
           Cflags: -I$out/include

     

       211
       -
           EOF

     

       212
       -
         '';

     

       213
       -
       

     

       214
       -
         meta = with lib; {

     

       215
       -
           homepage = "https://v8.dev/";

     

       216
       -
           description = "Google's open source JavaScript engine";

     

       217
       -
           mainProgram = "d8";

     

       218
       -
           maintainers = with maintainers; [

     

       219
       -
             proglodyte

     

       220
       -
             matthewbauer

     

       221
       -
           ];

     

       222
       -
           platforms = platforms.unix;

     

       223
       -
           license = licenses.bsd3;

     

       224
       -
           knownVulnerabilities = [ "Severely outdated with multiple publicly known vulnerabilities" ];

     

       225
       -
         };

     

       226
       -
       }

-62

pkgs/development/libraries/v8/update.sh

···

       1
       -
       #!/usr/bin/env nix-shell

     

       2
       -
       #! nix-shell -i bash -p curl -p nix-prefetch-git -p jq

     

       3
       -
       VERSION_OVERVIEW=https://omahaproxy.appspot.com/all?os=linux

     

       4
       -
       TARGET_CHANNEL=stable

     

       5
       -
       

     

       6
       -
       set -eo pipefail

     

       7
       -
       

     

       8
       -
       if [ -n "$1" ]; then

     

       9
       -
         v8_version="$1"

     

       10
       -
         shift

     

       11
       -
       else

     

       12
       -
         v8_version=$(curl -s "$VERSION_OVERVIEW" | awk -F "," "\$2 ~ /${TARGET_CHANNEL}/ { print \$11 }")

     

       13
       -
       fi

     

       14
       -
       

     

       15
       -
       if [ -n "$1" ]; then

     

       16
       -
         file_path="$1"

     

       17
       -
       else

     

       18
       -
         file_path=default.nix

     

       19
       -
       fi

     

       20
       -
       

     

       21
       -
       echo "Using V8 version --> $v8_version"

     

       22
       -
       

     

       23
       -
       prefetched=$(nix-prefetch-git --no-deepClone https://chromium.googlesource.com/v8/v8 "refs/tags/${v8_version}")

     

       24
       -
       

     

       25
       -
       path=$(echo "$prefetched" | jq -r .path)

     

       26
       -
       sha256=$(echo "$prefetched" | jq -r .sha256)

     

       27
       -
       sed -e "s#\\(version = \\)\"[0-9\.]*\"#\1\"$v8_version\"#" -i ${file_path}

     

       28
       -
       sed -e "/v8Src = fetchgit/ { n; n; n; s/\".*\"/\"${sha256}\"/  }" -i ${file_path}

     

       29
       -
       

     

       30
       -
       deps="$path/DEPS"

     

       31
       -
       

     

       32
       -
       echo "$deps"

     

       33
       -
       

     

       34
       -
       echo "Processing gn"

     

       35
       -
       gn_rev=$(sed -ne "s/.*'gn_version': 'git_revision:\([^']*\).*/\1/p" < "$deps")

     

       36
       -
       gn_sha256=$(nix-prefetch-git --no-deepClone https://gn.googlesource.com/gn "$gn_rev" 2>/dev/null | jq -r .sha256)

     

       37
       -
       sed -e "/gnSrc = fetchgit/ { n; n; s/\".*\"/\"${gn_rev}\"/; n; s/\".*\"/\"${gn_sha256}\"/  }" -i ${file_path}

     

       38
       -
       

     

       39
       -
       sed -ne '/" = fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${file_path} | while read dep; do

     

       40
       -
           echo "Processing dependency --> $dep"

     

       41
       -
           escaped_dep=$(echo "$dep" | sed -e 's#/#\\/#g')

     

       42
       -
           dep_rev=$(sed -ne "/'${escaped_dep}':/ { n; s#.*+ '##; s#'.*##;  p }" "$deps")

     

       43
       -
       

     

       44
       -
           if [ "$dep_rev" = "" ]; then

     

       45
       -
               echo "Failed to resolve dependency $dep, not listed in DEPS file"

     

       46
       -
               rm -f "$deps"

     

       47
       -
               exit 2

     

       48
       -
           fi

     

       49
       -
       

     

       50
       -
           repo_url=$(sed -ne "/\"${escaped_dep}\" = fetchgit/ { n; s/.*\"\(.*\)\".*/\1/; s#\${git_url}#https://chromium.googlesource.com#; p }"  ${file_path})

     

       51
       -
           sha256=$(nix-prefetch-git --no-deepClone "$repo_url" "$dep_rev" 2>/dev/null | jq -r .sha256)

     

       52
       -
       

     

       53
       -
           if [ "$sha256" = "" ]; then

     

       54
       -
               echo "Failed to get sha256 via nix-prefetch-git $repo_url $dep_rev"

     

       55
       -
               rm -f "$deps"

     

       56
       -
               exit 2

     

       57
       -
           fi

     

       58
       -
       

     

       59
       -
           sed -e "/\"${escaped_dep}\" = fetchgit/ { n; n; s/\".*\"/\"${dep_rev}\"/; n; s/\".*\"/\"${sha256}\"/  }" -i ${file_path}

     

       60
       -
       done

     

       61
       -
       

     

       62
       -
       echo done.

+65 -40

pkgs/development/misc/juce/default.nix

···

       1
       -
       { lib

     

       2
       -
       , stdenv

     

       3
       -
       , fetchFromGitHub

     

       4
       -
       , fetchpatch

     

       0
        
       
     

       5
        
       

     

       6
       -
       # Native build inputs

     

       7
       -
       , cmake

     

       8
       -
       , pkg-config

     

       9
       -
       , makeWrapper

     

       10
        
       

     

       11
       -
       # Dependencies

     

       12
       -
       , alsa-lib

     

       13
       -
       , freetype

     

       14
       -
       , curl

     

       15
       -
       , libglvnd

     

       16
       -
       , webkitgtk_4_0

     

       17
       -
       , pcre

     

       18
       -
       , darwin

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
       }:

     

       20
        
       

     

       21
        
       stdenv.mkDerivation (finalAttrs: {

     

       22
        
         pname = "juce";

     

       23
       -
         version = "7.0.11";

     

       24
        
       

     

       25
        
         src = fetchFromGitHub {

     

       26
        
           owner = "juce-framework";

     

       27
        
           repo = "juce";

     

       28
        
           rev = finalAttrs.version;

     

       29
       -
           hash = "sha256-XFC+MYxUE3NatM2oYykiPJtiQLy33JD64VZFfZS2Tas=";

     

       30
        
         };

     

       31
        
       

     

       32
        
         patches = [

     

       33
       -
           (fetchpatch {

     

       34
       -
             name = "juce-6.1.2-cmake_install.patch";

     

       35
       -
             url = "https://gitlab.archlinux.org/archlinux/packaging/packages/juce/-/raw/4e6d34034b102af3cd762a983cff5dfc09e44e91/juce-6.1.2-cmake_install.patch";

     

       36
       -
             hash = "sha256-fr2K/dH0Zam5QKS63zos7eq9QLwdr+bvQL5ZxScagVU=";

     

       37
       -
           })

     

       38
        
         ];

     

       39
        
       

     

       40
        
         nativeBuildInputs = [

     
···

       43
        
           makeWrapper

     

       44
        
         ];

     

       45
        
       

     

       46
       -
         buildInputs = [

     

       47
       -
           freetype # libfreetype.so

     

       48
       -
           curl # libcurl.so

     

       49
       -
           (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so

     

       50
       -
           pcre # libpcre2.pc

     

       51
       -
         ] ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       52
       -
           alsa-lib # libasound.so

     

       53
       -
           libglvnd # libGL.so

     

       54
       -
           webkitgtk_4_0 # webkit2gtk-4.0

     

       55
       -
         ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       56
       -
           darwin.apple_sdk.frameworks.Cocoa

     

       57
       -
           darwin.apple_sdk.frameworks.MetalKit

     

       58
       -
           darwin.apple_sdk.frameworks.WebKit

     

       59
       -
         ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       60
        
       

     

       61
        
         meta = with lib; {

     

       62
        
           description = "Cross-platform C++ application framework";

     

       63
        
           mainProgram = "juceaide";

     

       64
       -
           longDescription = "JUCE is an open-source cross-platform C++ application framework for desktop and mobile applications, including VST, VST3, AU, AUv3, RTAS and AAX audio plug-ins";

     

       65
       -
           homepage = "https://github.com/juce-framework/JUCE";

     

       66
        
           changelog = "https://github.com/juce-framework/JUCE/blob/${finalAttrs.version}/CHANGE_LIST.md";

     

       67
       -
           license = with licenses; [ isc gpl3Plus ];

     

       0
        
       
     

       0
        
       
     

       68
        
           maintainers = with maintainers; [ kashw2 ];

     

       69
        
           platforms = platforms.all;

     

       70
        
         };

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         stdenv,

     

       4
       +
         fetchFromGitHub,

     

       5
       +
         fetchpatch,

     

       6
        
       

     

       7
       +
         # Native build inputs

     

       8
       +
         cmake,

     

       9
       +
         pkg-config,

     

       10
       +
         makeWrapper,

     

       11
        
       

     

       12
       +
         # Dependencies

     

       13
       +
         alsa-lib,

     

       14
       +
         freetype,

     

       15
       +
         curl,

     

       16
       +
         libglvnd,

     

       17
       +
         webkitgtk_4_0,

     

       18
       +
         pcre2,

     

       19
       +
         libsysprof-capture,

     

       20
       +
         util-linuxMinimal,

     

       21
       +
         libselinux,

     

       22
       +
         libsepol,

     

       23
       +
         libthai,

     

       24
       +
         libdatrie,

     

       25
       +
         libXdmcp,

     

       26
       +
         lerc,

     

       27
       +
         libxkbcommon,

     

       28
       +
         libepoxy,

     

       29
       +
         libXtst,

     

       30
       +
         sqlite,

     

       31
       +
         fontconfig,

     

       32
        
       }:

     

       33
        
       

     

       34
        
       stdenv.mkDerivation (finalAttrs: {

     

       35
        
         pname = "juce";

     

       36
       +
         version = "8.0.4";

     

       37
        
       

     

       38
        
         src = fetchFromGitHub {

     

       39
        
           owner = "juce-framework";

     

       40
        
           repo = "juce";

     

       41
        
           rev = finalAttrs.version;

     

       42
       +
           hash = "sha256-iAueT+yHwUUHOzqfK5zXEZQ0GgOKJ9q9TyRrVfWdewc=";

     

       43
        
         };

     

       44
        
       

     

       45
        
         patches = [

     

       46
       +
           # Adapted from https://gitlab.archlinux.org/archlinux/packaging/packages/juce/-/raw/4e6d34034b102af3cd762a983cff5dfc09e44e91/juce-6.1.2-cmake_install.patch

     

       47
       +
           # for Juce 8.0.4.

     

       48
       +
           ./juce-8.0.4-cmake_install.patch

     

       0
        
       
     

       0
        
       
     

       49
        
         ];

     

       50
        
       

     

       51
        
         nativeBuildInputs = [

     
···

       54
        
           makeWrapper

     

       55
        
         ];

     

       56
        
       

     

       57
       +
         buildInputs =

     

       58
       +
           [

     

       59
       +
             freetype # libfreetype.so

     

       60
       +
             curl # libcurl.so

     

       61
       +
             (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so

     

       62
       +
             pcre2 # libpcre2.pc

     

       63
       +
             libsysprof-capture

     

       64
       +
             libthai

     

       65
       +
             libdatrie

     

       66
       +
             lerc

     

       67
       +
             libepoxy

     

       68
       +
             sqlite

     

       69
       +
           ]

     

       70
       +
           ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       71
       +
             alsa-lib # libasound.so

     

       72
       +
             libglvnd # libGL.so

     

       73
       +
             webkitgtk_4_0 # webkit2gtk-4.0

     

       74
       +
             util-linuxMinimal

     

       75
       +
             libselinux

     

       76
       +
             libsepol

     

       77
       +
             libXdmcp

     

       78
       +
             libxkbcommon

     

       79
       +
             libXtst

     

       80
       +
           ];

     

       81
       +
       

     

       82
       +
         propagatedBuildInputs = [ fontconfig ];

     

       83
        
       

     

       84
        
         meta = with lib; {

     

       85
        
           description = "Cross-platform C++ application framework";

     

       86
        
           mainProgram = "juceaide";

     

       87
       +
           longDescription = "Open-source cross-platform C++ application framework for creating desktop and mobile applications, including VST, VST3, AU, AUv3, AAX and LV2 audio plug-ins";

     

       88
       +
           homepage = "https://juce.com/";

     

       89
        
           changelog = "https://github.com/juce-framework/JUCE/blob/${finalAttrs.version}/CHANGE_LIST.md";

     

       90
       +
           license = with licenses; [

     

       91
       +
             agpl3Only # Or alternatively the JUCE license, but that would not be included in nixpkgs then

     

       92
       +
           ];

     

       93
        
           maintainers = with maintainers; [ kashw2 ];

     

       94
        
           platforms = platforms.all;

     

       95
        
         };

+51

pkgs/development/misc/juce/juce-8.0.4-cmake_install.patch

···

       1
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       +
       index 019aa86c51..ceb7b2a8e5 100644

     

       3
       +
       --- a/CMakeLists.txt

     

       4
       +
       +++ b/CMakeLists.txt

     

       5
       +
       @@ -137,10 +137,10 @@

     

       6
       +
            VERSION ${JUCE_VERSION}

     

       7
       +
            COMPATIBILITY ExactVersion)

     

       8
       +
        

     

       9
       +
       -set(JUCE_INSTALL_DESTINATION "lib/cmake/JUCE-${JUCE_VERSION}" CACHE STRING

     

       10
       +
       +set(JUCE_INSTALL_DESTINATION "lib/cmake/juce" CACHE STRING

     

       11
       +
            "The location, relative to the install prefix, where the JUCE config file will be installed")

     

       12
       +
        

     

       13
       +
       -set(JUCE_MODULE_PATH "include/JUCE-${JUCE_VERSION}/modules")

     

       14
       +
       +set(JUCE_MODULE_PATH "share/juce/modules")

     

       15
       +
        set(UTILS_INSTALL_DIR "${JUCE_INSTALL_DESTINATION}")

     

       16
       +
        set(JUCEAIDE_PATH "${JUCE_TOOL_INSTALL_DIR}/${JUCE_JUCEAIDE_NAME}")

     

       17
       +
        configure_package_config_file("${JUCE_CMAKE_UTILS_DIR}/JUCEConfig.cmake.in"

     

       18
       +
       @@ -148,7 +148,6 @@

     

       19
       +
            PATH_VARS UTILS_INSTALL_DIR JUCEAIDE_PATH JUCE_MODULE_PATH

     

       20
       +
            INSTALL_DESTINATION "${JUCE_INSTALL_DESTINATION}")

     

       21
       +
        

     

       22
       +
       -set(JUCE_MODULE_PATH "${JUCE_MODULES_DIR}")

     

       23
       +
        set(UTILS_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extras/Build/CMake")

     

       24
       +
        get_target_property(JUCEAIDE_PATH juceaide IMPORTED_LOCATION)

     

       25
       +
        configure_package_config_file("${JUCE_CMAKE_UTILS_DIR}/JUCEConfig.cmake.in"

     

       26
       +
       diff --git a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt

     

       27
       +
       index 7ef20eddf1..3dfb1f1802 100644

     

       28
       +
       --- a/extras/Build/juceaide/CMakeLists.txt

     

       29
       +
       +++ b/extras/Build/juceaide/CMakeLists.txt

     

       30
       +
       @@ -153,7 +153,7 @@

     

       31
       +
        

     

       32
       +
            add_executable(juce::juceaide ALIAS juceaide)

     

       33
       +
        

     

       34
       +
       -    set(JUCE_TOOL_INSTALL_DIR "bin/JUCE-${JUCE_VERSION}" CACHE STRING

     

       35
       +
       +    set(JUCE_TOOL_INSTALL_DIR "bin" CACHE STRING

     

       36
       +
                "The location, relative to the install prefix, where juceaide will be installed")

     

       37
       +
        

     

       38
       +
            install(PROGRAMS "${imported_location}" DESTINATION "${JUCE_TOOL_INSTALL_DIR}")

     

       39
       +
       diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt

     

       40
       +
       index 27c987abe2..5b8de75bde 100644

     

       41
       +
       --- a/modules/CMakeLists.txt

     

       42
       +
       +++ b/modules/CMakeLists.txt

     

       43
       +
       @@ -31,7 +31,7 @@

     

       44
       +
        # ==============================================================================

     

       45
       +
        

     

       46
       +
        juce_add_modules(

     

       47
       +
       -    INSTALL_PATH "include/JUCE-${JUCE_VERSION}/modules"

     

       48
       +
       +    INSTALL_PATH "share/juce/modules"

     

       49
       +
            ALIAS_NAMESPACE juce

     

       50
       +
            juce_analytics

     

       51
       +
            juce_animation

+1 -1

pkgs/development/python-modules/bravia-tv/default.nix

···

       30
        
           homepage = "https://github.com/dcnielsen90/python-bravia-tv";

     

       31
        
           description = "Python library for Sony Bravia TV remote control";

     

       32
        
           license = licenses.mit;

     

       33
       -
           maintainers = with maintainers; [ colemickens ];

     

       34
        
         };

     

       35
        
       }

···

       30
        
           homepage = "https://github.com/dcnielsen90/python-bravia-tv";

     

       31
        
           description = "Python library for Sony Bravia TV remote control";

     

       32
        
           license = licenses.mit;

     

       33
       +
           maintainers = with maintainers; [ ];

     

       34
        
         };

     

       35
        
       }

+1 -1

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

···

       58
        
           homepage = "https://github.com/ol-iver/denonavr";

     

       59
        
           changelog = "https://github.com/ol-iver/denonavr/releases/tag/${version}";

     

       60
        
           license = licenses.mit;

     

       61
       -
           maintainers = with maintainers; [ colemickens ];

     

       62
        
         };

     

       63
        
       }

···

       58
        
           homepage = "https://github.com/ol-iver/denonavr";

     

       59
        
           changelog = "https://github.com/ol-iver/denonavr/releases/tag/${version}";

     

       60
        
           license = licenses.mit;

     

       61
       +
           maintainers = with maintainers; [ ];

     

       62
        
         };

     

       63
        
       }

+1 -1

pkgs/development/python-modules/flux-led/default.nix

···

       57
        
           homepage = "https://github.com/Danielhiversen/flux_led";

     

       58
        
           changelog = "https://github.com/Danielhiversen/flux_led/releases/tag/${version}";

     

       59
        
           license = licenses.lgpl3Plus;

     

       60
       -
           maintainers = with maintainers; [ colemickens ];

     

       61
        
           platforms = platforms.linux;

     

       62
        
           mainProgram = "flux_led";

     

       63
        
         };

···

       57
        
           homepage = "https://github.com/Danielhiversen/flux_led";

     

       58
        
           changelog = "https://github.com/Danielhiversen/flux_led/releases/tag/${version}";

     

       59
        
           license = licenses.lgpl3Plus;

     

       60
       +
           maintainers = with maintainers; [ ];

     

       61
        
           platforms = platforms.linux;

     

       62
        
           mainProgram = "flux_led";

     

       63
        
         };

+1 -1

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

···

       50
        
           homepage = "https://github.com/GhostofGoes/getmac";

     

       51
        
           changelog = "https://github.com/GhostofGoes/getmac/blob/${version}/CHANGELOG.md";

     

       52
        
           license = licenses.mit;

     

       53
       -
           maintainers = with maintainers; [ colemickens ];

     

       54
        
         };

     

       55
        
       }

···

       50
        
           homepage = "https://github.com/GhostofGoes/getmac";

     

       51
        
           changelog = "https://github.com/GhostofGoes/getmac/blob/${version}/CHANGELOG.md";

     

       52
        
           license = licenses.mit;

     

       53
       +
           maintainers = with maintainers; [ ];

     

       54
        
         };

     

       55
        
       }

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

···

       5
        
         buildPythonPackage,

     

       6
        
         cmake,

     

       7
        
         darwin,

     

       0
        
       
     

       8
        
         doxygen,

     

       9
        
         draco,

     

       10
        
         embree,

     
···

       144
        
             jinja2

     

       145
        
             numpy

     

       146
        
             pyopengl

     

       0
        
       
     

       147
        
           ]

     

       148
        
           ++ lib.optionals (withTools || withUsdView) [

     

       149
        
             pyside-tools-uic

···

       5
        
         buildPythonPackage,

     

       6
        
         cmake,

     

       7
        
         darwin,

     

       8
       +
         distutils,

     

       9
        
         doxygen,

     

       10
        
         draco,

     

       11
        
         embree,

     
···

       145
        
             jinja2

     

       146
        
             numpy

     

       147
        
             pyopengl

     

       148
       +
             distutils

     

       149
        
           ]

     

       150
        
           ++ lib.optionals (withTools || withUsdView) [

     

       151
        
             pyside-tools-uic

+1 -1

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

···

       41
        
           homepage = "https://github.com/pkkid/python-plexapi";

     

       42
        
           changelog = "https://github.com/pkkid/python-plexapi/releases/tag/${version}";

     

       43
        
           license = licenses.bsd3;

     

       44
       -
           maintainers = with maintainers; [ colemickens ];

     

       45
        
         };

     

       46
        
       }

···

       41
        
           homepage = "https://github.com/pkkid/python-plexapi";

     

       42
        
           changelog = "https://github.com/pkkid/python-plexapi/releases/tag/${version}";

     

       43
        
           license = licenses.bsd3;

     

       44
       +
           maintainers = with maintainers; [ ];

     

       45
        
         };

     

       46
        
       }

+1 -1

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

···

       31
        
           homepage = "https://github.com/jjlawren/python-plexauth/";

     

       32
        
           description = "Handles the authorization flow to obtain tokens from Plex.tv via external redirection";

     

       33
        
           license = licenses.mit;

     

       34
       -
           maintainers = with maintainers; [ colemickens ];

     

       35
        
         };

     

       36
        
       }

···

       31
        
           homepage = "https://github.com/jjlawren/python-plexauth/";

     

       32
        
           description = "Handles the authorization flow to obtain tokens from Plex.tv via external redirection";

     

       33
        
           license = licenses.mit;

     

       34
       +
           maintainers = with maintainers; [ ];

     

       35
        
         };

     

       36
        
       }

+1 -1

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

···

       32
        
           homepage = "https://github.com/jjlawren/python-plexwebsocket/";

     

       33
        
           changelog = "https://github.com/jjlawren/python-plexwebsocket/releases/tag/v${version}";

     

       34
        
           license = licenses.mit;

     

       35
       -
           maintainers = with maintainers; [ colemickens ];

     

       36
        
         };

     

       37
        
       }

···

       32
        
           homepage = "https://github.com/jjlawren/python-plexwebsocket/";

     

       33
        
           changelog = "https://github.com/jjlawren/python-plexwebsocket/releases/tag/v${version}";

     

       34
        
           license = licenses.mit;

     

       35
       +
           maintainers = with maintainers; [ ];

     

       36
        
         };

     

       37
        
       }

+1 -1

pkgs/development/python-modules/python-mpv-jsonipc/default.nix

···

       36
        
           homepage = "https://github.com/iwalton3/python-mpv-jsonipc";

     

       37
        
           description = "Python API to MPV using JSON IPC";

     

       38
        
           license = licenses.gpl3;

     

       39
       -
           maintainers = with maintainers; [ colemickens ];

     

       40
        
         };

     

       41
        
       }

···

       36
        
           homepage = "https://github.com/iwalton3/python-mpv-jsonipc";

     

       37
        
           description = "Python API to MPV using JSON IPC";

     

       38
        
           license = licenses.gpl3;

     

       39
       +
           maintainers = with maintainers; [ ];

     

       40
        
         };

     

       41
        
       }

+29 -17

pkgs/development/tools/misc/edb/default.nix

···

       1
        
       {

     

       2
        
         lib,

     

       3
       -
         mkDerivation,

     

       4
        
         fetchFromGitHub,

     

       5
        
         cmake,

     

       6
        
         pkg-config,

     
···

       9
        
         double-conversion,

     

       10
        
         graphviz,

     

       11
        
         qtxmlpatterns,

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       12
        
       }:

     

       13
        
       

     

       14
       -
       mkDerivation rec {

     

       15
        
         pname = "edb";

     

       16
       -
         version = "1.4.0";

     

       17
        
       

     

       18
        
         src = fetchFromGitHub {

     

       19
        
           owner = "eteran";

     

       20
        
           repo = "edb-debugger";

     

       21
       -
           rev = version;

     

       22
        
           fetchSubmodules = true;

     

       23
       -
           hash = "sha256-1Q0eZS05L4sxzcPvEFdEaobO7JYHRu98Yf+n3ZnBi+E=";

     

       24
        
         };

     

       25
        
       

     

       26
        
         nativeBuildInputs = [

     

       27
        
           cmake

     

       28
        
           pkg-config

     

       0
        
       
     

       0
        
       
     

       29
        
         ];

     

       30
        
       

     

       31
        
         buildInputs = [

     

       0
        
       
     

       32
        
           boost.dev

     

       33
        
           capstone_4

     

       34
        
           double-conversion

     
···

       36
        
           qtxmlpatterns

     

       37
        
         ];

     

       38
        
       

     

       39
       -
         postPatch = ''

     

       40
       -
           # Remove CMAKE_INSTALL_PREFIX from DEFAULT_PLUGIN_PATH otherwise the nix store path will appear twice.

     

       41
       -
           substituteInPlace ./src/CMakeLists.txt --replace \

     

       42
       -
               '-DDEFAULT_PLUGIN_PATH=\"''${CMAKE_INSTALL_PREFIX}/''${CMAKE_INSTALL_LIBDIR}/edb\"' \

     

       43
       -
               '-DDEFAULT_PLUGIN_PATH=\"''${CMAKE_INSTALL_LIBDIR}/edb\"'

     

       44
        
       

     

       0
        
       
     

       45
        
           # The build script checks for the presence of .git to determine whether

     

       46
        
           # submodules were fetched and will throw an error if it's not there.

     

       47
        
           # Avoid using leaveDotGit in the fetchFromGitHub options as it is non-deterministic.

     

       48
        
           mkdir -p src/qhexview/.git lib/gdtoa-desktop/.git

     

       0
        
       
     

       49
        
       

     

       50
       -
           # Change default optional terminal program path to one that is more likely to work on NixOS.

     

       51
       -
           substituteInPlace ./src/Configuration.cpp --replace "/usr/bin/xterm" "xterm";

     

       52
       -
         '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       53
        
       

     

       54
       -
         meta = with lib; {

     

       55
        
           description = "Cross platform AArch32/x86/x86-64 debugger";

     

       56
        
           mainProgram = "edb";

     

       57
        
           homepage = "https://github.com/eteran/edb-debugger";

     

       58
       -
           license = licenses.gpl2Plus;

     

       59
       -
           maintainers = with maintainers; [

     

       60
        
             lihop

     

       61
        
             maxxk

     

       62
        
           ];

     

       63
        
           platforms = [ "x86_64-linux" ];

     

       64
        
         };

     

       65
       -
       }

···

       1
        
       {

     

       2
        
         lib,

     

       3
       +
         stdenv,

     

       4
        
         fetchFromGitHub,

     

       5
        
         cmake,

     

       6
        
         pkg-config,

     
···

       9
        
         double-conversion,

     

       10
        
         graphviz,

     

       11
        
         qtxmlpatterns,

     

       12
       +
         qttools,

     

       13
       +
         qtbase,

     

       14
       +
         wrapQtAppsHook,

     

       15
       +
         testers,

     

       16
       +
         nix-update-script,

     

       17
        
       }:

     

       18
        
       

     

       19
       +
       stdenv.mkDerivation (finalAttrs: {

     

       20
        
         pname = "edb";

     

       21
       +
         version = "1.5.0";

     

       22
        
       

     

       23
        
         src = fetchFromGitHub {

     

       24
        
           owner = "eteran";

     

       25
        
           repo = "edb-debugger";

     

       26
       +
           tag = finalAttrs.version;

     

       27
        
           fetchSubmodules = true;

     

       28
       +
           hash = "sha256-ALhA/odVwUQHKuOZ1W/i/6L7da/yitdpBsx2kz2ySQE=";

     

       29
        
         };

     

       30
        
       

     

       31
        
         nativeBuildInputs = [

     

       32
        
           cmake

     

       33
        
           pkg-config

     

       34
       +
           wrapQtAppsHook

     

       35
       +
           qttools

     

       36
        
         ];

     

       37
        
       

     

       38
        
         buildInputs = [

     

       39
       +
           qtbase

     

       40
        
           boost.dev

     

       41
        
           capstone_4

     

       42
        
           double-conversion

     
···

       44
        
           qtxmlpatterns

     

       45
        
         ];

     

       46
        
       

     

       47
       +
         cmakeFlags = [

     

       48
       +
           (lib.cmakeFeature "DEFAULT_PLUGIN_DIR" "${placeholder "out"}/lib/edb")

     

       49
       +
         ];

     

       0
        
       
     

       0
        
       
     

       50
        
       

     

       51
       +
         postPatch = ''

     

       52
        
           # The build script checks for the presence of .git to determine whether

     

       53
        
           # submodules were fetched and will throw an error if it's not there.

     

       54
        
           # Avoid using leaveDotGit in the fetchFromGitHub options as it is non-deterministic.

     

       55
        
           mkdir -p src/qhexview/.git lib/gdtoa-desktop/.git

     

       56
       +
         '';

     

       57
        
       

     

       58
       +
         passthru = {

     

       59
       +
           tests.version = testers.testVersion {

     

       60
       +
             package = finalAttrs.finalPackage;

     

       61
       +
             command = "env QT_QPA_PLATFORM=minimal ${lib.getExe finalAttrs.finalPackage} --version";

     

       62
       +
           };

     

       63
       +
           updateScript = nix-update-script { };

     

       64
       +
         };

     

       65
        
       

     

       66
       +
         meta = {

     

       67
        
           description = "Cross platform AArch32/x86/x86-64 debugger";

     

       68
        
           mainProgram = "edb";

     

       69
        
           homepage = "https://github.com/eteran/edb-debugger";

     

       70
       +
           license = lib.licenses.gpl2Plus;

     

       71
       +
           maintainers = with lib.maintainers; [

     

       72
        
             lihop

     

       73
        
             maxxk

     

       74
        
           ];

     

       75
        
           platforms = [ "x86_64-linux" ];

     

       76
        
         };

     

       77
       +
       })

+2 -2

pkgs/games/sgt-puzzles/default.nix

···

       18
        
       

     

       19
        
       stdenv.mkDerivation rec {

     

       20
        
         pname = "sgt-puzzles";

     

       21
       -
         version = "20241123.5e74004";

     

       22
        
       

     

       23
        
         src = fetchurl {

     

       24
        
           url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";

     

       25
       -
           hash = "sha256-r96rQWq2UJoLoIB+w1xcxIvd5kNGGYq+Wri/Vojeb0Q=";

     

       26
        
         };

     

       27
        
       

     

       28
        
         sgt-puzzles-menu = fetchurl {

···

       18
        
       

     

       19
        
       stdenv.mkDerivation rec {

     

       20
        
         pname = "sgt-puzzles";

     

       21
       +
         version = "20241223.5eea14c";

     

       22
        
       

     

       23
        
         src = fetchurl {

     

       24
        
           url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";

     

       25
       +
           hash = "sha256-c9cPPxjU7O+uAp6jzCkfv8ZJeVrcLmEfD+lUK0l+X9w=";

     

       26
        
         };

     

       27
        
       

     

       28
        
         sgt-puzzles-menu = fetchurl {

+12 -12

pkgs/misc/drivers/epsonscan2/build.patch pkgs/by-name/ep/epsonscan2/build.patch

···

       64
        
        static const int kMaxBuf = 256;

     

       65
        
        

     

       66
        
       diff --git a/src/Controller/Src/Scanner/Engine.cpp b/src/Controller/Src/Scanner/Engine.cpp

     

       67
       -
       index 9489d4b..670bad9 100644

     

       68
        
       --- a/src/Controller/Src/Scanner/Engine.cpp

     

       69
        
       +++ b/src/Controller/Src/Scanner/Engine.cpp

     

       70
       -
       @@ -263,8 +263,8 @@ SDIError Engine::Open()

     

       71
       -
        	//kill es2netif

     

       72
       -
        	//kill es2intif

     

       73
       -
        

     

       74
       -
       -	system("killall -9 -q es2netif > /dev/null");

     

       75
       -
       -	system("killall -9 -q es2intif > /dev/null");

     

       76
       -
       +	system("@KILLALL@ -9 -q es2netif > /dev/null");

     

       77
       -
       +	system("@KILLALL@ -9 -q es2intif > /dev/null");

     

       78
       -
        

     

       79
       -
        	if (engine_) {

     

       80
       -
        		return ExchangeError(engine_->Open());

     

       81
        
       diff --git a/src/Standalone/CMakeLists.txt b/src/Standalone/CMakeLists.txt

     

       82
        
       index eff3dd3..c2b3803 100644

     

       83
        
       --- a/src/Standalone/CMakeLists.txt

···

       64
        
        static const int kMaxBuf = 256;

     

       65
        
        

     

       66
        
       diff --git a/src/Controller/Src/Scanner/Engine.cpp b/src/Controller/Src/Scanner/Engine.cpp

     

       67
       +
       index 8bd842e..d011329 100755

     

       68
        
       --- a/src/Controller/Src/Scanner/Engine.cpp

     

       69
        
       +++ b/src/Controller/Src/Scanner/Engine.cpp

     

       70
       +
       @@ -210,8 +210,8 @@ bool Engine::InitWithDeviceInfoDict(const char *deviceInfo) {

     

       71
       +
        SDIError Engine::Open()

     

       72
       +
        {

     

       73
       +
         SDI_TRACE_LOG("Enter");

     

       74
       +
       - system("killall -9 -q es2netif > /dev/null");

     

       75
       +
       - system("killall -9 -q es2intif > /dev/null");

     

       76
       +
       + system("@KILLALL@ -9 -q es2netif > /dev/null");

     

       77
       +
       + system("@KILLALL@ -9 -q es2intif > /dev/null");

     

       78
       +
         if (engine_) {

     

       79
       +
          return ExchangeError(engine_->Open());

     

       80
       +
         }

     

       81
        
       diff --git a/src/Standalone/CMakeLists.txt b/src/Standalone/CMakeLists.txt

     

       82
        
       index eff3dd3..c2b3803 100644

     

       83
        
       --- a/src/Standalone/CMakeLists.txt

+19 -25

pkgs/misc/drivers/epsonscan2/default.nix pkgs/by-name/ep/epsonscan2/package.nix

···

       25
        
       let

     

       26
        
         pname = "epsonscan2";

     

       27
        
         description = "Epson Scan 2 scanner driver for many modern Epson scanners and multifunction printers";

     

       28
       -
         version = "6.7.63.0";

     

       29
        
       

     

       30
        
         system = stdenv.hostPlatform.system;

     

       31
        
       

     

       32
        
         src = fetchzip {

     

       33
       -
           url = "https://download3.ebz.epson.net/dsc/f/03/00/15/17/69/0ef02802c476a6564f13cac929859c394f40326a/epsonscan2-6.7.63.0-1.src.tar.gz";

     

       34
       -
           hash = "sha256-ZLnbIk0I7g6ext5anPD+/lD4qNlk6f2fL0xdIWLcfbY=";

     

       35
        
         };

     

       36
        
         bundle =

     

       37
        
           {

     

       38
       -
             "i686-linux" = fetchzip {

     

       39
       -
               name = "${pname}-bundle";

     

       40
       -
               url = "https://download3.ebz.epson.net/dsc/f/03/00/15/17/67/ceae6a02aaa81cb61012899987fbb5ab891b6ab2/epsonscan2-bundle-6.7.63.0.i686.deb.tar.gz";

     

       41
       -
               hash = "sha256-h9beAzNdjOhTlZqW0rJbSQXGOpvFRGvTcWw0ZtOqiYY=";

     

       42
       -
             };

     

       43
       -
       

     

       44
        
             "x86_64-linux" = fetchzip {

     

       45
        
               name = "${pname}-bundle";

     

       46
       -
               url = "https://download3.ebz.epson.net/dsc/f/03/00/15/17/68/050e5a55ed90f4efb4ca3bdd34e5797b149443ca/epsonscan2-bundle-6.7.63.0.x86_64.deb.tar.gz";

     

       47
       -
               hash = "sha256-+S17FfS2h4zZCvE6W+yZvdJb6+OWYTt0ZWCA+pe1NZc=";

     

       48
        
             };

     

       49
        
           }

     

       50
        
           ."${system}" or (throw "Unsupported system: ${system}");

     
···

       55
        
       

     

       56
        
         patches = [

     

       57
        
           ./build.patch

     

       0
        
       
     

       58
        
           (fetchpatch {

     

       59
       -
             url = "https://github.com/flathub/net.epson.epsonscan2/raw/master/patches/epsonscan2-crash.patch";

     

       60
       -
             hash = "sha256-srMxlFfnZuJ3ed5veFcJIiZuW27F/3xOS0yr4ywn4FI=";

     

       61
        
           })

     

       62
        
           (fetchpatch {

     

       63
       -
             url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/master/patches/epsonscan2-oob-container.patch";

     

       64
       -
             hash = "sha256-FhXZT0bIBYwdFow2USRJl8Q7j2eqpq98Hh0lHFQlUQY=";

     

       65
        
           })

     

       66
        
           (fetchpatch {

     

       67
       -
             url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/master/patches/epsonscan2-xdg-open.patch";

     

       68
       -
             hash = "sha256-4ih3vZjPwWiiAxKfpLIwbbsk1K2oXSuxGbT5PVwfUsc=";

     

       69
        
           })

     

       70
        
         ];

     

       71
        
       

     

       72
        
         postPatch = ''

     

       0
        
       
     

       0
        
       
     

       73
        
           substituteInPlace src/Controller/Src/Scanner/Engine.cpp \

     

       74
       -
             --replace '@KILLALL@' ${killall}/bin/killall

     

       75
        
       

     

       76
        
           substituteInPlace src/Controller/Src/Filter/GetOrientation.cpp \

     

       77
       -
             --replace '@OCR_ENGINE_GETROTATE@' $out/libexec/epsonscan2-ocr/ocr-engine-getrotate

     

       78
        
         '';

     

       79
        
       

     

       80
        
         nativeBuildInputs =

     
···

       127
        
           + lib.optionalString withGui ''

     

       128
        
             # The icon file extension is .ico but it's actually a png!

     

       129
        
             mkdir -p $out/share/icons/hicolor/{48x48,128x128}/apps

     

       130
       -
             convert $src/Resources/Icons/escan2_app.ico -resize 48x48 $out/share/icons/hicolor/48x48/apps/epsonscan2.png

     

       131
       -
             convert $src/Resources/Icons/escan2_app.ico -resize 128x128 $out/share/icons/hicolor/128x128/apps/epsonscan2.png

     

       132
        
           ''

     

       133
        
           + lib.optionalString withNonFreePlugins ''

     

       134
        
             ar xf ${bundle}/plugins/epsonscan2-non-free-plugin_*.deb

     
···

       170
        
             </literal>

     

       171
        
           '';

     

       172
        
           homepage = "https://support.epson.net/linux/en/epsonscan2.php";

     

       173
       -
           platforms = [

     

       174
       -
             "i686-linux"

     

       175
       -
             "x86_64-linux"

     

       176
       -
           ];

     

       177
        
           sourceProvenance =

     

       178
        
             with lib.sourceTypes;

     

       179
        
             [ fromSource ] ++ lib.optionals withNonFreePlugins [ binaryNativeCode ];

···

       25
        
       let

     

       26
        
         pname = "epsonscan2";

     

       27
        
         description = "Epson Scan 2 scanner driver for many modern Epson scanners and multifunction printers";

     

       28
       +
         version = "6.7.70.0";

     

       29
        
       

     

       30
        
         system = stdenv.hostPlatform.system;

     

       31
        
       

     

       32
        
         src = fetchzip {

     

       33
       +
           url = "https://download3.ebz.epson.net/dsc/f/03/00/16/14/37/7577ee65efdad48ee2d2f38d9eda75418e490552/epsonscan2-6.7.70.0-1.src.tar.gz";

     

       34
       +
           hash = "sha256-y7XGxrOpVou/ZSfUffV3qv+SsFFpTiU7pWvtfsiLZWc=";

     

       35
        
         };

     

       36
        
         bundle =

     

       37
        
           {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       38
        
             "x86_64-linux" = fetchzip {

     

       39
        
               name = "${pname}-bundle";

     

       40
       +
               url = "https://download3.ebz.epson.net/dsc/f/03/00/16/14/38/7b1780ace96e2c6033bbb667c7f3ed281e4e9f38/epsonscan2-bundle-6.7.70.0.x86_64.deb.tar.gz";

     

       41
       +
               hash = "sha256-fPNNFgW/VU/YG+jjmSvPZ0WsHibsXY1TNp164GxLHKw=";

     

       42
        
             };

     

       43
        
           }

     

       44
        
           ."${system}" or (throw "Unsupported system: ${system}");

     
···

       49
        
       

     

       50
        
         patches = [

     

       51
        
           ./build.patch

     

       52
       +
           ./gcc14.patch

     

       53
        
           (fetchpatch {

     

       54
       +
             url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/a489ac2f8cbd03afeda86673930cc17663c31a53/patches/0002-Fix-crash.patch";

     

       55
       +
             hash = "sha256-rNsFnHq//CJcIZl0M6RLRkIY3YhnJZbikO8SeeC2ktg=";

     

       56
        
           })

     

       57
        
           (fetchpatch {

     

       58
       +
             url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/a489ac2f8cbd03afeda86673930cc17663c31a53/patches/0004-Fix-a-crash-on-an-OOB-container-access.patch";

     

       59
       +
             hash = "sha256-WmA8pmPSJ1xUdeBbE8Jzi6w9p96aIOm0erF3T4EQ6VA=";

     

       60
        
           })

     

       61
        
           (fetchpatch {

     

       62
       +
             url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/a489ac2f8cbd03afeda86673930cc17663c31a53/patches/0003-Use-XDG-open-to-open-the-directory.patch";

     

       63
       +
             hash = "sha256-H3lle1SXkkpbBkozYEwiX0z9oTUubTpB+l91utxH03M=";

     

       64
        
           })

     

       65
        
         ];

     

       66
        
       

     

       67
        
         postPatch = ''

     

       68
       +
           rm CMakeCache.txt

     

       69
       +
       

     

       70
        
           substituteInPlace src/Controller/Src/Scanner/Engine.cpp \

     

       71
       +
             --replace-fail '@KILLALL@' ${killall}/bin/killall

     

       72
        
       

     

       73
        
           substituteInPlace src/Controller/Src/Filter/GetOrientation.cpp \

     

       74
       +
             --replace-fail '@OCR_ENGINE_GETROTATE@' $out/libexec/epsonscan2-ocr/ocr-engine-getrotate

     

       75
        
         '';

     

       76
        
       

     

       77
        
         nativeBuildInputs =

     
···

       124
        
           + lib.optionalString withGui ''

     

       125
        
             # The icon file extension is .ico but it's actually a png!

     

       126
        
             mkdir -p $out/share/icons/hicolor/{48x48,128x128}/apps

     

       127
       +
             magick $src/Resources/Icons/escan2_app.ico -resize 48x48 -delete 1,2,3 $out/share/icons/hicolor/48x48/apps/epsonscan2.png

     

       128
       +
             magick $src/Resources/Icons/escan2_app.ico -resize 128x128 -delete 1,2,3 $out/share/icons/hicolor/128x128/apps/epsonscan2.png

     

       129
        
           ''

     

       130
        
           + lib.optionalString withNonFreePlugins ''

     

       131
        
             ar xf ${bundle}/plugins/epsonscan2-non-free-plugin_*.deb

     
···

       167
        
             </literal>

     

       168
        
           '';

     

       169
        
           homepage = "https://support.epson.net/linux/en/epsonscan2.php";

     

       170
       +
           platforms = [ "x86_64-linux" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       171
        
           sourceProvenance =

     

       172
        
             with lib.sourceTypes;

     

       173
        
             [ fromSource ] ++ lib.optionals withNonFreePlugins [ binaryNativeCode ];

pkgs/servers/web-apps/wordpress/packages/plugins.json

···

       191
        
           "sha256": "12r17xxwrnci5v18x71y44289z5dvvrj8xr3sfl1ipvlrvzggbfh",

     

       192
        
           "version": "3.0"

     

       193
        
         },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       194
        
         "wp-fastest-cache": {

     

       195
        
           "path": "wp-fastest-cache/tags/1.3.2",

     

       196
        
           "rev": "3181365",

···

       191
        
           "sha256": "12r17xxwrnci5v18x71y44289z5dvvrj8xr3sfl1ipvlrvzggbfh",

     

       192
        
           "version": "3.0"

     

       193
        
         },

     

       194
       +
         "wp-fail2ban": {

     

       195
       +
           "path": "wp-fail2ban/tags/5.3.2",

     

       196
       +
           "rev": "3131194",

     

       197
       +
           "sha256": "1svp2a3xr6ajfhabz2n4rqcf9bzfr9dilc2n27ral9akc86lj1ii",

     

       198
       +
           "version": "5.3.2"

     

       199
       +
         },

     

       200
        
         "wp-fastest-cache": {

     

       201
        
           "path": "wp-fastest-cache/tags/1.3.2",

     

       202
        
           "rev": "3181365",

pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json

···

       31
        
       , "wordpress-seo": "gpl3Only"

     

       32
        
       , "worker": "gpl3Plus"

     

       33
        
       , "wp-change-email-sender": "gpl2Plus"

     

       0
        
       
     

       34
        
       , "wp-fastest-cache": "gpl2Plus"

     

       35
        
       , "wp-gdpr-compliance": "gpl2Plus"

     

       36
        
       , "wp-import-export-lite": "gpl3Plus"

···

       31
        
       , "wordpress-seo": "gpl3Only"

     

       32
        
       , "worker": "gpl3Plus"

     

       33
        
       , "wp-change-email-sender": "gpl2Plus"

     

       34
       +
       , "wp-fail2ban": "gpl3Plus"

     

       35
        
       , "wp-fastest-cache": "gpl2Plus"

     

       36
        
       , "wp-gdpr-compliance": "gpl2Plus"

     

       37
        
       , "wp-import-export-lite": "gpl3Plus"

pkgs/tools/networking/edgedb/0001-dynamically-patchelf-binaries.patch pkgs/by-name/ed/edgedb/0001-dynamically-patchelf-binaries.patch

+3 -3

pkgs/tools/networking/edgedb/default.nix pkgs/by-name/ed/edgedb/package.nix

···

       16
        
       }:

     

       17
        
       rustPlatform.buildRustPackage rec {

     

       18
        
         pname = "edgedb";

     

       19
       -
         version = "6.0.2";

     

       20
        
       

     

       21
        
         src = fetchFromGitHub {

     

       22
        
           owner = "edgedb";

     

       23
        
           repo = "edgedb-cli";

     

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

     

       25
       -
           hash = "sha256-P55LwByDVO3pEzg4OZldXiyli8s5oHvV8MXCDwkF2+8=";

     

       26
        
           fetchSubmodules = true;

     

       27
        
         };

     

       28
        
       

     

       29
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       30
        
           inherit pname version src;

     

       31
       -
           hash = "sha256-oRtgORzp0tabPcyArPgG8LGfYlSPhpaeRPT9QWF5BGs=";

     

       32
        
         };

     

       33
        
       

     

       34
        
         nativeBuildInputs = [

···

       16
        
       }:

     

       17
        
       rustPlatform.buildRustPackage rec {

     

       18
        
         pname = "edgedb";

     

       19
       +
         version = "6.1.0";

     

       20
        
       

     

       21
        
         src = fetchFromGitHub {

     

       22
        
           owner = "edgedb";

     

       23
        
           repo = "edgedb-cli";

     

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

     

       25
       +
           hash = "sha256-iB0ZWciEx/Xiq+pMg3nMJNHumoy5Z8dB6ev7UneHnVg=";

     

       26
        
           fetchSubmodules = true;

     

       27
        
         };

     

       28
        
       

     

       29
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       30
        
           inherit pname version src;

     

       31
       +
           hash = "sha256-oiDCUJamnl2ykvfs7V20dvr29ZAtSl+kZW4fzmlc1Ao=";

     

       32
        
         };

     

       33
        
       

     

       34
        
         nativeBuildInputs = [

pkgs/top-level/aliases.nix

···

       1364
        
       

     

       1365
        
         ### V ###

     

       1366
        
       

     

       0
        
       
     

       1367
        
         validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21

     

       1368
        
         vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26

     

       1369
        
         vaapiIntel = intel-vaapi-driver; # Added 2023-05-31

···

       1364
        
       

     

       1365
        
         ### V ###

     

       1366
        
       

     

       1367
       +
         v8 = throw "`v8` has been removed as it's unmaintained for several years and has vulnerabilites. Please migrate to `nodejs.libv8`"; # Added 2024-12-21

     

       1368
        
         validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21

     

       1369
        
         vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26

     

       1370
        
         vaapiIntel = intel-vaapi-driver; # Added 2023-05-31

+3 -7

pkgs/top-level/all-packages.nix

···

       331
        
           catch2 = catch2_3;

     

       332
        
         };

     

       333
        
       

     

       334
       -
         edgedb = callPackage ../tools/networking/edgedb { };

     

       335
       -
       

     

       336
        
         eludris = callPackage ../tools/misc/eludris { };

     

       337
        
       

     

       338
        
         enochecker-test = with python3Packages; callPackage ../development/tools/enochecker-test { };

     
···

       10892
        
       

     

       10893
        
         unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { });

     

       10894
        
       

     

       10895
       -
         v8 = callPackage ../development/libraries/v8 {

     

       10896
       -
           stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;

     

       10897
       -
         };

     

       10898
       -
       

     

       10899
        
         valeStyles = recurseIntoAttrs (callPackages ../by-name/va/vale/styles.nix { });

     

       10900
        
       

     

       10901
        
         valhalla = callPackage ../development/libraries/valhalla {

     
···

       17847
        
       

     

       17848
        
         cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { };

     

       17849
        
       

     

       17850
       -
         epsonscan2 = pkgs.libsForQt5.callPackage ../misc/drivers/epsonscan2 { };

     

       0
        
       
     

       0
        
       
     

       17851
        
       

     

       17852
        
         foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix { withNonfreeDb = true; };

     

       17853

···

       331
        
           catch2 = catch2_3;

     

       332
        
         };

     

       333
        
       

     

       0
        
       
     

       0
        
       
     

       334
        
         eludris = callPackage ../tools/misc/eludris { };

     

       335
        
       

     

       336
        
         enochecker-test = with python3Packages; callPackage ../development/tools/enochecker-test { };

     
···

       10890
        
       

     

       10891
        
         unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { });

     

       10892
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       10893
        
         valeStyles = recurseIntoAttrs (callPackages ../by-name/va/vale/styles.nix { });

     

       10894
        
       

     

       10895
        
         valhalla = callPackage ../development/libraries/valhalla {

     
···

       17841
        
       

     

       17842
        
         cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { };

     

       17843
        
       

     

       17844
       +
         epsonscan2 = callPackage ../by-name/ep/epsonscan2/package.nix {

     

       17845
       +
           inherit (qt5) wrapQtAppsHook qtbase;

     

       17846
       +
         };

     

       17847
        
       

     

       17848
        
         foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix { withNonfreeDb = true; };

     

       17849