diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 45b211cbc521..09ca05897dba 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8330,6 +8330,12 @@ keys = [ { fingerprint = "7391 BF2D A2C3 B2C9 BE25 ACA9 C7A7 4616 F302 5DF4"; } ]; matrix = "@felipeqq2:pub.solar"; }; + felissedano = { + name = "Felis Sedano"; + email = "contact@felissedano.com"; + github = "felissedano"; + githubId = 109383955; + }; felixalbrigtsen = { email = "felix@albrigtsen.it"; github = "felixalbrigtsen"; @@ -15289,6 +15295,12 @@ githubId = 208297; name = "Luz"; }; + lwb-2021 = { + email = "lwb-2021@qq.com"; + github = "lwb-2021"; + githubId = 91705377; + name = "lwb-2021"; + }; lx = { email = "alex@adnab.me"; github = "Alexis211"; @@ -24009,6 +24021,12 @@ githubId = 617130; keys = [ { fingerprint = "C4F7 46C7 B560 38D8 210F 0288 5877 DEE9 7428 557F"; } ]; }; + skohtv = { + name = "Skoh"; + email = "contact@skoh.dev"; + github = "skohtv"; + githubId = 101289702; + }; skovati = { github = "skovati"; githubId = 49844593; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index f96d90941323..949531d9a83c 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -31,7 +31,7 @@ in description = '' The user IDs used in NixOS. ''; - type = types.attrsOf types.int; + type = types.attrsOf types.ints.u32; }; ids.gids = lib.mkOption { @@ -39,7 +39,7 @@ in description = '' The group IDs used in NixOS. ''; - type = types.attrsOf types.int; + type = types.attrsOf types.ints.u32; }; }; diff --git a/nixos/modules/profiles/nix-builder-vm.nix b/nixos/modules/profiles/nix-builder-vm.nix index 287ae83f498e..67a134cb95fa 100644 --- a/nixos/modules/profiles/nix-builder-vm.nix +++ b/nixos/modules/profiles/nix-builder-vm.nix @@ -85,7 +85,7 @@ in }; hostPort = mkOption { default = 31022; - type = types.int; + type = types.port; example = 22; description = '' The localhost host port to forward TCP to the guest port. diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index e8eb756f8f59..049d5d0c78a7 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -77,49 +77,49 @@ in SYS_UID_MIN = lib.mkOption { description = "Range of user IDs used for the creation of system users by useradd or newusers."; default = 400; - type = lib.types.int; + type = lib.types.ints.u32; }; SYS_UID_MAX = lib.mkOption { description = "Range of user IDs used for the creation of system users by useradd or newusers."; default = 999; - type = lib.types.int; + type = lib.types.ints.u32; }; UID_MIN = lib.mkOption { description = "Range of user IDs used for the creation of regular users by useradd or newusers."; default = 1000; - type = lib.types.int; + type = lib.types.ints.u32; }; UID_MAX = lib.mkOption { description = "Range of user IDs used for the creation of regular users by useradd or newusers."; default = 29999; - type = lib.types.int; + type = lib.types.ints.u32; }; SYS_GID_MIN = lib.mkOption { description = "Range of group IDs used for the creation of system groups by useradd, groupadd, or newusers"; default = 400; - type = lib.types.int; + type = lib.types.ints.u32; }; SYS_GID_MAX = lib.mkOption { description = "Range of group IDs used for the creation of system groups by useradd, groupadd, or newusers"; default = 999; - type = lib.types.int; + type = lib.types.ints.u32; }; GID_MIN = lib.mkOption { description = "Range of group IDs used for the creation of regular groups by useradd, groupadd, or newusers."; default = 1000; - type = lib.types.int; + type = lib.types.ints.u32; }; GID_MAX = lib.mkOption { description = "Range of group IDs used for the creation of regular groups by useradd, groupadd, or newusers."; default = 29999; - type = lib.types.int; + type = lib.types.ints.u32; }; TTYGROUP = lib.mkOption { diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 64555228c9c3..410829ee4cb6 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -182,7 +182,7 @@ in pbPort = lib.mkOption { default = 9989; - type = lib.types.either lib.types.str lib.types.int; + type = lib.types.either lib.types.str lib.types.port; example = "'tcp:9990:interface=127.0.0.1'"; description = '' The buildmaster will listen on a TCP port of your choosing diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 0c3091f85b49..de4403b30208 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -64,7 +64,7 @@ in sslPort = mkOption { default = 8154; - type = types.int; + type = types.port; description = '' Specifies port number on which the Go.CD server HTTPS interface listens. ''; diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index 814f0e99a8a7..27b7a5b94db2 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -415,7 +415,7 @@ in }; jmxPort = mkOption { - type = types.int; + type = types.port; default = 7199; description = '' Specifies the default port over which Cassandra will be available for diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 5cce94ac6d5e..c05bfc47bb77 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -94,7 +94,7 @@ in }; listenPortStart = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 4500; description = '' Starting port number for database listening sockets. Every FDB process binds to a diff --git a/nixos/modules/services/development/distccd.nix b/nixos/modules/services/development/distccd.nix index 46d09911e2b7..29ea8767b283 100644 --- a/nixos/modules/services/development/distccd.nix +++ b/nixos/modules/services/development/distccd.nix @@ -65,7 +65,7 @@ in }; nice = lib.mkOption { - type = lib.types.nullOr lib.types.int; + type = lib.types.nullOr (lib.types.ints.between (-20) 19); default = null; description = '' Niceness of the compilation tasks. diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix index 19ec7f76af8c..7ec2144230ed 100644 --- a/nixos/modules/services/logging/journalwatch.nix +++ b/nixos/modules/services/logging/journalwatch.nix @@ -72,7 +72,7 @@ in package = lib.mkPackageOption pkgs "journalwatch" { }; priority = lib.mkOption { - type = lib.types.int; + type = lib.types.ints.between 0 7; default = 6; description = '' Lowest priority of message to be considered. diff --git a/nixos/modules/services/misc/cpuminer-cryptonight.nix b/nixos/modules/services/misc/cpuminer-cryptonight.nix index adaee2bbb215..a06077497e22 100644 --- a/nixos/modules/services/misc/cpuminer-cryptonight.nix +++ b/nixos/modules/services/misc/cpuminer-cryptonight.nix @@ -43,7 +43,7 @@ in description = "Password for mining server"; }; threads = lib.mkOption { - type = lib.types.int; + type = lib.types.ints.unsigned; default = 0; description = "Number of miner threads, defaults to available processors"; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index a604bc88b3bf..240561f20278 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -638,7 +638,7 @@ in description = "External address used to access registry from the internet"; }; externalPort = mkOption { - type = types.int; + type = types.port; description = "External port used to access registry from the internet"; }; }; diff --git a/nixos/modules/services/misc/gotenberg.nix b/nixos/modules/services/misc/gotenberg.nix index e9a6388b970b..542aa342e5d6 100644 --- a/nixos/modules/services/misc/gotenberg.nix +++ b/nixos/modules/services/misc/gotenberg.nix @@ -107,7 +107,7 @@ in package = mkPackageOption pkgs "chromium" { }; maxQueueSize = mkOption { - type = types.int; + type = types.ints.unsigned; default = 0; description = "Maximum queue size for chromium-based conversions. Setting to 0 disables the limit."; }; @@ -143,7 +143,7 @@ in description = "Deny accepting URLs from these domains in the `downloadFrom` API field. Accepts a regular expression."; }; maxRetries = mkOption { - type = types.int; + type = types.ints.unsigned; default = 4; description = "The maximum amount of times to retry downloading a file specified with `downloadFrom`."; }; @@ -158,13 +158,13 @@ in package = mkPackageOption pkgs "libreoffice" { }; restartAfter = mkOption { - type = types.int; + type = types.ints.unsigned; default = 10; description = "Restart LibreOffice after this many conversions. Setting to 0 disables this feature."; }; maxQueueSize = mkOption { - type = types.int; + type = types.ints.unsigned; default = 0; description = "Maximum queue size for LibreOffice-based conversions. Setting to 0 disables the limit."; }; diff --git a/nixos/modules/services/misc/homepage-dashboard.nix b/nixos/modules/services/misc/homepage-dashboard.nix index 827c0f1b1590..c344d1b4a44c 100644 --- a/nixos/modules/services/misc/homepage-dashboard.nix +++ b/nixos/modules/services/misc/homepage-dashboard.nix @@ -23,7 +23,7 @@ in }; listenPort = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 8082; description = "Port for Homepage to bind to."; }; diff --git a/nixos/modules/services/misc/rshim.nix b/nixos/modules/services/misc/rshim.nix index 49296f0e2f05..37bcb40e16e7 100644 --- a/nixos/modules/services/misc/rshim.nix +++ b/nixos/modules/services/misc/rshim.nix @@ -61,7 +61,7 @@ in }; log-level = lib.mkOption { - type = lib.types.int; + type = lib.types.ints.between 0 4; description = '' Specify the log level (0:none, 1:error, 2:warning, 3:notice, 4:debug). ''; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index c21b4384ba43..8a860ba44142 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -329,7 +329,7 @@ in }; listenPort = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 53589; description = '' Port number of the Taskserver. diff --git a/nixos/modules/services/monitoring/nezha-agent.nix b/nixos/modules/services/monitoring/nezha-agent.nix index 87ecbfdde710..e9161defe80b 100644 --- a/nixos/modules/services/monitoring/nezha-agent.nix +++ b/nixos/modules/services/monitoring/nezha-agent.nix @@ -98,12 +98,7 @@ in ''; }; report_delay = lib.mkOption { - type = lib.types.enum [ - 1 - 2 - 3 - 4 - ]; + type = lib.types.ints.between 1 4; default = 3; description = '' The interval between system status reportings. diff --git a/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix index 7c91e7995803..0d8853951357 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix @@ -22,7 +22,7 @@ in }; gatewayPort = mkOption { - type = types.int; + type = types.port; default = 49000; description = '' The port of the FRITZ!Box UPnP service. diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index 5eb0517d4fc5..48bb0f0e93f3 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -110,7 +110,7 @@ in graphitePort = lib.mkOption { description = "Port of Graphite server (i.e. carbon-cache)."; default = null; - type = lib.types.nullOr lib.types.int; + type = lib.types.nullOr lib.types.port; }; extraConfig = lib.mkOption { diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix index 8729945fc3fd..9d3c3f9e4188 100644 --- a/nixos/modules/services/network-filesystems/nfsd.nix +++ b/nixos/modules/services/network-filesystems/nfsd.nix @@ -81,7 +81,7 @@ in }; mountdPort = lib.mkOption { - type = lib.types.nullOr lib.types.int; + type = lib.types.nullOr lib.types.port; default = null; example = 4002; description = '' @@ -90,7 +90,7 @@ in }; lockdPort = lib.mkOption { - type = lib.types.nullOr lib.types.int; + type = lib.types.nullOr lib.types.port; default = null; example = 4001; description = '' @@ -101,7 +101,7 @@ in }; statdPort = lib.mkOption { - type = lib.types.nullOr lib.types.int; + type = lib.types.nullOr lib.types.port; default = null; example = 4000; description = '' diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index 1176fb3131fc..3297e65dac2b 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -140,7 +140,7 @@ in sftpd.enable = lib.mkEnableOption "SFTP service"; sftpd.port = lib.mkOption { default = null; - type = lib.types.nullOr lib.types.int; + type = lib.types.nullOr lib.types.port; description = '' The port on which the SFTP server will listen. diff --git a/nixos/modules/services/networking/3proxy.nix b/nixos/modules/services/networking/3proxy.nix index aa76e57417fb..dca17e8194ef 100644 --- a/nixos/modules/services/networking/3proxy.nix +++ b/nixos/modules/services/networking/3proxy.nix @@ -83,7 +83,7 @@ in ''; }; bindPort = lib.mkOption { - type = lib.types.nullOr lib.types.int; + type = lib.types.nullOr lib.types.port; default = null; example = 3128; description = '' @@ -192,7 +192,7 @@ in ''; }; targetPorts = lib.mkOption { - type = lib.types.listOf lib.types.int; + type = lib.types.listOf lib.types.port; default = [ ]; example = [ 80 diff --git a/nixos/modules/services/networking/autossh.nix b/nixos/modules/services/networking/autossh.nix index d40c7b5cb415..2e6fbcec9431 100644 --- a/nixos/modules/services/networking/autossh.nix +++ b/nixos/modules/services/networking/autossh.nix @@ -33,7 +33,7 @@ in description = "Name of the user the AutoSSH session should run as"; }; monitoringPort = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 0; example = 20000; description = '' diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix index 8d60deda0085..1786aa530f02 100644 --- a/nixos/modules/services/networking/coturn.nix +++ b/nixos/modules/services/networking/coturn.nix @@ -50,7 +50,7 @@ in services.coturn = { enable = lib.mkEnableOption "coturn TURN server"; listening-port = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 3478; description = '' TURN listener port for UDP and TCP. @@ -59,7 +59,7 @@ in ''; }; tls-listening-port = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 5349; description = '' TURN listener port for TLS. @@ -74,7 +74,7 @@ in ''; }; alt-listening-port = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = cfg.listening-port + 1; defaultText = lib.literalExpression "listening-port + 1"; description = '' @@ -89,7 +89,7 @@ in ''; }; alt-tls-listening-port = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = cfg.tls-listening-port + 1; defaultText = lib.literalExpression "tls-listening-port + 1"; description = '' @@ -130,14 +130,14 @@ in ''; }; min-port = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 49152; description = '' Lower bound of UDP relay endpoints ''; }; max-port = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 65535; description = '' Upper bound of UDP relay endpoints @@ -263,7 +263,7 @@ in ''; }; cli-port = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 5766; description = '' CLI server port. diff --git a/nixos/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix index a0c67796377b..c95eb5d271af 100644 --- a/nixos/modules/services/networking/freenet.nix +++ b/nixos/modules/services/networking/freenet.nix @@ -15,7 +15,7 @@ in enable = lib.mkEnableOption "Freenet daemon"; nice = lib.mkOption { - type = lib.types.int; + type = lib.types.ints.between (-20) 19; default = 10; description = "Set the nice level for the Freenet daemon"; }; diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 5fa3cadb9a7e..a9c686763ca9 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -274,7 +274,7 @@ in channel = mkOption { default = 0; example = 11; - type = types.int; + type = types.ints.positive; description = '' The channel to operate on. Use 0 to enable ACS (Automatic Channel Selection). Beware that not every device supports ACS in which case {command}`hostapd` @@ -571,7 +571,7 @@ in options = { logLevel = mkOption { default = 2; - type = types.int; + type = types.ints.between 0 4; description = '' Levels (minimum value for logged events): 0 = verbose debugging @@ -957,7 +957,7 @@ in vlanid = mkOption { default = null; example = 1; - type = types.nullOr types.int; + type = types.nullOr types.ints.unsigned; description = "If this attribute is given, all clients using this entry will get tagged with the given VLAN ID."; }; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 1f9c9dcac4a0..15e86c4c342e 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -667,7 +667,7 @@ in description = "Upstream outproxy bind address."; }; outproxyPort = mkOption { - type = types.int; + type = types.port; default = 4444; description = "Upstream outproxy bind port."; }; @@ -686,7 +686,7 @@ in { options = { destinationPort = mkOption { - type = with types; nullOr int; + type = with types; nullOr port; default = null; description = "Connect to particular port at destination."; }; @@ -711,7 +711,7 @@ in { options = { inPort = mkOption { - type = types.int; + type = types.port; default = 0; description = "Service port. Default to the tunnel's listen port."; }; diff --git a/nixos/modules/services/networking/icecream/daemon.nix b/nixos/modules/services/networking/icecream/daemon.nix index 789ff377bbaf..baf63539254f 100644 --- a/nixos/modules/services/networking/icecream/daemon.nix +++ b/nixos/modules/services/networking/icecream/daemon.nix @@ -79,7 +79,7 @@ in }; nice = mkOption { - type = types.int; + type = types.ints.between (-20) 19; default = 5; description = '' The level of niceness to use. diff --git a/nixos/modules/services/networking/livekit-ingress.nix b/nixos/modules/services/networking/livekit-ingress.nix index 260698a4b2b4..7aaf6d1397af 100644 --- a/nixos/modules/services/networking/livekit-ingress.nix +++ b/nixos/modules/services/networking/livekit-ingress.nix @@ -71,13 +71,13 @@ in rtc_config = { port_range_start = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 50000; description = "Start of UDP port range for WebRTC"; }; port_range_end = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 51000; description = "End of UDP port range for WebRTC"; }; diff --git a/nixos/modules/services/networking/livekit.nix b/nixos/modules/services/networking/livekit.nix index 1c93fd6fc069..ec7cc212c82a 100644 --- a/nixos/modules/services/networking/livekit.nix +++ b/nixos/modules/services/networking/livekit.nix @@ -85,13 +85,13 @@ in rtc = { port_range_start = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 50000; description = "Start of UDP port range for WebRTC"; }; port_range_end = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 51000; description = "End of UDP port range for WebRTC"; }; diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 5c0df8ca7960..692868c8a790 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -41,9 +41,9 @@ let ${lib.optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"} certrequired=${lib.boolToString cfg.clientCertRequired} - ${lib.optionalString (cfg.sslCert != "") "sslCert=${cfg.sslCert}"} - ${lib.optionalString (cfg.sslKey != "") "sslKey=${cfg.sslKey}"} - ${lib.optionalString (cfg.sslCa != "") "sslCA=${cfg.sslCa}"} + ${lib.optionalString (cfg.sslCert != null) "sslCert=${cfg.sslCert}"} + ${lib.optionalString (cfg.sslKey != null) "sslKey=${cfg.sslKey}"} + ${lib.optionalString (cfg.sslCa != null) "sslCA=${cfg.sslCa}"} ${lib.optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"} @@ -238,20 +238,20 @@ in clientCertRequired = lib.mkEnableOption "requiring clients to authenticate via certificates"; sslCert = lib.mkOption { - type = lib.types.str; - default = ""; + type = lib.types.nullOr lib.types.path; + default = null; description = "Path to your SSL certificate."; }; sslKey = lib.mkOption { - type = lib.types.str; - default = ""; + type = lib.types.nullOr lib.types.path; + default = null; description = "Path to your SSL key."; }; sslCa = lib.mkOption { - type = lib.types.str; - default = ""; + type = lib.types.nullOr lib.types.path; + default = null; description = "Path to your SSL CA certificate."; }; @@ -418,13 +418,13 @@ in + lib.optionalString cfg.logToFile '' rw /var/log/murmur/murmurd.log, '' - + lib.optionalString (cfg.sslCert != "") '' + + lib.optionalString (cfg.sslCert != null) '' r ${cfg.sslCert}, '' - + lib.optionalString (cfg.sslKey != "") '' + + lib.optionalString (cfg.sslKey != null) '' r ${cfg.sslKey}, '' - + lib.optionalString (cfg.sslCa != "") '' + + lib.optionalString (cfg.sslCa != null) '' r ${cfg.sslCa}, '' + lib.optionalString (cfg.dbus != null) '' diff --git a/nixos/modules/services/networking/ntopng.nix b/nixos/modules/services/networking/ntopng.nix index a4b718864d37..b97a70db66ce 100644 --- a/nixos/modules/services/networking/ntopng.nix +++ b/nixos/modules/services/networking/ntopng.nix @@ -80,7 +80,7 @@ in httpPort = mkOption { default = 3000; - type = types.int; + type = types.port; description = '' Sets the HTTP port of the embedded web server. ''; diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index ce55056710e2..12879870fe39 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -708,7 +708,7 @@ in # HTTP server-related options httpPorts = mkOption { - type = types.listOf types.int; + type = types.listOf types.port; description = "Listening HTTP ports list for this service."; default = [ 5280 ]; }; @@ -723,7 +723,7 @@ in }; httpsPorts = mkOption { - type = types.listOf types.int; + type = types.listOf types.port; description = "Listening HTTPS ports list for this service."; default = [ 5281 ]; }; diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix index 17bc051fca20..19a0b293095d 100644 --- a/nixos/modules/services/networking/radvd.nix +++ b/nixos/modules/services/networking/radvd.nix @@ -39,7 +39,7 @@ in package = mkPackageOption pkgs "radvd" { }; debugLevel = mkOption { - type = types.int; + type = types.ints.between 0 5; default = 0; example = 5; description = '' diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index 25ad4b13daf2..2b72d7cbffc0 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -113,7 +113,7 @@ in }; listeningPort = mkOption { - type = types.int; + type = types.port; default = 0; example = 44444; description = '' @@ -139,7 +139,7 @@ in }; downloadLimit = mkOption { - type = types.int; + type = types.ints.unsigned; default = 0; example = 1024; description = '' @@ -148,7 +148,7 @@ in }; uploadLimit = mkOption { - type = types.int; + type = types.ints.unsigned; default = 0; example = 1024; description = '' @@ -166,7 +166,7 @@ in }; httpListenPort = mkOption { - type = types.int; + type = types.port; default = 9000; description = '' HTTP port to bind on. diff --git a/nixos/modules/services/networking/squid.nix b/nixos/modules/services/networking/squid.nix index 7a6a5cea15fc..bc072c249c56 100644 --- a/nixos/modules/services/networking/squid.nix +++ b/nixos/modules/services/networking/squid.nix @@ -145,7 +145,7 @@ in }; proxyPort = mkOption { - type = types.int; + type = types.port; default = 3128; description = "TCP port on which squid will listen."; }; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 19c8ce15dfec..aa4d08a7f74a 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -336,7 +336,7 @@ in }; localAnnouncePort = mkOption { - type = types.nullOr types.int; + type = types.nullOr types.port; default = null; description = '' The port on which to listen and send IPv4 broadcast announcements to. diff --git a/nixos/modules/services/networking/websockify.nix b/nixos/modules/services/networking/websockify.nix index c9219fc17d51..5e17e9bc7818 100644 --- a/nixos/modules/services/networking/websockify.nix +++ b/nixos/modules/services/networking/websockify.nix @@ -36,7 +36,7 @@ in portMap = mkOption { description = "Ports to map by default."; default = { }; - type = types.attrsOf types.int; + type = types.attrsOf types.port; }; }; }; diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix index 49bcc9e830d3..96cf4cc7148d 100644 --- a/nixos/modules/services/networking/zerobin.nix +++ b/nixos/modules/services/networking/zerobin.nix @@ -44,7 +44,7 @@ in }; listenPort = mkOption { - type = types.int; + type = types.port; default = 8000; example = 1357; description = '' diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index c7f21236e0fd..7813f154ecd6 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -72,7 +72,7 @@ in tcp_port = mkOption { description = "Elasticsearch port for the node to node communication."; default = 9300; - type = types.int; + type = types.port; }; cluster_name = mkOption { diff --git a/nixos/modules/services/security/cfssl.nix b/nixos/modules/services/security/cfssl.nix index 514442dbe437..329002417a25 100644 --- a/nixos/modules/services/security/cfssl.nix +++ b/nixos/modules/services/security/cfssl.nix @@ -154,14 +154,7 @@ in logLevel = lib.mkOption { default = 1; - type = lib.types.enum [ - 0 - 1 - 2 - 3 - 4 - 5 - ]; + type = lib.types.ints.between 0 5; description = "Log level (0 = DEBUG, 5 = FATAL)."; }; diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index adab048c5bf1..12599379ff01 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -996,6 +996,9 @@ in "-/etc/resolv.conf" "-/etc/nsswitch.conf" "-/etc/hosts" + "-/etc/passwd" + "-/etc/group" + "-/etc/shadow" "-/etc/localtime" "-/etc/kanidm" "-/etc/static/kanidm" diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix index d6248bd15fe2..d8c4d53b78c5 100644 --- a/nixos/modules/services/security/opensnitch.nix +++ b/nixos/modules/services/security/opensnitch.nix @@ -108,13 +108,7 @@ in }; LogLevel = lib.mkOption { - type = lib.types.enum [ - 0 - 1 - 2 - 3 - 4 - ]; + type = lib.types.ints.between 0 4; description = '' Default log level from 0 to 4 (debug, info, important, warning, error). diff --git a/nixos/modules/services/security/shibboleth-sp.nix b/nixos/modules/services/security/shibboleth-sp.nix index e9f92dcc0928..74dd333b1ae7 100644 --- a/nixos/modules/services/security/shibboleth-sp.nix +++ b/nixos/modules/services/security/shibboleth-sp.nix @@ -30,13 +30,13 @@ in }; fastcgi.shibAuthorizerPort = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 9100; description = "Port for shibauthorizer FastCGI process to bind to"; }; fastcgi.shibResponderPort = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 9101; description = "Port for shibauthorizer FastCGI process to bind to"; }; diff --git a/nixos/modules/services/system/cachix-watch-store.nix b/nixos/modules/services/system/cachix-watch-store.nix index 0df74b927afa..b30a57cd4926 100644 --- a/nixos/modules/services/system/cachix-watch-store.nix +++ b/nixos/modules/services/system/cachix-watch-store.nix @@ -36,13 +36,13 @@ in }; compressionLevel = lib.mkOption { - type = lib.types.nullOr lib.types.int; + type = lib.types.nullOr (lib.types.ints.between 0 16); description = "The compression level for ZSTD compression (between 0 and 16)"; default = null; }; jobs = lib.mkOption { - type = lib.types.nullOr lib.types.int; + type = lib.types.nullOr lib.types.ints.positive; description = "Number of threads used for pushing store paths"; default = null; }; diff --git a/nixos/modules/services/web-apps/anuko-time-tracker.nix b/nixos/modules/services/web-apps/anuko-time-tracker.nix index 52cbfd5ae4f0..4d00d418a1dc 100644 --- a/nixos/modules/services/web-apps/anuko-time-tracker.nix +++ b/nixos/modules/services/web-apps/anuko-time-tracker.nix @@ -225,7 +225,7 @@ in }; smtpPort = lib.mkOption { - type = lib.types.int; + type = lib.types.port; description = "MTA port."; default = 25; }; diff --git a/nixos/modules/services/web-apps/cryptpad.nix b/nixos/modules/services/web-apps/cryptpad.nix index 0ec6df1419bb..4a38d9589678 100644 --- a/nixos/modules/services/web-apps/cryptpad.nix +++ b/nixos/modules/services/web-apps/cryptpad.nix @@ -75,12 +75,12 @@ in description = "Address on which the Node.js server should listen"; }; httpPort = mkOption { - type = types.int; + type = types.port; default = 3000; description = "Port on which the Node.js server should listen"; }; websocketPort = mkOption { - type = types.int; + type = types.port; default = 3003; description = "Port for the websocket that needs to be separate"; }; diff --git a/nixos/modules/services/web-apps/kasmweb/default.nix b/nixos/modules/services/web-apps/kasmweb/default.nix index a5a5edd6deac..a32116562686 100644 --- a/nixos/modules/services/web-apps/kasmweb/default.nix +++ b/nixos/modules/services/web-apps/kasmweb/default.nix @@ -102,7 +102,7 @@ in }; listenPort = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 443; description = '' The port on which kasmweb should listen. diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix index b3ad13f4102b..1a97c88900f9 100644 --- a/nixos/modules/services/web-apps/nexus.nix +++ b/nixos/modules/services/web-apps/nexus.nix @@ -46,7 +46,7 @@ in }; listenPort = mkOption { - type = types.int; + type = types.port; default = 8081; description = "Port to listen on."; }; diff --git a/nixos/modules/services/web-apps/nifi.nix b/nixos/modules/services/web-apps/nifi.nix index 6e0a02cb7995..f4c175a68aa2 100644 --- a/nixos/modules/services/web-apps/nifi.nix +++ b/nixos/modules/services/web-apps/nifi.nix @@ -69,7 +69,7 @@ in }; listenPort = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = if cfg.enableHTTPS then 8443 else 8080; defaultText = lib.literalExpression '' if config.${opt.enableHTTPS} @@ -91,7 +91,7 @@ in }; proxyPort = lib.mkOption { - type = lib.types.nullOr lib.types.int; + type = lib.types.nullOr lib.types.port; default = if cfg.enableHTTPS then 8443 else null; defaultText = lib.literalExpression '' if config.${opt.enableHTTPS} diff --git a/nixos/modules/services/web-apps/pgpkeyserver-lite.nix b/nixos/modules/services/web-apps/pgpkeyserver-lite.nix index ff533bb669c9..6e7fbf7e1353 100644 --- a/nixos/modules/services/web-apps/pgpkeyserver-lite.nix +++ b/nixos/modules/services/web-apps/pgpkeyserver-lite.nix @@ -47,7 +47,7 @@ in hkpPort = mkOption { default = sksCfg.hkpPort; defaultText = literalExpression "config.${sksOpt.hkpPort}"; - type = types.int; + type = types.port; description = '' Which port the sks-keyserver is listening on. ''; diff --git a/nixos/modules/services/web-apps/plantuml-server.nix b/nixos/modules/services/web-apps/plantuml-server.nix index 43d08ff77d82..39d5ffc92496 100644 --- a/nixos/modules/services/web-apps/plantuml-server.nix +++ b/nixos/modules/services/web-apps/plantuml-server.nix @@ -75,7 +75,7 @@ in }; listenPort = mkOption { - type = types.int; + type = types.port; default = 8080; description = "Port to listen on."; }; diff --git a/nixos/modules/services/web-apps/silverbullet.nix b/nixos/modules/services/web-apps/silverbullet.nix index e1b795a30749..789fafb68f7f 100644 --- a/nixos/modules/services/web-apps/silverbullet.nix +++ b/nixos/modules/services/web-apps/silverbullet.nix @@ -24,7 +24,7 @@ in }; listenPort = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 3000; description = "Port to listen on."; }; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 07d4ad7fccfa..28d64a2e2bee 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -704,14 +704,14 @@ in }; maxClients = mkOption { - type = types.int; + type = types.ints.positive; default = 150; example = 8; description = "Maximum number of httpd processes (prefork)"; }; maxRequestsPerChild = mkOption { - type = types.int; + type = types.ints.unsigned; default = 0; example = 500; description = '' diff --git a/nixos/modules/services/web-servers/stargazer.nix b/nixos/modules/services/web-servers/stargazer.nix index c29f0107cd0e..4af08aeba0c1 100644 --- a/nixos/modules/services/web-servers/stargazer.nix +++ b/nixos/modules/services/web-servers/stargazer.nix @@ -74,7 +74,7 @@ in }; requestTimeout = lib.mkOption { - type = lib.types.int; + type = lib.types.ints.unsigned; default = 5; description = '' Number of seconds to wait for the client to send a complete @@ -83,7 +83,7 @@ in }; responseTimeout = lib.mkOption { - type = lib.types.int; + type = lib.types.ints.unsigned; default = 0; description = '' Number of seconds to wait for the client to send a complete diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 661053c20016..0ebde5bf642b 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -51,7 +51,7 @@ in temperature = { day = mkOption { - type = types.int; + type = types.ints.between 1000 25000; default = 5500; description = '' Colour temperature to use during the day, between @@ -59,7 +59,7 @@ in ''; }; night = mkOption { - type = types.int; + type = types.ints.between 1000 25000; default = 3700; description = '' Colour temperature to use at night, between diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 44619513f577..d95ab944acd8 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -416,11 +416,11 @@ let description = "The protocol specifier for port forwarding between host and container"; }; hostPort = mkOption { - type = types.int; + type = types.port; description = "Source port of the external interface on host"; }; containerPort = mkOption { - type = types.nullOr types.int; + type = types.nullOr types.port; default = null; description = "Target port of container"; }; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 3bd0540e2895..392b95f9dc74 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -32,7 +32,7 @@ config, wrapQtAppsHook, gst_plugins, - util-linux, + util-linuxMinimal, libunwind, libselinux, elfutils, @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config wrapQtAppsHook - util-linux + util-linuxMinimal libunwind libselinux elfutils @@ -96,14 +96,14 @@ stdenv.mkDerivation (finalAttrs: { ] # gst_plugins needed for setup-hooks ++ gst_plugins - ++ lib.optionals (withIpod) [ + ++ lib.optionals withIpod [ libgpod libplist usbmuxd ] - ++ lib.optionals (withMTP) [ libmtp ] - ++ lib.optionals (withCD) [ libcdio ] - ++ lib.optionals (withCloud) [ sparsehash ]; + ++ lib.optionals withMTP [ libmtp ] + ++ lib.optionals withCD [ libcdio ] + ++ lib.optionals withCloud [ sparsehash ]; postPatch = '' sed -i src/CMakeLists.txt \ @@ -119,9 +119,9 @@ stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - "-DFORCE_GIT_REVISION=1.3.1" - "-DUSE_SYSTEM_PROJECTM=ON" - "-DSPOTIFY_BLOB=OFF" + (lib.cmakeFeature "FORCE_GIT_REVISION" "1.3.1") + (lib.cmakeBool "USE_SYSTEM_PROJECTM" true) + (lib.cmakeBool "SPOTIFY_BLOB" false) ]; dontWrapQtApps = true; @@ -136,6 +136,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Multiplatform music player"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; + mainProgram = "clementine"; maintainers = with lib.maintainers; [ ttuegel ]; }; }) diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index 78ad89046f74..0b8b3e68b430 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -16,19 +16,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-1NGZTdAw2VS7txYuyKrpsm0bvLYYpsFZfkLCT5j2MIk="; + hash = "sha256-4yljDypIsx2bFKgCe0nL7Ljnzq6+efMRMBlpl1T6mU0="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-7d5tSZOGkmtfaL/IFk7ksFRAOlv58/Jw/N+nhlyJEHE="; + hash = "sha256-heiercuubJUhzOiRNPRvcBQfvbOtM6albpWvOkHlgsI="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-1qinxbsBU5Ot/ce5OcIH9ybhhHoRSHv98Mwr/Piwmis="; + hash = "sha256-U3VA9GjyP00bhZid3mdODLfmFW5WmtXmikPByDjELXA="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-1LMV1e9xCoXa0UhyUkNFJJ0Nr0xJasPbfYAr6h7l6EE="; + hash = "sha256-uCOQnQ8x5OGPl/139jAZ12PdbWczS2KOQHLFxjEQnL4="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}") @@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "csdevkit"; publisher = "ms-dotnettools"; - version = "1.41.11"; + version = "1.50.51"; inherit (extInfo) hash arch; }; sourceRoot = "extension"; # This has more than one folder. diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index 9f53c83a95d2..1cb3c0a2b3bb 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -18,19 +18,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-FPhB2oWx5x/qr2k4sAg8w2Wx+LvW/Syfc/u8nnTCQFU="; + hash = "sha256-0SMd7cEMSxH6fuvQl5RKc1jFvonBIgYpUMnmMnDiRmU="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-qVZ9Go+/mVIoUr8Qt/kJv8gvOWd7NLu1wk7YZ2v6Lw8="; + hash = "sha256-Y6KpB6WreP4ZWovUL4cOZxxorp2Ekzq9jISY0Yo4c1Q="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-7G9t84clyi4T3k7FxoPIfaIs4VabBTvGilTptd3AHOw="; + hash = "sha256-uXL/AN3dA45po1EuZHCSCLSFyzfVGs7yPX+0refwy10="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-fmWlcLVUUY6Ekx5mtsBYFrYFdXpSUg8PctDBUovETV4="; + hash = "sha256-Tj0uEwLFMNN+T5XG+8y67ssUig+QeUS4uFe0HZp2ua8="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}") @@ -52,7 +52,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "csharp"; publisher = "ms-dotnettools"; - version = "2.89.19"; + version = "2.90.60"; inherit (extInfo) hash arch; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 13fa0e6ed32f..c23eed203708 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -99,11 +99,11 @@ "vendorHash": "sha256-YIn8akPW+DCVF0eYZxsmJxmrJuYhK4QLG/uhmmrXd4c=" }, "auth0": { - "hash": "sha256-RnQq6dIaFfcix8uAmC2VJ5CLpaPXZjFYVbyPDEzqFFo=", + "hash": "sha256-Wv8B28h6idsni7peoKiQ7+5Uo5njw7zeNSRNq3ati8c=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.29.0", + "rev": "v1.30.0", "spdx": "MPL-2.0", "vendorHash": "sha256-tS+LKp4n1SjCmdrJ0kbxrcUYR53NCsODD9Yiq8B8hok=" }, @@ -1021,11 +1021,11 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-qMKjJP7iuW5qE+H/uP2TDl1zxowobutf9TrtJqQKzws=", + "hash": "sha256-G6pLpThqKuCDx4QdTYvJYpba56ZWaxPML/3H1oslw34=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v2.7.0", + "rev": "v2.8.0", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 252c42aabd7f..1d9c0bd444c5 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -46,12 +46,12 @@ assert enablePsiMedia -> enablePlugins; mkDerivation rec { pname = "psi-plus"; - version = "1.5.2081"; + version = "1.5.2115"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "sha256-C5EFC6HpUEFb5P3yGAwlhpj7MhS16P6fkKD5GjC3J9I="; + sha256 = "sha256-4is3ksl6IsYP1L0WhTT/56QUtR+EC1X6Lftre2BO6pM="; }; cmakeFlags = [ diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index 0d4aadc526ff..e0a28364887b 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "0.30.11"; + version = "0.30.12"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-KYxu1Wj7cJB0krcbdwCjbqokA/H9WtVYQ18ov0BkYQ4="; + hash = "sha256-+Ttriv/CG2dMttig0YjVB6BkxuCDjuLZsH92ENNom2c="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/by-name/ap/app2unit/package.nix b/pkgs/by-name/ap/app2unit/package.nix index 0689a92a89e0..c37973851c16 100644 --- a/pkgs/by-name/ap/app2unit/package.nix +++ b/pkgs/by-name/ap/app2unit/package.nix @@ -4,18 +4,21 @@ dash, scdoc, fetchFromGitHub, + nix-update-script, }: stdenvNoCC.mkDerivation rec { pname = "app2unit"; - version = "1.0.3"; + version = "1.1.2"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "app2unit"; tag = "v${version}"; - sha256 = "sha256-7eEVjgs+8k+/NLteSBKgn4gPaPLHC+3Uzlmz6XB0930="; + sha256 = "sha256-M2sitlrQNSLthSaDH+R8gUcZ8i+o1ktf2SB/vvjyJEI="; }; + passthru.updateScript = nix-update-script { }; + nativeBuildInputs = [ scdoc ]; buildPhase = '' diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index 1bc2f5bd79f8..789ef0d73019 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-NTdz7NtjvVQolSiqyCdR0P4dD0+ZQBKMEXTzwHPZgxU="; + hash = "sha256-zMCz0WRqIS2htf9TMfq6BlupU8dj5PrziEMxisjkOEc="; }; - cargoHash = "sha256-iLExF4lwXQ1BVBxEK+iD5HDkbjk38AbLaIirS04C4iw="; + cargoHash = "sha256-U+8JElXGNsiPUM9bLmqXYudRmg+K+VJLAgKLGqiVddc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/aw/aws-signing-helper/package.nix b/pkgs/by-name/aw/aws-signing-helper/package.nix index 66de8f8da88c..4517b6a42ea6 100644 --- a/pkgs/by-name/aw/aws-signing-helper/package.nix +++ b/pkgs/by-name/aw/aws-signing-helper/package.nix @@ -6,15 +6,15 @@ }: buildGoModule rec { pname = "aws-signing-helper"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "aws"; repo = "rolesanywhere-credential-helper"; rev = "v${version}"; - hash = "sha256-QOuumJSKrqkhSXvprefSkRFiC9LrjzD5g560VJKHCWc="; + hash = "sha256-FmMs8oU1x85ESTD4Ap6f+OC6AW7W3sULPv1bScDrbL4="; }; - vendorHash = "sha256-jKX0hmtMDPEnsey4RN7FgvQg1ZdQx/6c44OZuexuknQ="; + vendorHash = "sha256-znca4Zcy8brsPeSMpFSyojjKrborx/tx1wLBadWGYmQ="; checkPhase = '' runHook preCheck diff --git a/pkgs/by-name/ba/bashunit/package.nix b/pkgs/by-name/ba/bashunit/package.nix index 5832d6f23961..f1b72c3921f3 100644 --- a/pkgs/by-name/ba/bashunit/package.nix +++ b/pkgs/by-name/ba/bashunit/package.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bashunit"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "TypedDevs"; repo = "bashunit"; tag = finalAttrs.version; - hash = "sha256-sYg5zrB887rliBLdiZ6ZFcK2OVJjpRMO2fT498aOYF0="; + hash = "sha256-TIt1EG/KQCslwZH9seF5SUgH242ZkUkWf8HWqNBIrD0="; forceFetchGit = true; # needed to include the tests directory for the check phase }; diff --git a/pkgs/by-name/br/brush-splat/package.nix b/pkgs/by-name/br/brush-splat/package.nix new file mode 100644 index 000000000000..452c72360efe --- /dev/null +++ b/pkgs/by-name/br/brush-splat/package.nix @@ -0,0 +1,78 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + bzip2, + libxkbcommon, + sqlite, + vulkan-loader, + zstd, + stdenv, + wayland, + nix-update-script, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "brush-splat"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "ArthurBrussee"; + repo = "brush"; + tag = finalAttrs.version; + hash = "sha256-IvsHYCM/M2hHozzKwovgXpcW1b7MSEGneU62y1k8U9U="; + }; + + cargoHash = "sha256-7cJj5L8ggkBP9SDaYMtY9xIAHVAhi8cTD/0pncUaHbI="; + + # Force linking to libEGL, which is always dlopen()ed, and to + # libwayland-client & libxkbcommon, which is dlopen()ed based on the + # winit backend. + NIX_LDFLAGS = [ + "--no-as-needed" + "-lvulkan" + "-lwayland-client" + "-lxkbcommon" + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + bzip2 + libxkbcommon + sqlite + vulkan-loader + zstd + ] + ++ lib.optionals stdenv.isLinux [ + wayland + ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "3D Reconstruction for all"; + homepage = "https://github.com/ArthurBrussee/brush"; + changelog = "https://github.com/ArthurBrussee/brush/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ matthewcroughan ]; + mainProgram = "brush_app"; + }; +}) diff --git a/pkgs/by-name/ch/charge-lnd/package.nix b/pkgs/by-name/ch/charge-lnd/package.nix index bf32c78a05fd..b64162f87fdd 100644 --- a/pkgs/by-name/ch/charge-lnd/package.nix +++ b/pkgs/by-name/ch/charge-lnd/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "charge-lnd"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; src = fetchFromGitHub { owner = "accumulator"; repo = "charge-lnd"; tag = "v${version}"; - hash = "sha256-a/zIEA2oF1+BoZXk4YDWx69eVFSnANUE/F+ARI/VsXU="; + hash = "sha256-rACpIHVVq4q3iOEJgJbslCzEcP3qYrc3rZQ85YJfzoQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ci/ciel/package.nix b/pkgs/by-name/ci/ciel/package.nix index afa7f52af388..06a3f970cb45 100644 --- a/pkgs/by-name/ci/ciel/package.nix +++ b/pkgs/by-name/ci/ciel/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "ciel"; - version = "3.9.7"; + version = "3.9.8"; src = fetchFromGitHub { owner = "AOSC-Dev"; repo = "ciel-rs"; tag = "v${version}"; - hash = "sha256-GLgCepIZf08m4xywU0Erh5QWCSAcvGoE7/AOrBwCEWQ="; + hash = "sha256-swYIy+e+N4MVmNXSttLUWKmG2xj9TA9sWwCrIdo+gIA="; }; - cargoHash = "sha256-SWI7K/fi3DkbvEZ1nS5GfVkjvdwjd2oZbJFaELge34A="; + cargoHash = "sha256-RBtERA9CkTdW++ikHkV1X11hg49IrvVFIdTi1qQp+ok="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/co/confluent-cli/package.nix b/pkgs/by-name/co/confluent-cli/package.nix index 2e618642e67b..80cfa2b85278 100644 --- a/pkgs/by-name/co/confluent-cli/package.nix +++ b/pkgs/by-name/co/confluent-cli/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "confluent-cli"; - version = "4.37.0"; + version = "4.38.0"; # To get the latest version: # curl -L https://cnfl.io/cli | sh -s -- -l | grep -v latest | sort -V | tail -n1 @@ -26,10 +26,10 @@ stdenv.mkDerivation (finalAttrs: { fetchurl { url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${finalAttrs.version}/confluent_${finalAttrs.version}_${system}.tar.gz"; hash = selectSystem { - x86_64-linux = "sha256-UG9vLUoZEK4WSZIXa8VKZ4D7L7WxU9mkyp5WTqFQuog="; - aarch64-linux = "sha256-1dz4C/QiCRq1Ncu+dOCUcXqVXed4u7Eyrmxqaj11PIY="; - x86_64-darwin = "sha256-XdurFD65BypAryPkBfrvbG5dvIcIodltSd8W68H4KRw="; - aarch64-darwin = "sha256-PMcPR7Q5GahEYEiCEqS0Y71To7Tyy46HvvX8VS0VVS8="; + x86_64-linux = "sha256-NetkaNbUCbNyajtwLUVW5KpFhkyngYoWxJJxDK42QCQ="; + aarch64-linux = "sha256-xzMpG7BknzOdFoUZnnlCjsCxuFCkJMzGi+yH4+0QvtQ="; + x86_64-darwin = "sha256-UP5+tnLuYore8t/qi2d3iLf47OMxwF51mfJzgfLnK7s="; + aarch64-darwin = "sha256-IV0zEL4ApRZug0C0A0jQm9Vp78z/kk8MwcaXNOE3Agk="; }; }; diff --git a/pkgs/by-name/co/container-structure-test/package.nix b/pkgs/by-name/co/container-structure-test/package.nix index c640369c381d..d932b48b9464 100644 --- a/pkgs/by-name/co/container-structure-test/package.nix +++ b/pkgs/by-name/co/container-structure-test/package.nix @@ -8,13 +8,13 @@ container-structure-test, }: buildGoModule rec { - version = "1.19.3"; + version = "1.20.0"; pname = "container-structure-test"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "container-structure-test"; rev = "v${version}"; - sha256 = "sha256-KLLACXUn6dtVCI+gCMHU9hoAJBOAVyhfwxtzsopWS4U="; + sha256 = "sha256-7/RTWpj/W+W4mhQL2HX/6KuMbDFsjh9GGRCGZZ9sNHQ="; }; vendorHash = "sha256-pBq76HJ+nluOMOs9nqBKp1mr1LuX2NERXo48g8ezE9k="; diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index fff91444ba08..09f133e94272 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cyme"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "tuna-f1sh"; repo = "cyme"; rev = "v${version}"; - hash = "sha256-zwte2YzjEMW1wVti02tOa2IZMd2Z8amYUB9RHevx5bg="; + hash = "sha256-1a+8e9sVij9o1G/XlSf7tTECZOHTwqO9rORcYsVjp6Y="; }; - cargoHash = "sha256-wOOcIkEgyR5Af78uMuCksalVH8VPFXptg232It/ilXE="; + cargoHash = "sha256-HMPjsaHrd3UdazPiAyrHs9Emh0XdjQ/qkaZm6kxOyq4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/de/dethrace/package.nix b/pkgs/by-name/de/dethrace/package.nix index 97f6ea6bc89b..6c402cc03261 100644 --- a/pkgs/by-name/de/dethrace/package.nix +++ b/pkgs/by-name/de/dethrace/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "dethrace"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "dethrace-labs"; repo = "dethrace"; tag = "v${version}"; - hash = "sha256-Bt2wwF5cquXZwFpFyJ0TDmbFdTHbboQ93W/DvP9bsMo="; + hash = "sha256-+C3NyRLmvXrkZuhLGwIIHFWjXLMpt3srLZCVrxRUlkA="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ec/ecspresso/package.nix b/pkgs/by-name/ec/ecspresso/package.nix index c2f9ba6aff44..9c4ba0d8f086 100644 --- a/pkgs/by-name/ec/ecspresso/package.nix +++ b/pkgs/by-name/ec/ecspresso/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ecspresso"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "kayac"; repo = "ecspresso"; tag = "v${version}"; - hash = "sha256-t7XToo/OFrczwF24k51Ae1gFI3/C2HIP5mAJVN8BzLk="; + hash = "sha256-kZKfhGOxtuZM6oytt/36AW8R2XVoKuLZdaj7NvoRWGA="; }; subPackages = [ diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index b9e18dee9b2c..bbe6bf7e13fb 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -46,8 +46,9 @@ stdenv.mkDerivation { hash = "sha256-hZwLYaYV0j3YwFi8KRr4DZV73L2yIwFJ3XqCyq6L7hE="; }; + strictDeps = true; + nativeBuildInputs = [ - cjson cmake fakeGit git @@ -56,6 +57,7 @@ stdenv.mkDerivation { ]; buildInputs = [ + cjson curl freetype glew @@ -72,36 +74,32 @@ stdenv.mkDerivation { zlib ]; - preBuild = '' - # Required for build time to not be in 1980 - export SOURCE_DATE_EPOCH=$(date +%s) - # This indicates the build was by a CI pipeline and prevents the resource - # files from being flagged as 'dirty' due to potentially being custom built. - export CI="true" - ''; - cmakeFlags = [ - "-DCROSS_COMPILE32=0" - "-DCMAKE_BUILD_TYPE=Release" - "-DBUILD_SERVER=1" - "-DBUILD_CLIENT=1" - "-DBUNDLED_ZLIB=0" - "-DBUNDLED_CJSON=0" - "-DBUNDLED_JPEG=0" - "-DBUNDLED_LIBS=0" - "-DBUNDLED_FREETYPE=0" - "-DBUNDLED_OGG_VORBIS=0" - "-DBUNDLED_OPENAL=0" - "-DBUNDLED_PNG=0" - "-DBUNDLED_THEORA=0" - "-DBUNDLED_MINIZIP=0" - "-DINSTALL_EXTRA=0" - "-DINSTALL_OMNIBOT=0" - "-DINSTALL_GEOIP=0" - "-DINSTALL_WOLFADMIN=0" - "-DFEATURE_AUTOUPDATE=0" - "-DINSTALL_DEFAULT_BASEDIR=${placeholder "out"}/lib/etlegacy" - "-DINSTALL_DEFAULT_BINDIR=${placeholder "out"}/bin" + (lib.cmakeBool "CROSS_COMPILE32" false) + (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") + (lib.cmakeBool "BUILD_SERVER" true) + (lib.cmakeBool "BUILD_CLIENT" true) + (lib.cmakeBool "BUNDLED_ZLIB" false) + (lib.cmakeBool "BUNDLED_CJSON" false) + (lib.cmakeBool "BUNDLED_JPEG" false) + (lib.cmakeBool "BUNDLED_LIBS" false) + (lib.cmakeBool "BUNDLED_LIBS_DEFAULT" false) + (lib.cmakeBool "BUNDLED_FREETYPE" false) + (lib.cmakeBool "BUNDLED_OGG_VORBIS" false) + (lib.cmakeBool "BUNDLED_OPENAL" false) + (lib.cmakeBool "BUNDLED_PNG" false) + (lib.cmakeBool "BUNDLED_THEORA" false) + (lib.cmakeBool "BUNDLED_MINIZIP" false) + (lib.cmakeBool "CLIENT_GLVND" true) + (lib.cmakeBool "ENABLE_SSE" true) + (lib.cmakeBool "INSTALL_EXTRA" false) + (lib.cmakeBool "INSTALL_OMNIBOT" false) + (lib.cmakeBool "INSTALL_GEOIP" false) + (lib.cmakeBool "INSTALL_WOLFADMIN" false) + (lib.cmakeBool "FEATURE_AUTOUPDATE" false) + (lib.cmakeBool "FEATURE_RENDERER2" false) + (lib.cmakeFeature "INSTALL_DEFAULT_BASEDIR" "${placeholder "out"}/lib/etlegacy") + (lib.cmakeFeature "INSTALL_DEFAULT_BINDIR" "${placeholder "out"}/bin") ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/by-name/fa/fastly/package.nix b/pkgs/by-name/fa/fastly/package.nix index 061fcbab8293..626c68263697 100644 --- a/pkgs/by-name/fa/fastly/package.nix +++ b/pkgs/by-name/fa/fastly/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "fastly"; - version = "11.5.0"; + version = "12.0.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; tag = "v${version}"; - hash = "sha256-o2/gwXODAS4eex6q91hxbNx2RHNt5z8eaT3ZXS7D634="; + hash = "sha256-Cq4pTp9K6vsQrdWz9kMdX1K1KR26e/qPL55xqiZ5kYM="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -35,7 +35,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-qoRlUCAnJHt9B1w9R4dBtkvqKhk3hum6OjzraPKAzk0="; + vendorHash = "sha256-vjTqT/Gv8FU0HNvYqXIE9OCNRsJ8GbUNXIxXDdhDclc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix index 73051d72f445..5c5b98411091 100644 --- a/pkgs/by-name/ge/geph/package.nix +++ b/pkgs/by-name/ge/geph/package.nix @@ -38,6 +38,9 @@ rustPlatform.buildRustPackage (finalAttrs: { postPatch = '' substituteInPlace binaries/geph5-client/src/vpn/*.sh \ --replace-fail 'PATH=' 'PATH=${binPath}:' + + # This setting is dumped from https://github.com/geph-official/gephgui-wry/blob/a85a632448e548f69f9d1eea3d06a4bdc8be3d57/src/daemon.rs#L230 + cat ${./settings_default.yaml} | base32 -w 0 | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567' '0123456789ABCDEFGHJKMNPQRSTVWXYZ' | sed 's/=//g' > binaries/geph5-client-gui/src/settings_default.yaml.base32 ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/ge/geph/settings_default.yaml b/pkgs/by-name/ge/geph/settings_default.yaml new file mode 100644 index 000000000000..3121ebccdeb8 --- /dev/null +++ b/pkgs/by-name/ge/geph/settings_default.yaml @@ -0,0 +1,23 @@ +exit_constraint: auto + +broker: + race: + - fronted: + front: https://www.cdn77.com/ + host: 1826209743.rsc.cdn77.org + - fronted: + front: https://www.vuejs.org/ + host: svitania-naidallszei-2.netlify.app + override_dns: + - 75.2.60.5:443 + - fronted: + front: https://www.vuejs.org/ + host: svitania-naidallszei-3.netlify.app + override_dns: + - 75.2.60.5:443 + - aws_lambda: + function_name: geph-lambda-bouncer + region: us-east-1 + obfs_key: 855MJGAMB58MCPJBB97NADJ36D64WM2T:C4TN2M1H68VNMRVCCH57GDV2C5VN6V3RB8QMWP235D0P4RT2ACV7GVTRCHX3EC37 + +spoof_dns: true diff --git a/pkgs/by-name/gn/gnunet/package.nix b/pkgs/by-name/gn/gnunet/package.nix index a7f7dbf90f5c..106963786606 100644 --- a/pkgs/by-name/gn/gnunet/package.nix +++ b/pkgs/by-name/gn/gnunet/package.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnunet"; - version = "0.24.3"; + version = "0.25.0"; src = fetchurl { url = "mirror://gnu/gnunet/gnunet-${finalAttrs.version}.tar.gz"; - hash = "sha256-WwaJew6ESJu7Q4J47HPkNiRCsuBaY+QAI+wdDMzGxXY="; + hash = "sha256-LepmLuhgWUaFKvAtKAbKZP2t7cxxju72uG4LJoIsNv8="; }; enableParallelBuilding = true; @@ -94,6 +94,12 @@ stdenv.mkDerivation (finalAttrs: { # builds. find . \( -iname \*test\*.c -or -name \*.conf \) | \ xargs sed -i -e "s|/tmp|$TMPDIR|g" + + # fix error: conflicting types for `GNUNET_TESTING_cmd_{exec,finish}` + for name in exec finish; do + substituteInPlace src/lib/testing/testing_api_cmd_$name.c \ + --replace-fail 'const struct GNUNET_TESTING_Command' 'struct GNUNET_TESTING_Command' + done ''; # unfortunately, there's still a few failures with impure tests diff --git a/pkgs/by-name/go/gosec/package.nix b/pkgs/by-name/go/gosec/package.nix index 084c01f05b14..d1626c708f33 100644 --- a/pkgs/by-name/go/gosec/package.nix +++ b/pkgs/by-name/go/gosec/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.22.8"; + version = "2.22.9"; src = fetchFromGitHub { owner = "securego"; repo = "gosec"; rev = "v${version}"; - hash = "sha256-Ar8j5oJshouHss062m/YhAWSFDGzTKcZHGxQtKff9Bg="; + hash = "sha256-cI6cOD0fySVFex2gd1VTSgLGFz1CGunby2SvowKNXZQ="; }; - vendorHash = "sha256-zj1v98LDyaMFmjFtUV2L02j4FSBrODZFVhzYAj4rB1Q="; + vendorHash = "sha256-Q/Wws0fefVgp05aQnIlq+Br0RdoEvas0bp2XqT7w19s="; subPackages = [ "cmd/gosec" diff --git a/pkgs/by-name/ht/htmlhint/package.nix b/pkgs/by-name/ht/htmlhint/package.nix index 77a4c8f9eb7d..b1a46eca36fa 100644 --- a/pkgs/by-name/ht/htmlhint/package.nix +++ b/pkgs/by-name/ht/htmlhint/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "htmlhint"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "htmlhint"; repo = "HTMLHint"; rev = "v${version}"; - hash = "sha256-aFydnJiRqGzBKZGX/AvRlxjf3sw+fBwKdGmydFjD/xk="; + hash = "sha256-jhn3FWzqwqczB7siHRxpYNLPoC9YhZtkcVyvWdIq93k="; }; - npmDepsHash = "sha256-h37yWpXWh9+cMlI36zucq2ZbYsQUaGuRQGJySKIeda0="; + npmDepsHash = "sha256-acf6pyv3TsOA3Ulm/OMYZ2R7sMGEcsOXA9hbPXLbX3I="; meta = { changelog = "https://github.com/htmlhint/HTMLHint/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix index dda534d81406..fc197af49aae 100644 --- a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix +++ b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix @@ -6,7 +6,7 @@ }: let - version = "7.1.1-7"; + version = "7.1.2-1"; in (ffmpeg_7-full.override { @@ -15,7 +15,7 @@ in owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - hash = "sha256-QzmMhLwlFO9TOCLQaTpoCgNwPpertRA3h1+JMzOEULE="; + hash = "sha256-1nisdEtH5J5cDqUeDev0baCHopmoQ1SEojFdYdYeY0Q="; }; }).overrideAttrs (old: { diff --git a/pkgs/by-name/je/jetuml/package.nix b/pkgs/by-name/je/jetuml/package.nix new file mode 100644 index 000000000000..e67cba6d2496 --- /dev/null +++ b/pkgs/by-name/je/jetuml/package.nix @@ -0,0 +1,76 @@ +{ + stdenvNoCC, + lib, + makeDesktopItem, + copyDesktopItems, + fetchurl, + jdk, + makeBinaryWrapper, + imagemagick, +}: + +let + jdkWithFX = jdk.override { enableJavaFX = true; }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "jetuml"; + version = "3.9"; + + src = fetchurl { + url = "https://github.com/prmr/JetUML/releases/download/v${finalAttrs.version}/JetUML-${finalAttrs.version}.jar"; + hash = "sha256-wACGbHeRQ5rXcuI1J3eTfQraWp8eWtkIAPo7BNGcFUU="; + }; + + dontUnpack = true; + + strictDeps = true; + + nativeBuildInputs = [ + makeBinaryWrapper + copyDesktopItems + imagemagick + ]; + + desktopItems = [ + (makeDesktopItem { + name = "jetuml"; + desktopName = "JetUML"; + genericName = "UML Tool"; + categories = [ + "Application" + "Development" + "ProjectManagement" + ]; + icon = "jet"; + exec = "jetuml"; + comment = finalAttrs.meta.description; + }) + ]; + + installPhase = '' + runHook preInstall + + ${jdkWithFX}/lib/openjdk/bin/jar xf $src jet.png + magick jet.png -resize 128x128 jet128.png + magick jet.png -resize 48x48 jet48.png + install -Dm444 jet48.png $out/share/icons/hicolor/48x48/jet.png + install -Dm444 jet128.png $out/share/icons/hicolor/128x128/jet.png + + install -Dm444 $src $out/share/java/JetUML-${finalAttrs.version}.jar + + makeWrapper ${jdkWithFX}/lib/openjdk/bin/java $out/bin/jetuml \ + --add-flags "-jar $out/share/java/JetUML-${finalAttrs.version}.jar" + + runHook postInstall + ''; + + meta = { + homepage = "https://www.jetuml.org/"; + description = "Desktop application for fast UML diagramming"; + mainProgram = "jetuml"; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.felissedano ]; + }; +}) diff --git a/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix b/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix index ea06e465e278..c4a73de144b2 100644 --- a/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix +++ b/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule (finalAttrs: { # "chatgpt-cli" is taken by another package with the same upsteam name. # To keep "pname" and "package attribute name" identical, the owners name (kardolus) gets prefixed as identifier. pname = "kardolus-chatgpt-cli"; - version = "1.8.9"; + version = "1.8.10"; src = fetchFromGitHub { owner = "kardolus"; repo = "chatgpt-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-XC8Uzrm8OjyEvdYArFt6rJJYrXKJeG3QgaOqgUyFNmw="; + hash = "sha256-XZ9f+PAY0i7DfzZCxtZFw1jit7o/tjqAEc8uJpqiOAc="; }; vendorHash = null; # The tests of kardolus/chatgpt-cli require an OpenAI API Key to be present in the environment, - # (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.8.9/test/contract/contract_test.go#L35) + # (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.8.10/test/contract/contract_test.go#L35) # which will not be the case in the pipeline. # Therefore, tests must be skipped. doCheck = false; diff --git a/pkgs/by-name/li/libgbinder/package.nix b/pkgs/by-name/li/libgbinder/package.nix index e7c1458e8fc4..1091edbee99c 100644 --- a/pkgs/by-name/li/libgbinder/package.nix +++ b/pkgs/by-name/li/libgbinder/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.42"; + version = "1.1.43"; src = fetchFromGitHub { owner = "mer-hybris"; repo = "libgbinder"; rev = version; - sha256 = "sha256-f5yfAmCpjI4T0XKBiGPQ3JWLuYg+SlrQwYeY/HIrycY="; + sha256 = "sha256-a4lQzWOVdlXQeoJzvNaELiVXLvXsx4reigKrhsrcafM="; }; outputs = [ diff --git a/pkgs/by-name/li/libgnunetchat/package.nix b/pkgs/by-name/li/libgnunetchat/package.nix index f5803786bb60..01b94d9b6719 100644 --- a/pkgs/by-name/li/libgnunetchat/package.nix +++ b/pkgs/by-name/li/libgnunetchat/package.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation (finalAttrs: { name = "libgnunetchat"; - version = "0.5.3"; + version = "0.6.0"; src = fetchgit { url = "https://git.gnunet.org/libgnunetchat.git"; tag = "v${finalAttrs.version}"; - hash = "sha256-DhXPYa8ya9cEbwa4btQTrpjfoTGhzBInWXXH4gmDAQw="; + hash = "sha256-pRO8i7tHynCqm97RLMBOiWKCl2CAYBE6RXfyIljIiQ0="; }; strictDeps = true; @@ -51,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { pkgConfigModules = [ "gnunetchat" ]; description = "Library for secure, decentralized chat using GNUnet network services"; homepage = "https://git.gnunet.org/libgnunetchat.git"; + changelog = "https://git.gnunet.org/libgnunetchat.git/plain/ChangeLog?h=v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; teams = with lib.teams; [ ngi ]; diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index 7543c7704f36..5176cb4f8354 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -8,7 +8,7 @@ nix-update-script, }: let - version = "0.4.0"; + version = "0.4.2"; in rustPlatform.buildRustPackage { pname = "lla"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { owner = "chaqchase"; repo = "lla"; tag = "v${version}"; - hash = "sha256-ArkmjnMRTwnIMy2UNM+GsdZJIvWa4RRZ3n//Gm3k9s4="; + hash = "sha256-7/VfEcqvYGC1Pw9wJh5FF3c7BXgcg9LVDvcr4zCrros="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { installShellFiles ]; - cargoHash = "sha256-vw5cckGZjN6B7X7Pm/mZzWnSjRVYkgl58txv6Asqoug="; + cargoHash = "sha256-LYRNXNhPgpNZWP5XKqfgM6t9Ts2k/e09iXWMcuEp9LA="; cargoBuildFlags = [ "--workspace" ]; diff --git a/pkgs/by-name/ma/mackerel-agent/package.nix b/pkgs/by-name/ma/mackerel-agent/package.nix index fb38a764e41a..111b2b956b0c 100644 --- a/pkgs/by-name/ma/mackerel-agent/package.nix +++ b/pkgs/by-name/ma/mackerel-agent/package.nix @@ -10,20 +10,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.85.0"; + version = "0.85.1"; src = fetchFromGitHub { owner = "mackerelio"; repo = "mackerel-agent"; rev = "v${version}"; - sha256 = "sha256-wTL+zxa0uaRT8cP2P+iYW6qC8RS5g8wSpvsa01iSUXA="; + sha256 = "sha256-ngBBpvDk5HsMNoZy45mlEBn3dgG8j1b98tShdR6QmQQ="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ net-tools ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ iproute2 ]; - vendorHash = "sha256-Q3HsfLA6xqzwXVfRc0bOb15kW2tdwj14DvJEZoRy0/4="; + vendorHash = "sha256-Ubk/ms/3FwH1ZqZ5uTy0MubXhrKBoeaC85Y1KKH5cIw="; subPackages = [ "." ]; diff --git a/pkgs/by-name/mi/mim-solvers/package.nix b/pkgs/by-name/mi/mim-solvers/package.nix index 9df420c765d9..46d62d1a8677 100644 --- a/pkgs/by-name/mi/mim-solvers/package.nix +++ b/pkgs/by-name/mi/mim-solvers/package.nix @@ -9,17 +9,18 @@ python3Packages, pythonSupport ? false, stdenv, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "mim-solvers"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "machines-in-motion"; repo = "mim_solvers"; rev = "v${finalAttrs.version}"; - hash = "sha256-jUL/kyXKODpcCURG7e7/qNarvwm4+EnzZRL2Wix5Jbs="; + hash = "sha256-1Mqu9Hfy65HUIOVG/gJBpSMlOwDWVcH+LrR8CaWz0BE="; }; # eigenpy is not used without python support @@ -61,6 +62,8 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; pythonImportsCheck = [ "mim_solvers" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Numerical solvers used in the Machines in Motion Laboratory"; homepage = "https://github.com/machines-in-motion/mim_solvers"; diff --git a/pkgs/by-name/mk/mktxp/package.nix b/pkgs/by-name/mk/mktxp/package.nix index 5e30eb9c51aa..9a6dd83f98a6 100644 --- a/pkgs/by-name/mk/mktxp/package.nix +++ b/pkgs/by-name/mk/mktxp/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "1.2.12"; + version = "1.2.14"; in python3Packages.buildPythonApplication { pname = "mktxp"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication { owner = "akpw"; repo = "mktxp"; tag = "v${version}"; - hash = "sha256-2aSRnfhOROFJWzqvltYaN2FLXrRjICV56SOOHf4wKtg="; + hash = "sha256-4+0aw/r71FcVrxASco3AkYzi7zbFeiEkJB7acGdb1FQ="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 90785c4a01bb..28a8a91d702b 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "myks"; - version = "4.11.3"; + version = "4.11.4"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-NIcKYlirX110QHB5r8m3g2dZbWyImiFoFQZW0ig5shE="; + hash = "sha256-1tJPYLo14LPwd7mtNTvr6YMGz0s+K6aN9Hung/N9lrM="; }; - vendorHash = "sha256-Tiz9SmEKet2vp8toJrUaby1Jhsh+023bi1NC+WzOrX0="; + vendorHash = "sha256-k/EeQdThF8pgeY9RI012kjlEZkVVcnanL6L8UBrQTUI="; subPackages = "."; diff --git a/pkgs/by-name/nh/nhost-cli/package.nix b/pkgs/by-name/nh/nhost-cli/package.nix index 0a5045fcb14b..dcdc9cd65158 100644 --- a/pkgs/by-name/nh/nhost-cli/package.nix +++ b/pkgs/by-name/nh/nhost-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nhost-cli"; - version = "1.31.1"; + version = "1.31.2"; src = fetchFromGitHub { owner = "nhost"; repo = "cli"; tag = "v${version}"; - hash = "sha256-UfcQh8jdnNKn5AMerh+J83yuTY/cX20/8UA0NoPBJ14="; + hash = "sha256-RzLnhnnEDUIlRq89/CmhH7+o4Mt6GiXbGXDObSIk4tY="; }; vendorHash = null; diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix index 3c5600532d96..3d67a9329e63 100644 --- a/pkgs/by-name/ni/nix-update/package.nix +++ b/pkgs/by-name/ni/nix-update/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication rec { pname = "nix-update"; - version = "1.13.0"; + version = "1.13.1"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-update"; tag = version; - hash = "sha256-+d4NexgDkpuiesuA6vOv2COD3bgWddIL1SjFxuDF1dA="; + hash = "sha256-b/Ymvz4Un67j7UulzBJtmKrwcchpEE/si/QOn/m8m80="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/op/opengrok/package.nix b/pkgs/by-name/op/opengrok/package.nix index 730efd65593f..f25fb15d8ecb 100644 --- a/pkgs/by-name/op/opengrok/package.nix +++ b/pkgs/by-name/op/opengrok/package.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.14.2"; + version = "1.14.3"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-zn+w/k5Q5/73sOdmWivZKpjoXUjZDXhrCDU9gSYu8Nk="; + hash = "sha256-+7jLmvsEFxL4HcxuXQjgvMg/YiUtsrrnvjN0CY4pTJw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/pg/pg_top/package.nix b/pkgs/by-name/pg/pg_top/package.nix index 4252a38283d5..f9125c384d70 100644 --- a/pkgs/by-name/pg/pg_top/package.nix +++ b/pkgs/by-name/pg/pg_top/package.nix @@ -1,5 +1,6 @@ { cmake, + docutils, fetchurl, lib, libbsd, @@ -10,11 +11,11 @@ stdenv.mkDerivation rec { pname = "pg_top"; - version = "4.1.1"; + version = "4.1.3"; src = fetchurl { url = "https://pg_top.gitlab.io/source/pg_top-${version}.tar.xz"; - sha256 = "sha256-85LObBS9aAt7Ck5yiK0g2CAKxiYtnWp5XnTAUB5ui/k="; + sha256 = "sha256-4El3GmfP5UDJOsDxyU5z/s3JKw0jlMb8EB/hvtywwVs="; }; buildInputs = [ @@ -23,7 +24,10 @@ stdenv.mkDerivation rec { ncurses ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + docutils + ]; meta = with lib; { description = "'top' like tool for PostgreSQL"; diff --git a/pkgs/by-name/pi/pinecone/package.nix b/pkgs/by-name/pi/pinecone/package.nix index ad8933af0b9a..3fb208264da5 100644 --- a/pkgs/by-name/pi/pinecone/package.nix +++ b/pkgs/by-name/pi/pinecone/package.nix @@ -1,18 +1,18 @@ { lib, - buildGoModule, + buildGo124Module, fetchFromGitHub, }: -buildGoModule { +buildGo124Module { pname = "pinecone"; - version = "0.11.0-unstable-2023-08-10"; + version = "0.11.0-unstable-2025-03-04"; src = fetchFromGitHub { owner = "matrix-org"; repo = "pinecone"; - rev = "ea4c33717fd74ef7d6f49490625a0fa10e3f5bbc"; - hash = "sha256-q4EFWXSkQJ2n+xAWuBxdP7nrtv3eFql9LoavWo10dfs="; + rev = "b35aec69f59eb9bb8bd5a8c6be30fc276d3cce96"; + hash = "sha256-0jqvWdFjN4Kzhkv4Oe1obsKGW0i/MGEMX3ZhcxpsdxA="; }; vendorHash = "sha256-+P10K7G0UwkbCGEi6sYTQSqO7LzIf/xmaHIr7v110Ao="; diff --git a/pkgs/by-name/po/polenum/package.nix b/pkgs/by-name/po/polenum/package.nix index a4443f02e2de..2e7cec24462a 100644 --- a/pkgs/by-name/po/polenum/package.nix +++ b/pkgs/by-name/po/polenum/package.nix @@ -4,16 +4,16 @@ python3, }: -python3.pkgs.buildPythonApplication { +python3.pkgs.buildPythonApplication rec { pname = "polenum"; - version = "1.6.1-unstable-2024-07-30"; + version = "1.7"; format = "other"; src = fetchFromGitHub { owner = "Wh1t3Fox"; repo = "polenum"; - rev = "6f95ce0f9936d8c20820e199a4bb1ea68d2f061f"; - hash = "sha256-aCX7dByfkUSFHjhRAjrFhbbeIgYNGixnB5pHE/lftng="; + tag = version; + hash = "sha256-/xjGwolpbkh/ig0N9gpSTQMIJ/2ayThRBzx3tF1kfjM="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index 91b907f615c0..1865b9633364 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -1,12 +1,12 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2025-08-20 +# Last updated: 2025-09-22 { fetchurl }: let any-darwin = { - version = "6.9.79-2025-08-20"; + version = "6.9.80-2025-09-04"; src = fetchurl { - url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.79_250820_01.dmg"; - hash = "sha256-m8COj+kn9ify4D4FUpNXL31uO4j4DKqCQhZnoo5umTE="; + url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.80_250904_01.dmg"; + hash = "sha256-VUjgWQIxabjXkXJhxQiQJlYDkbLDNLaVQeRaZ4WGOIs="; }; }; in @@ -14,17 +14,17 @@ in aarch64-darwin = any-darwin; x86_64-darwin = any-darwin; aarch64-linux = { - version = "3.2.19-2025-08-20"; + version = "3.2.19-2025-09-04"; src = fetchurl { - url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250820_arm64_01.deb"; - hash = "sha256-rHgN0T9lcoAucwR3B2U8so/dAUfB92dQYc0TncTHPaM="; + url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250904_arm64_01.deb"; + hash = "sha256-OqBRxDfTz9w4cFeDSKeysPlqxaJtrp96PZieXnsjGhA="; }; }; x86_64-linux = { - version = "3.2.19-2025-08-20"; + version = "3.2.19-2025-09-04"; src = fetchurl { - url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250820_amd64_01.deb"; - hash = "sha256-4Y0GSWwFkqYX5ezE2Jk/tZIwsBHg88ZxJghzB+kXTds="; + url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250904_amd64_01.deb"; + hash = "sha256-5M3kykJCmFZZ0VTG/K+nYRt7SIUzvc3O6yPW8ebx45A="; }; }; } diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix index da994ed2b3e7..0aaf2b6654bc 100644 --- a/pkgs/by-name/qw/qwen-code/package.nix +++ b/pkgs/by-name/qw/qwen-code/package.nix @@ -4,17 +4,18 @@ fetchFromGitHub, nix-update-script, jq, + ripgrep, }: buildNpmPackage (finalAttrs: { pname = "qwen-code"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "QwenLM"; repo = "qwen-code"; tag = "v${finalAttrs.version}"; - hash = "sha256-5qKSWbc0NPpgvt36T/gRSgm1+o2Pbdw3tgfcGba6YSs="; + hash = "sha256-qsa4bAk0QUUZCtoEREBd+8s0AwwVr1os5TO7Luo/UrY="; }; patches = [ @@ -23,13 +24,21 @@ buildNpmPackage (finalAttrs: { ./add-missing-resolved-integrity-fields.patch ]; - npmDepsHash = "sha256-XvJO3ylm/ER5neSubci2w9OCTmqobmmXLbKmdQAqArY="; + npmDepsHash = "sha256-uLKxUD0e9YSEQz4dxsGXYojcYS6noqsWhtmsc20He0k="; nativeBuildInputs = [ jq ]; + buildInputs = [ ripgrep ]; + postPatch = '' + # Remove @lvce-editor/ripgrep dependency (no network on buildPhase + substituteInPlace package.json --replace-fail '"@lvce-editor/ripgrep": "^1.6.0",' "" + substituteInPlace packages/core/package.json --replace-fail '"@lvce-editor/ripgrep": "^1.6.0",' "" + substituteInPlace packages/core/src/tools/ripGrep.ts \ + --replace-fail "import { rgPath } from '@lvce-editor/ripgrep';" "const rgPath = 'rg';" + # patches below remove node-pty dependency which causes build fail on Darwin # should be conditional on platform but since package-lock.json is patched it changes its hash # though seems like this dependency is not really required by the package diff --git a/pkgs/by-name/se/semantic-release/package.nix b/pkgs/by-name/se/semantic-release/package.nix index 80571b984e54..f3be478f2021 100644 --- a/pkgs/by-name/se/semantic-release/package.nix +++ b/pkgs/by-name/se/semantic-release/package.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "semantic-release"; - version = "24.2.8"; + version = "24.2.9"; src = fetchFromGitHub { owner = "semantic-release"; repo = "semantic-release"; rev = "v${version}"; - hash = "sha256-blPpIVL1bg8u7vnZo+XRvVPOv8UAmwtt7Rl1h3XC1L8="; + hash = "sha256-6dR1wUkoUTRtyQliJFUYLC4eNW2ppIOqeUsL7rLCZiA="; }; - npmDepsHash = "sha256-XvZpyDEUMDj4TvjDsDhWiyJHiy+14mWgTghXeFP+vBM="; + npmDepsHash = "sha256-Frhb7bsY0z160EAKOWB5VCsrBMcrjKPE5OYtgX1Cmhs="; dontNpmBuild = true; diff --git a/pkgs/by-name/to/touchosc/package.nix b/pkgs/by-name/to/touchosc/package.nix index b47d0dba904e..8344a56a4449 100644 --- a/pkgs/by-name/to/touchosc/package.nix +++ b/pkgs/by-name/to/touchosc/package.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.4.4.236"; + version = "1.4.5.238"; suffix = { @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-bMC3FbamzpYqMSe4D20eulJOW4M7CVJrlFWpqv2iBJU="; - armv7l-linux = "sha256-tADriDthvPNx8u3/HvIthBzEbvRW/RDT5ZcnADfR2xA="; - x86_64-linux = "sha256-eCU0EpeL9C0eqklpczWzsw6cghJ8pLlChsHKuHqgLLA="; + aarch64-linux = "sha256-ITuIQfBw5LIN3sc11G78Pd5Ca4KDqxPhc9ArpGKBNzo="; + armv7l-linux = "sha256-DF7jTVp5Xieop6Q/EVznQmDlFFA5qaizXAoNwCXs/Hc="; + x86_64-linux = "sha256-6KpdwGXbyYwT0VhwPS9yP0c6HXUjKkGGmvZDiwQvlBw="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index d81707fe938b..5dc592333593 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tpnote"; - version = "1.25.14"; + version = "1.25.15"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; tag = "v${finalAttrs.version}"; - hash = "sha256-CgC4aLg1GdqDXzuWfV4i5C4//I3GJ2RJa0y3oFOM0II="; + hash = "sha256-vmHRpY2KvG6vxVQ6OVi/u6wpD8oqQFXn2IJOT0Nh/V0="; }; - cargoHash = "sha256-LF17FrWiqfFaVFbOjm9GiW9AsZmleZL++i8YDyrVZVM="; + cargoHash = "sha256-dltBOA6pxy2gLemVoX8l0Z+xkiJvhGWSmediWWnN1bc="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/un/unison-ucm/package.nix b/pkgs/by-name/un/unison-ucm/package.nix index c9602d1f46f0..d7c653248e85 100644 --- a/pkgs/by-name/un/unison-ucm/package.nix +++ b/pkgs/by-name/un/unison-ucm/package.nix @@ -14,21 +14,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.47"; + version = "0.5.48"; src = { aarch64-darwin = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz"; - hash = "sha256-Ocqwh+kH4tLMTMthbezDB0o00TTF/d6n8CzQxR919hA="; + hash = "sha256-HtgVPgxwOYvsv6Z+qG0GMnRyqzm/AlLDdIrypjzCBHo="; }; x86_64-darwin = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz"; - hash = "sha256-Fkouq/jv0Ddv1EjREtiGjMAEqdNoxwv4nqqp/nwf+zg="; + hash = "sha256-xtn8ozF2UdoSSYYCoYPh4AgbrYm+3vtmIRSXD8OWams="; + }; + aarch64-linux = fetchurl { + url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-arm64.tar.gz"; + hash = "sha256-xiEEkzdCS/HSEPLzuuDLh4iITsF2fuR51ACYQoQnzKQ="; }; x86_64-linux = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-x64.tar.gz"; - hash = "sha256-RizYZaNdaXCkfiFXblB34btqmu6xo3owKkSuOrgopIo="; + hash = "sha256-CMiheW4z27awGIpAk/DQN+JAAU7ZvIyFAEAI+ZaQhpY="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); @@ -82,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-darwin" "x86_64-linux" "aarch64-darwin" + "aarch64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/vi/vivify/package.nix b/pkgs/by-name/vi/vivify/package.nix new file mode 100644 index 000000000000..e943e0e15d36 --- /dev/null +++ b/pkgs/by-name/vi/vivify/package.nix @@ -0,0 +1,85 @@ +{ + lib, + stdenv, + fetchYarnDeps, + fetchFromGitHub, + yarnConfigHook, + npmHooks, + nodejs, + zip, + file, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vivify"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "jannis-baum"; + repo = "Vivify"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2lxf21T9y4GMFlk0+qbaJJ/twRffYEBoBXZXe/NRDQk="; + }; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-mOgfwetiLMTDquw3f3+U1iEhBbvf0OC5lkNJHdrRSK0="; + }; + + installPhase = '' + runHook preInstall + + yarn install + + substituteInPlace node_modules/.bin/tsc \ + --replace-fail '/usr/bin/env node' '${lib.getExe nodejs}' + + substituteInPlace node_modules/.bin/webpack \ + --replace-fail '/usr/bin/env node' '${lib.getExe nodejs}' + + substituteInPlace node_modules/.bin/postject \ + --replace-fail '/usr/bin/env node' '${lib.getExe nodejs}' + + make linux + + mkdir -p $out/bin + install -Dm755 ./build/linux/viv $out/bin/viv + install -Dm755 ./build/linux/vivify-server $out/bin/vivify-server + + wrapProgram $out/bin/viv \ + --prefix PATH : ${ + lib.makeBinPath [ + nodejs + file + ] + } + ''; + + nativeBuildInputs = [ + yarnConfigHook + npmHooks.npmInstallHook + zip + + nodejs + file + ]; + + # Stripping 'unneeded symbols' causes vivify-server executable to break + # (segmentation fault) + dontStrip = true; + + meta = { + description = "Live Markdown viewer"; + longDescription = '' + Vivify brings your files to life in the browser! + Vivify is primarily made to render Markdown and Jupyter Notebooks, but will also + serve as a directory browser and let you view code files with syntax highlighting. + ''; + homepage = "https://github.com/jannis-baum/Vivify"; + changelog = "https://github.com/jannis-baum/Vivify/releases/tag/v${finalAttrs.src.tag}"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ skohtv ]; + platforms = lib.platforms.linux; + mainProgram = "viv"; + }; +}) diff --git a/pkgs/by-name/xk/xk6/package.nix b/pkgs/by-name/xk/xk6/package.nix index 82ffbfb45c63..b3d58e1a2378 100644 --- a/pkgs/by-name/xk/xk6/package.nix +++ b/pkgs/by-name/xk/xk6/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "xk6"; - version = "1.1.3"; + version = "1.1.5"; src = fetchFromGitHub { owner = "grafana"; repo = "xk6"; tag = "v${version}"; - hash = "sha256-+sKZjC6H8ddRvCGFmUKp3H1BrLfoawWy3YCDY7bbnc0="; + hash = "sha256-+hWZWWrFkenzmaXAgzuZ9eWB4DmhQZNAQV+FYQdEg2U="; }; vendorHash = null; diff --git a/pkgs/data/icons/beauty-line-icon-theme/default.nix b/pkgs/data/icons/beauty-line-icon-theme/default.nix index d1bea8dfd6bd..af4c09e9adff 100644 --- a/pkgs/data/icons/beauty-line-icon-theme/default.nix +++ b/pkgs/data/icons/beauty-line-icon-theme/default.nix @@ -1,7 +1,7 @@ { lib, stdenvNoCC, - fetchFromGitHub, + fetchFromGitLab, breeze-icons, gtk3, gnome-icon-theme, @@ -13,20 +13,15 @@ stdenvNoCC.mkDerivation rec { pname = "BeautyLine"; - version = "0.0.4"; + version = "2.4"; - src = fetchFromGitHub { - owner = "gvolpe"; - repo = pname; - rev = version; - sparseCheckout = [ - "BeautyLine-V3" - ]; - hash = "sha256-IkkypAj250+OXbf19TampCnqYsSbJVIjeYlxJoyhpzk="; + src = fetchFromGitLab { + owner = "garuda-linux"; + repo = "themes-and-settings/artwork/beautyline"; + rev = "0df6f5df71c19496f9a873f8a52fbb5e84e95b12"; + hash = "sha256-SsYW4H1qam7kQJ3E4/vHJJOv2E4Pdk3itGncWa6YTqw="; }; - sourceRoot = "${src.name}/BeautyLine-V3"; - nativeBuildInputs = [ jdupes gtk3 @@ -63,6 +58,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://www.gnome-look.org/p/1425426/"; platforms = platforms.linux; license = [ licenses.publicDomain ]; - maintainers = with maintainers; [ gvolpe ]; + maintainers = with maintainers; [ lwb-2021 ]; }; } diff --git a/pkgs/development/compilers/flutter/versions/3_35/data.json b/pkgs/development/compilers/flutter/versions/3_35/data.json index fd02a6dbb4a9..915626fd790a 100644 --- a/pkgs/development/compilers/flutter/versions/3_35/data.json +++ b/pkgs/development/compilers/flutter/versions/3_35/data.json @@ -1,17 +1,17 @@ { - "version": "3.35.3", - "engineVersion": "ddf47dd3ff96dbde6d9c614db0d7f019d7c7a2b7", + "version": "3.35.4", + "engineVersion": "c29809135135e262a912cf583b2c90deb9ded610", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-f5RFYSG6LLz1Yt6EE7ETpcLDxlQ0Bm6b5FiLh39lbpY=", - "x86_64-linux": "sha256-f5RFYSG6LLz1Yt6EE7ETpcLDxlQ0Bm6b5FiLh39lbpY=" + "aarch64-linux": "sha256-lUqqu4OgveDOmVJw1BMnSYFCDooReGuj7Gh9ZCalcmE=", + "x86_64-linux": "sha256-lUqqu4OgveDOmVJw1BMnSYFCDooReGuj7Gh9ZCalcmE=" }, "x86_64-linux": { - "aarch64-linux": "sha256-vwEIm64Dwwhmo6L2fKKDNWa/uIyVfL/eCLJK7eob6lQ=", - "x86_64-linux": "sha256-vwEIm64Dwwhmo6L2fKKDNWa/uIyVfL/eCLJK7eob6lQ=" + "aarch64-linux": "sha256-Kw2I9ztyYOVl1V2ewLOIlxvvlX4+P3Hp5yZK82eLIbo=", + "x86_64-linux": "sha256-Kw2I9ztyYOVl1V2ewLOIlxvvlX4+P3Hp5yZK82eLIbo=" } }, "dartVersion": "3.9.2", @@ -21,53 +21,53 @@ "x86_64-darwin": "sha256-mjWHCF5voWLKlqBKYhl2OKg2aDx0pyIQ1TlF6k4MQz0=", "aarch64-darwin": "sha256-1rAfqatlOdphdi6dZSfUfKywAbdwRn6ijo60isjV3Lw=" }, - "flutterHash": "sha256-OXyciVucxYnb+d8IO1Sb0/47hlygnSoA+N8YtJw7ES8=", + "flutterHash": "sha256-8mX5KZGti5TR1AhB6ACAhGziZOgmnaaNF4RFyD1a3O4=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-j07VOm7nabzb9nA0L3I/Ojc0murKgIrX+n4t8CaOWUU=", - "aarch64-linux": "sha256-p0DktS367Iof8Wpy4ODojQBIeVyKClWnh0WjjUUbl+E=", - "x86_64-darwin": "sha256-j07VOm7nabzb9nA0L3I/Ojc0murKgIrX+n4t8CaOWUU=", - "x86_64-linux": "sha256-p0DktS367Iof8Wpy4ODojQBIeVyKClWnh0WjjUUbl+E=" + "aarch64-darwin": "sha256-59z28tm0Pr6Jwln/MlTJmCNoZrxRuqEOW5Ua1M6bryI=", + "aarch64-linux": "sha256-odC1O8RbcqLndwsRFtguPguH6oda3mDAabBAuFQKCLY=", + "x86_64-darwin": "sha256-59z28tm0Pr6Jwln/MlTJmCNoZrxRuqEOW5Ua1M6bryI=", + "x86_64-linux": "sha256-odC1O8RbcqLndwsRFtguPguH6oda3mDAabBAuFQKCLY=" }, "fuchsia": { - "aarch64-darwin": "sha256-JOlDUchplstR0Wu8RlK16RQBS4AAsEEQyU5TWG9nJ1Y=", - "aarch64-linux": "sha256-JOlDUchplstR0Wu8RlK16RQBS4AAsEEQyU5TWG9nJ1Y=", - "x86_64-darwin": "sha256-JOlDUchplstR0Wu8RlK16RQBS4AAsEEQyU5TWG9nJ1Y=", - "x86_64-linux": "sha256-JOlDUchplstR0Wu8RlK16RQBS4AAsEEQyU5TWG9nJ1Y=" + "aarch64-darwin": "sha256-xoET0OFPSF/OWiNHJSYoEgNwaopRTMMAdHZkBN6n/5k=", + "aarch64-linux": "sha256-xoET0OFPSF/OWiNHJSYoEgNwaopRTMMAdHZkBN6n/5k=", + "x86_64-darwin": "sha256-xoET0OFPSF/OWiNHJSYoEgNwaopRTMMAdHZkBN6n/5k=", + "x86_64-linux": "sha256-xoET0OFPSF/OWiNHJSYoEgNwaopRTMMAdHZkBN6n/5k=" }, "ios": { - "aarch64-darwin": "sha256-oz0/S33dcaKWAuWfXQfrDKQENrCxysKwQ50mloIqXK8=", - "aarch64-linux": "sha256-oz0/S33dcaKWAuWfXQfrDKQENrCxysKwQ50mloIqXK8=", - "x86_64-darwin": "sha256-oz0/S33dcaKWAuWfXQfrDKQENrCxysKwQ50mloIqXK8=", - "x86_64-linux": "sha256-oz0/S33dcaKWAuWfXQfrDKQENrCxysKwQ50mloIqXK8=" + "aarch64-darwin": "sha256-IUWziLP2FtBo041VkxVQCDVRYztybPTcNFfhMvHlReQ=", + "aarch64-linux": "sha256-IUWziLP2FtBo041VkxVQCDVRYztybPTcNFfhMvHlReQ=", + "x86_64-darwin": "sha256-IUWziLP2FtBo041VkxVQCDVRYztybPTcNFfhMvHlReQ=", + "x86_64-linux": "sha256-IUWziLP2FtBo041VkxVQCDVRYztybPTcNFfhMvHlReQ=" }, "linux": { - "aarch64-darwin": "sha256-IjaOmgSzh5bt2IPgrFKBCptToAFS68Lb/6JUib3efXE=", - "aarch64-linux": "sha256-IjaOmgSzh5bt2IPgrFKBCptToAFS68Lb/6JUib3efXE=", - "x86_64-darwin": "sha256-TSkUrQPG6B9vUevlhB7fQfslSGTIY+epzwRM8l72hYc=", - "x86_64-linux": "sha256-TSkUrQPG6B9vUevlhB7fQfslSGTIY+epzwRM8l72hYc=" + "aarch64-darwin": "sha256-Y8j7Mr8tbgbl89/bxnNnqTb4plTijv24CYtWlKxAxqs=", + "aarch64-linux": "sha256-Y8j7Mr8tbgbl89/bxnNnqTb4plTijv24CYtWlKxAxqs=", + "x86_64-darwin": "sha256-FZ8y8zTUSxhbGiFLyhgFRrwWAE77jSINuY6ypbL8Gjg=", + "x86_64-linux": "sha256-FZ8y8zTUSxhbGiFLyhgFRrwWAE77jSINuY6ypbL8Gjg=" }, "macos": { - "aarch64-darwin": "sha256-iTc6Q462wbCRzFvS7lKJZvlQMYb7eqJGfChmfgGQvls=", - "aarch64-linux": "sha256-iTc6Q462wbCRzFvS7lKJZvlQMYb7eqJGfChmfgGQvls=", - "x86_64-darwin": "sha256-iTc6Q462wbCRzFvS7lKJZvlQMYb7eqJGfChmfgGQvls=", - "x86_64-linux": "sha256-iTc6Q462wbCRzFvS7lKJZvlQMYb7eqJGfChmfgGQvls=" + "aarch64-darwin": "sha256-fHf8/MunFZ24Q3CEF032nljlZH2I8w7KlKfLVqKCpJc=", + "aarch64-linux": "sha256-fHf8/MunFZ24Q3CEF032nljlZH2I8w7KlKfLVqKCpJc=", + "x86_64-darwin": "sha256-fHf8/MunFZ24Q3CEF032nljlZH2I8w7KlKfLVqKCpJc=", + "x86_64-linux": "sha256-fHf8/MunFZ24Q3CEF032nljlZH2I8w7KlKfLVqKCpJc=" }, "universal": { - "aarch64-darwin": "sha256-QB6x399cf7FI5xJS25D3xQsprYMvqdOqs3R2GQwzB0I=", - "aarch64-linux": "sha256-ywTLTRvqZgLqSXSTS/axyGGWsUvMd76KQmz5p/cZhSY=", - "x86_64-darwin": "sha256-mCmTvirTGovEAaYKgYYkK8WJ9ntZMLshDLNrViPxf8U=", - "x86_64-linux": "sha256-hfngQ8yKVEgRDnE1JfBGUPf11u3IKNgag3Yx1/AWfSQ=" + "aarch64-darwin": "sha256-naywuR7a5kNzp32cg/n7x+rNP/nEPDzMILeaAkW1rZ0=", + "aarch64-linux": "sha256-++veEABUJp9nCvawRC+PzgG7I/Qg/WTEDjB0BLixnhY=", + "x86_64-darwin": "sha256-Ctt79i77YOqIzLzs1BNh50zbCEcLHPNm/nH+cICp1S8=", + "x86_64-linux": "sha256-ZFHB4gT3O/U+eKHSAynvbG1Kov1mshhcibmJlG1MsRs=" }, "web": { - "aarch64-darwin": "sha256-+OMF6Bc8tsdhDyBIokt/oTsGJLisaC/iv0Yt7xhChmk=", - "aarch64-linux": "sha256-+OMF6Bc8tsdhDyBIokt/oTsGJLisaC/iv0Yt7xhChmk=", - "x86_64-darwin": "sha256-+OMF6Bc8tsdhDyBIokt/oTsGJLisaC/iv0Yt7xhChmk=", - "x86_64-linux": "sha256-+OMF6Bc8tsdhDyBIokt/oTsGJLisaC/iv0Yt7xhChmk=" + "aarch64-darwin": "sha256-SkH+u5yQwY2JxLLW/4hG0tSr8l0diL4QMvi8kS064WY=", + "aarch64-linux": "sha256-SkH+u5yQwY2JxLLW/4hG0tSr8l0diL4QMvi8kS064WY=", + "x86_64-darwin": "sha256-SkH+u5yQwY2JxLLW/4hG0tSr8l0diL4QMvi8kS064WY=", + "x86_64-linux": "sha256-SkH+u5yQwY2JxLLW/4hG0tSr8l0diL4QMvi8kS064WY=" }, "windows": { - "x86_64-darwin": "sha256-SkBxiYhGp1EMQ8MH92QrDlbgrvsJLHuBs1NVaOxSAfc=", - "x86_64-linux": "sha256-SkBxiYhGp1EMQ8MH92QrDlbgrvsJLHuBs1NVaOxSAfc=" + "x86_64-darwin": "sha256-yYn8BChjhZgqUyrENcpAZRpBf1w0LmzCjXnx9z4aw4Q=", + "x86_64-linux": "sha256-yYn8BChjhZgqUyrENcpAZRpBf1w0LmzCjXnx9z4aw4Q=" } }, "pubspecLock": { diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index c9c796b66eb5..9695272f7a6a 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "datafusion"; - version = "48.0.0"; + version = "49.0.0"; pyproject = true; src = fetchFromGitHub { @@ -32,12 +32,12 @@ buildPythonPackage rec { tag = version; # Fetch arrow-testing and parquet-testing (tests assets) fetchSubmodules = true; - hash = "sha256-9IOkb31f4nFo9mWTr+z5ZG8xSXIZSgW3vCBgLaGxpfI="; + hash = "sha256-U3LRZQMjL8sNa5yQmwfhw9NRGC0299TRODylzZkvFh4="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-P9NFvhHAGgYIi36CHEPZPr8hmMNp5zrCcmE7NHx51k4="; + hash = "sha256-lCbqy6kZK+LSLvr+Odxt167ACnDap2enH/J4ILcPtOc="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index b337381be485..d7606c49001b 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -2,12 +2,12 @@ lib, stdenv, buildPythonPackage, - pythonOlder, pythonAtLeast, fetchFromGitHub, replaceVars, gdb, lldb, + setuptools, pytestCheckHook, pytest-xdist, pytest-timeout, @@ -26,9 +26,7 @@ buildPythonPackage rec { pname = "debugpy"; version = "1.8.17"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + pyproject = true; src = fetchFromGitHub { owner = "microsoft"; @@ -91,6 +89,8 @@ buildPythonPackage rec { } )''; + build-system = [ setuptools ]; + # Disable tests for unmaintained versions of python doCheck = pythonAtLeast "3.11"; @@ -136,17 +136,23 @@ buildPythonPackage rec { "test_systemexit" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + # ConnectionResetError: [Errno 54] Connection reset by peer + "tests/debugpy/test_breakpoints.py::test_error_in_condition[program-attach_connect(cli)-]" + "tests/debugpy/test_breakpoints.py::test_error_in_condition[program-attach_connect(cli)-NameError]" + ]; + # Fixes hanging tests on Darwin __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "debugpy" ]; - meta = with lib; { + meta = { description = "Implementation of the Debug Adapter Protocol for Python"; homepage = "https://github.com/microsoft/debugpy"; changelog = "https://github.com/microsoft/debugpy/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ kira-bruneau ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kira-bruneau ]; platforms = [ "x86_64-linux" "i686-linux" diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix index ef15c110c193..141a7ae3f6a7 100644 --- a/pkgs/development/python-modules/dipy/default.nix +++ b/pkgs/development/python-modules/dipy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dipy"; - version = "1.9.0"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -25,14 +25,9 @@ buildPythonPackage rec { owner = "dipy"; repo = "dipy"; tag = version; - hash = "sha256-6cpxuk2PL43kjQ+6UGiUHUXC7pC9OlW9kZvGOdEXyzw="; + hash = "sha256-vqjd5gd9B630pv6H4MvXnlPwlEhm1o7MbwYD0J7D24o="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "numpy==" "numpy>=" - ''; - build-system = [ cython meson-python @@ -74,11 +69,11 @@ buildPythonPackage rec { "dipy.nn" ]; - meta = with lib; { + meta = { homepage = "https://dipy.org/"; description = "Diffusion imaging toolkit for Python"; changelog = "https://github.com/dipy/dipy/blob/${version}/Changelog"; - license = licenses.bsd3; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/formulaic/default.nix b/pkgs/development/python-modules/formulaic/default.nix index 44870bba4566..97d387abec91 100644 --- a/pkgs/development/python-modules/formulaic/default.nix +++ b/pkgs/development/python-modules/formulaic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "formulaic"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "matthewwardrop"; repo = "formulaic"; tag = "v${version}"; - hash = "sha256-+MyMxtX3DCmluf+8dvo0uulc1AeKE6les1xiRGVWjPU="; + hash = "sha256-mZt+cwk/AaUmmeCj7aLu1QEBqlPUVUqQbYdgETMj/vY="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/inflate64/default.nix b/pkgs/development/python-modules/inflate64/default.nix index 35da809726c4..e844b2367110 100644 --- a/pkgs/development/python-modules/inflate64/default.nix +++ b/pkgs/development/python-modules/inflate64/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitea, + nix-update-script, setuptools, setuptools-scm, pytestCheckHook, @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "inflate64"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitea { @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "miurahr"; repo = "inflate64"; tag = "v${version}"; - hash = "sha256-deFx8NMbGLP51CdNvmZ25LQ5FLPBb1PB3QhGhIfTMfc="; + hash = "sha256-qYTkL37IzvrhYYwj6i6X8WRSQxprNKgBnQEYRnztzjA="; }; build-system = [ @@ -33,6 +34,8 @@ buildPythonPackage rec { "inflate64" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Compress and decompress with Enhanced Deflate compression algorithm"; homepage = "https://codeberg.org/miurahr/inflate64"; diff --git a/pkgs/development/python-modules/jianpu-ly/default.nix b/pkgs/development/python-modules/jianpu-ly/default.nix index 53efb8deb78c..c3b3ec5b1451 100644 --- a/pkgs/development/python-modules/jianpu-ly/default.nix +++ b/pkgs/development/python-modules/jianpu-ly/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jianpu-ly"; - version = "1.862"; + version = "1.863"; pyproject = true; src = fetchPypi { inherit version; pname = "jianpu_ly"; - hash = "sha256-lrJVepMtdeHti+zmHiTP578aVedWj9N+s74xif1U9UM="; + hash = "sha256-feSg7kWWBFHqqvyx4O05KtWa9p4JvKwrtyMqbNXwAd0="; }; dependencies = [ lilypond ]; diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index bd13239399d3..7bc73b5ae002 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "manifestoo-core"; - version = "1.11"; + version = "1.12"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-f242Zf6L/vvAAOHpqcJVBVKFD17ATpDU3Er/eoNqIfg="; + hash = "sha256-cBWTXCIWBu9+mVnyj4jvGZuX8Hh6dePBRqB7BDf0gRQ="; }; nativeBuildInputs = [ hatch-vcs ]; diff --git a/pkgs/development/python-modules/pandera/default.nix b/pkgs/development/python-modules/pandera/default.nix index ce68f97a5f7d..c42958c57fa9 100644 --- a/pkgs/development/python-modules/pandera/default.nix +++ b/pkgs/development/python-modules/pandera/default.nix @@ -20,6 +20,7 @@ # optional-dependencies black, dask, + duckdb, fastapi, geopandas, hypothesis, @@ -31,25 +32,25 @@ shapely, # tests - duckdb, joblib, - pyarrow, pyarrow-hotfix, - pytestCheckHook, + pyarrow, pytest-asyncio, + pytestCheckHook, pythonAtLeast, + rich, }: buildPythonPackage rec { pname = "pandera"; - version = "0.25.0"; + version = "0.26.1"; pyproject = true; src = fetchFromGitHub { owner = "unionai-oss"; repo = "pandera"; tag = "v${version}"; - hash = "sha256-0YeLeGpunjHRWFvSvz0r2BokM4/eJKXuBajgcGquca4="; + hash = "sha256-kjKsujDxX2+X6omP9qDWc2JI8bxQlOSVOcEnfACoL2I="; }; build-system = [ @@ -113,11 +114,12 @@ buildPythonPackage rec { extras // { all = lib.concatLists (lib.attrValues extras); }; nativeCheckInputs = [ - pytestCheckHook - pytest-asyncio joblib pyarrow pyarrow-hotfix + pytest-asyncio + pytestCheckHook + rich ] ++ optional-dependencies.all; @@ -133,17 +135,22 @@ buildPythonPackage rec { "tests/dask/test_dask_accessor.py::test_dataframe_series_add_schema" ]; - disabledTests = - lib.optionals stdenv.hostPlatform.isDarwin [ - # OOM error on ofborg: - "test_engine_geometry_coerce_crs" - # pandera.errors.SchemaError: Error while coercing 'geometry' to type geometry - "test_schema_dtype_crs_with_coerce" - ] - ++ lib.optionals (pythonAtLeast "3.13") [ - # AssertionError: assert DataType(Sparse[float64, nan]) == DataType(Sparse[float64, nan]) - "test_legacy_default_pandas_extension_dtype" - ]; + disabledTests = [ + # TypeError: __class__ assignment: 'GeoDataFrame' object... + "test_schema_model" + "test_schema_from_dataframe" + "test_schema_no_geometry" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # OOM error on ofborg: + "test_engine_geometry_coerce_crs" + # pandera.errors.SchemaError: Error while coercing 'geometry' to type geometry + "test_schema_dtype_crs_with_coerce" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # AssertionError: assert DataType(Sparse[float64, nan]) == DataType(Sparse[float64, nan]) + "test_legacy_default_pandas_extension_dtype" + ]; pythonImportsCheck = [ "pandera" diff --git a/pkgs/development/python-modules/piqp/default.nix b/pkgs/development/python-modules/piqp/default.nix index 63c7bd058b37..efdb378f7130 100644 --- a/pkgs/development/python-modules/piqp/default.nix +++ b/pkgs/development/python-modules/piqp/default.nix @@ -1,86 +1,71 @@ { lib, - fetchFromGitHub, buildPythonPackage, - pytestCheckHook, - stdenv, - pythonOlder, - setuptools, + fetchFromGitHub, + replaceVars, + cpu_features, + + # build-system cmake, ninja, - wheel, - matio, + pybind11, + scikit-build-core, + + # buildInputs eigen, gtest, - cpu_features, - pybind11, - python, + matio, + + # tests numpy, scipy, + pytestCheckHook, }: buildPythonPackage rec { pname = "piqp"; - version = "0.6.0"; + version = "0.6.2"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "PREDICT-EPFL"; repo = "piqp"; tag = "v${version}"; - hash = "sha256-hVUeDV2GrBAOIgaWhg+RV+8CFRIm8Kv6/wCs5bXs2aY="; + hash = "sha256-W9t7d+wV5WcphL54e6tpnKxiWFay9UrFmIRKsGk2yMM="; }; - postPatch = - let - # E.g. 3.11.2 -> "311" - pythonVersionMajorMinor = - with lib.versions; - "${major python.pythonVersion}${minor python.pythonVersion}"; - - # E.g. "linux-aarch64" - platform = - with stdenv.hostPlatform; - (lib.optionalString (!isDarwin) "${parsed.kernel.name}-${parsed.cpu.name}") - + (lib.optionalString isDarwin "macosx-${darwinMinVersion}-${darwinArch}"); - in - '' - build="build/temp.${platform}-cpython-${pythonVersionMajorMinor}/${pname}.${pname}" - mkdir -p $build/_deps - ln -s ${cpu_features.src} $build/_deps/cpu_features-src - ''; - - patches = [ ./use-nix-packages.patch ]; + patches = [ + (replaceVars ./use-nix-packages.patch { + cpu_features_src = cpu_features.src; + }) + ]; build-system = [ - setuptools cmake ninja - wheel + pybind11 + scikit-build-core ]; + dontUseCmakeConfigure = true; buildInputs = [ - matio eigen gtest - pybind11 + matio ]; - dontUseCmakeConfigure = true; - pythonImportsCheck = [ "piqp" ]; nativeCheckInputs = [ - pytestCheckHook numpy + pytestCheckHook scipy ]; - meta = with lib; { + meta = { description = "Proximal Interior Point Quadratic Programming solver"; homepage = "https://github.com/PREDICT-EPFL/piqp"; - license = licenses.bsd2; - maintainers = with maintainers; [ renesat ]; + changelog = "https://github.com/PREDICT-EPFL/piqp/releases/tag/v${version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ renesat ]; }; } diff --git a/pkgs/development/python-modules/piqp/use-nix-packages.patch b/pkgs/development/python-modules/piqp/use-nix-packages.patch index 27a61b165e54..ac4a5d87df50 100644 --- a/pkgs/development/python-modules/piqp/use-nix-packages.patch +++ b/pkgs/development/python-modules/piqp/use-nix-packages.patch @@ -1,21 +1,21 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ea1da5e..0a6f096 100644 +index 8e0eb68..0131d4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -100,7 +100,7 @@ if (BUILD_PYTHON_INTERFACE OR BUILD_MATLAB_INTERFACE) +@@ -109,7 +109,7 @@ if (BUILD_PYTHON_INTERFACE OR BUILD_MATLAB_INTERFACE) include(FetchContent) FetchContent_Declare( cpu_features -- URL https://github.com/google/cpu_features/archive/refs/tags/v0.9.0.zip -+ DOWNLOAD_COMMAND true +- URL https://github.com/google/cpu_features/archive/refs/tags/v0.10.1.zip ++ URL @cpu_features_src@ ) set(BUILD_SHARED_LIBS_COPY ${BUILD_SHARED_LIBS}) set(BUILD_SHARED_LIBS OFF) diff --git a/interfaces/c/tests/CMakeLists.txt b/interfaces/c/tests/CMakeLists.txt -index 010f038..c8f9ec4 100644 +index 5919593..bf504c5 100644 --- a/interfaces/c/tests/CMakeLists.txt +++ b/interfaces/c/tests/CMakeLists.txt -@@ -13,18 +13,8 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0") +@@ -17,18 +17,8 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.30.0") endif() # Google Test @@ -37,19 +37,16 @@ index 010f038..c8f9ec4 100644 enable_testing() diff --git a/interfaces/python/CMakeLists.txt b/interfaces/python/CMakeLists.txt -index f7415dc..885aeff 100644 +index b2e3cef..3d9cf65 100644 --- a/interfaces/python/CMakeLists.txt +++ b/interfaces/python/CMakeLists.txt -@@ -14,19 +14,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0") +@@ -13,16 +13,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0") + cmake_policy(SET CMP0135 OLD) endif() - # Find pybind11 --include(FetchContent) --FetchContent_Declare( -- pybind11 -- URL https://github.com/pybind/pybind11/archive/refs/tags/v2.12.0.zip --) --FetchContent_MakeAvailable(pybind11) +-# Find pybind11 +-set(PYBIND11_FINDPYTHON ON) +-find_package(pybind11 CONFIG REQUIRED) - -# detect arm64 cross compilation on macOS -if(DEFINED ENV{_PYTHON_HOST_PLATFORM}) @@ -62,7 +59,7 @@ index f7415dc..885aeff 100644 # add instruction set detection on x86/amd64 pybind11_add_module(instruction_set src/instruction_set.cpp) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index d11bd37..2275a62 100644 +index fded71a..cb568a7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,18 +14,8 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0") diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index 64db1c5206a4..926581a1bd48 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -1,13 +1,11 @@ { lib, - stdenv, buildPythonPackage, cython, fetchFromGitHub, - libiconv, + narwhals, pandas, python, - pythonOlder, readstat, setuptools, zlib, @@ -15,16 +13,14 @@ buildPythonPackage rec { pname = "pyreadstat"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "Roche"; repo = "pyreadstat"; tag = "v${version}"; - hash = "sha256-ZcdCUX8mNBipOV5k+y7WdgxCZLfsZZlClyeuL8sQ6BI="; + hash = "sha256-EiQKsz4+PdUNXAniw8ftZbF5B+BegUx40zumE3Z7Xmo="; }; build-system = [ @@ -32,9 +28,10 @@ buildPythonPackage rec { setuptools ]; - buildInputs = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + buildInputs = [ zlib ]; dependencies = [ + narwhals readstat pandas ]; diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix index b8c92da93302..81e9744b25e6 100644 --- a/pkgs/development/python-modules/python-docs-theme/default.nix +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "python-docs-theme"; - version = "2025.9.1"; + version = "2025.9.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "python"; repo = "python-docs-theme"; tag = version; - hash = "sha256-rO2L5M2TYU8+fJLDbu+EMqAy3vD7yNwd5b1fMZ8LNwg="; + hash = "sha256-G9QhrNqwSonyCQXxBv1GkUx39GyOQs+0gciJDQwWvVQ="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index 54714e1e66b2..9075dafe84aa 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -1,40 +1,57 @@ { - stdenv, lib, + stdenv, buildPythonPackage, fetchFromGitHub, - cython, - ecos, eigen, + + # build-system + cython, + numpy, + packaging, + scikit-learn, + setuptools, + setuptools-scm, + + # dependencies + ecos, joblib, numexpr, - numpy, osqp, pandas, - setuptools-scm, - scikit-learn, scipy, + + # tests pytestCheckHook, }: buildPythonPackage rec { pname = "scikit-survival"; - version = "0.24.1"; + version = "0.25.0"; pyproject = true; src = fetchFromGitHub { owner = "sebp"; repo = "scikit-survival"; tag = "v${version}"; - hash = "sha256-El5q2eE6wJKg/8rcFZPZQl7MVxw1jMsggjiCJHj7il8="; + hash = "sha256-OvdmZ2vDptYB2tq7OtokIQzjKzhQBWwnXZLW0m6FqlI="; }; - nativeBuildInputs = [ + postPatch = '' + ln -s ${lib.getInclude eigen}/include/eigen3/Eigen \ + sksurv/linear_model/src/eigen + ''; + + build-system = [ cython + numpy + packaging + scikit-learn + setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ ecos joblib numexpr @@ -49,22 +66,14 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - ln -s ${lib.getInclude eigen}/include/eigen3/Eigen \ - sksurv/linear_model/src/eigen - ''; - # Hack needed to make pytest + cython work # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298 preCheck = '' - export HOME=$(mktemp -d) - cp -r $TMP/$sourceRoot/tests $HOME - pushd $HOME + rm -rf sksurv ''; - postCheck = "popd"; - # very long tests, unnecessary for a leaf package disabledTests = [ + # very long tests, unnecessary for a leaf package "test_coxph" "test_datasets" "test_ensemble_selection" @@ -73,16 +82,17 @@ buildPythonPackage rec { "test_survival_svm" "test_tree" ] - ++ - lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) - # floating point mismatch on aarch64 - # 27079905.88052468 to far from 27079905.880496684 - "test_coxnet"; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + # floating point mismatch on aarch64 + # 27079905.88052468 to far from 27079905.880496684 + "test_coxnet" + ]; - meta = with lib; { + meta = { description = "Survival analysis built on top of scikit-learn"; homepage = "https://github.com/sebp/scikit-survival"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ GuillaumeDesforges ]; + changelog = "https://github.com/sebp/scikit-survival/releases/tag/v${version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ GuillaumeDesforges ]; }; } diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix index 43fb5b9cbdbe..de0d91404c7f 100644 --- a/pkgs/development/python-modules/temporalio/default.nix +++ b/pkgs/development/python-modules/temporalio/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "temporalio"; - version = "1.17.0"; + version = "1.18.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "temporalio"; repo = "sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-uxjZ3aINVP4g5UTzhGW7H/7dyaZlAqBuXH9uVS1zax0="; + hash = "sha256-uFcy348o4e7DZ+12Lc52wfANFHYCyMfLL/clhRsdkcI="; fetchSubmodules = true; }; @@ -42,7 +42,7 @@ buildPythonPackage rec { src cargoRoot ; - hash = "sha256-yE5mShJ++Zx+5AwsotGn20b7dC6BEbTiIy1xST9du+U="; + hash = "sha256-2/AH8ffSRXBrzF2G9n8MdJfbOrSnSVPRfB1fDm8wFU0="; }; cargoRoot = "temporalio/bridge"; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 44f3e2b992b4..a94b27413ddb 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.8.1"; + version = "4.8.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "mikedh"; repo = "trimesh"; tag = version; - hash = "sha256-nU79v0n6Dx5YV4nWBtLYXU1oickdcS43Me5fd5QNb88="; + hash = "sha256-9D3cuQ6parDq2pWSJmGlMzUyxUOs6Nn9T4l8Fpz50nw="; }; build-system = [ setuptools ];