Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge master into haskell-updates

authored by github-actions[bot] and committed by GitHub 63f3a926 ae051d93

+4302 -2914
+6
.git-blame-ignore-revs
··· 96 96 97 97 # nixos/*: add trivial defaultText for options with simple defaults 98 98 25124556397ba17bfd70297000270de1e6523b0a 99 + 100 + # systemd: rewrite comments 101 + 92dfeb7b3dab820ae307c56c216d175c69ee93cd 102 + 103 + # systemd: break too long lines of Nix code 104 + 67643f8ec84bef1482204709073e417c9f07eb87
+1 -1
COPYING
··· 1 - Copyright (c) 2003-2023 Eelco Dolstra and the Nixpkgs/NixOS contributors 1 + Copyright (c) 2003-2024 Eelco Dolstra and the Nixpkgs/NixOS contributors 2 2 3 3 Permission is hereby granted, free of charge, to any person obtaining 4 4 a copy of this software and associated documentation files (the
+5 -4
lib/attrsets.nix
··· 3 3 4 4 let 5 5 inherit (builtins) head tail length; 6 - inherit (lib.trivial) id mergeAttrs; 6 + inherit (lib.trivial) id mergeAttrs warn; 7 7 inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName; 8 8 inherit (lib.lists) foldr foldl' concatMap concatLists elemAt all partition groupBy take foldl; 9 9 in ··· 1197 1197 (x // y) // mask; 1198 1198 1199 1199 # DEPRECATED 1200 - zipWithNames = zipAttrsWithNames; 1200 + zipWithNames = warn 1201 + "lib.zipWithNames is a deprecated alias of lib.zipAttrsWithNames." zipAttrsWithNames; 1201 1202 1202 1203 # DEPRECATED 1203 - zip = builtins.trace 1204 - "lib.zip is deprecated, use lib.zipAttrsWith instead" zipAttrsWith; 1204 + zip = warn 1205 + "lib.zip is a deprecated alias of lib.zipAttrsWith." zipAttrsWith; 1205 1206 }
+3 -3
lib/lists.nix
··· 2 2 { lib }: 3 3 let 4 4 inherit (lib.strings) toInt; 5 - inherit (lib.trivial) compare min id; 5 + inherit (lib.trivial) compare min id warn; 6 6 inherit (lib.attrsets) mapAttrs; 7 7 inherit (lib.lists) sort; 8 8 in ··· 848 848 crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]] 849 849 => [ "13" "14" "23" "24" ] 850 850 */ 851 - crossLists = builtins.trace 852 - "lib.crossLists is deprecated, use lib.cartesianProductOfSets instead" 851 + crossLists = warn 852 + "lib.crossLists is deprecated, use lib.cartesianProductOfSets instead." 853 853 (f: foldl (fs: args: concatMap (f: map f args) fs) [f]); 854 854 855 855
+1 -1
lib/options.nix
··· 379 379 if ! isString text then throw "literalExpression expects a string." 380 380 else { _type = "literalExpression"; inherit text; }; 381 381 382 - literalExample = lib.warn "literalExample is deprecated, use literalExpression instead, or use literalMD for a non-Nix description." literalExpression; 382 + literalExample = lib.warn "lib.literalExample is deprecated, use lib.literalExpression instead, or use lib.literalMD for a non-Nix description." literalExpression; 383 383 384 384 /* Transition marker for documentation that's already migrated to markdown 385 385 syntax. This is a no-op and no longer needed.
+2 -2
lib/strings.nix
··· 561 561 [""" "'" "<" ">" "&"]; 562 562 563 563 # warning added 12-12-2022 564 - replaceChars = lib.warn "replaceChars is a deprecated alias of replaceStrings, replace usages of it with replaceStrings." builtins.replaceStrings; 564 + replaceChars = lib.warn "lib.replaceChars is a deprecated alias of lib.replaceStrings." builtins.replaceStrings; 565 565 566 566 # Case conversion utilities. 567 567 lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz"; ··· 1133 1133 "/prefix/nix-profiles-library-paths.patch" 1134 1134 "/prefix/compose-search-path.patch" ] 1135 1135 */ 1136 - readPathsFromFile = lib.warn "lib.readPathsFromFile is deprecated, use a list instead" 1136 + readPathsFromFile = lib.warn "lib.readPathsFromFile is deprecated, use a list instead." 1137 1137 (rootPath: file: 1138 1138 let 1139 1139 lines = lib.splitString "\n" (readFile file);
+1
lib/systems/inspect.nix
··· 48 48 isRiscV64 = { cpu = { family = "riscv"; bits = 64; }; }; 49 49 isRx = { cpu = { family = "rx"; }; }; 50 50 isSparc = { cpu = { family = "sparc"; }; }; 51 + isSparc64 = { cpu = { family = "sparc"; bits = 64; }; }; 51 52 isWasm = { cpu = { family = "wasm"; }; }; 52 53 isMsp430 = { cpu = { family = "msp430"; }; }; 53 54 isVc4 = { cpu = { family = "vc4"; }; };
+1 -1
lib/trivial.nix
··· 230 230 else if lib.pathExists revisionFile then lib.fileContents revisionFile 231 231 else default; 232 232 233 - nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version; 233 + nixpkgsVersion = warn "lib.nixpkgsVersion is a deprecated alias of lib.version." version; 234 234 235 235 /* Determine whether the function is being called from inside a Nix 236 236 shell.
+6
maintainers/maintainer-list.nix
··· 4371 4371 githubId = 49904992; 4372 4372 name = "Dawid Sowa"; 4373 4373 }; 4374 + daylinmorgan = { 4375 + email = "daylinmorgan@gmail.com"; 4376 + github = "daylinmorgan"; 4377 + githubId = 47667941; 4378 + name = "Daylin Morgan"; 4379 + }; 4374 4380 dbalan = { 4375 4381 email = "nix@dbalan.in"; 4376 4382 github = "dbalan";
+1
nixos/doc/manual/configuration/file-systems.chapter.md
··· 39 39 ```{=include=} sections 40 40 luks-file-systems.section.md 41 41 sshfs-file-systems.section.md 42 + overlayfs.section.md 42 43 ```
+27
nixos/doc/manual/configuration/overlayfs.section.md
··· 1 + # Overlayfs {#sec-overlayfs} 2 + 3 + NixOS offers a convenient abstraction to create both read-only as well writable 4 + overlays. 5 + 6 + ```nix 7 + fileSystems = { 8 + "/writable-overlay" = { 9 + overlay = { 10 + lowerdir = [ writableOverlayLowerdir ]; 11 + upperdir = "/.rw-writable-overlay/upper"; 12 + workdir = "/.rw-writable-overlay/work"; 13 + }; 14 + # Mount the writable overlay in the initrd. 15 + neededForBoot = true; 16 + }; 17 + "/readonly-overlay".overlay.lowerdir = [ 18 + writableOverlayLowerdir 19 + writableOverlayLowerdir2 20 + ]; 21 + }; 22 + ``` 23 + 24 + If `upperdir` and `workdir` are not null, they will be created before the 25 + overlay is mounted. 26 + 27 + To mount an overlay as read-only, you need to provide at least two `lowerdir`s.
+20
nixos/doc/manual/release-notes/rl-2405.section.md
··· 8 8 9 9 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> 10 10 11 + - `cryptsetup` has been upgraded from 2.6.1 to 2.7.0. Cryptsetup is a critical component enabling LUKS-based (but not only) full disk encryption. 12 + Take the time to review [the release notes](https://gitlab.com/cryptsetup/cryptsetup/-/raw/v2.7.0/docs/v2.7.0-ReleaseNotes). 13 + One of the highlight is that it is now possible to use hardware OPAL-based encryption of your disk with `cryptsetup`, it has a lot of caveats, see the above notes for the full details. 14 + 11 15 - `screen`'s module has been cleaned, and will now require you to set `programs.screen.enable` in order to populate `screenrc` and add the program to the environment. 12 16 13 17 - `linuxPackages_testing_bcachefs` is now fully deprecated by `linuxPackages_latest`, and is therefore no longer available. ··· 246 250 - `services.postgresql.extraPlugins` changed its type from just a list of packages to also a function that returns such a list. 247 251 For example a config line like ``services.postgresql.extraPlugins = with pkgs.postgresql_11.pkgs; [ postgis ];`` is recommended to be changed to ``services.postgresql.extraPlugins = ps: with ps; [ postgis ];``; 248 252 253 + - The Matrix homeserver [Synapse](https://element-hq.github.io/synapse/) module now supports configuring UNIX domain socket [listeners](#opt-services.matrix-synapse.settings.listeners) through the `path` option. 254 + The default replication worker on the main instance has been migrated away from TCP sockets to UNIX domain sockets. 255 + 249 256 - Programs written in [Nim](https://nim-lang.org/) are built with libraries selected by lockfiles. 250 257 The `nimPackages` and `nim2Packages` sets have been removed. 251 258 See https://nixos.org/manual/nixpkgs/unstable#nim for more information. ··· 254 261 This version of Portunus supports strong password hashes, but the legacy hash SHA-256 is also still supported to ensure a smooth migration of existing user accounts. 255 262 After upgrading, follow the instructions on the [upstream release notes](https://github.com/majewsky/portunus/releases/tag/v2.0.0) to upgrade all user accounts to strong password hashes. 256 263 Support for weak password hashes will be removed in NixOS 24.11. 264 + 265 + - A stdenv's default set of hardening flags can now be set via its `bintools-wrapper`'s `defaultHardeningFlags` argument. A convenient stdenv adapter, `withDefaultHardeningFlags`, can be used to override an existing stdenv's `defaultHardeningFlags`. 257 266 258 267 - `libass` now uses the native CoreText backend on Darwin, which may fix subtitle rendering issues with `mpv`, `ffmpeg`, etc. 259 268 ··· 272 281 - The option [`services.nextcloud.config.dbport`] of the Nextcloud module was removed to match upstream. 273 282 The port can be specified in [`services.nextcloud.config.dbhost`](#opt-services.nextcloud.config.dbhost). 274 283 284 + - A new abstraction to create both read-only as well as writable overlay file 285 + systems was added. Available via 286 + [fileSystems.overlay](#opt-fileSystems._name_.overlay.lowerdir). See also the 287 + [NixOS docs](#sec-overlayfs). 288 + 275 289 - `stdenv`: The `--replace` flag in `substitute`, `substituteInPlace`, `substituteAll`, `substituteAllStream`, and `substituteStream` is now deprecated if favor of the new `--replace-fail`, `--replace-warn` and `--replace-quiet`. The deprecated `--replace` equates to `--replace-warn`. 290 + 291 + - A new hardening flag, `zerocallusedregs` was made available, corresponding to the gcc/clang option `-fzero-call-used-regs=used-gpr`. 276 292 277 293 - New options were added to the dnsdist module to enable and configure a DNSCrypt endpoint (see `services.dnsdist.dnscrypt.enable`, etc.). 278 294 The module can generate the DNSCrypt provider key pair, certificates and also performs their rotation automatically with no downtime. ··· 290 306 `globalRedirect` can now have redirect codes other than 301 through 291 307 `redirectCode`. 292 308 309 + - `libjxl` 0.9.0 [dropped support for the butteraugli API](https://github.com/libjxl/libjxl/pull/2576). You will no longer be able to set `enableButteraugli` on `libaom`. 310 + 293 311 - The source of the `mockgen` package has changed to the [go.uber.org/mock](https://github.com/uber-go/mock) fork because [the original repository is no longer maintained](https://github.com/golang/mock#gomock). 294 312 295 313 - `security.pam.enableSSHAgentAuth` was renamed to `security.pam.sshAgentAuth.enable` and an `authorizedKeysFiles` ··· 297 315 **which is insecure**: see [#31611](https://github.com/NixOS/nixpkgs/issues/31611). 298 316 299 317 - [](#opt-boot.kernel.sysctl._net.core.wmem_max_) changed from a string to an integer because of the addition of a custom merge option (taking the highest value defined to avoid conflicts between 2 services trying to set that value), just as [](#opt-boot.kernel.sysctl._net.core.rmem_max_) since 22.11. 318 + 319 + - A new top-level package set, `pkgsExtraHardening` is added. This is a set of packages built with stricter hardening flags - those that have not yet received enough testing to be applied universally, those that are more likely to cause build failures or those that have drawbacks to their use (e.g. performance or required hardware features). 300 320 301 321 - `services.zfs.zed.enableMail` now uses the global `sendmail` wrapper defined by an email module 302 322 (such as msmtp or Postfix). It no longer requires using a special ZFS build with email support.
+7
nixos/maintainers/scripts/ec2/README.md
··· 1 + # Amazon images 2 + 3 + * The `create-amis.sh` script will be replaced by https://github.com/NixOS/amis which will regularly upload AMIs per NixOS channel bump. 4 + 5 + * @arianvp is planning to drop zfs support 6 + * @arianvp is planning to rewrite the image builder to use the repart-based image builder. 7 +
+2
nixos/maintainers/scripts/ec2/amazon-image.nix
··· 157 157 ''; 158 158 }; 159 159 in if config.ec2.zfs.enable then zfsBuilder else extBuilder; 160 + 161 + meta.maintainers = with maintainers; [ arianvp ]; 160 162 }
+1
nixos/modules/module-list.nix
··· 1527 1527 ./tasks/filesystems/jfs.nix 1528 1528 ./tasks/filesystems/nfs.nix 1529 1529 ./tasks/filesystems/ntfs.nix 1530 + ./tasks/filesystems/overlayfs.nix 1530 1531 ./tasks/filesystems/reiserfs.nix 1531 1532 ./tasks/filesystems/sshfs.nix 1532 1533 ./tasks/filesystems/squashfs.nix
+3 -3
nixos/modules/services/hardware/pcscd.nix
··· 46 46 config = mkIf config.services.pcscd.enable { 47 47 environment.etc."reader.conf".source = cfgFile; 48 48 49 - environment.systemPackages = [ package.out ]; 50 - systemd.packages = [ (getBin package) ]; 49 + environment.systemPackages = [ package ]; 50 + systemd.packages = [ package ]; 51 51 52 52 services.pcscd.plugins = [ pkgs.ccid ]; 53 53 ··· 64 64 # around it, we force the path to the cfgFile. 65 65 # 66 66 # https://github.com/NixOS/nixpkgs/issues/121088 67 - serviceConfig.ExecStart = [ "" "${getBin package}/bin/pcscd -f -x -c ${cfgFile}" ]; 67 + serviceConfig.ExecStart = [ "" "${package}/bin/pcscd -f -x -c ${cfgFile}" ]; 68 68 }; 69 69 }; 70 70 }
+3 -2
nixos/modules/services/matrix/synapse.md
··· 126 126 Otherwise, or you can generate a registration secret with 127 127 {command}`pwgen -s 64 1` and set it with 128 128 [](#opt-services.matrix-synapse.settings.registration_shared_secret). 129 - To create a new user or admin, run the following after you have set the secret 130 - and have rebuilt NixOS: 129 + To create a new user or admin from the terminal your client listener 130 + must be configured to use TCP sockets. Then you can run the following 131 + after you have set the secret and have rebuilt NixOS: 131 132 ```ShellSession 132 133 $ nix-shell -p matrix-synapse 133 134 $ register_new_matrix_user -k your-registration-shared-secret http://localhost:8008
+146 -20
nixos/modules/services/matrix/synapse.nix
··· 6 6 cfg = config.services.matrix-synapse; 7 7 format = pkgs.formats.yaml { }; 8 8 9 + filterRecursiveNull = o: 10 + if isAttrs o then 11 + mapAttrs (_: v: filterRecursiveNull v) (filterAttrs (_: v: v != null) o) 12 + else if isList o then 13 + map filterRecursiveNull (filter (v: v != null) o) 14 + else 15 + o; 16 + 9 17 # remove null values from the final configuration 10 - finalSettings = lib.filterAttrsRecursive (_: v: v != null) cfg.settings; 18 + finalSettings = filterRecursiveNull cfg.settings; 11 19 configFile = format.generate "homeserver.yaml" finalSettings; 12 20 13 21 usePostgresql = cfg.settings.database.name == "psycopg2"; ··· 105 113 SYSLOG_IDENTIFIER = logName; 106 114 }; 107 115 }); 116 + 117 + toIntBase8 = str: 118 + lib.pipe str [ 119 + lib.stringToCharacters 120 + (map lib.toInt) 121 + (lib.foldl (acc: digit: acc * 8 + digit) 0) 122 + ]; 123 + 124 + toDecimalFilePermission = value: 125 + if value == null then 126 + null 127 + else 128 + toIntBase8 value; 108 129 in { 109 130 110 131 imports = [ ··· 192 213 ]; 193 214 194 215 options = let 195 - listenerType = workerContext: types.submodule { 216 + listenerType = workerContext: types.submodule ({ config, ... }: { 196 217 options = { 197 218 port = mkOption { 198 - type = types.port; 219 + type = types.nullOr types.port; 220 + default = null; 199 221 example = 8448; 200 222 description = lib.mdDoc '' 201 223 The port to listen for HTTP(S) requests on. ··· 203 225 }; 204 226 205 227 bind_addresses = mkOption { 206 - type = types.listOf types.str; 207 - default = [ 228 + type = types.nullOr (types.listOf types.str); 229 + default = if config.path != null then null else [ 208 230 "::1" 209 231 "127.0.0.1" 210 232 ]; 233 + defaultText = literalExpression '' 234 + if path != null then 235 + null 236 + else 237 + [ 238 + "::1" 239 + "127.0.0.1" 240 + ] 241 + ''; 211 242 example = literalExpression '' 212 243 [ 213 244 "::" ··· 219 250 ''; 220 251 }; 221 252 253 + path = mkOption { 254 + type = types.nullOr types.path; 255 + default = null; 256 + description = '' 257 + Unix domain socket path to bind this listener to. 258 + 259 + ::: {.note} 260 + This option is incompatible with {option}`bind_addresses`, {option}`port`, {option}`tls` 261 + and also does not support the `metrics` and `manhole` listener {option}`type`. 262 + ::: 263 + ''; 264 + }; 265 + 266 + mode = mkOption { 267 + type = types.nullOr (types.strMatching "^[0,2-7]{3,4}$"); 268 + default = if config.path != null then "660" else null; 269 + defaultText = literalExpression '' 270 + if path != null then 271 + "660" 272 + else 273 + null 274 + ''; 275 + example = "660"; 276 + description = '' 277 + File permissions on the UNIX domain socket. 278 + ''; 279 + apply = toDecimalFilePermission; 280 + }; 281 + 222 282 type = mkOption { 223 283 type = types.enum [ 224 284 "http" ··· 234 294 }; 235 295 236 296 tls = mkOption { 237 - type = types.bool; 238 - default = !workerContext; 297 + type = types.nullOr types.bool; 298 + default = if config.path != null then 299 + null 300 + else 301 + !workerContext; 302 + defaultText = '' 303 + Enabled for the main instance listener, unless it is configured with a UNIX domain socket path. 304 + ''; 239 305 example = false; 240 306 description = lib.mdDoc '' 241 307 Whether to enable TLS on the listener socket. 308 + 309 + ::: {.note} 310 + This option will be ignored for UNIX domain sockets. 311 + ::: 242 312 ''; 243 313 }; 244 314 245 315 x_forwarded = mkOption { 246 316 type = types.bool; 247 - default = false; 317 + default = config.path != null; 318 + defaultText = '' 319 + Enabled if the listener is configured with a UNIX domain socket path 320 + ''; 248 321 example = true; 249 322 description = lib.mdDoc '' 250 323 Use the X-Forwarded-For (XFF) header as the client IP and not the ··· 291 364 ''; 292 365 }; 293 366 }; 294 - }; 367 + }); 295 368 in { 296 369 services.matrix-synapse = { 297 370 enable = mkEnableOption (lib.mdDoc "matrix.org synapse"); 298 371 372 + enableRegistrationScript = mkOption { 373 + type = types.bool; 374 + default = clientListener.bind_addresses != []; 375 + example = false; 376 + defaultText = '' 377 + Enabled if the client listener uses TCP sockets 378 + ''; 379 + description = '' 380 + Whether to install the `register_new_matrix_user` script, that 381 + allows account creation on the terminal. 382 + 383 + ::: {.note} 384 + This script does not work when the client listener uses UNIX domain sockets 385 + ::: 386 + ''; 387 + }; 388 + 299 389 serviceUnit = lib.mkOption { 300 390 type = lib.types.str; 301 391 readOnly = true; ··· 616 706 compress = false; 617 707 }]; 618 708 }] ++ lib.optional hasWorkers { 619 - port = 9093; 620 - bind_addresses = [ "127.0.0.1" ]; 709 + path = "/run/matrix-synapse/main_replication.sock"; 621 710 type = "http"; 622 - tls = false; 623 - x_forwarded = false; 624 711 resources = [{ 625 712 names = [ "replication" ]; 626 713 compress = false; ··· 630 717 List of ports that Synapse should listen on, their purpose and their configuration. 631 718 632 719 By default, synapse will be configured for client and federation traffic on port 8008, and 633 - for worker replication traffic on port 9093. See [`services.matrix-synapse.workers`](#opt-services.matrix-synapse.workers) 720 + use a UNIX domain socket for worker replication. See [`services.matrix-synapse.workers`](#opt-services.matrix-synapse.workers) 634 721 for more details. 635 722 ''; 636 723 }; ··· 1006 1093 listener = lib.findFirst 1007 1094 ( 1008 1095 listener: 1009 - listener.port == main.port 1096 + ( 1097 + lib.hasAttr "port" main && listener.port or null == main.port 1098 + || lib.hasAttr "path" main && listener.path or null == main.path 1099 + ) 1010 1100 && listenerSupportsResource "replication" listener 1011 - && (lib.any (bind: bind == main.host || bind == "0.0.0.0" || bind == "::") listener.bind_addresses) 1101 + && ( 1102 + lib.hasAttr "host" main && lib.any (bind: bind == main.host || bind == "0.0.0.0" || bind == "::") listener.bind_addresses 1103 + || lib.hasAttr "path" main 1104 + ) 1012 1105 ) 1013 1106 null 1014 1107 cfg.settings.listeners; ··· 1022 1115 This is done by default unless you manually configure either of those settings. 1023 1116 ''; 1024 1117 } 1025 - ]; 1118 + { 1119 + assertion = cfg.enableRegistrationScript -> clientListener.path == null; 1120 + message = '' 1121 + The client listener on matrix-synapse is configured to use UNIX domain sockets. 1122 + This configuration is incompatible with the `register_new_matrix_user` script. 1123 + 1124 + Disable `services.mastrix-synapse.enableRegistrationScript` to continue. 1125 + ''; 1126 + } 1127 + ] 1128 + ++ (map (listener: { 1129 + assertion = (listener.path == null) != (listener.bind_addresses == null); 1130 + message = '' 1131 + Listeners require either a UNIX domain socket `path` or `bind_addresses` for a TCP socket. 1132 + ''; 1133 + }) cfg.settings.listeners) 1134 + ++ (map (listener: { 1135 + assertion = listener.path != null -> (listener.bind_addresses == null && listener.port == null && listener.tls == null); 1136 + message = let 1137 + formatKeyValue = key: value: lib.optionalString (value != null) " - ${key}=${toString value}\n"; 1138 + in '' 1139 + Listener configured with UNIX domain socket (${toString listener.path}) ignores the following options: 1140 + ${formatKeyValue "bind_addresses" listener.bind_addresses}${formatKeyValue "port" listener.port}${formatKeyValue "tls" listener.tls} 1141 + ''; 1142 + }) cfg.settings.listeners) 1143 + ++ (map (listener: { 1144 + assertion = listener.path == null || listener.type == "http"; 1145 + message = '' 1146 + Listener configured with UNIX domain socket (${toString listener.path}) only supports the "http" listener type. 1147 + ''; 1148 + }) cfg.settings.listeners); 1026 1149 1027 1150 services.matrix-synapse.settings.redis = lib.mkIf cfg.configureRedisLocally { 1028 1151 enabled = true; 1029 1152 path = config.services.redis.servers.matrix-synapse.unixSocket; 1030 1153 }; 1031 1154 services.matrix-synapse.settings.instance_map.main = lib.mkIf hasWorkers (lib.mkDefault { 1032 - host = "127.0.0.1"; 1033 - port = 9093; 1155 + path = "/run/matrix-synapse/main_replication.sock"; 1034 1156 }); 1035 1157 1036 1158 services.matrix-synapse.serviceUnit = if hasWorkers then "matrix-synapse.target" else "matrix-synapse.service"; ··· 1086 1208 User = "matrix-synapse"; 1087 1209 Group = "matrix-synapse"; 1088 1210 WorkingDirectory = cfg.dataDir; 1211 + RuntimeDirectory = "matrix-synapse"; 1212 + RuntimeDirectoryPreserve = true; 1089 1213 ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID"; 1090 1214 Restart = "on-failure"; 1091 1215 UMask = "0077"; ··· 1178 1302 user = "matrix-synapse"; 1179 1303 }; 1180 1304 1181 - environment.systemPackages = [ registerNewMatrixUser ]; 1305 + environment.systemPackages = lib.optionals cfg.enableRegistrationScript [ 1306 + registerNewMatrixUser 1307 + ]; 1182 1308 }; 1183 1309 1184 1310 meta = {
+1 -2
nixos/modules/services/misc/nix-gc.nix
··· 64 64 example = "--max-freed $((64 * 1024**3))"; 65 65 type = lib.types.singleLineStr; 66 66 description = lib.mdDoc '' 67 - Options given to {file}`nix-collect-garbage` when the 68 - garbage collector is run automatically. 67 + Options given to [`nix-collect-garbage`](https://nixos.org/manual/nix/stable/command-ref/nix-collect-garbage) when the garbage collector is run automatically. 69 68 ''; 70 69 }; 71 70
+2
nixos/modules/services/networking/dhcpcd.nix
··· 219 219 ''; 220 220 } ]; 221 221 222 + environment.etc."dhcpcd.conf".source = dhcpcdConf; 223 + 222 224 systemd.services.dhcpcd = let 223 225 cfgN = config.networking; 224 226 hasDefaultGatewaySet = (cfgN.defaultGateway != null && cfgN.defaultGateway.address != "")
+5 -2
nixos/modules/services/networking/nftables.nix
··· 252 252 networking.nftables.flushRuleset = mkDefault (versionOlder config.system.stateVersion "23.11" || (cfg.rulesetFile != null || cfg.ruleset != "")); 253 253 systemd.services.nftables = { 254 254 description = "nftables firewall"; 255 - before = [ "network-pre.target" ]; 256 - wants = [ "network-pre.target" ]; 255 + after = [ "sysinit.target" ]; 256 + before = [ "network-pre.target" "shutdown.target" ]; 257 + conflicts = [ "shutdown.target" ]; 258 + wants = [ "network-pre.target" "sysinit.target" ]; 257 259 wantedBy = [ "multi-user.target" ]; 258 260 reloadIfChanged = true; 259 261 serviceConfig = let ··· 315 317 ExecStop = [ deletionsScriptVar cleanupDeletionsScript ]; 316 318 StateDirectory = "nftables"; 317 319 }; 320 + unitConfig.DefaultDependencies = false; 318 321 }; 319 322 }; 320 323 }
+144
nixos/modules/tasks/filesystems/overlayfs.nix
··· 1 + { config, lib, pkgs, utils, ... }: 2 + 3 + let 4 + # The scripted initrd contains some magic to add the prefix to the 5 + # paths just in time, so we don't add it here. 6 + sysrootPrefix = fs: 7 + if config.boot.initrd.systemd.enable && (utils.fsNeededForBoot fs) then 8 + "/sysroot" 9 + else 10 + ""; 11 + 12 + # Returns a service that creates the required directories before the mount is 13 + # created. 14 + preMountService = _name: fs: 15 + let 16 + prefix = sysrootPrefix fs; 17 + 18 + escapedMountpoint = utils.escapeSystemdPath (prefix + fs.mountPoint); 19 + mountUnit = "${escapedMountpoint}.mount"; 20 + 21 + upperdir = prefix + fs.overlay.upperdir; 22 + workdir = prefix + fs.overlay.workdir; 23 + in 24 + lib.mkIf (fs.overlay.upperdir != null) 25 + { 26 + "rw-${escapedMountpoint}" = { 27 + requiredBy = [ mountUnit ]; 28 + before = [ mountUnit ]; 29 + unitConfig = { 30 + DefaultDependencies = false; 31 + RequiresMountsFor = "${upperdir} ${workdir}"; 32 + }; 33 + serviceConfig = { 34 + Type = "oneshot"; 35 + ExecStart = "${pkgs.coreutils}/bin/mkdir -p -m 0755 ${upperdir} ${workdir}"; 36 + }; 37 + }; 38 + }; 39 + 40 + overlayOpts = { config, ... }: { 41 + 42 + options.overlay = { 43 + 44 + lowerdir = lib.mkOption { 45 + type = with lib.types; nullOr (nonEmptyListOf (either str pathInStore)); 46 + default = null; 47 + description = lib.mdDoc '' 48 + The list of path(s) to the lowerdir(s). 49 + 50 + To create a writable overlay, you MUST provide an upperdir and a 51 + workdir. 52 + 53 + You can create a read-only overlay when you provide multiple (at 54 + least 2!) lowerdirs and neither an upperdir nor a workdir. 55 + ''; 56 + }; 57 + 58 + upperdir = lib.mkOption { 59 + type = lib.types.nullOr lib.types.str; 60 + default = null; 61 + description = lib.mdDoc '' 62 + The path to the upperdir. 63 + 64 + If this is null, a read-only overlay is created using the lowerdir. 65 + 66 + If you set this to some value you MUST also set `workdir`. 67 + ''; 68 + }; 69 + 70 + workdir = lib.mkOption { 71 + type = lib.types.nullOr lib.types.str; 72 + default = null; 73 + description = lib.mdDoc '' 74 + The path to the workdir. 75 + 76 + This MUST be set if you set `upperdir`. 77 + ''; 78 + }; 79 + 80 + }; 81 + 82 + config = lib.mkIf (config.overlay.lowerdir != null) { 83 + fsType = "overlay"; 84 + device = lib.mkDefault "overlay"; 85 + 86 + options = 87 + let 88 + prefix = sysrootPrefix config; 89 + 90 + lowerdir = map (s: prefix + s) config.overlay.lowerdir; 91 + upperdir = prefix + config.overlay.upperdir; 92 + workdir = prefix + config.overlay.workdir; 93 + in 94 + [ 95 + "lowerdir=${lib.concatStringsSep ":" lowerdir}" 96 + ] ++ lib.optionals (config.overlay.upperdir != null) [ 97 + "upperdir=${upperdir}" 98 + "workdir=${workdir}" 99 + ] ++ (map (s: "x-systemd.requires-mounts-for=${s}") lowerdir); 100 + }; 101 + 102 + }; 103 + in 104 + 105 + { 106 + 107 + options = { 108 + 109 + # Merge the overlay options into the fileSystems option. 110 + fileSystems = lib.mkOption { 111 + type = lib.types.attrsOf (lib.types.submodule [ overlayOpts ]); 112 + }; 113 + 114 + }; 115 + 116 + config = 117 + let 118 + overlayFileSystems = lib.filterAttrs (_name: fs: (fs.overlay.lowerdir != null)) config.fileSystems; 119 + initrdFileSystems = lib.filterAttrs (_name: utils.fsNeededForBoot) overlayFileSystems; 120 + userspaceFileSystems = lib.filterAttrs (_name: fs: (!utils.fsNeededForBoot fs)) overlayFileSystems; 121 + in 122 + { 123 + 124 + boot.initrd.availableKernelModules = lib.mkIf (initrdFileSystems != { }) [ "overlay" ]; 125 + 126 + assertions = lib.concatLists (lib.mapAttrsToList 127 + (_name: fs: [ 128 + { 129 + assertion = (fs.overlay.upperdir == null) == (fs.overlay.workdir == null); 130 + message = "You cannot define a `lowerdir` without a `workdir` and vice versa for mount point: ${fs.mountPoint}"; 131 + } 132 + { 133 + assertion = (fs.overlay.lowerdir != null && fs.overlay.upperdir == null) -> (lib.length fs.overlay.lowerdir) >= 2; 134 + message = "A read-only overlay (without an `upperdir`) requires at least 2 `lowerdir`s: ${fs.mountPoint}"; 135 + } 136 + ]) 137 + config.fileSystems); 138 + 139 + boot.initrd.systemd.services = lib.mkMerge (lib.mapAttrsToList preMountService initrdFileSystems); 140 + systemd.services = lib.mkMerge (lib.mapAttrsToList preMountService userspaceFileSystems); 141 + 142 + }; 143 + 144 + }
+1
nixos/modules/virtualisation/amazon-image.nix
··· 103 103 # (e.g. it depends on GTK). 104 104 services.udisks2.enable = false; 105 105 }; 106 + meta.maintainers = with maintainers; [ arianvp ]; 106 107 }
+1
nixos/modules/virtualisation/amazon-init.nix
··· 84 84 }; 85 85 }; 86 86 }; 87 + meta.maintainers = with maintainers; [ arianvp ]; 87 88 }
+17 -5
nixos/modules/virtualisation/qemu-vm.nix
··· 701 701 type = types.listOf types.str; 702 702 default = []; 703 703 example = [ "-vga std" ]; 704 - description = lib.mdDoc "Options passed to QEMU."; 704 + description = lib.mdDoc '' 705 + Options passed to QEMU. 706 + See [QEMU User Documentation](https://www.qemu.org/docs/master/system/qemu-manpage) for a complete list. 707 + ''; 705 708 }; 706 709 707 710 consoles = mkOption { ··· 732 735 description = lib.mdDoc '' 733 736 Networking-related command-line options that should be passed to qemu. 734 737 The default is to use userspace networking (SLiRP). 738 + See the [QEMU Wiki on Networking](https://wiki.qemu.org/Documentation/Networking) for details. 735 739 736 740 If you override this option, be advised to keep 737 741 ''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} (as seen in the example) ··· 1066 1070 ''} 1067 1071 ''; 1068 1072 1069 - systemd.tmpfiles.rules = lib.mkIf config.boot.initrd.systemd.enable [ 1070 - "f /etc/NIXOS 0644 root root -" 1071 - "d /boot 0644 root root -" 1072 - ]; 1073 + systemd.tmpfiles.settings."10-qemu-vm" = lib.mkIf config.boot.initrd.systemd.enable { 1074 + "/etc/NIXOS".f = { 1075 + mode = "0644"; 1076 + user = "root"; 1077 + group = "root"; 1078 + }; 1079 + "${config.boot.loader.efi.efiSysMountPoint}".d = { 1080 + mode = "0644"; 1081 + user = "root"; 1082 + group = "root"; 1083 + }; 1084 + }; 1073 1085 1074 1086 # After booting, register the closure of the paths in 1075 1087 # `virtualisation.additionalPaths' in the Nix database in the VM. This
+1
nixos/tests/all-tests.nix
··· 301 301 fenics = handleTest ./fenics.nix {}; 302 302 ferm = handleTest ./ferm.nix {}; 303 303 ferretdb = handleTest ./ferretdb.nix {}; 304 + filesystems-overlayfs = runTest ./filesystems-overlayfs.nix; 304 305 firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; }; 305 306 firefox-beta = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-beta; }; 306 307 firefox-devedition = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-devedition; };
+89
nixos/tests/filesystems-overlayfs.nix
··· 1 + { lib, pkgs, ... }: 2 + 3 + let 4 + initrdLowerdir = pkgs.runCommand "initrd-lowerdir" { } '' 5 + mkdir -p $out 6 + echo "initrd" > $out/initrd.txt 7 + ''; 8 + initrdLowerdir2 = pkgs.runCommand "initrd-lowerdir-2" { } '' 9 + mkdir -p $out 10 + echo "initrd2" > $out/initrd2.txt 11 + ''; 12 + userspaceLowerdir = pkgs.runCommand "userspace-lowerdir" { } '' 13 + mkdir -p $out 14 + echo "userspace" > $out/userspace.txt 15 + ''; 16 + userspaceLowerdir2 = pkgs.runCommand "userspace-lowerdir-2" { } '' 17 + mkdir -p $out 18 + echo "userspace2" > $out/userspace2.txt 19 + ''; 20 + in 21 + { 22 + 23 + name = "writable-overlays"; 24 + 25 + meta.maintainers = with lib.maintainers; [ nikstur ]; 26 + 27 + nodes.machine = { config, pkgs, ... }: { 28 + boot.initrd.systemd.enable = true; 29 + boot.initrd.availableKernelModules = [ "overlay" ]; 30 + 31 + virtualisation.fileSystems = { 32 + "/initrd-overlay" = { 33 + overlay = { 34 + lowerdir = [ initrdLowerdir ]; 35 + upperdir = "/.rw-initrd-overlay/upper"; 36 + workdir = "/.rw-initrd-overlay/work"; 37 + }; 38 + neededForBoot = true; 39 + }; 40 + "/userspace-overlay" = { 41 + overlay = { 42 + lowerdir = [ userspaceLowerdir ]; 43 + upperdir = "/.rw-userspace-overlay/upper"; 44 + workdir = "/.rw-userspace-overlay/work"; 45 + }; 46 + }; 47 + "/ro-initrd-overlay" = { 48 + overlay.lowerdir = [ 49 + initrdLowerdir 50 + initrdLowerdir2 51 + ]; 52 + neededForBoot = true; 53 + }; 54 + "/ro-userspace-overlay" = { 55 + overlay.lowerdir = [ 56 + userspaceLowerdir 57 + userspaceLowerdir2 58 + ]; 59 + }; 60 + }; 61 + }; 62 + 63 + testScript = '' 64 + machine.wait_for_unit("default.target") 65 + 66 + with subtest("Initrd overlay"): 67 + machine.wait_for_file("/initrd-overlay/initrd.txt", 5) 68 + machine.succeed("touch /initrd-overlay/writable.txt") 69 + machine.succeed("findmnt --kernel --types overlay /initrd-overlay") 70 + 71 + with subtest("Userspace overlay"): 72 + machine.wait_for_file("/userspace-overlay/userspace.txt", 5) 73 + machine.succeed("touch /userspace-overlay/writable.txt") 74 + machine.succeed("findmnt --kernel --types overlay /userspace-overlay") 75 + 76 + with subtest("Read only initrd overlay"): 77 + machine.wait_for_file("/ro-initrd-overlay/initrd.txt", 5) 78 + machine.wait_for_file("/ro-initrd-overlay/initrd2.txt", 5) 79 + machine.fail("touch /ro-initrd-overlay/not-writable.txt") 80 + machine.succeed("findmnt --kernel --types overlay /ro-initrd-overlay") 81 + 82 + with subtest("Read only userspace overlay"): 83 + machine.wait_for_file("/ro-userspace-overlay/userspace.txt", 5) 84 + machine.wait_for_file("/ro-userspace-overlay/userspace2.txt", 5) 85 + machine.fail("touch /ro-userspace-overlay/not-writable.txt") 86 + machine.succeed("findmnt --kernel --types overlay /ro-userspace-overlay") 87 + ''; 88 + 89 + }
+2
nixos/tests/freetube.nix
··· 23 23 inherit name; 24 24 nodes = { "${name}" = machine; }; 25 25 meta.maintainers = with pkgs.lib.maintainers; [ kirillrdy ]; 26 + # time-out on ofborg 27 + meta.broken = pkgs.stdenv.isAarch64; 26 28 enableOCR = true; 27 29 28 30 testScript = ''
+2 -2
pkgs/applications/audio/ledfx/default.nix
··· 5 5 6 6 python3.pkgs.buildPythonPackage rec { 7 7 pname = "ledfx"; 8 - version = "2.0.90"; 8 + version = "2.0.92"; 9 9 pyproject= true; 10 10 11 11 src = fetchPypi { 12 12 inherit pname version; 13 - hash = "sha256-ZlZtC0bi9ZUf/1D9hUxxhdix6F8l7Lg5IUOOg+JHGYU="; 13 + hash = "sha256-tt2D8pjU/SClweAn9vHYl+H1POdB1u2SQfrnZZvBQ7I="; 14 14 }; 15 15 16 16 pythonRelaxDeps = true;
+3 -3
pkgs/applications/audio/listenbrainz-mpd/default.nix
··· 14 14 15 15 rustPlatform.buildRustPackage rec { 16 16 pname = "listenbrainz-mpd"; 17 - version = "2.3.2"; 17 + version = "2.3.3"; 18 18 19 19 src = fetchFromGitea { 20 20 domain = "codeberg.org"; 21 21 owner = "elomatreb"; 22 22 repo = "listenbrainz-mpd"; 23 23 rev = "v${version}"; 24 - hash = "sha256-DqxE+wEHDmOmh+iJa312uAWQcg/1ApOTZNLrhGq5KmY="; 24 + hash = "sha256-4FNFaVi+fxoXo2tl+bynHqh8yRt0Q4z/El/4m0GXZUY="; 25 25 }; 26 26 27 - cargoHash = "sha256-/fd3XIBHwJ95bwirUbMldw2cAfdF2Sv8CPxrbM4WWBI="; 27 + cargoHash = "sha256-FS7OYzKx/lQh86QQ8Dk9v1JrWUxPHNz3kITiEJ3sNng="; 28 28 29 29 nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; 30 30
-1
pkgs/applications/audio/meters_lv2/default.nix
··· 50 50 meta = with lib; { 51 51 description = "Collection of audio level meters with GUI in LV2 plugin format"; 52 52 homepage = "https://x42.github.io/meters.lv2/"; 53 - maintainers = with maintainers; [ ehmry ]; 54 53 license = licenses.gpl2; 55 54 platforms = platforms.linux; 56 55 };
+2 -2
pkgs/applications/audio/mympd/default.nix
··· 16 16 17 17 stdenv.mkDerivation (finalAttrs: { 18 18 pname = "mympd"; 19 - version = "14.0.0"; 19 + version = "14.0.1"; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "jcorporation"; 23 23 repo = "myMPD"; 24 24 rev = "v${finalAttrs.version}"; 25 - sha256 = "sha256-srwLnoQSPex7/PtgF6RWpJM39fpOqN3wze5ABSRTIRA="; 25 + sha256 = "sha256-wgrTkUpWx7YG8V9nyr+RHDBOz1TFA0p2OWDXG64BVjs="; 26 26 }; 27 27 28 28 nativeBuildInputs = [
-1
pkgs/applications/audio/picard/default.nix
··· 77 77 homepage = "https://picard.musicbrainz.org"; 78 78 changelog = "https://picard.musicbrainz.org/changelog"; 79 79 description = "The official MusicBrainz tagger"; 80 - maintainers = with maintainers; [ ehmry ]; 81 80 license = licenses.gpl2Plus; 82 81 platforms = platforms.all; 83 82 };
+2 -2
pkgs/applications/audio/transcribe/default.nix
··· 22 22 23 23 stdenv.mkDerivation rec { 24 24 pname = "transcribe"; 25 - version = "9.30.2"; 25 + version = "9.40.0"; 26 26 27 27 src = 28 28 if stdenv.hostPlatform.system == "x86_64-linux" then 29 29 fetchzip 30 30 { 31 31 url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.tar.gz"; 32 - sha256 = "sha256-EZyQsO3tSedMaZIhJWc7j3f7ikBf6XqXLUgdAiQdr14="; 32 + sha256 = "sha256-GHTr1rk7Kh5M0UYnryUlCk/G6pW3p80GJ6Ai0zXdfNs="; 33 33 } 34 34 else throw "Platform not supported"; 35 35
+2 -2
pkgs/applications/blockchains/taproot-assets/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "taproot-assets"; 8 - version = "0.3.2"; 8 + version = "0.3.3"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "lightninglabs"; 12 12 repo = "taproot-assets"; 13 13 rev = "v${version}"; 14 - hash = "sha256-zYS/qLWYzfmLksYLCUWosT287K8La2fuu9TcT4Wytto="; 14 + hash = "sha256-KEEecyZA+sVAkg2/i9AcfvPTB26Dk02r77Py87LP758="; 15 15 }; 16 16 17 17 vendorHash = "sha256-jz6q3l2FtkJM3qyaTTqqu3ZG2FeKW9s7WdlW1pHij5k=";
+2 -2
pkgs/applications/editors/ed/sources.nix
··· 23 23 { 24 24 ed = let 25 25 pname = "ed"; 26 - version = "1.19"; 26 + version = "1.20"; 27 27 src = fetchurl { 28 28 url = "mirror://gnu/ed/ed-${version}.tar.lz"; 29 - hash = "sha256-zi8uXEJHkKqW0J2suT2bv9wLfrYknJy3U4RS6Ox3zUg="; 29 + hash = "sha256-xgMN7+auFy8Wh5Btc1QFTHWmqRMK8xnU5zxQqRlZxaY="; 30 30 }; 31 31 in import ./generic.nix { 32 32 inherit pname version src meta;
+3 -3
pkgs/applications/editors/emacs/sources.nix
··· 77 77 78 78 emacs29 = import ./make-emacs.nix (mkArgs { 79 79 pname = "emacs"; 80 - version = "29.1"; 80 + version = "29.2"; 81 81 variant = "mainline"; 82 - rev = "29.1"; 83 - hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg="; 82 + rev = "29.2"; 83 + hash = "sha256-qSQmQzVyEGSr4GAI6rqnEwBvhl09D2D8MNasHqZQPL8="; 84 84 }); 85 85 86 86 emacs28-macport = import ./make-emacs.nix (mkArgs {
+7 -7
pkgs/applications/editors/lite-xl/default.nix
··· 1 - { agg 2 - , fetchFromGitHub 1 + { fetchFromGitHub 3 2 , Foundation 4 3 , freetype 5 4 , lib ··· 8 7 , ninja 9 8 , pcre2 10 9 , pkg-config 11 - , reproc 12 10 , SDL2 13 11 , stdenv 14 12 }: 15 13 16 14 stdenv.mkDerivation rec { 17 15 pname = "lite-xl"; 18 - version = "2.1.1"; 16 + version = "2.1.3"; 19 17 20 18 src = fetchFromGitHub { 21 19 owner = "lite-xl"; 22 20 repo = "lite-xl"; 23 21 rev = "v${version}"; 24 - sha256 = "sha256-tZ9bCazs4ygNl5RKFNUtxboaMcG8a7mIz2FuiExX1d4="; 22 + hash = "sha256-4ykUdcNwJ4r/4u9H+c8pgupY3BaPi2y69X6yaDjCjac="; 25 23 }; 26 24 27 25 nativeBuildInputs = [ meson ninja pkg-config ]; 28 26 29 27 buildInputs = [ 30 - agg 31 28 freetype 32 29 lua5_4 33 30 pcre2 34 - reproc 35 31 SDL2 36 32 ] ++ lib.optionals stdenv.isDarwin [ 37 33 Foundation 34 + ]; 35 + 36 + mesonFlags = [ 37 + "-Duse_system_lua=true" 38 38 ]; 39 39 40 40 meta = with lib; {
+24 -3
pkgs/applications/editors/micro/default.nix
··· 1 - { lib, buildGoModule, fetchFromGitHub, installShellFiles, callPackage }: 2 - 1 + { lib 2 + , stdenv 3 + , buildGoModule 4 + , fetchFromGitHub 5 + , installShellFiles 6 + , callPackage 7 + , wl-clipboard 8 + , xclip 9 + , makeWrapper 10 + , withXclip ? true 11 + , withWlclip ? true 12 + }: 13 + let 14 + clipboardPkgs = if stdenv.isLinux then 15 + lib.optional withXclip xclip ++ 16 + lib.optional withWlclip wl-clipboard 17 + else [ ]; 18 + in 3 19 buildGoModule rec { 4 20 pname = "micro"; 5 21 version = "2.0.13"; ··· 13 29 14 30 vendorHash = "sha256-ePhObvm3m/nT+7IyT0W6K+y+9UNkfd2kYjle2ffAd9Y="; 15 31 16 - nativeBuildInputs = [ installShellFiles ]; 32 + nativeBuildInputs = [ installShellFiles makeWrapper ]; 17 33 18 34 subPackages = [ "cmd/micro" ]; 19 35 ··· 32 48 installManPage assets/packaging/micro.1 33 49 install -Dm444 -t $out/share/applications assets/packaging/micro.desktop 34 50 install -Dm644 assets/micro-logo-mark.svg $out/share/icons/hicolor/scalable/apps/micro.svg 51 + ''; 52 + 53 + postFixup = '' 54 + wrapProgram "$out/bin/micro" \ 55 + --prefix PATH : "${lib.makeBinPath clipboardPkgs}" 35 56 ''; 36 57 37 58 passthru.tests.expect = callPackage ./test-with-expect.nix { };
+8 -8
pkgs/applications/editors/vscode/vscode.nix
··· 30 30 archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; 31 31 32 32 sha256 = { 33 - x86_64-linux = "0qykchhd6cplyip4gp5s1fpv664xw2y5z0z7n6zwhwpfrld8piwb"; 34 - x86_64-darwin = "0mris80k62yabaz2avh4q2vjpnqcwa77phx3icdif0c19w185pqw"; 35 - aarch64-linux = "0rbj0l9wdbkxgzy9j9qvx0237g5nx4np0ank4x6jbxhlbs8xdw39"; 36 - aarch64-darwin = "1j1wd1ssyrd6651k7ias22phcb358k6aigdirfzczam303cxr0hw"; 37 - armv7l-linux = "1c6bikdhgd6w5njqza5xmhi7iz4kzydcfb2i7jqklb514knqxc8f"; 33 + x86_64-linux = "0nffz9xqm1iny7sqi1pkmnfcski15qsycw9gxir18j51kfzz50wf"; 34 + x86_64-darwin = "082m2wwd67ayjadlywqimnmdm8imw6lz0rd8rnwjd2sjksxnrsk8"; 35 + aarch64-linux = "0wlm8ajm1xw8lpmnbkzkgvaakfa9gacwi7m2fdyc4822rq7fn09b"; 36 + aarch64-darwin = "1rgcljj97f551yr0q5f0vxdkvbhxrbyqrw85gb6qfxpg5d0l7y4f"; 37 + armv7l-linux = "1wpslrysi8a6rnx99lq16zx277lnmqjp02q6gxmkpcvrvw27m6yj"; 38 38 }.${system} or throwSystem; 39 39 in 40 40 callPackage ./generic.nix rec { 41 41 # Please backport all compatible updates to the stable release. 42 42 # This is important for the extension ecosystem. 43 - version = "1.86.0"; 43 + version = "1.86.1"; 44 44 pname = "vscode" + lib.optionalString isInsiders "-insiders"; 45 45 46 46 # This is used for VS Code - Remote SSH test 47 - rev = "05047486b6df5eb8d44b2ecd70ea3bdf775fd937"; 47 + rev = "31c37ee8f63491495ac49e43b8544550fbae4533"; 48 48 49 49 executableName = "code" + lib.optionalString isInsiders "-insiders"; 50 50 longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; ··· 68 68 src = fetchurl { 69 69 name = "vscode-server-${rev}.tar.gz"; 70 70 url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; 71 - sha256 = "0d3g6csi2aplsy5j3v84m65mhlg0krpb2sndk0nh7gafyc5gnn28"; 71 + sha256 = "1hq6i51d1dhpippc8gmhygw3kj9cx021y54ga58l5b80wvg2cf1y"; 72 72 }; 73 73 }; 74 74
+6 -3
pkgs/applications/emulators/bsnes/higan/default.nix
··· 18 18 # Darwin dependencies 19 19 , libicns 20 20 , darwin 21 + , unstableGitUpdater 21 22 }: 22 23 23 24 stdenv.mkDerivation rec { 24 25 pname = "higan"; 25 - version = "115+unstable=2021-08-18"; 26 + version = "115-unstable-2023-11-13"; 26 27 27 28 src = fetchFromGitHub { 28 29 owner = "higan-emu"; 29 30 repo = "higan"; 30 - rev = "9bf1b3314b2bcc73cbc11d344b369c31562aff10"; 31 - hash = "sha256-HZItJ97x20OjFKv2OVbMja7g+c1ZXcgcaC/XDe3vMZM="; 31 + rev = "993368d917cb750107390effe2cd394ba8710208"; 32 + hash = "sha256-D21DFLnYl2J4JhwmVmEKHhtglZWxVBrl/kOcvxJYbnA="; 32 33 }; 33 34 34 35 nativeBuildInputs = [ ··· 131 132 132 133 runHook postInstall 133 134 ''; 135 + 136 + passthru.updateScript = unstableGitUpdater {}; 134 137 135 138 meta = with lib; { 136 139 homepage = "https://github.com/higan-emu/higan";
+3 -3
pkgs/applications/emulators/darling/default.nix
··· 108 108 ]; 109 109 in stdenv.mkDerivation { 110 110 pname = "darling"; 111 - version = "unstable-2023-11-07"; 111 + version = "unstable-2024-02-03"; 112 112 113 113 src = fetchFromGitHub { 114 114 owner = "darlinghq"; 115 115 repo = "darling"; 116 - rev = "34351655a40d2090e70b3033a577b8cdea967633"; 116 + rev = "25afbc76428c39c3909e9efcf5caef1140425211"; 117 117 fetchSubmodules = true; 118 - hash = "sha256-Jhr7Do15vms8bJ8AczVSkuWrC7gUR5ZvU9/PfCmGGcg="; 118 + hash = "sha256-T0g38loUFv3jHvUu3R3QH9hwP8JVe2al4g4VhXnBDMc="; 119 119 }; 120 120 121 121 outputs = [ "out" "sdk" ];
+48 -48
pkgs/applications/emulators/retroarch/hashes.json
··· 37 37 "beetle-pce": { 38 38 "owner": "libretro", 39 39 "repo": "beetle-pce-libretro", 40 - "rev": "e8870b170ad4135bf5738c7206d7a27488d388ab", 41 - "hash": "sha256-c+LsfuX/3HxJTaIlZeGkGif+D1c7OpIhRUVbWuT8Kc0=", 42 - "date": "unstable-2024-02-02" 40 + "rev": "753f067738e55a6325d3ca5206151a9acd9127f0", 41 + "hash": "sha256-OWvoIi0DS3YhxK1S6PAbCNZwKKXti6brZlWVCJELfKY=", 42 + "date": "unstable-2024-02-09" 43 43 }, 44 44 "beetle-pce-fast": { 45 45 "owner": "libretro", 46 46 "repo": "beetle-pce-fast-libretro", 47 - "rev": "cfb9362fd0de38141d40266725829f25f574162a", 48 - "hash": "sha256-D/qAFFKe0mI/W4RnLwcB5lpwI+AlPjTfyo0SH6IZZkU=", 49 - "date": "unstable-2024-02-02" 47 + "rev": "86a80e1ba551f9a4627b8394901db0ee365c1442", 48 + "hash": "sha256-aIDc4jzliVLpI2Xetcd5tG74/xvIlqRdVEb72yHrsCo=", 49 + "date": "unstable-2024-02-09" 50 50 }, 51 51 "beetle-pcfx": { 52 52 "owner": "libretro", ··· 58 58 "beetle-psx": { 59 59 "owner": "libretro", 60 60 "repo": "beetle-psx-libretro", 61 - "rev": "fb579de80d7b9ca09940602c14e657f6317dd046", 62 - "hash": "sha256-NRnznhvmgOQdNuEYyi0HIeVPzPz7ILEQ3vsYTZY8AbE=", 63 - "date": "unstable-2024-02-02" 61 + "rev": "3adff889b9b8251526ca7dae963be46bf8401e2e", 62 + "hash": "sha256-DaDzoAQJLuer/c+V1bJGbejnyGYB2RYdebZ1YIoVRKw=", 63 + "date": "unstable-2024-02-09" 64 64 }, 65 65 "beetle-saturn": { 66 66 "owner": "libretro", ··· 79 79 "beetle-supergrafx": { 80 80 "owner": "libretro", 81 81 "repo": "beetle-supergrafx-libretro", 82 - "rev": "d24d383f88ff892e9f8dce7c1f3ce491f2f7731a", 83 - "hash": "sha256-Cbol57jpDpkMnfKCULw6DgJwcnfTNexZ1hSw817z+E8=", 84 - "date": "unstable-2024-02-02" 82 + "rev": "32070ffd0082fd5127519bb6e92a2daecc359408", 83 + "hash": "sha256-ZBZtDMP2inarEuLE76Zw1/qZ2YfyTJy+2eN10hhpn64=", 84 + "date": "unstable-2024-02-09" 85 85 }, 86 86 "beetle-vb": { 87 87 "owner": "libretro", ··· 114 114 "bsnes": { 115 115 "owner": "libretro", 116 116 "repo": "bsnes-libretro", 117 - "rev": "dda5b43ed6a552310528509af59bed26af2527f5", 118 - "hash": "sha256-7AXHq6ASQ+42yef/jQ74kZtpW9SUuXpmWZbtO84/COg=", 119 - "date": "unstable-2024-02-02" 117 + "rev": "d230353616ab4c7dc01a2f2a63865011bd5c7ffd", 118 + "hash": "sha256-TiOdptWOb13UQ8jKDbIlZQQ3mY3h/lPHr/GskPVAkwA=", 119 + "date": "unstable-2024-02-09" 120 120 }, 121 121 "bsnes-hd": { 122 122 "owner": "DerKoun", ··· 192 192 "fbneo": { 193 193 "owner": "libretro", 194 194 "repo": "fbneo", 195 - "rev": "e8cd9f81bc974f7427d9cff9ffc1d2f3a8d15f1f", 196 - "hash": "sha256-XR/pLOvQ8L2dLguC1I2C7z8FoBid6oFSudnQNY3ub7c=", 197 - "date": "unstable-2024-01-30" 195 + "rev": "bb7aa7ea1e3a9a293fcf4e2b15994afde2e52899", 196 + "hash": "sha256-XTOZGKq02obnzbtUEAEs99Kxhd8hFqLjI/smwtNAU8Q=", 197 + "date": "unstable-2024-02-08" 198 198 }, 199 199 "fceumm": { 200 200 "owner": "libretro", ··· 206 206 "flycast": { 207 207 "owner": "flyinghead", 208 208 "repo": "flycast", 209 - "rev": "c146a92f83ae2cba8df8970e21efc54301b9ade1", 210 - "hash": "sha256-+ZED9pLfPr4uNNMNTmsrQWUgbKLW3DnPBdniwQ1fr9U=", 209 + "rev": "7029e1615a215bc43e51f8eac605f31dd01ba8cd", 210 + "hash": "sha256-JUXKlUNIg+1vvOfUQpysxUMYIRJqIzj9UNIwb+8HRPo=", 211 211 "fetchSubmodules": true, 212 - "date": "unstable-2024-02-03" 212 + "date": "unstable-2024-02-09" 213 213 }, 214 214 "fmsx": { 215 215 "owner": "libretro", 216 216 "repo": "fmsx-libretro", 217 - "rev": "1806eed4376fbe2fad82fa19271ea298cfbb7795", 218 - "hash": "sha256-nX0H/+iEq7eBN4tm1+dT6/3BYLCpoyiE/L6waDPmUZI=", 219 - "date": "unstable-2023-04-17" 217 + "rev": "9b5cf868825a629cc4c7086768338165d3bbf706", 218 + "hash": "sha256-zDDAMzV+pfu+AwjgXwduPfHyW1rQnvaDpFvz++QBBkA=", 219 + "date": "unstable-2024-02-08" 220 220 }, 221 221 "freeintv": { 222 222 "owner": "libretro", ··· 235 235 "gambatte": { 236 236 "owner": "libretro", 237 237 "repo": "gambatte-libretro", 238 - "rev": "c9a07107f121498a158762116d47d7068a247d3c", 239 - "hash": "sha256-U4FR794/hB3tHsdbtnC7qL0qr1oi1ZF4PYFTu+sVMVI=", 240 - "date": "unstable-2024-02-02" 238 + "rev": "05c4e10168aa3070b4ea01f7da7ab1c0d4241103", 239 + "hash": "sha256-W/s8FWjFOIcclLkbM5s2+2dcvr+X2My5319SvRo5/lU=", 240 + "date": "unstable-2024-02-09" 241 241 }, 242 242 "genesis-plus-gx": { 243 243 "owner": "libretro", 244 244 "repo": "Genesis-Plus-GX", 245 - "rev": "59cdc560e21eeddfa4d5a5c935413cdaa9d660f3", 246 - "hash": "sha256-FB0znNFG6T67V63jm7WprhGRw9rHNJgH4SZ/BtgAyFg=", 247 - "date": "unstable-2024-02-02" 245 + "rev": "ecb956d914d6bc4e5deb49384bc929939e9a19e5", 246 + "hash": "sha256-Fk+Ldjav+yQl6fkYESR6t1JEOKiCZYCW386QL4ozE68=", 247 + "date": "unstable-2024-02-06" 248 248 }, 249 249 "gpsp": { 250 250 "owner": "libretro", ··· 291 291 "mame2003": { 292 292 "owner": "libretro", 293 293 "repo": "mame2003-libretro", 294 - "rev": "be247427a8a68f8401ce40c830e2d8767d000f84", 295 - "hash": "sha256-ZQ0DWok6EmVEDOhcN7LsK5T4XXHpH9Cyd22KP/UjMok=", 296 - "date": "unstable-2023-11-22" 294 + "rev": "838f84f14422529c37bbb9803eb649209c8ba4e8", 295 + "hash": "sha256-NiqlA4FjHS0GLypEg6QbhEJlhV0YU7VmMquzqnyr7aA=", 296 + "date": "unstable-2024-02-08" 297 297 }, 298 298 "mame2003-plus": { 299 299 "owner": "libretro", 300 300 "repo": "mame2003-plus-libretro", 301 - "rev": "53c6083a2044c3529a436b51c5206cd9a896d12c", 302 - "hash": "sha256-k4jl3cN18HQya3F4DXHN/Hoq7UXKVmJg5Lgp08n6M/M=", 303 - "date": "unstable-2024-02-03" 301 + "rev": "debcb547ea7ae197433142810e99e1313c58cb14", 302 + "hash": "sha256-l9YmDiUJ+CQP4i8O8W+E9uTLPZZgLqLR9v7e5hFgJhE=", 303 + "date": "unstable-2024-02-09" 304 304 }, 305 305 "mame2010": { 306 306 "owner": "libretro", ··· 369 369 "mupen64plus": { 370 370 "owner": "libretro", 371 371 "repo": "mupen64plus-libretro-nx", 372 - "rev": "0e1dc5abacf91f1640206d32d18735e82071681e", 373 - "hash": "sha256-gt9oVJunDCdhHbaqL9xaGlztxdT1D2UvYETqCXogIwU=", 374 - "date": "unstable-2024-01-30" 372 + "rev": "fa55ddca926d3c3ad2285911646919def4aa6fa3", 373 + "hash": "sha256-Fn/qSQDR8FuHG9eLE0I24wUa0sdosrl6+lhnf9cD+yQ=", 374 + "date": "unstable-2024-02-06" 375 375 }, 376 376 "neocd": { 377 377 "owner": "libretro", ··· 433 433 "pcsx_rearmed": { 434 434 "owner": "libretro", 435 435 "repo": "pcsx_rearmed", 436 - "rev": "06cdf83a3a30bfb8cafee768dbe83bbaef6c8ddd", 437 - "hash": "sha256-E/+dAcJwfaUMjYJUjfAcn98SIh61BiS5YpcZg99lg+Q=", 438 - "date": "unstable-2024-02-04" 436 + "rev": "016c6e93f6db684211f5c8b05433cb500715ba50", 437 + "hash": "sha256-uYzL0uuQbxa4N0uQT8YEBiCgwkIcigvjeNU600WqSDQ=", 438 + "date": "unstable-2024-02-07" 439 439 }, 440 440 "picodrive": { 441 441 "owner": "libretro", ··· 456 456 "ppsspp": { 457 457 "owner": "hrydgard", 458 458 "repo": "ppsspp", 459 - "rev": "f65c84f4cb8117b273e7fa2ab578c95aedc6dd56", 460 - "hash": "sha256-GgXozubq6ByZDWGkUrzeEgKxUaBaIN3NY5/IIRBNn/o=", 459 + "rev": "25689c36d9c2f3f1b7aa612d89b86caf1809e376", 460 + "hash": "sha256-hXknMyBNo1vJ49gJsuNef+sccolAovg1I8Wzuw/BnE8=", 461 461 "fetchSubmodules": true, 462 - "date": "unstable-2024-02-05" 462 + "date": "unstable-2024-02-09" 463 463 }, 464 464 "prboom": { 465 465 "owner": "libretro", ··· 520 520 "snes9x": { 521 521 "owner": "snes9xgit", 522 522 "repo": "snes9x", 523 - "rev": "e76abdc4ef8f961ea0f8e87c160cf59cc6d44e42", 524 - "hash": "sha256-JERfp69UB/PC2iIjbepOKpPdmZJbrzWbXhaLMJfOaXY=", 525 - "date": "unstable-2024-01-28" 523 + "rev": "be6372c0345c82a87b880c791703fb1929ecf72c", 524 + "hash": "sha256-JzUXxTJZG3LdWC+FCM/3/ynGclQ11rCj7q5fs45r5Bw=", 525 + "date": "unstable-2024-02-08" 526 526 }, 527 527 "snes9x2002": { 528 528 "owner": "libretro",
+2 -2
pkgs/applications/finance/denaro/default.nix
··· 14 14 15 15 buildDotnetModule rec { 16 16 pname = "denaro"; 17 - version = "2024.1.0"; 17 + version = "2024.2.0"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "NickvisionApps"; 21 21 repo = "Denaro"; 22 22 rev = version; 23 - hash = "sha256-1LGcJmNucLmP5JbtZcLGuIE0UTmeUxLl9j31Oe0k93s="; 23 + hash = "sha256-fEhwup8SiYvKH2FtzruEFsj8axG5g3YJ917aqc8dn/8="; 24 24 }; 25 25 26 26 dotnet-sdk = dotnetCorePackages.sdk_8_0;
+6
pkgs/applications/graphics/krita/generic.nix
··· 28 28 url = "https://invent.kde.org/graphics/krita/-/commit/2d71c47661d43a4e3c1ab0c27803de980bdf2bb2.diff"; 29 29 hash = "sha256-U3E44nj4vra++PJV20h4YHjES78kgrJtr4ktNeQfOdA="; 30 30 }) 31 + # Fixes build with libjxl 0.9.0 32 + (fetchpatch { 33 + name = "fix-build-with-libjxl-0.9.0.patch"; 34 + url = "https://invent.kde.org/graphics/krita/-/commit/ace7edcca6ad322581ab39620f21ccf3ffbd3b5a.diff"; 35 + hash = "sha256-dXk4+HNS0+Ie/8V4+Oj4rBJrJbNHG57gIzPymXLEc9M="; 36 + }) 31 37 ]; 32 38 33 39 nativeBuildInputs = [ cmake extra-cmake-modules pkg-config python3Packages.sip makeWrapper ];
+2 -2
pkgs/applications/misc/keymapp/default.nix
··· 22 22 in 23 23 stdenv.mkDerivation rec { 24 24 pname = "keymapp"; 25 - version = "1.0.7"; 25 + version = "1.0.8"; 26 26 27 27 src = fetchurl { 28 28 url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz"; 29 - hash = "sha256-BmCLF/4wjBDxToMW0OYqI6PZwqmctgBs7nBygmJ+YOU="; 29 + hash = "sha256-adFQCuHkorXixn/dId/vrCcnjQ2VDDQM049UrodjFgA="; 30 30 }; 31 31 32 32 nativeBuildInputs = [
+2 -11
pkgs/applications/misc/lutris/default.nix
··· 76 76 in 77 77 buildPythonApplication rec { 78 78 pname = "lutris-unwrapped"; 79 - version = "0.5.14"; 79 + version = "0.5.16"; 80 80 81 81 src = fetchFromGitHub { 82 82 owner = "lutris"; 83 83 repo = "lutris"; 84 84 rev = "v${version}"; 85 - hash = "sha256-h7oHFVqMJU1HuuUgh5oKXxr9uaIPHz7Q4gf8ONLzric="; 85 + hash = "sha256-Ed1bhugBe97XmY050A5jCPcnLj0Fd7qPX2p/Ab+YbOE="; 86 86 }; 87 - 88 - # Backport patch to fix a failing test 89 - # FIXME: remove in next release 90 - patches = [ 91 - (fetchpatch { 92 - url = "https://github.com/lutris/lutris/commit/1f1d554df3b38da64fc65557ad619e55e050641e.patch"; 93 - hash = "sha256-kVK1RX6T1ijffWVU7VEt2fR62QpvI6VZebiKPgEE/N8="; 94 - }) 95 - ]; 96 87 97 88 nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; 98 89 buildInputs = [
+3 -3
pkgs/applications/misc/owmods-cli/default.nix
··· 12 12 13 13 rustPlatform.buildRustPackage rec { 14 14 pname = "owmods-cli"; 15 - version = "0.12.0"; 15 + version = "0.12.1"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "ow-mods"; 19 19 repo = "ow-mod-man"; 20 20 rev = "cli_v${version}"; 21 - hash = "sha256-k9Jn8LiqDyVmtjKnmpoVePNW2x5UyFfcXAPyvEgUaCU="; 21 + hash = "sha256-hvzKTJKjO7MafvnrpG9ZkCz1ePr9NCo54zaRRkRCc60="; 22 22 }; 23 23 24 - cargoHash = "sha256-RGJ0vefFkjbAL/y5/q1KMJtkO5bloj9SSebaABWSr/I="; 24 + cargoHash = "sha256-db6wZs7OVPoESl4RnvOtmaM07FgKmko3nyf1CXzyJHA="; 25 25 26 26 nativeBuildInputs = [ 27 27 pkg-config
+2 -2
pkgs/applications/misc/remnote/default.nix
··· 6 6 in 7 7 { 8 8 pname = "remnote"; 9 - version = "1.13.34"; 9 + version = "1.13.52"; 10 10 11 11 src = fetchurl { 12 12 url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; 13 - hash = "sha256-QOfU1pZWQfShq8bQPh9ZiGKxzIV6LH8S/sQk3MQVKD0="; 13 + hash = "sha256-4wN4lqeA9olo6igr1M1JhecPG/ruVivdOyWiRlDAzQQ="; 14 14 }; 15 15 appexec = appimageTools.wrapType2 { 16 16 inherit pname version src;
+3 -3
pkgs/applications/misc/sigi/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "sigi"; 5 - version = "3.6.1"; 5 + version = "3.6.3"; 6 6 7 7 src = fetchCrate { 8 8 inherit pname version; 9 - sha256 = "sha256-UL4V/5XvqaqO4R2ievw379D/rzHf/ITgvG3BcSbMeTQ="; 9 + hash = "sha256-JGQ9UbkS3Q1ohy6vtiUlPijuffH4Gb99cZCKreGqE/U="; 10 10 }; 11 11 12 - cargoSha256 = "sha256-wzTUK4AvJmBK7LX7CLCAeAXLDxMJA/3qs/KT1+pMaoI="; 12 + cargoHash = "sha256-W/ekk4tsYxG7FXzJW5i0Ii7nLgDHCSCjO3couN+/sMk="; 13 13 nativeBuildInputs = [ installShellFiles ]; 14 14 15 15 # In case anything goes wrong.
+2 -2
pkgs/applications/misc/wofi/default.nix
··· 11 11 }: 12 12 stdenv.mkDerivation rec { 13 13 pname = "wofi"; 14 - version = "1.3"; 14 + version = "1.4"; 15 15 16 16 src = fetchFromSourcehut { 17 17 repo = pname; 18 18 owner = "~scoopta"; 19 19 rev = "v${version}"; 20 - sha256 = "sha256-GxMjEXBPQniD+Yc9QZjd8TH4ILJAX5dNzrjxDawhy8w="; 20 + sha256 = "sha256-zzBD1OPPlOjAUaJOlMf6k1tSai1w1ZvOwy2sSOWI7AM="; 21 21 vc = "hg"; 22 22 }; 23 23
+2 -2
pkgs/applications/networking/cluster/cilium/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "cilium-cli"; 5 - version = "0.15.21"; 5 + version = "0.15.22"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "cilium"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - hash = "sha256-jagNtaR7YAOdvy/yJrIRQfr8UQTrEoVrPLaGklt8mUk="; 11 + hash = "sha256-tjVrcxWXE/eOeVoXnoBHYXk4rA3QqcWDbK1MRZ+v7uE="; 12 12 }; 13 13 14 14 vendorHash = null;
+2 -2
pkgs/applications/networking/cluster/kubeshark/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "kubeshark"; 5 - version = "52.1.9"; 5 + version = "52.1.30"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "kubeshark"; 9 9 repo = "kubeshark"; 10 10 rev = "v${version}"; 11 - hash = "sha256-VtL/fuXMc+vTaP3nSBQm0wfe8m3/yqv5nzjP0BDLVw8="; 11 + hash = "sha256-9nlPfWKgx56evxJkW+iRWJCBxqmMaBH0nCJBAAoibJc="; 12 12 }; 13 13 14 14 vendorHash = "sha256-SmvO9DYOXxnmN2dmHPPOguVwEbWSH/xNLBB+idpzopo=";
+3 -3
pkgs/applications/networking/cluster/nomad/default.nix
··· 81 81 82 82 nomad_1_7 = generic { 83 83 buildGoModule = buildGo121Module; 84 - version = "1.7.3"; 85 - sha256 = "sha256-Rl/bDglO87kbtxFCy0eiTQVJCAwPobQI4GJQOflvXhk="; 86 - vendorHash = "sha256-M8lGzUvPY8hNhN9ExHasfnLhe+DYBb86RXr1wdrRbgw="; 84 + version = "1.7.4"; 85 + sha256 = "sha256-iyY899W/uwP/wQcarKufSpJdXRAtwDxT6yw5vrB6Xmk="; 86 + vendorHash = "sha256-yPf19IRTq+LAaoHsEFVuPJLapFxH3o16y0PbYW0ehiw="; 87 87 license = lib.licenses.bsl11; 88 88 passthru.tests.nomad = nixosTests.nomad; 89 89 preCheck = ''
+4 -3
pkgs/applications/networking/instant-messengers/baresip/default.nix pkgs/by-name/ba/baresip/package.nix
··· 27 27 , dbusSupport ? true 28 28 }: 29 29 stdenv.mkDerivation rec { 30 - version = "3.8.1"; 30 + version = "3.9.0"; 31 31 pname = "baresip"; 32 32 src = fetchFromGitHub { 33 33 owner = "baresip"; 34 34 repo = "baresip"; 35 35 rev = "v${version}"; 36 - hash = "sha256-39HRvRTyA0V8NKFUUpj7UGc01KVXULTE3HUd9Kh06bw="; 36 + hash = "sha256-AJCm823Fyu1n3gWw6wUfakM6YWwMtzQ84M0OKXZ4ThI="; 37 37 }; 38 38 prePatch = lib.optionalString (!dbusSupport) '' 39 39 substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' "" ··· 126 126 meta = { 127 127 description = "A modular SIP User-Agent with audio and video support"; 128 128 homepage = "https://github.com/baresip/baresip"; 129 - maintainers = with lib.maintainers; [ elohmeier raskin ]; 129 + maintainers = with lib.maintainers; [ elohmeier raskin ehmry ]; 130 + mainProgram = "baresip"; 130 131 license = lib.licenses.bsd3; 131 132 platforms = lib.platforms.unix; 132 133 };
+2 -2
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "signalbackup-tools"; 5 - version = "20240115-3"; 5 + version = "20240205"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "bepaald"; 9 9 repo = pname; 10 10 rev = version; 11 - hash = "sha256-Ba+9irsOnGcAUJtCwbdes9DYS704dNuKAqNvJGXQKMM="; 11 + hash = "sha256-Iwos+WJrCWXbNpuaZTLyc8OEtfMA0EF1DIyLNlsZSx4="; 12 12 }; 13 13 14 14 postPatch = ''
+6 -6
pkgs/applications/networking/instant-messengers/slack/default.nix
··· 45 45 46 46 pname = "slack"; 47 47 48 - x86_64-darwin-version = "4.36.138"; 49 - x86_64-darwin-sha256 = "1dj4q98sva25kbniqnwz2l38lg48dhrdmjx31sg8j0ayrs82hha4"; 48 + x86_64-darwin-version = "4.36.140"; 49 + x86_64-darwin-sha256 = "0w1fxza3aglh7513znv190gsha12rk7k1ybdp4ml2pffwmm8diad"; 50 50 51 - x86_64-linux-version = "4.36.138"; 52 - x86_64-linux-sha256 = "06h258fvpprx37vjvd5sxl6bxnfcq3shviwx9wv8m9fmg2riwnsg"; 51 + x86_64-linux-version = "4.36.140"; 52 + x86_64-linux-sha256 = "0zahhhpcb1dxdhfmam32iqr5w3pspzbmcdv53ciqfnbkmwzkc3xr"; 53 53 54 - aarch64-darwin-version = "4.36.138"; 55 - aarch64-darwin-sha256 = "10xg5aa668iq0n56la1rqgpbzw8jym0y8dgv99f1l7yn03fcwpql"; 54 + aarch64-darwin-version = "4.36.140"; 55 + aarch64-darwin-sha256 = "118mzkpk431dcm61gkbj5m4sdxkwnk6fvmxg9f96xiv6n22n7pnx"; 56 56 57 57 version = { 58 58 x86_64-darwin = x86_64-darwin-version;
+3 -3
pkgs/applications/networking/instant-messengers/webcord/default.nix
··· 14 14 15 15 buildNpmPackage rec { 16 16 pname = "webcord"; 17 - version = "4.7.0"; 17 + version = "4.7.1"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "SpacingBat3"; 21 21 repo = "WebCord"; 22 22 rev = "v${version}"; 23 - hash = "sha256-h0JEIfNoYx0MrHeEg/kwn/10JVxNVXIuvWcTOfellbg="; 23 + hash = "sha256-JzKXIdXR/C3HRbpmSUq3qXYpLnVQjIY/uO+wbt1k2jI="; 24 24 }; 25 25 26 - npmDepsHash = "sha256-L6ZrPqi4DjTn1P4O+lWDmvzQwqpsWmSOtnFMBHkNQAI="; 26 + npmDepsHash = "sha256-KbMoM1zYOjX2Dwu6DJZLyezRx78AC9piPw3xsX3Kb3I="; 27 27 28 28 nativeBuildInputs = [ 29 29 copyDesktopItems
+2 -2
pkgs/applications/networking/irc/hexchat/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "hexchat"; 10 - version = "2.16.1"; 10 + version = "2.16.2"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "hexchat"; 14 14 repo = "hexchat"; 15 15 rev = "v${version}"; 16 - sha256 = "sha256-2IUlNUTL3TOJnDNMds2EWwkfn5NUOQ1ids96Ddo196E="; 16 + sha256 = "sha256-rgaXqXbBWlfSyz+CT0jRLyfGOR1cYYnRhEAu7AsaWus="; 17 17 }; 18 18 19 19 nativeBuildInputs = [ meson ninja pkg-config makeWrapper ];
-1
pkgs/applications/networking/newsreaders/slrn/default.nix
··· 28 28 meta = with lib; { 29 29 description = "The slrn (S-Lang read news) newsreader"; 30 30 homepage = "https://slrn.sourceforge.net/index.html"; 31 - maintainers = with maintainers; [ ehmry ]; 32 31 license = licenses.gpl2; 33 32 platforms = with platforms; linux; 34 33 };
-1
pkgs/applications/networking/nym/default.nix
··· 79 79 ''; 80 80 homepage = "https://nymtech.net"; 81 81 license = licenses.asl20; 82 - maintainers = [ maintainers.ehmry ]; 83 82 platforms = platforms.all; 84 83 }; 85 84 }
+1 -1
pkgs/applications/networking/soulseek/nicotine-plus/default.nix
··· 51 51 ''; 52 52 homepage = "https://www.nicotine-plus.org"; 53 53 license = licenses.gpl3Plus; 54 - maintainers = with maintainers; [ ehmry klntsky ]; 54 + maintainers = with maintainers; [ klntsky ]; 55 55 }; 56 56 }
+2 -2
pkgs/applications/office/morgen/default.nix
··· 3 3 4 4 stdenv.mkDerivation rec { 5 5 pname = "morgen"; 6 - version = "3.1.6"; 6 + version = "3.2.2"; 7 7 8 8 src = fetchurl { 9 9 url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; 10 - hash = "sha256-/rMPNIpjkHdLE0lAdWCz71DbcqIW+1Y6RdFrYAfTSKU="; 10 + hash = "sha256-+VvQM851uWoMXV3hwuVSlK9IqiNjh57uq8Wlwl/VvPg="; 11 11 }; 12 12 13 13 nativeBuildInputs = [
+2 -2
pkgs/applications/office/qownnotes/default.nix
··· 19 19 let 20 20 pname = "qownnotes"; 21 21 appname = "QOwnNotes"; 22 - version = "24.1.5"; 22 + version = "24.2.0"; 23 23 in 24 24 stdenv.mkDerivation { 25 25 inherit pname version; 26 26 27 27 src = fetchurl { 28 28 url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; 29 - hash = "sha256-iw3MdsS1i7B8RXZk2GXwiOReSUC1IX5z0MTEk9B4nMM="; 29 + hash = "sha256-mk7yFlL+NiTZ0JtSY3y/Y1NrN1QYcBxveMImv1zB1l8="; 30 30 }; 31 31 32 32 nativeBuildInputs = [
+10
pkgs/applications/science/biology/hh-suite/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 , cmake 5 6 , xxd 6 7 , enableMpi ? false ··· 17 18 rev = "v${version}"; 18 19 hash = "sha256-kjNqJddioCZoh/cZL3YNplweIGopWIGzCYQOnKDqZmw="; 19 20 }; 21 + 22 + patches = [ 23 + # Should be removable as soon as this upstream PR is merged: https://github.com/soedinglab/hh-suite/pull/357 24 + (fetchpatch { 25 + name = "fix-gcc13-build-issues.patch"; 26 + url = "https://github.com/soedinglab/hh-suite/commit/cec47cba5dcd580e668b1ee507c9282fbdc8e7d7.patch"; 27 + hash = "sha256-Msdmj9l8voPYXK0SSwUA6mEbFLBhTjjE/Kjp0VL4Kf4="; 28 + }) 29 + ]; 20 30 21 31 nativeBuildInputs = [ cmake xxd ]; 22 32 cmakeFlags = lib.optional stdenv.hostPlatform.isx86 "-DHAVE_SSE2=1"
+2 -2
pkgs/applications/search/recoll/default.nix
··· 70 70 71 71 mkDerivation rec { 72 72 pname = "recoll"; 73 - version = "1.36.2"; 73 + version = "1.37.2"; 74 74 75 75 src = fetchurl { 76 76 url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; 77 - hash = "sha256-GyQqI3ciRO0TRaAeM4rGu+j/eB4bJlQ7VBTTxUGMNt4="; 77 + hash = "sha256-xLdk3pJSV1YaloSV3TuTdJhujXsxUGrDru+mu86YBTU="; 78 78 }; 79 79 80 80 configureFlags = [
+6 -6
pkgs/applications/version-management/jujutsu/default.nix
··· 20 20 21 21 rustPlatform.buildRustPackage rec { 22 22 pname = "jujutsu"; 23 - version = "0.13.0"; 23 + version = "0.14.0"; 24 24 25 25 src = fetchFromGitHub { 26 26 owner = "martinvonz"; 27 27 repo = "jj"; 28 28 rev = "v${version}"; 29 - hash = "sha256-UFe4hVzn/jN22KtTuTcyNpseJdgIkmh9/eAJdSObfYU="; 29 + hash = "sha256-xnGnervyXPfZyQTYsPu09fj+QvbEZ6rDJ4fYHBeF/RY="; 30 30 }; 31 31 32 - cargoHash = "sha256-WY8egnsyCuTLHd2Jnw+RLNd2LUOorHlnHVGLxtR5exQ="; 32 + cargoHash = "sha256-wuZ0zthaemzyDn5J2au2L2k0QJnzbrCRjSBIPivEbnQ="; 33 33 34 34 cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors 35 35 useNextest = true; # nextest is the upstream integration framework ··· 58 58 installManPage ./jj.1 59 59 60 60 installShellCompletion --cmd jj \ 61 - --bash <($out/bin/jj util completion --bash) \ 62 - --fish <($out/bin/jj util completion --fish) \ 63 - --zsh <($out/bin/jj util completion --zsh) 61 + --bash <($out/bin/jj util completion bash) \ 62 + --fish <($out/bin/jj util completion fish) \ 63 + --zsh <($out/bin/jj util completion zsh) 64 64 ''; 65 65 66 66 passthru = {
+4
pkgs/applications/video/davinci-resolve/default.nix
··· 234 234 zlib 235 235 ]; 236 236 237 + extraPreBwrapCmds = lib.optionalString studioVariant '' 238 + mkdir -p ~/.local/share/DaVinciResolve/license || exit 1 239 + ''; 240 + 237 241 extraBwrapArgs = lib.optionals studioVariant [ 238 242 "--bind \"$HOME\"/.local/share/DaVinciResolve/license ${davinci}/.license" 239 243 ];
+2 -1
pkgs/applications/video/freetube/default.nix
··· 39 39 40 40 postFixup = '' 41 41 makeWrapper ${electron}/bin/electron $out/bin/${pname} \ 42 - --add-flags $out/share/${pname}/resources/app.asar 42 + --add-flags $out/share/${pname}/resources/app.asar \ 43 + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" 43 44 ''; 44 45 45 46 meta = with lib; {
+2 -2
pkgs/applications/virtualization/crun/default.nix
··· 39 39 in 40 40 stdenv.mkDerivation rec { 41 41 pname = "crun"; 42 - version = "1.14"; 42 + version = "1.14.1"; 43 43 44 44 src = fetchFromGitHub { 45 45 owner = "containers"; 46 46 repo = pname; 47 47 rev = version; 48 - hash = "sha256-ElmdYJ4X5C+2BKWgUoL7bg/whvAg2CFBDFAGnJXscB4="; 48 + hash = "sha256-IEfHww+kAPKcTe5bWM+YuDe6PHlSdZQVEunlBMQ29Ic="; 49 49 fetchSubmodules = true; 50 50 }; 51 51
+1
pkgs/build-support/build-fhsenv-chroot/env.nix
··· 135 135 136 136 # symlink ALSA stuff 137 137 ln -s /host/etc/asound.conf asound.conf 138 + ln -s /host/etc/alsa alsa 138 139 139 140 # symlink SSL certs 140 141 mkdir -p ssl
+5 -1
pkgs/build-support/cc-wrapper/add-hardening.sh
··· 32 32 fi 33 33 34 34 if (( "${NIX_DEBUG:-0}" >= 1 )); then 35 - declare -a allHardeningFlags=(fortify fortify3 stackprotector pie pic strictoverflow format) 35 + declare -a allHardeningFlags=(fortify fortify3 stackprotector pie pic strictoverflow format zerocallusedregs) 36 36 declare -A hardeningDisableMap=() 37 37 38 38 # Determine which flags were effectively disabled so we can report below. ··· 109 109 format) 110 110 if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi 111 111 hardeningCFlagsBefore+=('-Wformat' '-Wformat-security' '-Werror=format-security') 112 + ;; 113 + zerocallusedregs) 114 + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling zerocallusedregs >&2; fi 115 + hardeningCFlagsBefore+=('-fzero-call-used-regs=used-gpr') 112 116 ;; 113 117 *) 114 118 # Ignore unsupported. Checked in Nix that at least *some*
+10 -1
pkgs/build-support/cc-wrapper/default.nix
··· 223 223 224 224 defaultHardeningFlags = bintools.defaultHardeningFlags or []; 225 225 226 + # if cc.hardeningUnsupportedFlagsByTargetPlatform exists, this is 227 + # called with the targetPlatform as an argument and 228 + # cc.hardeningUnsupportedFlags is completely ignored - the function 229 + # is responsible for including the constant hardeningUnsupportedFlags 230 + # list however it sees fit. 231 + ccHardeningUnsupportedFlags = if cc ? hardeningUnsupportedFlagsByTargetPlatform 232 + then cc.hardeningUnsupportedFlagsByTargetPlatform targetPlatform 233 + else (cc.hardeningUnsupportedFlags or []); 234 + 226 235 darwinPlatformForCC = optionalString stdenv.targetPlatform.isDarwin ( 227 236 if (targetPlatform.darwinPlatform == "macos" && isGNU) then "macosx" 228 237 else targetPlatform.darwinPlatform ··· 584 593 ## Hardening support 585 594 ## 586 595 + '' 587 - export hardening_unsupported_flags="${builtins.concatStringsSep " " (cc.hardeningUnsupportedFlags or [])}" 596 + export hardening_unsupported_flags="${builtins.concatStringsSep " " ccHardeningUnsupportedFlags}" 588 597 '' 589 598 590 599 # Machine flags. These are necessary to support
+1 -1
pkgs/build-support/rust/rustc-wrapper/rustc-wrapper.sh
··· 4 4 5 5 for arg; do 6 6 case "$arg" in 7 - --sysroot) 7 + --sysroot|--sysroot=*) 8 8 defaultSysroot=() 9 9 ;; 10 10 --)
+2 -2
pkgs/by-name/al/alsa-lib/package.nix
··· 8 8 9 9 stdenv.mkDerivation (finalAttrs: { 10 10 pname = "alsa-lib"; 11 - version = "1.2.9"; 11 + version = "1.2.11"; 12 12 13 13 src = fetchurl { 14 14 url = "mirror://alsa/lib/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; 15 - hash = "sha256-3JxkP9xMz9BXLMaFhY3UHgivtYPzBGCzF+QYgnX2FbI="; 15 + hash = "sha256-nz8vabmV+a03NZBy+8aaOoi/uggfyD6b4w4UZieVu00="; 16 16 }; 17 17 18 18 patches = [
+11 -1
pkgs/by-name/al/alsa-ucm-conf/package.nix
··· 1 - { lib, stdenv, fetchurl }: 1 + { lib, stdenv, fetchurl, fetchpatch }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "alsa-ucm-conf"; ··· 8 8 url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; 9 9 hash = "sha256-nCHj8B/wC6p1jfF+hnzTbiTrtBpr7ElzfpkQXhbyrpc="; 10 10 }; 11 + 12 + patches = [ 13 + (fetchpatch { 14 + # ToDo: Remove this patch in the next package upgrade 15 + # Fixes SplitPCM to make some audio devices work with alsa-ucm-conf v1.2.10 again 16 + name = "alsa-ucm-conf-splitpcm-device-argument-fix.patch"; 17 + url = "https://github.com/alsa-project/alsa-ucm-conf/commit/b68aa52acdd2763fedad5eec0f435fbf43e5ccc6.patch"; 18 + hash = "sha256-8WE4+uhi4W7cCSZYmL7uFpcHJ9muX09UkGXyZIpEd9I="; 19 + }) 20 + ]; 11 21 12 22 dontBuild = true; 13 23
+16 -3
pkgs/by-name/am/amphetype/package.nix
··· 1 - { fetchFromGitLab, lib, python3Packages, qt5 }: 1 + { copyDesktopItems, fetchFromGitLab, lib, makeDesktopItem, python3Packages, qt5 2 + }: 2 3 3 4 let 4 5 pname = "amphetype"; 5 6 version = "1.0.0"; 7 + description = "An advanced typing practice program"; 6 8 in python3Packages.buildPythonApplication { 7 9 inherit pname version; 8 10 ··· 21 23 22 24 doCheck = false; 23 25 24 - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; 26 + nativeBuildInputs = [ copyDesktopItems qt5.wrapQtAppsHook ]; 27 + 28 + desktopItems = [ 29 + (makeDesktopItem { 30 + name = pname; 31 + desktopName = "Amphetype"; 32 + genericName = "Typing Practice"; 33 + categories = [ "Education" "Qt" ]; 34 + exec = pname; 35 + comment = description; 36 + }) 37 + ]; 25 38 26 39 meta = with lib; { 27 - description = "An advanced typing practice program"; 40 + inherit description; 28 41 homepage = "https://gitlab.com/franksh/amphetype"; 29 42 license = licenses.gpl3Only; 30 43 maintainers = with maintainers; [ rycee ];
+2 -2
pkgs/by-name/ap/approxmc/package.nix
··· 12 12 13 13 stdenv.mkDerivation (finalAttrs: { 14 14 pname = "approxmc"; 15 - version = "4.1.23"; 15 + version = "4.1.24"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "meelgroup"; 19 19 repo = "approxmc"; 20 20 rev = finalAttrs.version; 21 - hash = "sha256-pE2m6Cc2u53H/5CM+2JuQxZOhjhHUZOi0kn23CJmALM="; 21 + hash = "sha256-rADPC7SVwzjUN5jb7Wt341oGfr6+LszIaBUe8QgmpRU="; 22 22 }; 23 23 24 24 nativeBuildInputs = [ cmake ];
-66
pkgs/by-name/bi/bitwarden-directory-connector-cli/package.nix
··· 1 - { 2 - lib, 3 - buildNpmPackage, 4 - fetchFromGitHub, 5 - buildPackages, 6 - python3, 7 - pkg-config, 8 - libsecret, 9 - nodejs_18, 10 - }: 11 - buildNpmPackage rec { 12 - pname = "bitwarden-directory-connector-cli"; 13 - version = "2023.10.0"; 14 - nodejs = nodejs_18; 15 - 16 - src = fetchFromGitHub { 17 - owner = "bitwarden"; 18 - repo = "directory-connector"; 19 - rev = "v${version}"; 20 - hash = "sha256-PlOtTh+rpTxAv8ajHBDHZuL7yeeLVpbAfKEDPQlejIg="; 21 - }; 22 - 23 - postPatch = '' 24 - ${lib.getExe buildPackages.jq} 'del(.scripts.preinstall)' package.json > package.json.tmp 25 - mv -f package.json{.tmp,} 26 - ''; 27 - 28 - npmDepsHash = "sha256-jBAWWY12qeX2EDhUvT3TQpnQvYXRsIilRrXGpVzxYvw="; 29 - 30 - env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; 31 - 32 - makeCacheWritable = true; 33 - npmBuildScript = "build:cli:prod"; 34 - 35 - installPhase = '' 36 - runHook preInstall 37 - mkdir -p $out/libexec/bitwarden-directory-connector 38 - cp -R {build-cli,node_modules} $out/libexec/bitwarden-directory-connector 39 - runHook postInstall 40 - ''; 41 - 42 - # needs to be wrapped with nodejs so that it can be executed 43 - postInstall = '' 44 - chmod +x $out/libexec/bitwarden-directory-connector/build-cli/bwdc.js 45 - mkdir -p $out/bin 46 - ln -s $out/libexec/bitwarden-directory-connector/build-cli/bwdc.js $out/bin/bitwarden-directory-connector-cli 47 - ''; 48 - 49 - buildInputs = [ 50 - libsecret 51 - ]; 52 - 53 - nativeBuildInputs = [ 54 - python3 55 - pkg-config 56 - ]; 57 - 58 - meta = with lib; { 59 - description = "LDAP connector for Bitwarden"; 60 - homepage = "https://github.com/bitwarden/directory-connector"; 61 - license = licenses.gpl3Only; 62 - maintainers = with maintainers; [Silver-Golden]; 63 - platforms = platforms.linux; 64 - mainProgram = "bitwarden-directory-connector-cli"; 65 - }; 66 - }
+13 -3
pkgs/by-name/bl/bluez/package.nix
··· 5 5 , docutils 6 6 , ell 7 7 , enableExperimental ? false 8 - , fetchpatch 9 8 , fetchurl 10 9 , glib 11 10 , json_c ··· 19 18 20 19 stdenv.mkDerivation (finalAttrs: { 21 20 pname = "bluez"; 22 - version = "5.71"; 21 + version = "5.72"; 23 22 24 23 src = fetchurl { 25 24 url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz"; 26 - hash = "sha256-uCjUGMk87R9Vthb7VILPAVN0QL+zT72hpWTz7OlHNdg="; 25 + hash = "sha256-SZ1/o0WplsG7ZQ9cZ0nh2SkRH6bs4L4OmGh/7mEkU24="; 27 26 }; 28 27 28 + patches = 29 + # Disable one failing test with musl libc, also seen by alpine 30 + # https://github.com/bluez/bluez/issues/726 31 + lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) 32 + (fetchurl { 33 + url = "https://git.alpinelinux.org/aports/plain/main/bluez/disable_aics_unit_testcases.patch?id=8e96f7faf01a45f0ad8449c1cd825db63a8dfd48"; 34 + hash = "sha256-1PJkipqBO3qxxOqRFQKfpWlne1kzTCgtnTFYI1cFQt4="; 35 + }) 36 + ; 37 + 29 38 buildInputs = [ 30 39 alsa-lib 31 40 dbus ··· 41 50 nativeBuildInputs = [ 42 51 docutils 43 52 pkg-config 53 + python3.pkgs.pygments 44 54 python3.pkgs.wrapPython 45 55 ]; 46 56
+1
pkgs/by-name/ca/cardboard/package.nix
··· 127 127 }; 128 128 129 129 meta = { 130 + broken = true; # Upstream is archived, fails to build on gcc-13. 130 131 homepage = "https://gitlab.com/cardboardwm/cardboard"; 131 132 description = "A scrollable, tiling Wayland compositor inspired on PaperWM"; 132 133 license = lib.licenses.gpl3Only;
+3 -2
pkgs/by-name/cm/cmake/package.nix
··· 46 46 + lib.optionalString isMinimalBuild "-minimal" 47 47 + lib.optionalString cursesUI "-cursesUI" 48 48 + lib.optionalString qt5UI "-qt5UI"; 49 - version = "3.27.8"; 49 + version = "3.27.9"; 50 50 51 51 src = fetchurl { 52 52 url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; 53 - hash = "sha256-/s4kVj9peHD7uYLqi/F0gsnV+FXYyb8LgkY9dsno0Mw="; 53 + hash = "sha256-YJqbmFcqal6kd/kSz/uXMQntTQpqaz+eI1PSzcBIcI4="; 54 54 }; 55 55 56 56 patches = [ ··· 68 68 ++ lib.optional stdenv.isDarwin ./006-darwin-always-set-runtime-c-flag.diff; 69 69 70 70 outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" "info" ]; 71 + separateDebugInfo = true; 71 72 setOutputFlags = false; 72 73 73 74 setupHooks = [
+26
pkgs/by-name/cm/cmd-wrapped/package.nix
··· 1 + { lib 2 + , rustPlatform 3 + , fetchFromGitHub 4 + }: 5 + 6 + rustPlatform.buildRustPackage rec { 7 + pname = "cmd-wrapped"; 8 + version = "0.1.1"; 9 + 10 + src = fetchFromGitHub { 11 + owner = "YiNNx"; 12 + repo = "cmd-wrapped"; 13 + rev = version; 14 + hash = "sha256-9GyeJFU8wLl2kCnrwZ+j+PwCRS17NvzgSCpulhXHYqQ="; 15 + }; 16 + 17 + cargoHash = "sha256-i6LgLvLMDF696Tpn4yVA1XNuaTrABLVg3SgclHBq6Go="; 18 + 19 + meta = with lib; { 20 + description = "Find out what the past year looks like in commandline"; 21 + homepage = "https://github.com/YiNNx/cmd-wrapped"; 22 + license = licenses.mit; 23 + maintainers = with maintainers; [ Cryolitia ]; 24 + mainProgram = "cmd-wrapped"; 25 + }; 26 + }
+3 -3
pkgs/by-name/co/cosmic-icons/package.nix
··· 8 8 }: 9 9 stdenvNoCC.mkDerivation rec { 10 10 pname = "cosmic-icons"; 11 - version = "unstable-2024-01-23"; 11 + version = "unstable-2024-02-07"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "pop-os"; 15 15 repo = pname; 16 - rev = "49a1762c958196924afcf1eae52ee910c4b4bc9f"; 17 - sha256 = "sha256-wL4f1rXWuFmeZCAAw0y+JQ3iesZcEC3XxWWrvrJ50oA="; 16 + rev = "edd405ed84186ee24307deb7da6f25efc85986e9"; 17 + sha256 = "sha256-qz39vI9bRac9ZQg8FPrwv3/TW5zGlsvs2me5aE5vvZo="; 18 18 }; 19 19 20 20 nativeBuildInputs = [ just ];
+6 -6
pkgs/by-name/cr/crc/package.nix
··· 7 7 }: 8 8 9 9 let 10 - openShiftVersion = "4.14.7"; 11 - okdVersion = "4.14.0-0.okd-2023-12-01-225814"; 12 - microshiftVersion = "4.14.7"; 10 + openShiftVersion = "4.14.8"; 11 + okdVersion = "4.14.0-0.okd-scos-2024-01-10-151818"; 12 + microshiftVersion = "4.14.8"; 13 13 podmanVersion = "4.4.4"; 14 14 writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; 15 - gitCommit = "6d23b6aa727bdefe4b5d1a77b2f9da7cec477a3e"; 16 - gitHash = "sha256-NeCARhDmqIukBpnf6fkI0FTE4D9FUaWjBd7eG29eu9A="; 15 + gitCommit = "54a6f9a15155edb2bdb70128c7c535fc69841031"; 16 + gitHash = "sha256-tjrlh31J3fDiYm2+PUnVVRIxxQvJKQVLcYEnMekD4Us="; 17 17 in 18 18 buildGoModule rec { 19 - version = "2.31.0"; 19 + version = "2.32.0"; 20 20 pname = "crc"; 21 21 22 22 src = fetchFromGitHub {
+3 -3
pkgs/by-name/ez/eza/package.nix
··· 17 17 18 18 rustPlatform.buildRustPackage rec { 19 19 pname = "eza"; 20 - version = "0.18.1"; 20 + version = "0.18.2"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "eza-community"; 24 24 repo = "eza"; 25 25 rev = "v${version}"; 26 - hash = "sha256-8n8U8t2hr4CysjXMPRUVKFQlNpTQL8K6Utd1BCtYOfE="; 26 + hash = "sha256-gVpgI/I91ounqSrEIM7BWJKR4NyRuEU2iK+g8T9L6YY="; 27 27 }; 28 28 29 - cargoHash = "sha256-QNZSF+93JDOt6PknZDy3xOBgeIJbyYHKgM4nM5Xh27c="; 29 + cargoHash = "sha256-q2xVSB3lpsur8P8KF7jDVrEj24q6FRVJbh7bL4teOqQ="; 30 30 31 31 nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; 32 32 buildInputs = [ zlib ]
+3 -3
pkgs/by-name/fi/files-cli/package.nix
··· 7 7 8 8 buildGoModule rec { 9 9 pname = "files-cli"; 10 - version = "2.12.28"; 10 + version = "2.12.30"; 11 11 12 12 src = fetchFromGitHub { 13 13 repo = "files-cli"; 14 14 owner = "files-com"; 15 15 rev = "v${version}"; 16 - hash = "sha256-4YW261qQtbfbX08zuGzr3qH470DaWUDIVaex7qYe2tI="; 16 + hash = "sha256-V0oQ43ZTgzXjp+jZvF0UxfjU7vhbvKuDG2rBvB1pEOk="; 17 17 }; 18 18 19 - vendorHash = "sha256-w5R7eVrnpcKu0/V2gAeZ7RL6VyA57INcOU31Jhwf1so="; 19 + vendorHash = "sha256-OKNwYQCiB07cpnmQmJR0OJ3gX4VtXEcCPzsINEHj8Zg="; 20 20 21 21 ldflags = [ 22 22 "-s"
+22
pkgs/by-name/go/gokey/package.nix
··· 1 + { lib, buildGoModule, fetchFromGitHub }: 2 + buildGoModule { 3 + pname = "gokey"; 4 + version = "0.1.2-unstable-2023-11-16"; 5 + 6 + src = fetchFromGitHub { 7 + owner = "cloudflare"; 8 + repo = "gokey"; 9 + rev = "26fcef24d123e0eaf7b92224e6880f529f94aa9f"; 10 + hash = "sha256-nt4fO8NKYfRkpoC1z8zDrEZC7+fo6sU/ZOHCMHIAT58="; 11 + }; 12 + 13 + vendorHash = "sha256-ZDCoRE2oP8ANsu7jfLm3BMLzXdsq1dhsEigvwWgKk54="; 14 + 15 + meta = with lib; { 16 + homepage = "https://github.com/cloudflare/gokey"; 17 + description = "Vault-less password store"; 18 + license = licenses.bsd3; 19 + maintainers = [ maintainers.confus ]; 20 + mainProgram = "gokey"; 21 + }; 22 + }
+2 -2
pkgs/by-name/gp/gpt4all-chat/package.nix
··· 11 11 12 12 stdenv.mkDerivation (finalAttrs: { 13 13 pname = "gpt4all-chat"; 14 - version = "2.6.2"; 14 + version = "2.7.0"; 15 15 16 16 src = fetchFromGitHub { 17 17 fetchSubmodules = true; 18 - hash = "sha256-BQE4UQEOOUAh0uGwQf7Q9D30s+aoGFyyMH6EI/WVIkc="; 18 + hash = "sha256-l9Do58Cld9n89J+px8RPjyioIa0Bo3qGSQe7QEGcZr8="; 19 19 owner = "nomic-ai"; 20 20 repo = "gpt4all"; 21 21 rev = "v${finalAttrs.version}";
+3 -3
pkgs/by-name/ha/hare/package.nix
··· 60 60 in 61 61 stdenv.mkDerivation (finalAttrs: { 62 62 pname = "hare"; 63 - version = "0-unstable-2024-02-01"; 63 + version = "unstable-2024-02-05"; 64 64 65 65 outputs = [ "out" "man" ]; 66 66 67 67 src = fetchFromSourcehut { 68 68 owner = "~sircmpwn"; 69 69 repo = "hare"; 70 - rev = "4d387ed61968f468e43571d15485b498e28acaec"; 71 - hash = "sha256-vVL8e+P/lnp0/jO+lQ/q0CehwxAvXh+FPOMJ8r+2Ftk="; 70 + rev = "d0c057dbbb0f1ee9179769e187c0fbd3b00327d4"; 71 + hash = "sha256-3zpUqdxoKMwezRfMgnpY3KfMB5/PFfRYtGPZxWfNDtA="; 72 72 }; 73 73 74 74 patches = [
+3 -3
pkgs/by-name/ha/harec/package.nix
··· 23 23 in 24 24 stdenv.mkDerivation (finalAttrs: { 25 25 pname = "harec"; 26 - version = "0-unstable-2024-01-29"; 26 + version = "unstable-2024-02-03"; 27 27 28 28 src = fetchFromSourcehut { 29 29 owner = "~sircmpwn"; 30 30 repo = "harec"; 31 - rev = "f9e17e633845d8d38566b4ea32db0a29ac85d96e"; 32 - hash = "sha256-Xy9VOcDtbJUz3z6Vk8bqH41VbAFKtJ9fzPGEwVz8KQM="; 31 + rev = "09cb18990266eef814917d8211d38b82e0896532"; 32 + hash = "sha256-cxWRqGipoDATN1+V9s9S2WJ3sLMcTqIJmhP5XTld3AU="; 33 33 }; 34 34 35 35 nativeBuildInputs = [
+3 -3
pkgs/by-name/in/invidtui/package.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "invidtui"; 5 - version = "0.3.8"; 5 + version = "0.4.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "darkhz"; 9 9 repo = "invidtui"; 10 10 rev = "refs/tags/v${version}"; 11 - hash = "sha256-m2ygORf6GIJZXYYJKy6i12wDEkxQywtYdCutHeiyNYY="; 11 + hash = "sha256-3F/JWdYjb3Wtd2eBkEmId3SCVapu2gCgLFowK59RXRc="; 12 12 }; 13 13 14 - vendorHash = "sha256-HQ6JHXiqawDwSV48/Czbao4opnuz1LqIBdcObrkCfNs="; 14 + vendorHash = "sha256-rwKx3h0X7RfIZ9lE/4TJoK0BR6f/lPcLNFbQjUtq/Tk="; 15 15 16 16 doCheck = true; 17 17
+1 -1
pkgs/by-name/li/libmpdclient/package.nix
··· 29 29 homepage = "https://www.musicpd.org/libs/libmpdclient/"; 30 30 changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/libmpdclient/${finalAttrs.src.rev}/NEWS"; 31 31 license = with lib.licenses; [ bsd2 ]; 32 - maintainers = with lib.maintainers; [ AndersonTorres ehmry ]; 32 + maintainers = with lib.maintainers; [ AndersonTorres ]; 33 33 platforms = lib.platforms.unix; 34 34 }; 35 35 })
+33
pkgs/by-name/lz/lzlib/package.nix
··· 1 + { lib, stdenv, fetchurl, texinfo, lzip }: 2 + 3 + stdenv.mkDerivation (finalAttrs: { 4 + pname = "lzlib"; 5 + version = "1.14"; 6 + outputs = [ "out" "info" ]; 7 + 8 + nativeBuildInputs = [ texinfo lzip ]; 9 + 10 + src = fetchurl { 11 + url = "mirror://savannah/lzip/lzlib/lzlib-${finalAttrs.version}.tar.lz"; 12 + sha256 = "e362ecccd82d4dd297df6a51b952c65d2172f9bf41a5c4590d3604d83aa519d3"; 13 + # hash from release email 14 + }; 15 + 16 + postPatch = lib.optionalString stdenv.isDarwin '' 17 + substituteInPlace Makefile.in --replace '-Wl,--soname=' '-Wl,-install_name,$(out)/lib/' 18 + ''; 19 + 20 + makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ]; 21 + doCheck = true; 22 + 23 + configureFlags = [ "--enable-shared" ]; 24 + 25 + meta = { 26 + homepage = "https://www.nongnu.org/lzip/lzlib.html"; 27 + description = 28 + "Data compression library providing in-memory LZMA compression and decompression functions, including integrity checking of the decompressed data"; 29 + license = lib.licenses.bsd2; 30 + platforms = lib.platforms.all; 31 + maintainers = with lib.maintainers; [ ehmry ]; 32 + }; 33 + })
+66
pkgs/by-name/ma/material-black-colors/package.nix
··· 1 + { lib 2 + , stdenvNoCC 3 + , fetchFromGitHub 4 + , colorVariants ? [] # default: install all icons 5 + }: 6 + 7 + let 8 + pname = "material-black-colors"; 9 + colorVariantList = [ 10 + "MB-Blueberry-Suru-GLOW" 11 + "MB-Cherry-Suru-GLOW" 12 + "MB-Lime-Suru-GLOW" 13 + "MB-Mango-Suru-GLOW" 14 + "MB-Pistachio-Suru-GLOW" 15 + "MB-Plum-Suru-GLOW" 16 + "Material-Black-Blueberry-Numix-FLAT" 17 + "Material-Black-Blueberry-Numix" 18 + "Material-Black-Blueberry-Suru" 19 + "Material-Black-Cherry-Numix-FLAT" 20 + "Material-Black-Cherry-Numix" 21 + "Material-Black-Cherry-Suru" 22 + "Material-Black-Lime-Numix-FLAT" 23 + "Material-Black-Lime-Numix" 24 + "Material-Black-Lime-Suru" 25 + "Material-Black-Mango-Numix-FLAT" 26 + "Material-Black-Mango-Numix" 27 + "Material-Black-Mango-Suru" 28 + "Material-Black-Pistachio-Numix-FLAT" 29 + "Material-Black-Pistachio-Numix" 30 + "Material-Black-Pistachio-Suru" 31 + "Material-Black-Plum-Numix-FLAT" 32 + "Material-Black-Plum-Numix" 33 + "Material-Black-Plum-Suru" 34 + ]; 35 + 36 + in 37 + lib.checkListOfEnum "${pname}: color variants" colorVariantList colorVariants 38 + 39 + stdenvNoCC.mkDerivation { 40 + inherit pname; 41 + version = "0-unstable-2020-12-17"; 42 + 43 + src = fetchFromGitHub { 44 + owner = "rtlewis88"; 45 + repo = "rtl88-Themes"; 46 + rev = "3864d851aac7f4e76cf23717aee104de234aef74"; 47 + hash = "sha256-BUJMd6Ltq16/HqqDbB5VDGIRSzLivXxNYZPT9sd6oTI="; 48 + }; 49 + 50 + installPhase = '' 51 + runHook preInstall 52 + mkdir -p $out/share/icons 53 + cp -r ${lib.concatStringsSep " " (if colorVariants != [] then colorVariants else colorVariantList)} $out/share/icons/ 54 + runHook postInstall 55 + ''; 56 + 57 + dontFixup = true; 58 + 59 + meta = with lib; { 60 + description = "Material Black Colors icons"; 61 + homepage = "https://github.com/rtlewis88/rtl88-Themes/tree/material-black-COLORS"; 62 + maintainers = with maintainers; [ d3vil0p3r ]; 63 + platforms = platforms.all; 64 + license = with licenses; [ gpl3Plus mit ]; 65 + }; 66 + }
+2 -2
pkgs/by-name/md/md4c/package.nix
··· 7 7 8 8 stdenv.mkDerivation (finalAttrs: { 9 9 pname = "md4c"; 10 - version = "0.5.1"; 10 + version = "0.5.2"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "mity"; 14 14 repo = "md4c"; 15 15 rev = "release-${finalAttrs.version}"; 16 - hash = "sha256-BWmzNV3iC2g8MHoYtqIcUtLQz3oaQwH+Pyy4fN3N7/k="; 16 + hash = "sha256-2/wi7nJugR8X2J9FjXJF1UDnbsozGoO7iR295/KSJng="; 17 17 }; 18 18 19 19 outputs = [ "out" "lib" "dev" "man" ];
+224
pkgs/by-name/ni/nimlangserver/lock.json
··· 1 + { 2 + "depends": [ 3 + { 4 + "method": "fetchzip", 5 + "packages": [ 6 + "asynctools" 7 + ], 8 + "path": "/nix/store/51nf7pb5cwg2n441ka6w6g6c4hdjsdj4-source", 9 + "rev": "bb01d965a2ad0f08eaff6a53874f028ddbab4909", 10 + "sha256": "0v4n7maskd07qsx8rsr9v0bs7nzbncmvxsn7j9jsk9azcy803v49", 11 + "srcDir": "", 12 + "url": "https://github.com/nickysn/asynctools/archive/bb01d965a2ad0f08eaff6a53874f028ddbab4909.tar.gz" 13 + }, 14 + { 15 + "method": "fetchzip", 16 + "packages": [ 17 + "asynctools" 18 + ], 19 + "path": "/nix/store/86w001hvppm2xfmqzb3733rnd5s1dmc2-source", 20 + "rev": "non-blocking", 21 + "sha256": "1iyr2k3vrbqfwm70w9bsyhis799lm9rin8j5pkjxgrpshm1znpbd", 22 + "srcDir": "", 23 + "url": "https://github.com/yyoncho/asynctools/archive/non-blocking.tar.gz" 24 + }, 25 + { 26 + "method": "fetchzip", 27 + "packages": [ 28 + "bearssl" 29 + ], 30 + "path": "/nix/store/drj65wylnxdbv4jqhymf7biiyjfb75v8-source", 31 + "rev": "9372f27a25d0718d3527afad6cc936f6a853f86e", 32 + "sha256": "152zbyqx12fmmjl4wn6kqqk1jzp1ywm4xvjd28ll9037f1pyd5ic", 33 + "srcDir": "", 34 + "url": "https://github.com/status-im/nim-bearssl/archive/9372f27a25d0718d3527afad6cc936f6a853f86e.tar.gz" 35 + }, 36 + { 37 + "method": "fetchzip", 38 + "packages": [ 39 + "chronicles" 40 + ], 41 + "path": "/nix/store/ffz78k6z9wf8vj2kv1jdj5dq2rxf61j7-source", 42 + "rev": "2a2681b60289aaf7895b7056f22616081eb1a882", 43 + "sha256": "0n8awgrmn9f6vd7ibv1jlyxk61lrs7hc51fghilrw6g6xq5w9rxq", 44 + "srcDir": "", 45 + "url": "https://github.com/status-im/nim-chronicles/archive/2a2681b60289aaf7895b7056f22616081eb1a882.tar.gz" 46 + }, 47 + { 48 + "method": "fetchzip", 49 + "packages": [ 50 + "chronos" 51 + ], 52 + "path": "/nix/store/l4zs1l1yw4yhf1f8q7r5x5z2szjygr6d-source", 53 + "rev": "ba143e029f35fd9b4cd3d89d007cc834d0d5ba3c", 54 + "sha256": "1lv3l9c4ifqzlfgpwpvpq2z3994zz1nirg8f59xrnfb7zgbv8l3i", 55 + "srcDir": "", 56 + "url": "https://github.com/status-im/nim-chronos/archive/ba143e029f35fd9b4cd3d89d007cc834d0d5ba3c.tar.gz" 57 + }, 58 + { 59 + "method": "fetchzip", 60 + "packages": [ 61 + "faststreams" 62 + ], 63 + "path": "/nix/store/4nj341ypj07hjvxv0462wpnywhkj02b5-source", 64 + "rev": "422971502bd641703bf78a27cb20429e77fcfb8b", 65 + "sha256": "0snzh904f8f3wn33liy6817q9ccx8mvsl88blhr49qh69mzbgnba", 66 + "srcDir": "", 67 + "url": "https://github.com/status-im/nim-faststreams/archive/422971502bd641703bf78a27cb20429e77fcfb8b.tar.gz" 68 + }, 69 + { 70 + "method": "fetchzip", 71 + "packages": [ 72 + "httputils" 73 + ], 74 + "path": "/nix/store/jmgpadmdabybhij1srd81xfr873zgfmm-source", 75 + "rev": "5065d2cf18dcb9812e25cc0e2c50eb357bde04cf", 76 + "sha256": "069fw3h9cjn0hab9vhfri8ibld7yihb8ggyg1nv5vxz6i3x026m5", 77 + "srcDir": "", 78 + "url": "https://github.com/status-im/nim-http-utils/archive/5065d2cf18dcb9812e25cc0e2c50eb357bde04cf.tar.gz" 79 + }, 80 + { 81 + "method": "fetchzip", 82 + "packages": [ 83 + "json_rpc" 84 + ], 85 + "path": "/nix/store/szg3jxcg0bf6zv224nyisqhnibkd2pxw-source", 86 + "rev": "c8a5cbe26917e6716b1597dae2d08166f3ce789a", 87 + "sha256": "1l1y4psbcd5w68j1zz172rlwsk7jxbwlr14r2kwnkj7xc7lfwlnx", 88 + "srcDir": "", 89 + "url": "https://github.com/yyoncho/nim-json-rpc/archive/c8a5cbe26917e6716b1597dae2d08166f3ce789a.tar.gz" 90 + }, 91 + { 92 + "method": "fetchzip", 93 + "packages": [ 94 + "json_serialization" 95 + ], 96 + "path": "/nix/store/h0xl7qnw7bh513rb24k1n805x3n1rimw-source", 97 + "rev": "d9394dc7286064902d825bbc1203d03d7218633a", 98 + "sha256": "102m7jaxjip24a6hrnk0nvfb0vmdx5zq4m9i4xyzq8m782xyqp94", 99 + "srcDir": "", 100 + "url": "https://github.com/status-im/nim-json-serialization/archive/d9394dc7286064902d825bbc1203d03d7218633a.tar.gz" 101 + }, 102 + { 103 + "method": "fetchzip", 104 + "packages": [ 105 + "news" 106 + ], 107 + "path": "/nix/store/siwfngb840kcdjdviy5rhlpvdpkw14sk-source", 108 + "rev": "8bfd753649aa7e870ec45e93f1453d3bfcf66733", 109 + "sha256": "0hvs4kfr4aais7ixvh9d7na2r2zjnvaw3m3rpklafn9qld2wpaav", 110 + "srcDir": "src", 111 + "url": "https://github.com/status-im/news/archive/8bfd753649aa7e870ec45e93f1453d3bfcf66733.tar.gz" 112 + }, 113 + { 114 + "method": "fetchzip", 115 + "packages": [ 116 + "news" 117 + ], 118 + "path": "/nix/store/siwfngb840kcdjdviy5rhlpvdpkw14sk-source", 119 + "rev": "status", 120 + "sha256": "0hvs4kfr4aais7ixvh9d7na2r2zjnvaw3m3rpklafn9qld2wpaav", 121 + "srcDir": "src", 122 + "url": "https://github.com/status-im/news/archive/status.tar.gz" 123 + }, 124 + { 125 + "method": "fetchzip", 126 + "packages": [ 127 + "nimcrypto" 128 + ], 129 + "path": "/nix/store/dnj20qh97ylf57nka9wbxs735wbw7yxv-source", 130 + "rev": "4014ef939b51e02053c2e16dd3481d47bc9267dd", 131 + "sha256": "1kgqr2lqaffglc1fgbanwcvhkqcbbd20d5b6w4lf0nksfl9c357a", 132 + "srcDir": "", 133 + "url": "https://github.com/cheatfate/nimcrypto/archive/4014ef939b51e02053c2e16dd3481d47bc9267dd.tar.gz" 134 + }, 135 + { 136 + "method": "fetchzip", 137 + "packages": [ 138 + "serialization" 139 + ], 140 + "path": "/nix/store/ss096qz8svm5my0mjhk3imyrc2nm2x0y-source", 141 + "rev": "4d541ec43454809904fc4c3c0a7436410ad597d2", 142 + "sha256": "1a5x0fsxxkqpambz9q637dz0jrzv9q1jb3cya12k6106vc65lyf8", 143 + "srcDir": "", 144 + "url": "https://github.com/status-im/nim-serialization/archive/4d541ec43454809904fc4c3c0a7436410ad597d2.tar.gz" 145 + }, 146 + { 147 + "method": "fetchzip", 148 + "packages": [ 149 + "stew" 150 + ], 151 + "path": "/nix/store/90rwcr71bq13cid74v4aazikv2s924r1-source", 152 + "rev": "d9400ddea08341a65102cffdb693d3a7131efef4", 153 + "sha256": "0gkmh63izhp0bxyfmwfvyp81bxnzwnc3r7nxr5a05xpl8crk85w2", 154 + "srcDir": "", 155 + "url": "https://github.com/status-im/nim-stew/archive/d9400ddea08341a65102cffdb693d3a7131efef4.tar.gz" 156 + }, 157 + { 158 + "method": "fetchzip", 159 + "packages": [ 160 + "stint" 161 + ], 162 + "path": "/nix/store/q42j4w2f70qfihcrpzgl3fspxihfsadb-source", 163 + "rev": "c0ae9e10a9238883d18226fa28a5435c4d305e45", 164 + "sha256": "0dxhjg5nf4sc4ga2zrxqcmr1v3ki9irkl603x0y3pz5sd8jdi731", 165 + "srcDir": "", 166 + "url": "https://github.com/status-im/nim-stint/archive/c0ae9e10a9238883d18226fa28a5435c4d305e45.tar.gz" 167 + }, 168 + { 169 + "method": "fetchzip", 170 + "packages": [ 171 + "testutils" 172 + ], 173 + "path": "/nix/store/hn5r1ywl4qzzjl9zj62w5m6f8bqkjn8q-source", 174 + "rev": "dfc4c1b39f9ded9baf6365014de2b4bfb4dafc34", 175 + "sha256": "0fi59m8yvayzlh1ajbl98ddy43i3ikjqh3s5px16y0s3cidg4fai", 176 + "srcDir": "", 177 + "url": "https://github.com/status-im/nim-testutils/archive/dfc4c1b39f9ded9baf6365014de2b4bfb4dafc34.tar.gz" 178 + }, 179 + { 180 + "method": "fetchzip", 181 + "packages": [ 182 + "unittest2" 183 + ], 184 + "path": "/nix/store/wdj38hf9hdyb1skgb6v0z00kxkdmnq04-source", 185 + "rev": "b178f47527074964f76c395ad0dfc81cf118f379", 186 + "sha256": "1ir20z9m4wmm0bs2dd2qiq75w0x3skv0yj7sqp6bqfh98ni44xdc", 187 + "srcDir": "", 188 + "url": "https://github.com/status-im/nim-unittest2/archive/b178f47527074964f76c395ad0dfc81cf118f379.tar.gz" 189 + }, 190 + { 191 + "method": "fetchzip", 192 + "packages": [ 193 + "websock" 194 + ], 195 + "path": "/nix/store/yad26q3iv3r2lw9xs655kyx3hvflxi1p-source", 196 + "rev": "2c3ae3137f3c9cb48134285bd4a47186fa51f0e8", 197 + "sha256": "09pkxzsnahljkqyp540v1wwiqcnbkz5ji5bz9q9cwn3axpmqc3v7", 198 + "srcDir": "", 199 + "url": "https://github.com/status-im/nim-websock/archive/2c3ae3137f3c9cb48134285bd4a47186fa51f0e8.tar.gz" 200 + }, 201 + { 202 + "method": "fetchzip", 203 + "packages": [ 204 + "with" 205 + ], 206 + "path": "/nix/store/qkwz2w5haw8px691c6gkklvxxp38j9d3-source", 207 + "rev": "2f95909c767605e06670dc70f5cffd6b9284f192", 208 + "sha256": "1qdq9wpm6xahqczmvdn3a7yvvrw5x42ylvzmbybdwjzd8vmgg0zv", 209 + "srcDir": "", 210 + "url": "https://github.com/zevv/with/archive/2f95909c767605e06670dc70f5cffd6b9284f192.tar.gz" 211 + }, 212 + { 213 + "method": "fetchzip", 214 + "packages": [ 215 + "zlib" 216 + ], 217 + "path": "/nix/store/br78rad2jnl6zka2q89qi6pkfiyn10fv-source", 218 + "rev": "f34ca261efd90f118dc1647beefd2f7a69b05d93", 219 + "sha256": "1k8y7m1ry1z8jm8hj8pa3vlqprshaa59cdwq2a4acrfw9ks5w482", 220 + "srcDir": "", 221 + "url": "https://github.com/status-im/nim-zlib/archive/f34ca261efd90f118dc1647beefd2f7a69b05d93.tar.gz" 222 + } 223 + ] 224 + }
+34
pkgs/by-name/ni/nimlangserver/package.nix
··· 1 + { 2 + lib, 3 + buildNimPackage, 4 + fetchFromGitHub, 5 + }: 6 + buildNimPackage (final: prev: { 7 + pname = "nimlangserver"; 8 + version = "1.2.0"; 9 + 10 + # lock.json was generated by converting 11 + # nimble.lock into requires "<gitUrl>#revSha" in a dummy.nimble 12 + # for all packages and then running nim_lk on said dummy package 13 + # default nim_lk output fails because it attempts 14 + # to use branches that will not work instead of HEAD for packages 15 + lockFile = ./lock.json; 16 + 17 + src = fetchFromGitHub { 18 + owner = "nim-lang"; 19 + repo = "langserver"; 20 + rev = "71b59bfa77dabf6b8b381f6e18a1d963a1a658fc"; 21 + hash = "sha256-dznegEhRHvztrNhBcUhW83RYgJpduwdGLWj/tJ//K8c="; 22 + }; 23 + 24 + doCheck = false; 25 + 26 + meta = with lib; 27 + final.src.meta 28 + // { 29 + description = "The Nim language server implementation (based on nimsuggest)"; 30 + license = licenses.mit; 31 + mainProgram = "nimlangserver"; 32 + maintainers = with maintainers; [daylinmorgan]; 33 + }; 34 + })
+4 -4
pkgs/by-name/oc/ocenaudio/package.nix
··· 13 13 14 14 stdenv.mkDerivation rec { 15 15 pname = "ocenaudio"; 16 - version = "3.13.3"; 16 + version = "3.13.4"; 17 17 18 18 src = fetchurl { 19 - url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; 20 - hash = "sha256-B0+NyFZ9c0ljzYMJm3741TpoxFS0Zo6hxzhadYFofSA="; 19 + url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=v${version}"; 20 + hash = "sha256-vE+xwwkBXIksy+6oygLDsrT8mFfHYIGcb6+8KMZe0no="; 21 21 }; 22 22 23 23 nativeBuildInputs = [ ··· 45 45 mv $out/usr/share $out/share 46 46 rm -rf $out/usr 47 47 substituteInPlace $out/share/applications/ocenaudio.desktop \ 48 - --replace "/opt/ocenaudio/bin/ocenaudio" "ocenaudio" 48 + --replace-fail "/opt/ocenaudio/bin/ocenaudio" "ocenaudio" 49 49 mkdir -p $out/share/licenses/ocenaudio 50 50 mv $out/bin/ocenaudio_license.txt $out/share/licenses/ocenaudio/LICENSE 51 51
+31
pkgs/by-name/pg/pget/package.nix
··· 1 + { lib 2 + , buildGoModule 3 + , fetchFromGitHub 4 + }: 5 + buildGoModule rec { 6 + pname = "pget"; 7 + version = "0.2.1"; 8 + 9 + src = fetchFromGitHub { 10 + owner = "Code-Hex"; 11 + repo = "pget"; 12 + rev = "v${version}"; 13 + hash = "sha256-SDe9QH1iSRfMBSCfYiOJPXUbDvxH5cCCWvQq9uTWT9Y="; 14 + }; 15 + 16 + vendorHash = "sha256-p9sgvk5kfim3rApgp++1n05S9XrOWintxJfCeeySuBo="; 17 + 18 + ldflags = [ 19 + "-w" 20 + "-s" 21 + "-X=main.version=${version}" 22 + ]; 23 + 24 + meta = with lib; { 25 + description = "The fast, resumable file download client"; 26 + homepage = "https://github.com/Code-Hex/pget?tab=readme-ov-file"; 27 + license = licenses.mit; 28 + maintainers = with maintainers; [ Ligthiago ]; 29 + mainProgram = "pget"; 30 + }; 31 + }
+29
pkgs/by-name/pl/plzip/package.nix
··· 1 + { lib, stdenv, fetchurl, lzip, lzlib, texinfo }: 2 + 3 + stdenv.mkDerivation (finalAttrs: { 4 + pname = "plzip"; 5 + version = "1.11"; 6 + outputs = [ "out" "man" "info" ]; 7 + 8 + src = fetchurl { 9 + url = "mirror://savannah/lzip/plzip/plzip-${finalAttrs.version}.tar.lz"; 10 + sha256 = "51f48d33df659bb3e1e7e418275e922ad752615a5bc984139da08f1e6d7d10fd"; 11 + # hash from release email 12 + }; 13 + 14 + nativeBuildInputs = [ lzip texinfo ]; 15 + buildInputs = [ lzlib ]; 16 + 17 + enableParallelBuilding = true; 18 + 19 + doCheck = true; 20 + 21 + meta = { 22 + homepage = "https://www.nongnu.org/lzip/plzip.html"; 23 + description = "A massively parallel lossless data compressor based on the lzlib compression library"; 24 + license = lib.licenses.gpl2Plus; 25 + platforms = lib.platforms.all; 26 + maintainers = with lib.maintainers; [ _360ied ehmry ]; 27 + mainProgram = "plzip"; 28 + }; 29 + })
+57
pkgs/by-name/qc/qcm/package.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 5 + , pkg-config 6 + , qt6 7 + , curl 8 + , ffmpeg 9 + , cubeb 10 + }: 11 + 12 + stdenv.mkDerivation rec { 13 + pname = "qcm"; 14 + version = "1.0.2"; 15 + 16 + src = fetchFromGitHub { 17 + owner = "hypengw"; 18 + repo = "Qcm"; 19 + rev = "v${version}"; 20 + fetchSubmodules = true; 21 + hash = "sha256-6QivAQqOuWIldx2Rh5nNsj0gia3AOUm6vy9aqyJ1G6k="; 22 + }; 23 + 24 + patches = [ ./remove_cubeb_vendor.patch ]; 25 + 26 + nativeBuildInputs = [ 27 + cmake 28 + pkg-config 29 + qt6.wrapQtAppsHook 30 + ]; 31 + 32 + buildInputs = [ 33 + qt6.qtbase 34 + qt6.qtdeclarative 35 + qt6.qtwayland 36 + curl 37 + ffmpeg 38 + cubeb 39 + ] ++ cubeb.passthru.backendLibs; 40 + 41 + qtWrapperArgs = [ 42 + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath cubeb.passthru.backendLibs}" 43 + ]; 44 + 45 + postInstall = '' 46 + rm -r $out/{include,lib/cmake} 47 + ''; 48 + 49 + meta = with lib; { 50 + description = "An unofficial Qt client for netease cloud music"; 51 + homepage = "https://github.com/hypengw/Qcm"; 52 + license = licenses.gpl2Plus; 53 + mainProgram = "Qcm"; 54 + maintainers = with maintainers; [ aleksana ]; 55 + platforms = platforms.linux; 56 + }; 57 + }
+33
pkgs/by-name/qc/qcm/remove_cubeb_vendor.patch
··· 1 + diff --git a/player/CMakeLists.txt b/player/CMakeLists.txt 2 + index c160e10..62c2611 100644 3 + --- a/player/CMakeLists.txt 4 + +++ b/player/CMakeLists.txt 5 + @@ -25,4 +25,4 @@ target_include_directories( 6 + target_link_libraries( 7 + player 8 + PUBLIC core error asio_helper PkgConfig::LIBAV 9 + - PRIVATE ctre cubeb::cubeb) 10 + + PRIVATE ctre cubeb) 11 + diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt 12 + index 45345d3..f797b48 100644 13 + --- a/third_party/CMakeLists.txt 14 + +++ b/third_party/CMakeLists.txt 15 + @@ -41,10 +41,7 @@ option(USE_SANITIZERS "" OFF) 16 + set(USE_WINMM 17 + OFF 18 + CACHE BOOL "") 19 + -add_subdirectory(cubeb EXCLUDE_FROM_ALL) 20 + -set_property(TARGET cubeb PROPERTY MSVC_RUNTIME_LIBRARY 21 + - "MultiThreaded$<$<CONFIG:Debug>:Debug>") 22 + -add_library(cubeb::cubeb ALIAS cubeb) 23 + +find_package(cubeb REQUIRED) 24 + 25 + option(KDSingleApplication_QT6 "" ON) 26 + option(KDSingleApplication_STATIC "" ON) 27 + @@ -55,4 +52,4 @@ add_subdirectory(KDSingleApplication) 28 + 29 + 30 + add_library(pegtl INTERFACE) 31 + -target_include_directories(pegtl INTERFACE PEGTL/include) 32 + \ No newline at end of file 33 + +target_include_directories(pegtl INTERFACE PEGTL/include)
+2 -2
pkgs/by-name/re/renode-unstable/package.nix
··· 7 7 inherit buildUnstable; 8 8 }).overrideAttrs (finalAttrs: _: { 9 9 pname = "renode-unstable"; 10 - version = "1.14.0+20240119git1a0826937"; 10 + version = "1.14.0+20240130git6e173a1bb"; 11 11 12 12 src = fetchurl { 13 13 url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; 14 - hash = "sha256-bv5+6DVzBFt5XeKcLJFpUHB5T1RKCNi/CuXXpIn6e9k="; 14 + hash = "sha256-D4DjZYsvtlJXgoAHkYb7qPqbNfpidXHmEozEj6nPPqA="; 15 15 }; 16 16 })
+2 -2
pkgs/by-name/ti/tilda/package.nix
··· 15 15 16 16 stdenv.mkDerivation (finalAttrs: { 17 17 pname = "tilda"; 18 - version = "1.5.4"; 18 + version = "2.0.0"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "lanoxx"; 22 22 repo = "tilda"; 23 23 rev = "tilda-${finalAttrs.version}"; 24 - hash = "sha256-uDx28jmjNUyzJbgTJiHbjI9U5mYb9bnfl/9AjbxNUWA="; 24 + hash = "sha256-Gseti810JwhYQSaGdE2KRRqnwNmthNBiFvXH9DyVpak="; 25 25 }; 26 26 27 27 nativeBuildInputs = [
+2 -2
pkgs/by-name/ti/tinycompress/package.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "tinycompress"; 8 - version = "1.2.8"; 8 + version = "1.2.11"; 9 9 10 10 src = fetchurl { 11 11 url = "mirror://alsa/tinycompress/${pname}-${version}.tar.bz2"; 12 - hash = "sha256-L4l+URLNO8pnkLXOz9puBmLIvF7g+6uXKyR6DMYg1mw="; 12 + hash = "sha256-6754jCgyjnzKJFqvkZSlrQ3JHp4NyIPCz5/rbULJ8/w="; 13 13 }; 14 14 15 15 meta = with lib; {
+3 -3
pkgs/by-name/ux/uxn/package.nix
··· 7 7 8 8 stdenv.mkDerivation (finalAttrs: { 9 9 pname = "uxn"; 10 - version = "unstable-2024-01-21"; 10 + version = "unstable-2024-02-07"; 11 11 12 12 src = fetchFromSourcehut { 13 13 owner = "~rabbits"; 14 14 repo = "uxn"; 15 - rev = "3e1183285a94a0930c9b09fd4fa73ac3a5d24fda"; 16 - hash = "sha256-hhxcj/jVBOm7E63Z9sS3SnFjexQEXVtw3QU5n/4hkVI="; 15 + rev = "300a3d7b3ed399721cef59e9ed9efe8a1d4e0f6f"; 16 + hash = "sha256-uwHXa4GhXNJHroQG8t3VQggvdCA3G4/1d/XVfsgeI7E="; 17 17 }; 18 18 19 19 outputs = [ "out" "projects" ];
+2 -2
pkgs/by-name/vc/vcpkg-tool/package.nix
··· 18 18 }: 19 19 stdenv.mkDerivation (finalAttrs: { 20 20 pname = "vcpkg-tool"; 21 - version = "2024-01-11"; 21 + version = "2024-02-05"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "microsoft"; 25 25 repo = "vcpkg-tool"; 26 26 rev = finalAttrs.version; 27 - hash = "sha256-PwCJv0O0ysE4CQVOrt+rqp3pjSt/11We+ZI8vdaYpPM="; 27 + hash = "sha256-MTlRa7uyJqU98nhADsAwJ3BjlMvijAWIcTJO8GO+6tY="; 28 28 }; 29 29 30 30 nativeBuildInputs = [
+3 -3
pkgs/data/misc/publicsuffix-list/default.nix
··· 2 2 3 3 stdenvNoCC.mkDerivation { 4 4 pname = "publicsuffix-list"; 5 - version = "unstable-2023-02-16"; 5 + version = "0-unstable-2024-01-07"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "publicsuffix"; 9 9 repo = "list"; 10 - rev = "8ec4d3049fe139f92937b6137155c33b81dcaf18"; 11 - hash = "sha256-wA8zk0iADFNP33veIf+Mfx22zdMzHsMNWEizMp1SnuA="; 10 + rev = "5db9b65997e3c9230ac4353b01994c2ae9667cb9"; 11 + hash = "sha256-kIJVS2ETAXQa1MMG8cjRUSFUn+jm9jBWH8go3L+lqHE="; 12 12 }; 13 13 14 14 dontBuild = true;
+17 -15
pkgs/data/misc/tzdata/default.nix
··· 1 1 { lib, stdenv, fetchurl, buildPackages }: 2 2 3 - stdenv.mkDerivation rec { 3 + stdenv.mkDerivation (finalAttrs: { 4 4 pname = "tzdata"; 5 - version = "2023d"; 5 + version = "2024a"; 6 6 7 7 srcs = [ 8 8 (fetchurl { 9 - url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; 10 - hash = "sha256-28ohlwsKi4wM7O7B17kfqQO+D27KWucytTKWciMqCPM="; 9 + url = "https://data.iana.org/time-zones/releases/tzdata${finalAttrs.version}.tar.gz"; 10 + hash = "sha256-DQQ0RZrL0gWaeo2h8zBKhKhlkfbtacYkj/+lArbt/+M="; 11 11 }) 12 12 (fetchurl { 13 - url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; 14 - hash = "sha256-6aX54RiIbS3pK2K7BVEKKMxsBY15HJO9a4TTKSw8Fh4="; 13 + url = "https://data.iana.org/time-zones/releases/tzcode${finalAttrs.version}.tar.gz"; 14 + hash = "sha256-gAcolK3/WkWPHRQ+FuTKHYsqEiycU5naSCy2jLpqH/g="; 15 15 }) 16 16 ]; 17 17 ··· 25 25 propagatedBuildOutputs = [ ]; 26 26 27 27 makeFlags = [ 28 - "TOPDIR=$(out)" 29 - "TZDIR=$(out)/share/zoneinfo" 30 - "BINDIR=$(bin)/bin" 31 - "ZICDIR=$(bin)/bin" 28 + "TOPDIR=${placeholder "out"}" 29 + "TZDIR=${placeholder "out"}/share/zoneinfo" 30 + "BINDIR=${placeholder "bin"}/bin" 31 + "ZICDIR=${placeholder "bin"}/bin" 32 32 "ETCDIR=$(TMPDIR)/etc" 33 33 "TZDEFAULT=tzdefault-to-remove" 34 - "LIBDIR=$(dev)/lib" 35 - "MANDIR=$(man)/share/man" 34 + "LIBDIR=${placeholder "dev"}/lib" 35 + "MANDIR=${placeholder "man"}/share/man" 36 36 "AWK=awk" 37 37 "CFLAGS=-DHAVE_LINK=0" 38 38 "CFLAGS+=-DZIC_BLOAT_DEFAULT=\\\"fat\\\"" ··· 45 45 "CFLAGS+=-DRESERVE_STD_EXT_IDS" 46 46 ]; 47 47 48 - doCheck = false; # needs more tools 48 + doCheck = true; 49 + # everything except for check_web, because that needs curl and wants to talk to https://validator.w3.org 50 + checkTarget = "check_back check_character_set check_white_space check_links check_name_lengths check_now check_slashed_abbrs check_sorted check_tables check_ziguard check_zishrink check_tzs"; 49 51 50 52 installFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ 51 53 "zic=${buildPackages.tzdata.bin}/bin/zic" ··· 70 72 meta = with lib; { 71 73 homepage = "http://www.iana.org/time-zones"; 72 74 description = "Database of current and historical time zones"; 73 - changelog = "https://github.com/eggert/tz/blob/${version}/NEWS"; 75 + changelog = "https://github.com/eggert/tz/blob/${finalAttrs.version}/NEWS"; 74 76 license = with licenses; [ 75 77 bsd3 # tzcode 76 78 publicDomain # tzdata ··· 78 80 platforms = platforms.all; 79 81 maintainers = with maintainers; [ ajs124 fpletz ]; 80 82 }; 81 - } 83 + })
+3 -2
pkgs/data/misc/unicode-character-database/default.nix
··· 1 - { lib, stdenv 1 + { lib, stdenvNoCC 2 2 , fetchurl 3 3 , unzip 4 4 }: 5 5 6 - stdenv.mkDerivation rec { 6 + stdenvNoCC.mkDerivation rec { 7 7 pname = "unicode-character-database"; 8 8 version = "15.1.0"; 9 9 ··· 23 23 24 24 mkdir -p $out/share/unicode 25 25 cp -r * $out/share/unicode 26 + rm $out/share/unicode/env-vars 26 27 27 28 runHook postInstall 28 29 '';
+5 -5
pkgs/data/themes/base16-schemes/default.nix
··· 2 2 3 3 stdenv.mkDerivation (finalAttrs: { 4 4 pname = "base16-schemes"; 5 - version = "unstable-2023-05-02"; 5 + version = "unstable-2024-01-14"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "tinted-theming"; 9 - repo = "base16-schemes"; 10 - rev = "9a4002f78dd1094c123169da243680b2fda3fe69"; 11 - sha256 = "sha256-AngNF++RZQB0l4M8pRgcv66pAcIPY+cCwmUOd+RBJKA="; 9 + repo = "schemes"; 10 + rev = "395074124283df993571f2abb9c713f413b76e6e"; 11 + sha256 = "sha256-9LmwYbtTxNFiP+osqRUbOXghJXpYvyvAwBwW80JMO7s="; 12 12 }; 13 13 14 14 installPhase = '' 15 15 runHook preInstall 16 16 17 17 mkdir -p $out/share/themes/ 18 - install *.yaml $out/share/themes/ 18 + install base16/*.yaml $out/share/themes/ 19 19 20 20 runHook postInstall 21 21 '';
+2 -2
pkgs/desktops/cinnamon/cinnamon-session/default.nix
··· 32 32 in 33 33 stdenv.mkDerivation rec { 34 34 pname = "cinnamon-session"; 35 - version = "6.0.3"; 35 + version = "6.0.4"; 36 36 37 37 src = fetchFromGitHub { 38 38 owner = "linuxmint"; 39 39 repo = pname; 40 40 rev = version; 41 - hash = "sha256-dNg1e339NWRzyEsRp7I91SwK2H+lU28Ra+7MSgUDk8w="; 41 + hash = "sha256-GtaoqzcnpKbiP4OqhnLkNWzZTUqX/KgVE6JImNMkdGo="; 42 42 }; 43 43 44 44 patches = [
+5
pkgs/development/compilers/edk2/default.nix
··· 59 59 mkdir -p $out/CryptoPkg/Library/OpensslLib/openssl 60 60 tar --strip-components=1 -xf ${buildPackages.openssl.src} -C $out/CryptoPkg/Library/OpensslLib/openssl 61 61 chmod -R +w $out/ 62 + 63 + # Fix missing INT64_MAX include that edk2 explicitly does not provide 64 + # via it's own <stdint.h>. Let's pull in openssl's definition instead: 65 + sed -i $out/CryptoPkg/Library/OpensslLib/openssl/crypto/property/property_parse.c \ 66 + -e '1i #include "internal/numbers.h"' 62 67 ''; 63 68 64 69 nativeBuildInputs = [ pythonEnv ];
+1
pkgs/development/compilers/gcc/default.nix
··· 407 407 inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD langJava version; 408 408 isGNU = true; 409 409 hardeningUnsupportedFlags = lib.optional is48 "stackprotector" 410 + ++ lib.optional (!atLeast11) "zerocallusedregs" 410 411 ++ lib.optional (!atLeast12) "fortify3" 411 412 ++ lib.optionals (langFortran) [ "fortify" "format" ]; 412 413 };
+133
pkgs/development/compilers/llvm/10/clang/default.nix
··· 1 + { lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 2 + , buildLlvmTools 3 + , fixDarwinDylibNames 4 + , enableManpages ? false 5 + }: 6 + 7 + let 8 + self = stdenv.mkDerivation ({ 9 + pname = "clang"; 10 + inherit version; 11 + 12 + src = fetch "clang" "091bvcny2lh32zy8f3m9viayyhb2zannrndni7325rl85cwgr6pr"; 13 + 14 + unpackPhase = '' 15 + unpackFile $src 16 + mv clang-${version}* clang 17 + sourceRoot=$PWD/clang 18 + unpackFile ${clang-tools-extra_src} 19 + mv clang-tools-extra-* $sourceRoot/tools/extra 20 + ''; 21 + 22 + nativeBuildInputs = [ cmake python3 ] 23 + ++ lib.optional enableManpages python3.pkgs.sphinx 24 + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; 25 + 26 + buildInputs = [ libxml2 libllvm ]; 27 + 28 + cmakeFlags = [ 29 + "-DCLANGD_BUILD_XPC=OFF" 30 + "-DLLVM_ENABLE_RTTI=ON" 31 + ] ++ lib.optionals enableManpages [ 32 + "-DCLANG_INCLUDE_DOCS=ON" 33 + "-DLLVM_ENABLE_SPHINX=ON" 34 + "-DSPHINX_OUTPUT_MAN=ON" 35 + "-DSPHINX_OUTPUT_HTML=OFF" 36 + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" 37 + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ 38 + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" 39 + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" 40 + ]; 41 + 42 + patches = [ 43 + ./purity.patch 44 + # https://reviews.llvm.org/D51899 45 + ./compiler-rt-baremetal.patch 46 + ./gnu-install-dirs.patch 47 + (substituteAll { 48 + src = ../../clang-6-10-LLVMgold-path.patch; 49 + libllvmLibdir = "${libllvm.lib}/lib"; 50 + }) 51 + ]; 52 + 53 + postPatch = '' 54 + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ 55 + -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ 56 + lib/Driver/ToolChains/*.cpp 57 + '' + lib.optionalString stdenv.hostPlatform.isMusl '' 58 + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp 59 + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' 60 + substituteInPlace tools/extra/clangd/CMakeLists.txt \ 61 + --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE 62 + ''; 63 + 64 + outputs = [ "out" "lib" "dev" "python" ]; 65 + 66 + postInstall = '' 67 + ln -sv $out/bin/clang $out/bin/cpp 68 + 69 + # Move libclang to 'lib' output 70 + moveToOutput "lib/libclang.*" "$lib" 71 + moveToOutput "lib/libclang-cpp.*" "$lib" 72 + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ 73 + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ 74 + --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." 75 + 76 + mkdir -p $python/bin $python/share/{clang,scan-view} 77 + mv $out/bin/{git-clang-format,scan-view} $python/bin 78 + if [ -e $out/bin/set-xcode-analyzer ]; then 79 + mv $out/bin/set-xcode-analyzer $python/bin 80 + fi 81 + mv $out/share/clang/*.py $python/share/clang 82 + mv $out/share/scan-view/*.py $python/share/scan-view 83 + rm $out/bin/c-index-test 84 + patchShebangs $python/bin 85 + 86 + mkdir -p $dev/bin 87 + cp bin/clang-tblgen $dev/bin 88 + ''; 89 + 90 + passthru = { 91 + inherit libllvm; 92 + isClang = true; 93 + hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ]; 94 + }; 95 + 96 + meta = llvm_meta // { 97 + homepage = "https://clang.llvm.org/"; 98 + description = "A C language family frontend for LLVM"; 99 + longDescription = '' 100 + The Clang project provides a language front-end and tooling 101 + infrastructure for languages in the C language family (C, C++, Objective 102 + C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. 103 + It aims to deliver amazingly fast compiles, extremely useful error and 104 + warning messages and to provide a platform for building great source 105 + level tools. The Clang Static Analyzer and clang-tidy are tools that 106 + automatically find bugs in your code, and are great examples of the sort 107 + of tools that can be built using the Clang frontend as a library to 108 + parse C/C++ code. 109 + ''; 110 + mainProgram = "clang"; 111 + }; 112 + } // lib.optionalAttrs enableManpages { 113 + pname = "clang-manpages"; 114 + 115 + buildPhase = '' 116 + make docs-clang-man 117 + ''; 118 + 119 + installPhase = '' 120 + mkdir -p $out/share/man/man1 121 + # Manually install clang manpage 122 + cp docs/man/*.1 $out/share/man/man1/ 123 + ''; 124 + 125 + outputs = [ "out" ]; 126 + 127 + doCheck = false; 128 + 129 + meta = llvm_meta // { 130 + description = "man page for Clang ${version}"; 131 + }; 132 + }); 133 + in self
+1 -1
pkgs/development/compilers/llvm/11/clang/default.nix
··· 95 95 passthru = { 96 96 inherit libllvm; 97 97 isClang = true; 98 - hardeningUnsupportedFlags = [ "fortify3" ]; 98 + hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ]; 99 99 }; 100 100 101 101 meta = llvm_meta // {
+1 -1
pkgs/development/compilers/llvm/12/clang/default.nix
··· 89 89 passthru = { 90 90 inherit libllvm; 91 91 isClang = true; 92 - hardeningUnsupportedFlags = [ "fortify3" ]; 92 + hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ]; 93 93 }; 94 94 95 95 meta = llvm_meta // {
+1 -1
pkgs/development/compilers/llvm/13/clang/default.nix
··· 83 83 passthru = { 84 84 inherit libllvm; 85 85 isClang = true; 86 - hardeningUnsupportedFlags = [ "fortify3" ]; 86 + hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ]; 87 87 }; 88 88 89 89 meta = llvm_meta // {
+1 -1
pkgs/development/compilers/llvm/14/clang/default.nix
··· 86 86 passthru = { 87 87 inherit libllvm; 88 88 isClang = true; 89 - hardeningUnsupportedFlags = [ "fortify3" ]; 89 + hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ]; 90 90 }; 91 91 92 92 meta = llvm_meta // {
+7 -2
pkgs/development/compilers/llvm/15/clang/default.nix
··· 7 7 }: 8 8 9 9 let 10 - self = stdenv.mkDerivation (rec { 10 + self = stdenv.mkDerivation (finalAttrs: rec { 11 11 pname = "clang"; 12 12 inherit version; 13 13 ··· 97 97 passthru = { 98 98 inherit libllvm; 99 99 isClang = true; 100 - hardeningUnsupportedFlags = [ "fortify3" ]; 100 + hardeningUnsupportedFlags = [ 101 + "fortify3" 102 + ]; 103 + hardeningUnsupportedFlagsByTargetPlatform = targetPlatform: 104 + lib.optional (!(targetPlatform.isx86_64 || targetPlatform.isAarch64)) "zerocallusedregs" 105 + ++ (finalAttrs.passthru.hardeningUnsupportedFlags or []); 101 106 }; 102 107 103 108 meta = llvm_meta // {
+7 -2
pkgs/development/compilers/llvm/16/clang/default.nix
··· 7 7 }: 8 8 9 9 let 10 - self = stdenv.mkDerivation (rec { 10 + self = stdenv.mkDerivation (finalAttrs: rec { 11 11 pname = "clang"; 12 12 inherit version; 13 13 ··· 91 91 passthru = { 92 92 inherit libllvm; 93 93 isClang = true; 94 - hardeningUnsupportedFlags = [ "fortify3" ]; 94 + hardeningUnsupportedFlags = [ 95 + "fortify3" 96 + ]; 97 + hardeningUnsupportedFlagsByTargetPlatform = targetPlatform: 98 + lib.optional (!(targetPlatform.isx86_64 || targetPlatform.isAarch64)) "zerocallusedregs" 99 + ++ (finalAttrs.passthru.hardeningUnsupportedFlags or []); 95 100 }; 96 101 97 102 meta = llvm_meta // {
+7 -2
pkgs/development/compilers/llvm/17/clang/default.nix
··· 7 7 }: 8 8 9 9 let 10 - self = stdenv.mkDerivation (rec { 10 + self = stdenv.mkDerivation (finalAttrs: rec { 11 11 pname = "clang"; 12 12 inherit version; 13 13 ··· 95 95 passthru = { 96 96 inherit libllvm; 97 97 isClang = true; 98 - hardeningUnsupportedFlags = [ "fortify3" ]; 98 + hardeningUnsupportedFlags = [ 99 + "fortify3" 100 + ]; 101 + hardeningUnsupportedFlagsByTargetPlatform = targetPlatform: 102 + lib.optional (!(targetPlatform.isx86_64 || targetPlatform.isAarch64)) "zerocallusedregs" 103 + ++ (finalAttrs.passthru.hardeningUnsupportedFlags or []); 99 104 }; 100 105 101 106 meta = llvm_meta // {
+145
pkgs/development/compilers/llvm/8/clang/default.nix
··· 1 + { lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 2 + , buildLlvmTools 3 + , fixDarwinDylibNames 4 + , enableManpages ? false 5 + , enablePolly ? false # TODO: get this info from llvm (passthru?) 6 + }: 7 + 8 + let 9 + self = stdenv.mkDerivation ({ 10 + pname = "clang"; 11 + inherit version; 12 + 13 + src = fetch "cfe" "0ihnbdl058gvl2wdy45p5am55bq8ifx8m9mhcsgj9ax8yxlzvvvh"; 14 + 15 + unpackPhase = '' 16 + unpackFile $src 17 + mv cfe-${version}* clang 18 + sourceRoot=$PWD/clang 19 + unpackFile ${clang-tools-extra_src} 20 + mv clang-tools-extra-* $sourceRoot/tools/extra 21 + ''; 22 + 23 + nativeBuildInputs = [ cmake python3 ] 24 + ++ lib.optional enableManpages python3.pkgs.sphinx 25 + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; 26 + 27 + buildInputs = [ libxml2 libllvm ]; 28 + 29 + cmakeFlags = [ 30 + "-DCMAKE_CXX_FLAGS=-std=c++11" 31 + "-DCLANGD_BUILD_XPC=OFF" 32 + "-DLLVM_ENABLE_RTTI=ON" 33 + ] ++ lib.optionals enableManpages [ 34 + "-DCLANG_INCLUDE_DOCS=ON" 35 + "-DLLVM_ENABLE_SPHINX=ON" 36 + "-DSPHINX_OUTPUT_MAN=ON" 37 + "-DSPHINX_OUTPUT_HTML=OFF" 38 + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" 39 + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ 40 + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" 41 + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" 42 + ] ++ lib.optionals enablePolly [ 43 + "-DWITH_POLLY=ON" 44 + "-DLINK_POLLY_INTO_TOOLS=ON" 45 + ]; 46 + 47 + patches = [ 48 + ../../common/clang/5-8-purity.patch 49 + ./xpc.patch 50 + # Backport for -static-pie, which the latter touches, and which is nice in 51 + # its own right. 52 + ./static-pie.patch 53 + # Backport for the `--unwindlib=[libgcc|compiler-rt]` flag, which is 54 + # needed for our bootstrapping to not interfere with C. 55 + ./unwindlib.patch 56 + # https://reviews.llvm.org/D51899 57 + ./compiler-rt-baremetal.patch 58 + # make clang -xhip use $PATH to find executables 59 + ./HIP-use-PATH-8.patch 60 + ./gnu-install-dirs.patch 61 + (substituteAll { 62 + src = ../../clang-6-10-LLVMgold-path.patch; 63 + libllvmLibdir = "${libllvm.lib}/lib"; 64 + }) 65 + ]; 66 + 67 + postPatch = '' 68 + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ 69 + -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ 70 + lib/Driver/ToolChains/*.cpp 71 + '' + lib.optionalString stdenv.hostPlatform.isMusl '' 72 + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp 73 + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' 74 + substituteInPlace tools/extra/clangd/CMakeLists.txt \ 75 + --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE 76 + ''; 77 + 78 + outputs = [ "out" "lib" "dev" "python" ]; 79 + 80 + postInstall = '' 81 + ln -sv $out/bin/clang $out/bin/cpp 82 + 83 + # Move libclang to 'lib' output 84 + moveToOutput "lib/libclang.*" "$lib" 85 + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ 86 + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." 87 + 88 + mkdir -p $python/bin $python/share/{clang,scan-view} 89 + mv $out/bin/{git-clang-format,scan-view} $python/bin 90 + if [ -e $out/bin/set-xcode-analyzer ]; then 91 + mv $out/bin/set-xcode-analyzer $python/bin 92 + fi 93 + mv $out/share/clang/*.py $python/share/clang 94 + mv $out/share/scan-view/*.py $python/share/scan-view 95 + rm $out/bin/c-index-test 96 + patchShebangs $python/bin 97 + 98 + mkdir -p $dev/bin 99 + cp bin/clang-tblgen $dev/bin 100 + ''; 101 + 102 + passthru = { 103 + inherit libllvm; 104 + isClang = true; 105 + hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ]; 106 + }; 107 + 108 + meta = llvm_meta // { 109 + homepage = "https://clang.llvm.org/"; 110 + description = "A C language family frontend for LLVM"; 111 + longDescription = '' 112 + The Clang project provides a language front-end and tooling 113 + infrastructure for languages in the C language family (C, C++, Objective 114 + C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. 115 + It aims to deliver amazingly fast compiles, extremely useful error and 116 + warning messages and to provide a platform for building great source 117 + level tools. The Clang Static Analyzer and clang-tidy are tools that 118 + automatically find bugs in your code, and are great examples of the sort 119 + of tools that can be built using the Clang frontend as a library to 120 + parse C/C++ code. 121 + ''; 122 + mainProgram = "clang"; 123 + }; 124 + } // lib.optionalAttrs enableManpages { 125 + pname = "clang-manpages"; 126 + 127 + buildPhase = '' 128 + make docs-clang-man 129 + ''; 130 + 131 + installPhase = '' 132 + mkdir -p $out/share/man/man1 133 + # Manually install clang manpage 134 + cp docs/man/*.1 $out/share/man/man1/ 135 + ''; 136 + 137 + outputs = [ "out" ]; 138 + 139 + doCheck = false; 140 + 141 + meta = llvm_meta // { 142 + description = "man page for Clang ${version}"; 143 + }; 144 + }); 145 + in self
+1 -1
pkgs/development/compilers/llvm/9/clang/default.nix
··· 97 97 passthru = { 98 98 inherit libllvm; 99 99 isClang = true; 100 - hardeningUnsupportedFlags = [ "fortify3" ]; 100 + hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ]; 101 101 }; 102 102 103 103 meta = llvm_meta // {
+7 -2
pkgs/development/compilers/llvm/git/clang/default.nix
··· 7 7 }: 8 8 9 9 let 10 - self = stdenv.mkDerivation (rec { 10 + self = stdenv.mkDerivation (finalAttrs: rec { 11 11 pname = "clang"; 12 12 inherit version; 13 13 ··· 96 96 passthru = { 97 97 inherit libllvm; 98 98 isClang = true; 99 - hardeningUnsupportedFlags = [ "fortify3" ]; 99 + hardeningUnsupportedFlags = [ 100 + "fortify3" 101 + ]; 102 + hardeningUnsupportedFlagsByTargetPlatform = targetPlatform: 103 + lib.optional (!(targetPlatform.isx86_64 || targetPlatform.isAarch64)) "zerocallusedregs" 104 + ++ (finalAttrs.passthru.hardeningUnsupportedFlags or []); 100 105 }; 101 106 102 107 meta = llvm_meta // {
+1
pkgs/development/compilers/odin/default.nix
··· 53 53 cp odin $out/bin/odin 54 54 55 55 mkdir -p $out/share 56 + cp -r base $out/share/base 56 57 cp -r core $out/share/core 57 58 cp -r vendor $out/share/vendor 58 59
+15 -15
pkgs/development/compilers/zulu/11.nix
··· 8 8 # Note that the latest build may differ by platform 9 9 dists = { 10 10 x86_64-linux = { 11 - zuluVersion = "11.66.15"; 12 - jdkVersion = "11.0.20"; 11 + zuluVersion = "11.70.15"; 12 + jdkVersion = "11.0.22"; 13 13 hash = 14 - if enableJavaFX then "sha256-CjWtqnirEDrpF61WXm/Yi372IzhpTpi+/AfEqirlZnc=" 15 - else "sha256-o0tAT4egimEUizjhQW2DcYnh33oEDZSedDYz2vRpWjw="; 14 + if enableJavaFX then "sha256-FxTHgng7/oDY3n3qy8j1ztbpBQeoGcEBJbEXqaE4Zr4=" 15 + else "sha256-V41ZRrJtkle3joKhwoID5bvWkN5I4gFjmbEnTD7no8U="; 16 16 }; 17 17 18 18 aarch64-linux = { 19 - zuluVersion = "11.66.15"; 20 - jdkVersion = "11.0.20"; 19 + zuluVersion = "11.70.15"; 20 + jdkVersion = "11.0.22"; 21 21 hash = 22 22 if enableJavaFX then throw "JavaFX is not available for aarch64-linux" 23 - else "sha256-VBdEOfKz/d0R8QSMOX/nu0XUydZtRS1oibAT0E0hxN4="; 23 + else "sha256-u6XWMXAArUhMMb6j3KFOhkIxpVYR1oYLF0Wde7/tI0k="; 24 24 }; 25 25 26 26 x86_64-darwin = { 27 - zuluVersion = "11.66.15"; 28 - jdkVersion = "11.0.20"; 27 + zuluVersion = "11.70.15"; 28 + jdkVersion = "11.0.22"; 29 29 hash = 30 - if enableJavaFX then "sha256-pVgCJkgYTlFeL7nkkMWLeJ/J8ELhgvWb7gzf3erZP7Y=" 31 - else "sha256-vKqxHP5Yb651g8bZ0xHGQ4Q1T7JjjrmgEuykw/Gh2f0="; 30 + if enableJavaFX then "sha256-JkJZwk+D28wHWqwUoLo7WW5ypwTrT5biSoP+70YI3eQ=" 31 + else "sha256-ca/ttkPe2tbcm1ruguDgPsxKWbEdKcICsKCDXaup9N4="; 32 32 }; 33 33 34 34 aarch64-darwin = { 35 - zuluVersion = "11.66.15"; 36 - jdkVersion = "11.0.20"; 35 + zuluVersion = "11.70.15"; 36 + jdkVersion = "11.0.22"; 37 37 hash = 38 - if enableJavaFX then "sha256-VoZo34SCUU+HHnTl6iLe0QBC+4VDkPP14N98oqSg9EQ=" 39 - else "sha256-djK8Kfikt9SSuT87x1p7YWMIlNuF0TZFYDWrKiTTiIU="; 38 + if enableJavaFX then "sha256-bAgH4lCxPvvFOeif5gI2aoLt1aC4EXPzb2YmiS9bQsU=" 39 + else "sha256-PWQOF+P9djZarjAJaE3I0tuI1E4H/9584VN04BMzmvM="; 40 40 }; 41 41 }; 42 42 } // builtins.removeAttrs args [ "callPackage" ])
+20 -12
pkgs/development/compilers/zulu/8.nix
··· 8 8 # Note that the latest build may differ by platform 9 9 dists = { 10 10 x86_64-linux = { 11 - zuluVersion = "8.72.0.17"; 12 - jdkVersion = "8.0.382"; 11 + zuluVersion = "8.76.0.17"; 12 + jdkVersion = "8.0.402"; 13 13 hash = 14 - if enableJavaFX then "sha256-mIPCFESU7hy2naYur2jvFBtVn/LZQRcFiyiG61buCYs=" 15 - else "sha256-exWlbyrgBb7aD4daJps9qtFP+hKWkwbMdFR4OFslupY="; 14 + if enableJavaFX then "sha256-29aDAu8WVYQFSpMUFq4gG64BBz/ei/VDMg72xrpB9w4=" 15 + else "sha256-34DI6O7T8iqDHsX63S3xk+BKDu8IHRRWNvtxpsnUJEk="; 16 + }; 17 + 18 + aarch64-linux = { 19 + zuluVersion = "8.74.0.17"; 20 + jdkVersion = "8.0.392"; 21 + hash = 22 + if enableJavaFX then throw "JavaFX is not available for aarch64-linux" 23 + else "sha256-xESdKEmfkiE657X/xclwsJR5M+P72BpWErtAcYMcK0Y="; 16 24 }; 17 25 18 26 x86_64-darwin = { 19 - zuluVersion = "8.72.0.17"; 20 - jdkVersion = "8.0.382"; 27 + zuluVersion = "8.76.0.17"; 28 + jdkVersion = "8.0.402"; 21 29 hash = 22 - if enableJavaFX then "sha256-/x8FqygivzddXsOwIV8aj/u+LPXMmokgu97vLAVEv80=" 23 - else "sha256-3dTPIPGUeT6nb3gncNvEa4VTRyQIBJpp8oZadrT2ToE="; 30 + if enableJavaFX then "sha256-oqFpKeWwfiXr3oX78LGvAyDGAAS2GON2gAm6fHGH7Ow=" 31 + else "sha256-edZqDEsydQCDEwC1ZCDF/MjWVTnuQNWcKR2k/RjaIEI="; 24 32 }; 25 33 26 34 aarch64-darwin = { 27 - zuluVersion = "8.72.0.17"; 28 - jdkVersion = "8.0.382"; 35 + zuluVersion = "8.76.0.17"; 36 + jdkVersion = "8.0.402"; 29 37 hash = 30 - if enableJavaFX then "sha256-FkQ+0MzSZWUzc/HmiDVZEHGOrdKAVCdK5pm9wXXzzaU=" 31 - else "sha256-rN5AI4xAWppE4kJlzMod0JmGyHdHjTXYtx8/wOW6CFk="; 38 + if enableJavaFX then "sha256-UCWRXCz4v381IWzWPDYzwJwbhsmZOYxKPLGJBQGjPmc=" 39 + else "sha256-0VPlOuNB39gDnU+pK0DGTSUjTHTtYoxaRg3YD2LyLXg="; 32 40 }; 33 41 }; 34 42 } // builtins.removeAttrs args [ "callPackage" ])
+10 -4
pkgs/development/coq-modules/mathcomp-analysis/default.nix
··· 9 9 repo = "analysis"; 10 10 owner = "math-comp"; 11 11 12 + release."1.0.0".sha256 = "sha256-KiXyaWB4zQ3NuXadq4BSWfoN1cIo1xiLVSN6nW03tC4="; 13 + release."0.7.0".sha256 = "sha256-JwkyetXrFsFHqz8KY3QBpHsrkhmEFnrCGuKztcoen60="; 14 + release."0.6.7".sha256 = "sha256-3i2PBMEwihwgwUmnS0cmrZ8s+aLPFVq/vo0aXMUaUyA="; 12 15 release."0.6.6".sha256 = "sha256-tWtv6yeB5/vzwpKZINK9OQ0yQsvD8qu9zVSNHvLMX5Y="; 13 16 release."0.6.5".sha256 = "sha256-oJk9/Jl1SWra2aFAXRAVfX7ZUaDfajqdDksYaW8dv8E="; 14 17 release."0.6.1".sha256 = "sha256-1VyNXu11/pDMuH4DmFYSUF/qZ4Bo+/Zl3Y0JkyrH/r0="; ··· 26 29 release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; 27 30 28 31 defaultVersion = with versions; lib.switch [ coq.version mathcomp.version ] [ 29 - { cases = [ (isGe "8.17") (range "1.15.0" "1.18.0") ]; out = "0.6.6"; } 30 - { cases = [ (isGe "8.14") (range "1.15.0" "1.17.0") ]; out = "0.6.5"; } 31 - { cases = [ (isGe "8.14") (range "1.13.0" "1.16.0") ]; out = "0.6.1"; } 32 - { cases = [ (isGe "8.14") (range "1.13" "1.15") ]; out = "0.5.2"; } 32 + { cases = [ (range "8.17" "8.19") (range "2.0.0" "2.2.0") ]; out = "1.0.0"; } 33 + { cases = [ (range "8.17" "8.19") (range "1.17.0" "1.19.0") ]; out = "0.7.0"; } 34 + { cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.7"; } 35 + { cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.6"; } 36 + { cases = [ (range "8.14" "8.18") (range "1.15.0" "1.17.0") ]; out = "0.6.5"; } 37 + { cases = [ (range "8.14" "8.18") (range "1.13.0" "1.16.0") ]; out = "0.6.1"; } 38 + { cases = [ (range "8.14" "8.18") (range "1.13" "1.15") ]; out = "0.5.2"; } 33 39 { cases = [ (range "8.13" "8.15") (range "1.13" "1.14") ]; out = "0.5.1"; } 34 40 { cases = [ (range "8.13" "8.15") (range "1.12" "1.14") ]; out = "0.3.13"; } 35 41 { cases = [ (range "8.11" "8.14") (range "1.12" "1.13") ]; out = "0.3.10"; }
+10 -4
pkgs/development/coq-modules/mathcomp-infotheo/default.nix
··· 1 - { coq, mkCoqDerivation, mathcomp-analysis, lib, version ? null }: 1 + { coq, mkCoqDerivation, mathcomp-analysis, mathcomp-algebra-tactics, lib, version ? null }: 2 2 3 - mkCoqDerivation { 3 + (mkCoqDerivation { 4 4 namePrefix = [ "coq" "mathcomp" ]; 5 5 pname = "infotheo"; 6 6 owner = "affeldt-aist"; 7 7 inherit version; 8 + 8 9 defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [ 9 - { cases = [ (isGe "8.17") (isGe "0.6.0") ]; out = "0.5.2"; } 10 + { cases = [ (isGe "8.17") (range "0.6.6" "0.7.0") ]; out = "0.6.1"; } 11 + { cases = [ (range "8.17" "8.18") (range "0.6.0" "0.6.7") ]; out = "0.5.2"; } 10 12 { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.5") ]; out = "0.5.1"; } 11 13 ] null; 14 + release."0.6.1".sha256 = "sha256-tFB5lrwRPIlHkP+ebgcJwu03Cc9yVaOINOAo8Bf2LT4="; 12 15 release."0.5.1".sha256 = "sha256-yBBl5l+V+dggsg5KM59Yo9CULKog/xxE8vrW+ZRnX7Y="; 13 16 release."0.5.2".sha256 = "sha256-8WAnAV53c0pMTdwj8XcUDUkLZbpUgIQbEOgOb63uHQA="; 14 17 ··· 18 21 description = "A Coq formalization of information theory and linear error-correcting codes"; 19 22 license = licenses.lgpl21Plus; 20 23 }; 21 - } 24 + }).overrideAttrs (o: { 25 + propagatedBuildInputs = o.propagatedBuildInputs 26 + ++ lib.optional (lib.versions.isGe "0.6.1" o.version || o.version == "dev") mathcomp-algebra-tactics; 27 + })
-39
pkgs/development/embedded/espflash/default.nix
··· 1 - { lib 2 - , rustPlatform 3 - , fetchCrate 4 - , pkg-config 5 - , stdenv 6 - , udev 7 - , Security 8 - , SystemConfiguration 9 - }: 10 - 11 - rustPlatform.buildRustPackage rec { 12 - pname = "espflash"; 13 - version = "2.1.0"; 14 - 15 - src = fetchCrate { 16 - inherit pname version; 17 - hash = "sha256-Gd+8pA36mO+BCA0EFshboBi0etNjsiQFQU1wBYf/o6I="; 18 - }; 19 - 20 - nativeBuildInputs = [ pkg-config ]; 21 - 22 - buildInputs = lib.optionals stdenv.isLinux [ 23 - udev 24 - ] ++ lib.optionals stdenv.isDarwin [ 25 - Security 26 - SystemConfiguration 27 - ]; 28 - 29 - cargoHash = "sha256-IObAbsyrVBXt5zldirRezU7vS3R3aUihMFy2yIRWIlk="; 30 - 31 - meta = with lib; { 32 - description = "Serial flasher utility for Espressif SoCs and modules"; 33 - homepage = "https://github.com/esp-rs/espflash"; 34 - changelog = "https://github.com/esp-rs/espflash/blob/v${version}/CHANGELOG.md"; 35 - mainProgram = "espflash"; 36 - license = with licenses; [ asl20 /* or */ mit ]; 37 - maintainers = with maintainers; [ newam ]; 38 - }; 39 - }
+2 -2
pkgs/development/interpreters/erlang/26.nix
··· 1 1 { mkDerivation }: 2 2 3 3 mkDerivation { 4 - version = "26.2.1"; 5 - sha256 = "sha256-4aQ4YTeiT32lZ9ZFi7/vV7O4fARYVLbGLtHm5alSDyw="; 4 + version = "26.2.2"; 5 + sha256 = "sha256-7S+mC4pDcbXyhW2r5y8+VcX9JQXq5iEUJZiFmgVMPZ0="; 6 6 }
-598
pkgs/development/interpreters/python/cpython/3.10/asyncio-deprecation.patch
··· 1 - REVERT https://github.com/python/cpython/commit/300d812fd1c4d9244e71de0d228cc72439d312a7 2 - --- b/Doc/library/asyncio-eventloop.rst 3 - +++ a/Doc/library/asyncio-eventloop.rst 4 - @@ -43,12 +43,10 @@ 5 - 6 - Get the current event loop. 7 - 8 - + If there is no current event loop set in the current OS thread, 9 - + the OS thread is main, and :func:`set_event_loop` has not yet 10 - + been called, asyncio will create a new event loop and set it as the 11 - + current one. 12 - - When called from a coroutine or a callback (e.g. scheduled with 13 - - call_soon or similar API), this function will always return the 14 - - running event loop. 15 - - 16 - - If there is no running event loop set, the function will return 17 - - the result of ``get_event_loop_policy().get_event_loop()`` call. 18 - 19 - Because this function has rather complex behavior (especially 20 - when custom event loop policies are in use), using the 21 - @@ -60,14 +58,10 @@ 22 - event loop. 23 - 24 - .. deprecated:: 3.10 25 - + Emits a deprecation warning if there is no running event loop. 26 - + In future Python releases, this function may become an alias of 27 - + :func:`get_running_loop` and will accordingly raise a 28 - + :exc:`RuntimeError` if there is no running event loop. 29 - - Deprecation warning is emitted if there is no current event loop. 30 - - In Python 3.12 it will be an error. 31 - - 32 - - .. note:: 33 - - In Python versions 3.10.0--3.10.8 this function 34 - - (and other functions which used it implicitly) emitted a 35 - - :exc:`DeprecationWarning` if there was no running event loop, even if 36 - - the current loop was set. 37 - 38 - .. function:: set_event_loop(loop) 39 - 40 - reverted: 41 - --- b/Doc/library/asyncio-llapi-index.rst 42 - +++ a/Doc/library/asyncio-llapi-index.rst 43 - @@ -19,7 +19,7 @@ 44 - - The **preferred** function to get the running event loop. 45 - 46 - * - :func:`asyncio.get_event_loop` 47 - + - Get an event loop instance (current or via the policy). 48 - - - Get an event loop instance (running or current via the current policy). 49 - 50 - * - :func:`asyncio.set_event_loop` 51 - - Set the event loop as current via the current policy. 52 - reverted: 53 - --- b/Doc/library/asyncio-policy.rst 54 - +++ a/Doc/library/asyncio-policy.rst 55 - @@ -112,11 +112,6 @@ 56 - 57 - On Windows, :class:`ProactorEventLoop` is now used by default. 58 - 59 - - .. deprecated:: 3.10.9 60 - - :meth:`get_event_loop` now emits a :exc:`DeprecationWarning` if there 61 - - is no current event loop set and a new event loop has been implicitly 62 - - created. In Python 3.12 it will be an error. 63 - - 64 - 65 - .. class:: WindowsSelectorEventLoopPolicy 66 - 67 - reverted: 68 - --- b/Lib/asyncio/events.py 69 - +++ a/Lib/asyncio/events.py 70 - @@ -650,21 +650,6 @@ 71 - if (self._local._loop is None and 72 - not self._local._set_called and 73 - threading.current_thread() is threading.main_thread()): 74 - - stacklevel = 2 75 - - try: 76 - - f = sys._getframe(1) 77 - - except AttributeError: 78 - - pass 79 - - else: 80 - - while f: 81 - - module = f.f_globals.get('__name__') 82 - - if not (module == 'asyncio' or module.startswith('asyncio.')): 83 - - break 84 - - f = f.f_back 85 - - stacklevel += 1 86 - - import warnings 87 - - warnings.warn('There is no current event loop', 88 - - DeprecationWarning, stacklevel=stacklevel) 89 - self.set_event_loop(self.new_event_loop()) 90 - 91 - if self._local._loop is None: 92 - @@ -778,13 +763,12 @@ 93 - 94 - 95 - def _get_event_loop(stacklevel=3): 96 - - # This internal method is going away in Python 3.12, left here only for 97 - - # backwards compatibility with 3.10.0 - 3.10.8 and 3.11.0. 98 - - # Similarly, this method's C equivalent in _asyncio is going away as well. 99 - - # See GH-99949 for more details. 100 - current_loop = _get_running_loop() 101 - if current_loop is not None: 102 - return current_loop 103 - + import warnings 104 - + warnings.warn('There is no current event loop', 105 - + DeprecationWarning, stacklevel=stacklevel) 106 - return get_event_loop_policy().get_event_loop() 107 - 108 - 109 - reverted: 110 - --- b/Lib/test/test_asyncio/test_base_events.py 111 - +++ a/Lib/test/test_asyncio/test_base_events.py 112 - @@ -752,7 +752,7 @@ 113 - def test_env_var_debug(self): 114 - code = '\n'.join(( 115 - 'import asyncio', 116 - + 'loop = asyncio.get_event_loop()', 117 - - 'loop = asyncio.new_event_loop()', 118 - 'print(loop.get_debug())')) 119 - 120 - # Test with -E to not fail if the unit test was run with 121 - reverted: 122 - --- b/Lib/test/test_asyncio/test_events.py 123 - +++ a/Lib/test/test_asyncio/test_events.py 124 - @@ -2561,9 +2561,8 @@ 125 - def test_get_event_loop(self): 126 - policy = asyncio.DefaultEventLoopPolicy() 127 - self.assertIsNone(policy._local._loop) 128 - + 129 - + loop = policy.get_event_loop() 130 - - with self.assertWarns(DeprecationWarning) as cm: 131 - - loop = policy.get_event_loop() 132 - - self.assertEqual(cm.filename, __file__) 133 - self.assertIsInstance(loop, asyncio.AbstractEventLoop) 134 - 135 - self.assertIs(policy._local._loop, loop) 136 - @@ -2577,10 +2576,7 @@ 137 - policy, "set_event_loop", 138 - wraps=policy.set_event_loop) as m_set_event_loop: 139 - 140 - + loop = policy.get_event_loop() 141 - - with self.assertWarns(DeprecationWarning) as cm: 142 - - loop = policy.get_event_loop() 143 - - self.addCleanup(loop.close) 144 - - self.assertEqual(cm.filename, __file__) 145 - 146 - # policy._local._loop must be set through .set_event_loop() 147 - # (the unix DefaultEventLoopPolicy needs this call to attach 148 - @@ -2614,8 +2610,7 @@ 149 - 150 - def test_set_event_loop(self): 151 - policy = asyncio.DefaultEventLoopPolicy() 152 - + old_loop = policy.get_event_loop() 153 - - old_loop = policy.new_event_loop() 154 - - policy.set_event_loop(old_loop) 155 - 156 - self.assertRaises(AssertionError, policy.set_event_loop, object()) 157 - 158 - @@ -2728,11 +2723,15 @@ 159 - asyncio.set_event_loop_policy(Policy()) 160 - loop = asyncio.new_event_loop() 161 - 162 - + with self.assertWarns(DeprecationWarning) as cm: 163 - + with self.assertRaises(TestError): 164 - + asyncio.get_event_loop() 165 - + self.assertEqual(cm.warnings[0].filename, __file__) 166 - - with self.assertRaises(TestError): 167 - - asyncio.get_event_loop() 168 - asyncio.set_event_loop(None) 169 - + with self.assertWarns(DeprecationWarning) as cm: 170 - + with self.assertRaises(TestError): 171 - + asyncio.get_event_loop() 172 - + self.assertEqual(cm.warnings[0].filename, __file__) 173 - - with self.assertRaises(TestError): 174 - - asyncio.get_event_loop() 175 - 176 - with self.assertRaisesRegex(RuntimeError, 'no running'): 177 - asyncio.get_running_loop() 178 - @@ -2746,11 +2745,16 @@ 179 - loop.run_until_complete(func()) 180 - 181 - asyncio.set_event_loop(loop) 182 - + with self.assertWarns(DeprecationWarning) as cm: 183 - + with self.assertRaises(TestError): 184 - + asyncio.get_event_loop() 185 - + self.assertEqual(cm.warnings[0].filename, __file__) 186 - + 187 - - with self.assertRaises(TestError): 188 - - asyncio.get_event_loop() 189 - asyncio.set_event_loop(None) 190 - + with self.assertWarns(DeprecationWarning) as cm: 191 - + with self.assertRaises(TestError): 192 - + asyncio.get_event_loop() 193 - + self.assertEqual(cm.warnings[0].filename, __file__) 194 - - with self.assertRaises(TestError): 195 - - asyncio.get_event_loop() 196 - 197 - finally: 198 - asyncio.set_event_loop_policy(old_policy) 199 - @@ -2774,8 +2778,10 @@ 200 - self.addCleanup(loop2.close) 201 - self.assertEqual(cm.warnings[0].filename, __file__) 202 - asyncio.set_event_loop(None) 203 - + with self.assertWarns(DeprecationWarning) as cm: 204 - + with self.assertRaisesRegex(RuntimeError, 'no current'): 205 - + asyncio.get_event_loop() 206 - + self.assertEqual(cm.warnings[0].filename, __file__) 207 - - with self.assertRaisesRegex(RuntimeError, 'no current'): 208 - - asyncio.get_event_loop() 209 - 210 - with self.assertRaisesRegex(RuntimeError, 'no running'): 211 - asyncio.get_running_loop() 212 - @@ -2789,11 +2795,15 @@ 213 - loop.run_until_complete(func()) 214 - 215 - asyncio.set_event_loop(loop) 216 - + with self.assertWarns(DeprecationWarning) as cm: 217 - + self.assertIs(asyncio.get_event_loop(), loop) 218 - + self.assertEqual(cm.warnings[0].filename, __file__) 219 - - self.assertIs(asyncio.get_event_loop(), loop) 220 - 221 - asyncio.set_event_loop(None) 222 - + with self.assertWarns(DeprecationWarning) as cm: 223 - + with self.assertRaisesRegex(RuntimeError, 'no current'): 224 - + asyncio.get_event_loop() 225 - + self.assertEqual(cm.warnings[0].filename, __file__) 226 - - with self.assertRaisesRegex(RuntimeError, 'no current'): 227 - - asyncio.get_event_loop() 228 - 229 - finally: 230 - asyncio.set_event_loop_policy(old_policy) 231 - reverted: 232 - --- b/Lib/test/test_asyncio/test_futures.py 233 - +++ a/Lib/test/test_asyncio/test_futures.py 234 - @@ -145,8 +145,10 @@ 235 - self.assertTrue(f.cancelled()) 236 - 237 - def test_constructor_without_loop(self): 238 - + with self.assertWarns(DeprecationWarning) as cm: 239 - + with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): 240 - + self._new_future() 241 - + self.assertEqual(cm.warnings[0].filename, __file__) 242 - - with self.assertRaisesRegex(RuntimeError, 'no current event loop'): 243 - - self._new_future() 244 - 245 - def test_constructor_use_running_loop(self): 246 - async def test(): 247 - @@ -156,10 +158,12 @@ 248 - self.assertIs(f.get_loop(), self.loop) 249 - 250 - def test_constructor_use_global_loop(self): 251 - + # Deprecated in 3.10 252 - - # Deprecated in 3.10, undeprecated in 3.11.1 253 - asyncio.set_event_loop(self.loop) 254 - self.addCleanup(asyncio.set_event_loop, None) 255 - + with self.assertWarns(DeprecationWarning) as cm: 256 - + f = self._new_future() 257 - + self.assertEqual(cm.warnings[0].filename, __file__) 258 - - f = self._new_future() 259 - self.assertIs(f._loop, self.loop) 260 - self.assertIs(f.get_loop(), self.loop) 261 - 262 - @@ -495,8 +499,10 @@ 263 - return (arg, threading.get_ident()) 264 - ex = concurrent.futures.ThreadPoolExecutor(1) 265 - f1 = ex.submit(run, 'oi') 266 - + with self.assertWarns(DeprecationWarning) as cm: 267 - + with self.assertRaises(RuntimeError): 268 - + asyncio.wrap_future(f1) 269 - + self.assertEqual(cm.warnings[0].filename, __file__) 270 - - with self.assertRaisesRegex(RuntimeError, 'no current event loop'): 271 - - asyncio.wrap_future(f1) 272 - ex.shutdown(wait=True) 273 - 274 - def test_wrap_future_use_running_loop(self): 275 - @@ -511,14 +517,16 @@ 276 - ex.shutdown(wait=True) 277 - 278 - def test_wrap_future_use_global_loop(self): 279 - + # Deprecated in 3.10 280 - - # Deprecated in 3.10, undeprecated in 3.11.1 281 - asyncio.set_event_loop(self.loop) 282 - self.addCleanup(asyncio.set_event_loop, None) 283 - def run(arg): 284 - return (arg, threading.get_ident()) 285 - ex = concurrent.futures.ThreadPoolExecutor(1) 286 - f1 = ex.submit(run, 'oi') 287 - + with self.assertWarns(DeprecationWarning) as cm: 288 - + f2 = asyncio.wrap_future(f1) 289 - + self.assertEqual(cm.warnings[0].filename, __file__) 290 - - f2 = asyncio.wrap_future(f1) 291 - self.assertIs(self.loop, f2._loop) 292 - ex.shutdown(wait=True) 293 - 294 - reverted: 295 - --- b/Lib/test/test_asyncio/test_streams.py 296 - +++ a/Lib/test/test_asyncio/test_streams.py 297 - @@ -747,8 +747,10 @@ 298 - self.assertEqual(data, b'data') 299 - 300 - def test_streamreader_constructor_without_loop(self): 301 - + with self.assertWarns(DeprecationWarning) as cm: 302 - + with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): 303 - + asyncio.StreamReader() 304 - + self.assertEqual(cm.warnings[0].filename, __file__) 305 - - with self.assertRaisesRegex(RuntimeError, 'no current event loop'): 306 - - asyncio.StreamReader() 307 - 308 - def test_streamreader_constructor_use_running_loop(self): 309 - # asyncio issue #184: Ensure that StreamReaderProtocol constructor 310 - @@ -762,17 +764,21 @@ 311 - def test_streamreader_constructor_use_global_loop(self): 312 - # asyncio issue #184: Ensure that StreamReaderProtocol constructor 313 - # retrieves the current loop if the loop parameter is not set 314 - + # Deprecated in 3.10 315 - - # Deprecated in 3.10, undeprecated in 3.11.1 316 - self.addCleanup(asyncio.set_event_loop, None) 317 - asyncio.set_event_loop(self.loop) 318 - + with self.assertWarns(DeprecationWarning) as cm: 319 - + reader = asyncio.StreamReader() 320 - + self.assertEqual(cm.warnings[0].filename, __file__) 321 - - reader = asyncio.StreamReader() 322 - self.assertIs(reader._loop, self.loop) 323 - 324 - 325 - def test_streamreaderprotocol_constructor_without_loop(self): 326 - reader = mock.Mock() 327 - + with self.assertWarns(DeprecationWarning) as cm: 328 - + with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): 329 - + asyncio.StreamReaderProtocol(reader) 330 - + self.assertEqual(cm.warnings[0].filename, __file__) 331 - - with self.assertRaisesRegex(RuntimeError, 'no current event loop'): 332 - - asyncio.StreamReaderProtocol(reader) 333 - 334 - def test_streamreaderprotocol_constructor_use_running_loop(self): 335 - # asyncio issue #184: Ensure that StreamReaderProtocol constructor 336 - @@ -786,11 +792,13 @@ 337 - def test_streamreaderprotocol_constructor_use_global_loop(self): 338 - # asyncio issue #184: Ensure that StreamReaderProtocol constructor 339 - # retrieves the current loop if the loop parameter is not set 340 - + # Deprecated in 3.10 341 - - # Deprecated in 3.10, undeprecated in 3.11.1 342 - self.addCleanup(asyncio.set_event_loop, None) 343 - asyncio.set_event_loop(self.loop) 344 - reader = mock.Mock() 345 - + with self.assertWarns(DeprecationWarning) as cm: 346 - + protocol = asyncio.StreamReaderProtocol(reader) 347 - + self.assertEqual(cm.warnings[0].filename, __file__) 348 - - protocol = asyncio.StreamReaderProtocol(reader) 349 - self.assertIs(protocol._loop, self.loop) 350 - 351 - def test_multiple_drain(self): 352 - reverted: 353 - --- b/Lib/test/test_asyncio/test_tasks.py 354 - +++ a/Lib/test/test_asyncio/test_tasks.py 355 - @@ -210,8 +210,10 @@ 356 - 357 - a = notmuch() 358 - self.addCleanup(a.close) 359 - + with self.assertWarns(DeprecationWarning) as cm: 360 - + with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): 361 - + asyncio.ensure_future(a) 362 - + self.assertEqual(cm.warnings[0].filename, __file__) 363 - - with self.assertRaisesRegex(RuntimeError, 'no current event loop'): 364 - - asyncio.ensure_future(a) 365 - 366 - async def test(): 367 - return asyncio.ensure_future(notmuch()) 368 - @@ -221,10 +223,12 @@ 369 - self.assertTrue(t.done()) 370 - self.assertEqual(t.result(), 'ok') 371 - 372 - + # Deprecated in 3.10 373 - - # Deprecated in 3.10.0, undeprecated in 3.10.9 374 - asyncio.set_event_loop(self.loop) 375 - self.addCleanup(asyncio.set_event_loop, None) 376 - + with self.assertWarns(DeprecationWarning) as cm: 377 - + t = asyncio.ensure_future(notmuch()) 378 - + self.assertEqual(cm.warnings[0].filename, __file__) 379 - - t = asyncio.ensure_future(notmuch()) 380 - self.assertIs(t._loop, self.loop) 381 - self.loop.run_until_complete(t) 382 - self.assertTrue(t.done()) 383 - @@ -243,8 +247,10 @@ 384 - 385 - a = notmuch() 386 - self.addCleanup(a.close) 387 - + with self.assertWarns(DeprecationWarning) as cm: 388 - + with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): 389 - + asyncio.ensure_future(a) 390 - + self.assertEqual(cm.warnings[0].filename, __file__) 391 - - with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): 392 - - asyncio.ensure_future(a) 393 - 394 - async def test(): 395 - return asyncio.ensure_future(notmuch()) 396 - @@ -254,10 +260,12 @@ 397 - self.assertTrue(t.done()) 398 - self.assertEqual(t.result(), 'ok') 399 - 400 - + # Deprecated in 3.10 401 - - # Deprecated in 3.10.0, undeprecated in 3.10.9 402 - asyncio.set_event_loop(self.loop) 403 - self.addCleanup(asyncio.set_event_loop, None) 404 - + with self.assertWarns(DeprecationWarning) as cm: 405 - + t = asyncio.ensure_future(notmuch()) 406 - + self.assertEqual(cm.warnings[0].filename, __file__) 407 - - t = asyncio.ensure_future(notmuch()) 408 - self.assertIs(t._loop, self.loop) 409 - self.loop.run_until_complete(t) 410 - self.assertTrue(t.done()) 411 - @@ -1480,8 +1488,10 @@ 412 - self.addCleanup(a.close) 413 - 414 - futs = asyncio.as_completed([a]) 415 - + with self.assertWarns(DeprecationWarning) as cm: 416 - + with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): 417 - + list(futs) 418 - + self.assertEqual(cm.warnings[0].filename, __file__) 419 - - with self.assertRaisesRegex(RuntimeError, 'no current event loop'): 420 - - list(futs) 421 - 422 - def test_as_completed_coroutine_use_running_loop(self): 423 - loop = self.new_test_loop() 424 - @@ -1497,14 +1507,17 @@ 425 - loop.run_until_complete(test()) 426 - 427 - def test_as_completed_coroutine_use_global_loop(self): 428 - + # Deprecated in 3.10 429 - - # Deprecated in 3.10.0, undeprecated in 3.10.9 430 - async def coro(): 431 - return 42 432 - 433 - loop = self.new_test_loop() 434 - asyncio.set_event_loop(loop) 435 - self.addCleanup(asyncio.set_event_loop, None) 436 - + futs = asyncio.as_completed([coro()]) 437 - + with self.assertWarns(DeprecationWarning) as cm: 438 - + futs = list(futs) 439 - + self.assertEqual(cm.warnings[0].filename, __file__) 440 - - futs = list(asyncio.as_completed([coro()])) 441 - self.assertEqual(len(futs), 1) 442 - self.assertEqual(loop.run_until_complete(futs[0]), 42) 443 - 444 - @@ -1974,8 +1987,10 @@ 445 - 446 - inner = coro() 447 - self.addCleanup(inner.close) 448 - + with self.assertWarns(DeprecationWarning) as cm: 449 - + with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'): 450 - + asyncio.shield(inner) 451 - + self.assertEqual(cm.warnings[0].filename, __file__) 452 - - with self.assertRaisesRegex(RuntimeError, 'no current event loop'): 453 - - asyncio.shield(inner) 454 - 455 - def test_shield_coroutine_use_running_loop(self): 456 - async def coro(): 457 - @@ -1989,13 +2004,15 @@ 458 - self.assertEqual(res, 42) 459 - 460 - def test_shield_coroutine_use_global_loop(self): 461 - + # Deprecated in 3.10 462 - - # Deprecated in 3.10.0, undeprecated in 3.10.9 463 - async def coro(): 464 - return 42 465 - 466 - asyncio.set_event_loop(self.loop) 467 - self.addCleanup(asyncio.set_event_loop, None) 468 - + with self.assertWarns(DeprecationWarning) as cm: 469 - + outer = asyncio.shield(coro()) 470 - + self.assertEqual(cm.warnings[0].filename, __file__) 471 - - outer = asyncio.shield(coro()) 472 - self.assertEqual(outer._loop, self.loop) 473 - res = self.loop.run_until_complete(outer) 474 - self.assertEqual(res, 42) 475 - @@ -2933,7 +2950,7 @@ 476 - self.assertIsNone(asyncio.current_task(loop=self.loop)) 477 - 478 - def test_current_task_no_running_loop_implicit(self): 479 - + with self.assertRaises(RuntimeError): 480 - - with self.assertRaisesRegex(RuntimeError, 'no running event loop'): 481 - asyncio.current_task() 482 - 483 - def test_current_task_with_implicit_loop(self): 484 - @@ -3097,8 +3114,10 @@ 485 - return asyncio.gather(*args, **kwargs) 486 - 487 - def test_constructor_empty_sequence_without_loop(self): 488 - + with self.assertWarns(DeprecationWarning) as cm: 489 - + with self.assertRaises(RuntimeError): 490 - + asyncio.gather() 491 - + self.assertEqual(cm.warnings[0].filename, __file__) 492 - - with self.assertRaisesRegex(RuntimeError, 'no current event loop'): 493 - - asyncio.gather() 494 - 495 - def test_constructor_empty_sequence_use_running_loop(self): 496 - async def gather(): 497 - @@ -3111,10 +3130,12 @@ 498 - self.assertEqual(fut.result(), []) 499 - 500 - def test_constructor_empty_sequence_use_global_loop(self): 501 - + # Deprecated in 3.10 502 - - # Deprecated in 3.10.0, undeprecated in 3.10.9 503 - asyncio.set_event_loop(self.one_loop) 504 - self.addCleanup(asyncio.set_event_loop, None) 505 - + with self.assertWarns(DeprecationWarning) as cm: 506 - + fut = asyncio.gather() 507 - + self.assertEqual(cm.warnings[0].filename, __file__) 508 - - fut = asyncio.gather() 509 - self.assertIsInstance(fut, asyncio.Future) 510 - self.assertIs(fut._loop, self.one_loop) 511 - self._run_loop(self.one_loop) 512 - @@ -3202,8 +3223,10 @@ 513 - self.addCleanup(gen1.close) 514 - gen2 = coro() 515 - self.addCleanup(gen2.close) 516 - + with self.assertWarns(DeprecationWarning) as cm: 517 - + with self.assertRaises(RuntimeError): 518 - + asyncio.gather(gen1, gen2) 519 - + self.assertEqual(cm.warnings[0].filename, __file__) 520 - - with self.assertRaisesRegex(RuntimeError, 'no current event loop'): 521 - - asyncio.gather(gen1, gen2) 522 - 523 - def test_constructor_use_running_loop(self): 524 - async def coro(): 525 - @@ -3217,14 +3240,16 @@ 526 - self.one_loop.run_until_complete(fut) 527 - 528 - def test_constructor_use_global_loop(self): 529 - + # Deprecated in 3.10 530 - - # Deprecated in 3.10.0, undeprecated in 3.10.9 531 - async def coro(): 532 - return 'abc' 533 - asyncio.set_event_loop(self.other_loop) 534 - self.addCleanup(asyncio.set_event_loop, None) 535 - gen1 = coro() 536 - gen2 = coro() 537 - + with self.assertWarns(DeprecationWarning) as cm: 538 - + fut = asyncio.gather(gen1, gen2) 539 - + self.assertEqual(cm.warnings[0].filename, __file__) 540 - - fut = asyncio.gather(gen1, gen2) 541 - self.assertIs(fut._loop, self.other_loop) 542 - self.other_loop.run_until_complete(fut) 543 - 544 - reverted: 545 - --- b/Lib/test/test_asyncio/test_unix_events.py 546 - +++ a/Lib/test/test_asyncio/test_unix_events.py 547 - @@ -1740,8 +1740,7 @@ 548 - 549 - def test_child_watcher_replace_mainloop_existing(self): 550 - policy = self.create_policy() 551 - + loop = policy.get_event_loop() 552 - - loop = policy.new_event_loop() 553 - - policy.set_event_loop(loop) 554 - 555 - # Explicitly setup SafeChildWatcher, 556 - # default ThreadedChildWatcher has no _loop property 557 - reverted: 558 - --- b/Lib/test/test_coroutines.py 559 - +++ a/Lib/test/test_coroutines.py 560 - @@ -2319,8 +2319,7 @@ 561 - def test_unawaited_warning_during_shutdown(self): 562 - code = ("import asyncio\n" 563 - "async def f(): pass\n" 564 - + "asyncio.gather(f())\n") 565 - - "async def t(): asyncio.gather(f())\n" 566 - - "asyncio.run(t())\n") 567 - assert_python_ok("-c", code) 568 - 569 - code = ("import sys\n" 570 - reverted: 571 - --- b/Modules/_asynciomodule.c 572 - +++ a/Modules/_asynciomodule.c 573 - @@ -332,6 +332,13 @@ 574 - return loop; 575 - } 576 - 577 - + if (PyErr_WarnEx(PyExc_DeprecationWarning, 578 - + "There is no current event loop", 579 - + stacklevel)) 580 - + { 581 - + return NULL; 582 - + } 583 - + 584 - policy = PyObject_CallNoArgs(asyncio_get_event_loop_policy); 585 - if (policy == NULL) { 586 - return NULL; 587 - @@ -3085,11 +3092,6 @@ 588 - return get_event_loop(1); 589 - } 590 - 591 - -// This internal method is going away in Python 3.12, left here only for 592 - -// backwards compatibility with 3.10.0 - 3.10.8 and 3.11.0. 593 - -// Similarly, this method's Python equivalent in asyncio.events is going 594 - -// away as well. 595 - -// See GH-99949 for more details. 596 - /*[clinic input] 597 - _asyncio._get_event_loop 598 - stacklevel: int = 3
+140 -104
pkgs/development/interpreters/python/cpython/default.nix
··· 1 - { lib, stdenv, fetchurl, fetchpatch, fetchgit 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , fetchpatch 5 + , fetchgit 6 + 7 + # build dependencies 8 + , autoconf-archive 9 + , autoreconfHook 10 + , nukeReferences 11 + , pkg-config 12 + , python-setup-hook 13 + 14 + # runtime dependencies 2 15 , bzip2 3 16 , expat 4 17 , libffi 5 - , gdbm 6 - , xz 7 - , mailcap, mimetypesSupport ? true 18 + , libxcrypt 19 + , mpdecimal 8 20 , ncurses 9 21 , openssl 10 - , openssl_legacy 11 - , readline 12 22 , sqlite 13 - , tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false 14 - , bluez ? null, bluezSupport ? false 23 + , xz 15 24 , zlib 16 - , tzdata ? null 17 - , libxcrypt 18 - , self 25 + 26 + # platform-specific dependencies 27 + , bash 19 28 , configd 20 29 , darwin 21 30 , windows 22 - , autoreconfHook 23 - , autoconf-archive 24 - , pkg-config 25 - , python-setup-hook 26 - , nukeReferences 27 - # For the Python package set 28 - , packageOverrides ? (self: super: {}) 31 + 32 + # optional dependencies 33 + , bluezSupport ? false, bluez 34 + , mimetypesSupport ? true, mailcap 35 + , tzdata 36 + , withGdbm ? !stdenv.hostPlatform.isWindows, gdbm 37 + , withReadline ? !stdenv.hostPlatform.isWindows, readline 38 + , x11Support ? false, tcl, tk, tix, libX11, xorgproto 39 + 40 + # splicing/cross 41 + , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" 42 + , self 29 43 , pkgsBuildBuild 30 44 , pkgsBuildHost 31 45 , pkgsBuildTarget 32 46 , pkgsHostHost 33 47 , pkgsTargetTarget 48 + 49 + # build customization 34 50 , sourceVersion 35 51 , hash 36 52 , passthruFun 37 - , bash 38 53 , stripConfig ? false 39 54 , stripIdlelib ? false 40 55 , stripTests ? false ··· 44 59 , includeSiteCustomize ? true 45 60 , static ? stdenv.hostPlatform.isStatic 46 61 , enableFramework ? false 62 + , noldconfigPatch ? ./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch" 63 + 64 + # pgo (not reproducible) + -fno-semantic-interposition 65 + # https://docs.python.org/3/using/configure.html#cmdoption-enable-optimizations 47 66 , enableOptimizations ? false 48 - # these dont build for windows 49 - , withGdbm ? !stdenv.hostPlatform.isWindows 50 - , withReadline ? !stdenv.hostPlatform.isWindows 51 - # enableNoSemanticInterposition is a subset of the enableOptimizations flag that doesn't harm reproducibility. 52 - # clang starts supporting `-fno-sematic-interposition` with version 10 53 - , enableNoSemanticInterposition ? (!stdenv.cc.isClang || (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "10")) 54 - # enableLTO is a subset of the enableOptimizations flag that doesn't harm reproducibility. 67 + 68 + # improves performance, but remains reproducible 69 + , enableNoSemanticInterposition ? true 70 + 55 71 # enabling LTO on 32bit arch causes downstream packages to fail when linking 56 72 # enabling LTO on *-darwin causes python3 to fail when linking. 57 73 , enableLTO ? stdenv.is64bit && stdenv.isLinux 74 + 75 + # enable asserts to ensure the build remains reproducible 58 76 , reproducibleBuild ? false 59 - , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" 60 - , noldconfigPatch ? ./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch" 77 + 78 + # for the Python package set 79 + , packageOverrides ? (self: super: {}) 80 + 81 + # tests 61 82 , testers 83 + 62 84 } @ inputs: 63 85 64 86 # Note: this package is used for bootstrapping fetchurl, and thus ··· 73 95 74 96 assert bluezSupport -> bluez != null; 75 97 76 - assert enableFramework -> stdenv.isDarwin; 98 + assert lib.assertMsg (bluezSupport -> stdenv.isLinux) 99 + "Bluez support is only available on Linux."; 100 + 101 + assert lib.assertMsg (enableFramework -> stdenv.isDarwin) 102 + "Framework builds are only supported on Darwin."; 77 103 78 104 assert lib.assertMsg (reproducibleBuild -> stripBytecode) 79 105 "Deterministic builds require stripping bytecode."; ··· 84 110 assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode)) 85 111 "Deterministic builds are not achieved when (default unoptimized) bytecode is created."; 86 112 87 - with lib; 88 - 89 113 let 90 - # some python packages need legacy ciphers, so we're using openssl 3, but with that config 91 - # null check for Minimal 92 - openssl' = if openssl != null then openssl_legacy else null; 114 + inherit (lib) 115 + concatMapStringsSep 116 + concatStringsSep 117 + getDev 118 + getLib 119 + optionals 120 + optionalString 121 + replaceStrings 122 + versionOlder 123 + ; 93 124 94 125 buildPackages = pkgsBuildHost; 95 126 inherit (passthru) pythonOnBuildForHost; 96 - 97 - inherit (darwin.apple_sdk.frameworks) Cocoa; 98 127 99 128 tzdataSupport = tzdata != null && passthru.pythonAtLeast "3.9"; 100 129 ··· 119 148 120 149 version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; 121 150 122 - nativeBuildInputs = optionals (!stdenv.isDarwin) [ 151 + nativeBuildInputs = [ 152 + nukeReferences 153 + ] ++ optionals (!stdenv.isDarwin) [ 154 + autoconf-archive # needed for AX_CHECK_COMPILE_FLAG 123 155 autoreconfHook 124 156 pkg-config 125 - autoconf-archive # needed for AX_CHECK_COMPILE_FLAG 126 - ] ++ [ 127 - nukeReferences 128 157 ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ 129 158 buildPackages.stdenv.cc 130 159 pythonOnBuildForHost ··· 132 161 stdenv.cc.cc.libllvm.out 133 162 ]; 134 163 135 - buildInputs = filter (p: p != null) ([ 136 - zlib bzip2 expat xz libffi libxcrypt ] 137 - ++ optional withGdbm gdbm 138 - ++ [ sqlite ] 139 - ++ optional withReadline readline 140 - ++ [ ncurses openssl' ] 141 - ++ optionals x11Support [ tcl tk libX11 xorgproto ] 142 - ++ optionals (bluezSupport && stdenv.isLinux) [ bluez ] 143 - ++ optionals stdenv.isDarwin [ configd ]) 144 - 145 - ++ optionals enableFramework [ Cocoa ] 146 - ++ optionals stdenv.hostPlatform.isMinGW [ windows.mingw_w64_pthreads windows.dlfcn ] 147 - ++ optionals tzdataSupport [ tzdata ]; # `zoneinfo` module 164 + buildInputs = lib.filter (p: p != null) ([ 165 + bzip2 166 + expat 167 + libffi 168 + libxcrypt 169 + mpdecimal 170 + ncurses 171 + openssl 172 + sqlite 173 + xz 174 + zlib 175 + ] ++ optionals bluezSupport [ 176 + bluez 177 + ] ++ optionals enableFramework [ 178 + darwin.apple_sdk.frameworks.Cocoa 179 + ] ++ optionals stdenv.hostPlatform.isMinGW [ 180 + windows.dlfcn 181 + windows.mingw_w64_pthreads 182 + ] ++ optionals stdenv.isDarwin [ 183 + configd 184 + ] ++ optionals tzdataSupport [ 185 + tzdata 186 + ] ++ optionals withGdbm [ 187 + gdbm 188 + ] ++ optionals withReadline [ 189 + readline 190 + ] ++ optionals x11Support [ 191 + libX11 192 + tcl 193 + tk 194 + xorgproto 195 + ]); 148 196 149 197 hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); 150 198 ··· 207 255 pythonAbi = nixpkgsPythonAbiMappings.${parsed.abi.name} or parsed.abi.name; 208 256 in 209 257 # Python <3.11 doesn't distinguish musl and glibc and always prefixes with "gnu" 210 - if lib.versionOlder version "3.11" then 258 + if versionOlder version "3.11" then 211 259 replaceStrings [ "musl" ] [ "gnu" ] pythonAbi 212 260 else 213 261 pythonAbi; ··· 238 286 inherit src version; 239 287 240 288 inherit nativeBuildInputs; 241 - buildInputs = lib.optionals (!stdenv.hostPlatform.isWindows) [ bash ] ++ buildInputs; # bash is only used for patchShebangs 242 - 289 + buildInputs = lib.optionals (!stdenv.hostPlatform.isWindows) [ 290 + bash # only required for patchShebangs 291 + ] ++ buildInputs; 243 292 244 293 prePatch = optionalString stdenv.isDarwin '' 245 - substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' 294 + substituteInPlace configure --replace-fail '`/usr/bin/arch`' '"i386"' 246 295 '' + optionalString (pythonOlder "3.9" && stdenv.isDarwin && x11Support) '' 247 296 # Broken on >= 3.9; replaced with ./3.9/darwin-tcl-tk.patch 248 - substituteInPlace setup.py --replace /Library/Frameworks /no-such-path 297 + substituteInPlace setup.py --replace-fail /Library/Frameworks /no-such-path 249 298 ''; 250 299 251 - patches = optionals (version == "3.10.9") [ 252 - # https://github.com/python/cpython/issues/100160 253 - ./3.10/asyncio-deprecation.patch 254 - ] ++ optionals (version == "3.11.1") [ 255 - # https://github.com/python/cpython/issues/100160 256 - (fetchpatch { 257 - name = "asyncio-deprecation-3.11.patch"; 258 - url = "https://github.com/python/cpython/commit/3fae04b10e2655a20a3aadb5e0d63e87206d0c67.diff"; 259 - revert = true; 260 - excludes = [ "Misc/NEWS.d/*" ]; 261 - hash = "sha256-PmkXf2D9trtW1gXZilRIWgdg2Y47JfELq1z4DuG3wJY="; 262 - }) 263 - ] ++ [ 300 + patches = [ 264 301 # Disable the use of ldconfig in ctypes.util.find_library (since 265 302 # ldconfig doesn't work on NixOS), and don't use 266 303 # ctypes.util.find_library during the loading of the uuid module ··· 282 319 ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.isDarwin) [ 283 320 # Stop checking for TCL/TK in global macOS locations 284 321 ./3.9/darwin-tcl-tk.patch 285 - ] ++ optionals (isPy3k && hasDistutilsCxxPatch && pythonOlder "3.12") [ 322 + ] ++ optionals (hasDistutilsCxxPatch && pythonOlder "3.12") [ 286 323 # Fix for http://bugs.python.org/issue1222585 287 324 # Upstream distutils is calling C compiler to compile C++ code, which 288 325 # only works for GCC and Apple Clang. This makes distutils to call C++ ··· 323 360 324 361 postPatch = optionalString (!stdenv.hostPlatform.isWindows) '' 325 362 substituteInPlace Lib/subprocess.py \ 326 - --replace "'/bin/sh'" "'${bash}/bin/sh'" 363 + --replace-fail "'/bin/sh'" "'${bash}/bin/sh'" 327 364 '' + optionalString mimetypesSupport '' 328 365 substituteInPlace Lib/mimetypes.py \ 329 - --replace "@mime-types@" "${mailcap}" 366 + --replace-fail "@mime-types@" "${mailcap}" 330 367 '' + optionalString (pythonOlder "3.13" && x11Support && (tix != null)) '' 331 - substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" 368 + substituteInPlace "Lib/tkinter/tix.py" --replace-fail \ 369 + "os.environ.get('TIX_LIBRARY')" \ 370 + "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" 332 371 ''; 333 372 334 373 env = { ··· 343 382 PYTHONHASHSEED=0; 344 383 }; 345 384 385 + # https://docs.python.org/3/using/configure.html 346 386 configureFlags = [ 347 387 "--without-ensurepip" 348 388 "--with-system-expat" 349 - "--with-system-ffi" 389 + ] ++ optionals (!(stdenv.isDarwin && pythonAtLeast "3.12")) [ 390 + # ./Modules/_decimal/_decimal.c:4673:6: error: "No valid combination of CONFIG_64, CONFIG_32 and _PyHASH_BITS" 391 + # https://hydra.nixos.org/build/248410479/nixlog/2/tail 392 + "--with-system-libmpdec" 393 + ] ++ optionals (openssl != null) [ 394 + "--with-openssl=${openssl.dev}" 395 + ] ++ optionals tzdataSupport [ 396 + "--with-tzpath=${tzdata}/share/zoneinfo" 397 + ] ++ optionals (execSuffix != "") [ 398 + "--with-suffix=${execSuffix}" 399 + ] ++ optionals enableLTO [ 400 + "--with-lto" 350 401 ] ++ optionals (!static && !enableFramework) [ 351 402 "--enable-shared" 352 403 ] ++ optionals enableFramework [ 353 404 "--enable-framework=${placeholder "out"}/Library/Frameworks" 354 405 ] ++ optionals enableOptimizations [ 355 406 "--enable-optimizations" 356 - ] ++ optionals enableLTO [ 357 - "--with-lto" 358 - ] ++ optionals (pythonOlder "3.7") [ 359 - # This is unconditionally true starting in CPython 3.7. 360 - "--with-threads" 361 - ] ++ optionals (sqlite != null && isPy3k) [ 407 + ] ++ optionals (sqlite != null) [ 362 408 "--enable-loadable-sqlite-extensions" 363 - ] ++ optionals (openssl' != null) [ 364 - "--with-openssl=${openssl'.dev}" 365 409 ] ++ optionals (libxcrypt != null) [ 366 410 "CFLAGS=-I${libxcrypt}/include" 367 411 "LIBS=-L${libxcrypt}/lib" ··· 393 437 # Never even try to use lchmod on linux, 394 438 # don't rely on detecting glibc-isms. 395 439 "ac_cv_func_lchmod=no" 396 - ] ++ optionals tzdataSupport [ 397 - "--with-tzpath=${tzdata}/share/zoneinfo" 398 - ] ++ optional static "LDFLAGS=-static" 399 - ++ optional (execSuffix != "") "--with-suffix=${execSuffix}"; 440 + ] ++ optionals static [ 441 + "LDFLAGS=-static" 442 + ]; 400 443 401 444 preConfigure = optionalString (pythonOlder "3.12") '' 402 - for i in /usr /sw /opt /pkg; do # improve purity 403 - substituteInPlace ./setup.py --replace $i /no-such-path 445 + # Improve purity 446 + for path in /usr /sw /opt /pkg; do 447 + substituteInPlace ./setup.py --replace-warn $path /no-such-path 404 448 done 405 449 '' + optionalString stdenv.isDarwin '' 406 450 # Override the auto-detection in setup.py, which assumes a universal build ··· 408 452 '' + optionalString (stdenv.isDarwin && x11Support && pythonAtLeast "3.11") '' 409 453 export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}" 410 454 export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include" 411 - '' + optionalString (isPy3k && pythonOlder "3.7") '' 412 - # Determinism: The interpreter is patched to write null timestamps when compiling Python files 413 - # so Python doesn't try to update the bytecode when seeing frozen timestamps in Nix's store. 414 - export DETERMINISTIC_BUILD=1; 415 455 '' + optionalString stdenv.hostPlatform.isMusl '' 416 456 export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000" 417 457 '' + ··· 482 522 # This allows build Python to import host Python's sysconfigdata 483 523 mkdir -p "$out/${sitePackages}" 484 524 ln -s "$out/lib/${libPrefix}/"_sysconfigdata*.py "$out/${sitePackages}/" 485 - '' + lib.optionalString (pythonOlder "3.8") '' 486 - # This is gone in Python >= 3.8 487 - ln -s "$out/include/${executable}m" "$out/include/${executable}" 488 525 '' + optionalString stripConfig '' 489 526 rm -R $out/bin/python*-config $out/lib/python*/config-* 490 527 '' + optionalString stripIdlelib '' ··· 498 535 '' + optionalString includeSiteCustomize '' 499 536 # Include a sitecustomize.py file 500 537 cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py 501 - 502 538 '' + optionalString stripBytecode '' 503 539 # Determinism: deterministic bytecode 504 540 # First we delete all old bytecode. ··· 556 592 557 593 # Enforce that we don't have references to the OpenSSL -dev package, which we 558 594 # explicitly specify in our configure flags above. 559 - disallowedReferences = 560 - lib.optionals (openssl' != null && !static && !enableFramework) [ openssl'.dev ] 561 - ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ 595 + disallowedReferences = lib.optionals (openssl != null && !static && !enableFramework) [ 596 + openssl.dev 597 + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ 562 598 # Ensure we don't have references to build-time packages. 563 599 # These typically end up in shebangs. 564 600 pythonOnBuildForHost buildPackages.bash ··· 591 627 592 628 enableParallelBuilding = true; 593 629 594 - meta = { 630 + meta = with lib; { 595 631 homepage = "https://www.python.org"; 596 632 changelog = let 597 - majorMinor = lib.versions.majorMinor version; 598 - dashedVersion = lib.replaceStrings [ "." "a" ] [ "-" "-alpha-" ] version; 633 + majorMinor = versions.majorMinor version; 634 + dashedVersion = replaceStrings [ "." "a" ] [ "-" "-alpha-" ] version; 599 635 in 600 636 if sourceVersion.suffix == "" then 601 637 "https://docs.python.org/release/${version}/whatsnew/changelog.html"
+10 -13
pkgs/development/interpreters/python/default.nix
··· 16 16 passthruFun = import ./passthrufun.nix args; 17 17 18 18 sources = { 19 - python310 = { 20 - sourceVersion = { 21 - major = "3"; 22 - minor = "10"; 23 - patch = "13"; 24 - suffix = ""; 25 - }; 26 - hash = "sha256-XIiEhmhkDT4VKzW0U27xwjsspL0slX7x7LsFP1cd0/Y="; 27 - }; 28 - 29 19 python311 = { 30 20 sourceVersion = { 31 21 major = "3"; ··· 78 68 inherit passthruFun; 79 69 }; 80 70 81 - python310 = callPackage ./cpython ({ 71 + python310 = callPackage ./cpython { 82 72 self = __splicedPackages.python310; 73 + sourceVersion = { 74 + major = "3"; 75 + minor = "10"; 76 + patch = "13"; 77 + suffix = ""; 78 + }; 79 + hash = "sha256-XIiEhmhkDT4VKzW0U27xwjsspL0slX7x7LsFP1cd0/Y="; 83 80 inherit (darwin) configd; 84 81 inherit passthruFun; 85 - } // sources.python310); 82 + }; 86 83 87 84 python311 = callPackage ./cpython ({ 88 85 self = __splicedPackages.python311; ··· 125 122 readline = null; 126 123 ncurses = null; 127 124 gdbm = null; 128 - sqlite = null; 129 125 configd = null; 126 + sqlite = null; 130 127 tzdata = null; 131 128 libffi = libffiBoot; # without test suite 132 129 stripConfig = true;
+1 -1
pkgs/development/interpreters/wamr/default.nix
··· 18 18 nativeBuildInputs = [ cmake ]; 19 19 20 20 cmakeFlags = lib.optionals stdenv.isDarwin [ 21 - "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.targetPlatform.darwinSdkVersion}" 21 + "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinSdkVersion}" 22 22 ]; 23 23 24 24 sourceRoot = let
-38
pkgs/development/libraries/acl/LFS64.patch
··· 1 - From 2b42f64737adf6a2ddd491213580d6e9cdd2f5af Mon Sep 17 00:00:00 2001 2 - From: Khem Raj <raj.khem@gmail.com> 3 - Date: Thu, 10 Nov 2022 18:04:15 -0800 4 - Subject: chacl: Use portable version of dirent and readdir 5 - 6 - Using 64bit versions on 32bit architectures should be enabled with 7 - --enable-largefile, this makes it portable across musl and glibc 8 - 9 - Signed-off-by: Khem Raj <raj.khem@gmail.com> 10 - --- 11 - tools/chacl.c | 4 ++-- 12 - 1 file changed, 2 insertions(+), 2 deletions(-) 13 - 14 - diff --git a/tools/chacl.c b/tools/chacl.c 15 - index 525a7ff..8fff875 100644 16 - --- a/tools/chacl.c 17 - +++ b/tools/chacl.c 18 - @@ -320,7 +320,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname) 19 - { 20 - int failed = 0; 21 - DIR *dir; 22 - - struct dirent64 *d; 23 - + struct dirent *d; 24 - char *name; 25 - 26 - if ((dir = opendir(fname)) == NULL) { 27 - @@ -332,7 +332,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname) 28 - return(0); /* got a file, not an error */ 29 - } 30 - 31 - - while ((d = readdir64(dir)) != NULL) { 32 - + while ((d = readdir(dir)) != NULL) { 33 - /* skip "." and ".." entries */ 34 - if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) 35 - continue; 36 - -- 37 - cgit v1.1 38 -
+2 -14
pkgs/development/libraries/acl/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "acl"; 10 - version = "2.3.1"; 10 + version = "2.3.2"; 11 11 12 12 src = fetchurl { 13 13 url = "mirror://savannah/acl/acl-${version}.tar.gz"; 14 - sha256 = "sha256-dgxhxokBs3/dXu/ur0wMeia9/disdHoe3/HODiQ8Ea8="; 14 + hash = "sha256-XyvbrWKXB6p9hcYj+ZSqih0t7FWnPeUgW6wL9gWKL3w="; 15 15 }; 16 - 17 - patches = [ 18 - ./LFS64.patch 19 - ]; 20 16 21 17 outputs = [ "bin" "dev" "out" "man" "doc" ]; 22 18 23 19 nativeBuildInputs = [ gettext ]; 24 20 buildInputs = [ attr ]; 25 21 26 - # causes failures in coreutils test suite 27 - hardeningDisable = [ "fortify3" ]; 28 - 29 - # Upstream use C++-style comments in C code. Remove them. 30 - # This comment breaks compilation if too strict gcc flags are used. 31 22 postPatch = '' 32 - echo "Removing C++-style comments from include/acl.h" 33 - sed -e '/^\/\//d' -i include/acl.h 34 - 35 23 patchShebangs . 36 24 ''; 37 25
+2 -2
pkgs/development/libraries/armadillo/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "armadillo"; 5 - version = "12.6.7"; 5 + version = "12.8.0"; 6 6 7 7 src = fetchurl { 8 8 url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; 9 - hash = "sha256-3zIGS99cRxU88YCzwgEsihlKB+6JJlSmkUtIb/8s+mk="; 9 + hash = "sha256-qJu2/s5c6f3R0BpLwUXPfMC5OcV3fMpG3mnC9eNBLPA="; 10 10 }; 11 11 12 12 nativeBuildInputs = [ cmake ];
+1
pkgs/development/libraries/at-spi2-core/default.nix
··· 26 26 version = "2.50.0"; 27 27 28 28 outputs = [ "out" "dev" ]; 29 + separateDebugInfo = true; 29 30 30 31 src = fetchurl { 31 32 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+2 -2
pkgs/development/libraries/attr/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "attr"; 10 - version = "2.5.1"; 10 + version = "2.5.2"; 11 11 12 12 src = fetchurl { 13 13 url = "mirror://savannah/attr/${pname}-${version}.tar.gz"; 14 - sha256 = "1y6sibbkrcjygv8naadnsg6xmsqwfh6cwrqk01l0v2i5kfacdqds"; 14 + sha256 = "sha256-Ob9nRS+kHQlIwhl2AQU/SLPXigKTiXNDMqYwmmgMbIc="; 15 15 }; 16 16 17 17 outputs = [ "bin" "dev" "out" "man" "doc" ];
+2 -2
pkgs/development/libraries/audio/lilv/default.nix
··· 18 18 19 19 stdenv.mkDerivation rec { 20 20 pname = "lilv"; 21 - version = "0.24.22"; 21 + version = "0.24.24"; 22 22 23 23 outputs = [ "out" "dev" "man" ]; 24 24 25 25 src = fetchurl { 26 26 url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; 27 - hash = "sha256-dvlJ0OWfyDNjQJtexeFcEEb7fdZYnTwbkgzsH9Kfn/M="; 27 + hash = "sha256-a7a+n4hQQXbQZC8S3oCbK54txVYhporbjH7bma76u08="; 28 28 }; 29 29 30 30 nativeBuildInputs = [ meson ninja pkg-config python3 ];
+14 -10
pkgs/development/libraries/boehm-gc/default.nix
··· 1 1 { lib 2 2 , stdenv 3 - , fetchurl 4 - # doc: https://github.com/ivmai/bdwgc/blob/v8.2.2/doc/README.macros (LARGE_CONFIG) 3 + , fetchFromGitHub 4 + , autoreconfHook 5 + # doc: https://github.com/ivmai/bdwgc/blob/v8.2.4/doc/README.macros (LARGE_CONFIG) 5 6 , enableLargeConfig ? false 6 7 , enableMmap ? true 7 8 , enableStatic ? false ··· 10 11 11 12 stdenv.mkDerivation (finalAttrs: { 12 13 pname = "boehm-gc"; 13 - version = "8.2.2"; 14 + version = "8.2.4"; 14 15 15 - src = fetchurl { 16 - urls = [ 17 - # "https://www.hboehm.info/gc/gc_source/gc-${finalAttrs.version}.tar.gz" 18 - "https://github.com/ivmai/bdwgc/releases/download/v${finalAttrs.version}/gc-${finalAttrs.version}.tar.gz" 19 - ]; 20 - sha256 = "sha256-8wEHvLBi4JIKeQ//+lbZUSNIVGhZNkwjoUviZLOINqA="; 16 + src = fetchFromGitHub { 17 + owner = "ivmai"; 18 + repo = "bdwgc"; 19 + rev = "v${finalAttrs.version}"; 20 + hash = "sha256-KHijT4BBKfDvTpHpwognN+3ZXoC6JabBTFSYFyOUT9o="; 21 21 }; 22 22 23 23 outputs = [ "out" "dev" "doc" ]; 24 24 separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; 25 + 26 + nativeBuildInputs = [ 27 + autoreconfHook 28 + ]; 25 29 26 30 configureFlags = [ 27 31 "--enable-cplusplus" ··· 38 42 # not fix the problem the test failure will be a reminder to 39 43 # extend the set of versions requiring the workaround). 40 44 makeFlags = lib.optionals (stdenv.hostPlatform.isPower64 && 41 - finalAttrs.version == "8.2.2") 45 + finalAttrs.version == "8.2.4") 42 46 [ 43 47 # do not use /proc primitives to track dirty bits; see: 44 48 # https://github.com/ivmai/bdwgc/issues/479#issuecomment-1279687537
-1
pkgs/development/libraries/chromaprint/default.nix
··· 19 19 meta = with lib; { 20 20 homepage = "https://acoustid.org/chromaprint"; 21 21 description = "AcoustID audio fingerprinting library"; 22 - maintainers = with maintainers; [ ehmry ]; 23 22 license = licenses.lgpl21Plus; 24 23 platforms = platforms.unix; 25 24 };
+2 -2
pkgs/development/libraries/dav1d/default.nix
··· 26 26 27 27 stdenv.mkDerivation rec { 28 28 pname = "dav1d"; 29 - version = "1.2.1"; 29 + version = "1.3.0"; 30 30 31 31 src = fetchFromGitHub { 32 32 owner = "videolan"; 33 33 repo = pname; 34 34 rev = version; 35 - hash = "sha256-RrEim3HXXjx2RUU7K3wPH3QbhNTRN9ZX/oAcyE9aV8I="; 35 + hash = "sha256-c7Dur+0HpteI7KkR9oo3WynoH/FCRaBwZA7bJmPDJp8="; 36 36 }; 37 37 38 38 outputs = [ "out" "dev" ];
-1
pkgs/development/libraries/dbus-cplusplus/default.nix
··· 32 32 url = "https://src.fedoraproject.org/rpms/dbus-c++/raw/9f515ace0594c8b2b9f0d41ffe71bc5b78d30eee/f/dbus-c++-template-operators.patch"; 33 33 hash = "sha256-B8S7z/YH2YEQgaRsBJBBVTx8vHQhHW7z171TZmogpL8="; 34 34 }) 35 - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ 36 35 (fetchpatch { 37 36 name = "0001-src-eventloop.cpp-use-portable-method-for-initializi.patch"; 38 37 url = "https://github.com/openembedded/meta-openembedded/raw/119e75e48dbf0539b4e440417901458ffff79b38/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0001-src-eventloop.cpp-use-portable-method-for-initializi.patch";
+2 -2
pkgs/development/libraries/enchant/2.x.nix
··· 13 13 14 14 stdenv.mkDerivation rec { 15 15 pname = "enchant"; 16 - version = "2.6.3"; 16 + version = "2.6.5"; 17 17 18 18 outputs = [ "out" "dev" ]; 19 19 20 20 src = fetchurl { 21 21 url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; 22 - hash = "sha256-wcVxnypZfOPgbJOM+5n7aX2gk96nuFfMAE3B3PG7oYI="; 22 + hash = "sha256-no/SjLZae22jVFh4pcL1KhXwPASTOl/0jbif6GhFco4="; 23 23 }; 24 24 25 25 strictDeps = true;
+2 -2
pkgs/development/libraries/exempi/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "exempi"; 5 - version = "2.6.4"; 5 + version = "2.6.5"; 6 6 7 7 src = fetchurl { 8 8 url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2"; 9 - sha256 = "sha256-p1FJyWth45zcsEb9XlbYjP7qtuCPiU4V6//ZlECSv9A="; 9 + sha256 = "sha256-6fmj1Cv/c7XrD3fsIs0BY8PiGUnMQUrR8ZoEZd3kH/4="; 10 10 }; 11 11 12 12 configureFlags = [
+2 -2
pkgs/development/libraries/fdk-aac/default.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "fdk-aac"; 9 - version = "2.0.2"; 9 + version = "2.0.3"; 10 10 11 11 src = fetchurl { 12 12 url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz"; 13 - sha256 = "sha256-yehjDPnUM/POrXSQahUg0iI/ibzT+pJUhhAXRAuOsi8="; 13 + sha256 = "sha256-gptrie7zgkCc2mhX/YKvhPq7Y0F7CO3p6npVP4Ect54="; 14 14 }; 15 15 16 16 outputs = [ "out" "dev" ];
+83 -64
pkgs/development/libraries/ffmpeg/generic.nix
··· 34 34 , withBzlib ? withHeadlessDeps 35 35 , withCaca ? withFullDeps # Textual display (ASCII art) 36 36 , withCelt ? withFullDeps # CELT decoder 37 + , withChromaprint ? withFullDeps # Audio fingerprinting 37 38 , withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch && !hostPlatform.isRiscV)) 38 39 , withCudaLLVM ? withFullDeps 39 40 , withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) 40 41 , withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394) 41 42 , withDrm ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # libdrm support 42 43 , withFdkAac ? withFullDeps && withUnfree # Fraunhofer FDK AAC de/encoder 44 + , withFlite ? withFullDeps # Voice Synthesis 43 45 , withFontconfig ? withHeadlessDeps # Needed for drawtext filter 44 46 , withFreetype ? withHeadlessDeps # Needed for drawtext filter 45 - , withFrei0r ? withFullDeps # frei0r video filtering 47 + , withFrei0r ? withFullDeps && withGPL # frei0r video filtering 46 48 , withFribidi ? withFullDeps # Needed for drawtext filter 47 49 , withGme ? withFullDeps # Game Music Emulator 48 50 , withGnutls ? withHeadlessDeps ··· 50 52 , withIconv ? withHeadlessDeps 51 53 , withJack ? withFullDeps && !stdenv.isDarwin # Jack audio 52 54 , withLadspa ? withFullDeps # LADSPA audio filtering 53 - , withLibplacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library 54 55 , withLzma ? withHeadlessDeps # xz-utils 55 56 , withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx 56 57 , withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support ··· 61 62 , withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora 62 63 , withOpenal ? withFullDeps # OpenAL 1.1 capture support 63 64 , withOpencl ? withFullDeps 64 - , withOpencoreAmrnb ? withFullDeps # AMR-NB de/encoder & AMR-WB decoder 65 + , withOpencoreAmrnb ? withFullDeps && withVersion3 # AMR-NB de/encoder & AMR-WB decoder 65 66 , withOpengl ? false # OpenGL rendering 66 67 , withOpenh264 ? withFullDeps # H.264/AVC encoder 67 68 , withOpenjpeg ? withFullDeps # JPEG 2000 de/encoder 68 69 , withOpenmpt ? withFullDeps # Tracked music files decoder 69 70 , withOpus ? withHeadlessDeps # Opus de/encoder 71 + , withPlacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library 70 72 , withPulse ? withSmallDeps && !stdenv.isDarwin # Pulseaudio input support 71 73 , withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety) 72 74 , withRtmp ? false # RTMP[E] support 73 - , withSamba ? withFullDeps && !stdenv.isDarwin # Samba protocol 75 + , withSamba ? withFullDeps && !stdenv.isDarwin && withGPLv3 # Samba protocol 74 76 , withSdl2 ? withSmallDeps 75 77 , withShaderc ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" 76 78 , withSoxr ? withHeadlessDeps # Resampling via soxr ··· 85 87 , withV4l2M2m ? withV4l2 86 88 , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration 87 89 , withVdpau ? withSmallDeps # Vdpau hardware acceleration 88 - , withVidStab ? withFullDeps # Video stabilization 89 - , withVmaf ? withFullDeps && withGPLv3 && !stdenv.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) 90 - , withVoAmrwbenc ? withFullDeps # AMR-WB encoder 90 + , withVidStab ? withFullDeps && withGPL # Video stabilization 91 + , withVmaf ? withFullDeps && !stdenv.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) 92 + , withVoAmrwbenc ? withFullDeps && withVersion3 # AMR-WB encoder 91 93 , withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists 92 94 , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding 93 95 , withVulkan ? withFullDeps && !stdenv.isDarwin 94 96 , withWebp ? withFullDeps # WebP encoder 95 - , withX264 ? withHeadlessDeps # H.264/AVC encoder 96 - , withX265 ? withHeadlessDeps # H.265/HEVC encoder 97 - , withXavs ? withFullDeps # AVS encoder 97 + , withX264 ? withHeadlessDeps && withGPL # H.264/AVC encoder 98 + , withX265 ? withHeadlessDeps && withGPL # H.265/HEVC encoder 99 + , withXavs ? withFullDeps && withGPL # AVS encoder 98 100 , withXcb ? withXcbShm || withXcbxfixes || withXcbShape # X11 grabbing using XCB 99 101 , withXcbShape ? withFullDeps # X11 grabbing shape rendering 100 102 , withXcbShm ? withFullDeps # X11 grabbing shm communication 101 103 , withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering 102 104 , withXlib ? withFullDeps # Xlib support 103 105 , withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers 104 - , withXvid ? withHeadlessDeps # Xvid encoder, native encoder exists 106 + , withXvid ? withHeadlessDeps && withGPL # Xvid encoder, native encoder exists 105 107 , withZimg ? withHeadlessDeps 106 108 , withZlib ? withHeadlessDeps 107 109 , withZmq ? withFullDeps # Message passing ··· 110 112 * Licensing options (yes some are listed twice, filters and such are not listed) 111 113 */ 112 114 , withGPL ? true 113 - , withGPLv3 ? true 115 + , withVersion3 ? true # When withGPL is set this implies GPLv3 otherwise it is LGPLv3 116 + , withGPLv3 ? withGPL && withVersion3 114 117 , withUnfree ? false 115 118 116 119 /* ··· 125 128 , withMultithread ? true # Multithreading via pthreads/win32 threads 126 129 , withNetwork ? withHeadlessDeps # Network support 127 130 , withPixelutils ? withHeadlessDeps # Pixel utils in libavutil 131 + , withStatic ? stdenv.hostPlatform.isStatic 132 + , withShared ? !stdenv.hostPlatform.isStatic 133 + , withPic ? true 134 + , withThumb ? false # On some ARM platforms 135 + 128 136 /* 129 137 * Program options 130 138 */ ··· 181 189 , alsa-lib 182 190 , bzip2 183 191 , celt 192 + , chromaprint 184 193 , clang 185 194 , dav1d 186 195 , fdk_aac 196 + , flite 187 197 , fontconfig 188 198 , freetype 189 199 , frei0r ··· 301 311 /* 302 312 * Licensing dependencies 303 313 */ 304 - assert withGPLv3 -> withGPL; 305 - assert withUnfree -> withGPL && withGPLv3; 314 + assert withGPLv3 -> withGPL && withVersion3; 315 + 306 316 /* 307 317 * Build dependencies 308 318 */ ··· 376 386 * Licensing flags 377 387 */ 378 388 (enableFeature withGPL "gpl") 379 - (enableFeature withGPLv3 "version3") 389 + (enableFeature withVersion3 "version3") 380 390 (enableFeature withUnfree "nonfree") 381 391 /* 382 392 * Build flags 383 393 */ 384 - # On some ARM platforms --enable-thumb 385 - "--enable-shared" 386 - "--enable-pic" 394 + (enableFeature withStatic "static") 395 + (enableFeature withShared "shared") 396 + (enableFeature withPic "pic") 397 + (enableFeature withThumb "thumb") 387 398 388 399 (enableFeature withSmallBuild "small") 389 400 (enableFeature withRuntimeCPUDetection "runtime-cpudetect") ··· 447 458 * External libraries 448 459 */ 449 460 (enableFeature withAlsa "alsa") 450 - # FIXME: see if jellyfin-ffmpeg is already on a version >= 6.1 to use enableFeature 451 - (optionalString (withAribcaption && lib.versionAtLeast finalAttrs.version "6.1") "--enable-libaribcaption") 461 + (enableFeature withAom "libaom") 462 + ] ++ optionals (versionAtLeast finalAttrs.version "6.1") [ 463 + (enableFeature withAribcaption "libaribcaption") 464 + ] ++ [ 465 + (enableFeature withAss "libass") 466 + (enableFeature withBluray "libbluray") 467 + (enableFeature withBs2b "libbs2b") 452 468 (enableFeature withBzlib "bzlib") 453 469 (enableFeature withCelt "libcelt") 470 + (enableFeature withChromaprint "chromaprint") 454 471 (enableFeature withCuda "cuda") 455 472 (enableFeature withCudaLLVM "cuda-llvm") 456 473 (enableFeature withDav1d "libdav1d") 474 + (enableFeature withDc1394 "libdc1394") 475 + (enableFeature withDrm "libdrm") 457 476 (enableFeature withFdkAac "libfdk-aac") 458 - "--disable-libflite" # Force disable until a solution is found 477 + (enableFeature withFlite "libflite") 459 478 (enableFeature withFontconfig "fontconfig") 460 479 (enableFeature withFreetype "libfreetype") 461 480 (enableFeature withFrei0r "frei0r") ··· 463 482 (enableFeature withGme "libgme") 464 483 (enableFeature withGnutls "gnutls") 465 484 (enableFeature withGsm "libgsm") 466 - (enableFeature withLadspa "ladspa") 467 - (enableFeature withMp3lame "libmp3lame") 468 - (enableFeature withAom "libaom") 469 - (enableFeature withAss "libass") 470 - (enableFeature withBluray "libbluray") 471 - (enableFeature withBs2b "libbs2b") 472 - (enableFeature withDc1394 "libdc1394") 473 - (enableFeature withDrm "libdrm") 474 485 (enableFeature withIconv "iconv") 475 486 (enableFeature withJack "libjack") 487 + (enableFeature withLadspa "ladspa") 488 + (enableFeature withLzma "lzma") 476 489 (enableFeature withMfx "libmfx") 477 490 (enableFeature withModplug "libmodplug") 491 + (enableFeature withMp3lame "libmp3lame") 478 492 (enableFeature withMysofa "libmysofa") 479 - (enableFeature withOpus "libopus") 480 - (optionalString (versionAtLeast finalAttrs.version "5.0" && withLibplacebo) "--enable-libplacebo") 481 - (enableFeature withSvg "librsvg") 482 - (enableFeature withSrt "libsrt") 483 - (enableFeature withSsh "libssh") 484 - (enableFeature withTensorflow "libtensorflow") 485 - (enableFeature withTheora "libtheora") 486 - (enableFeature withV4l2 "libv4l2") 487 - (enableFeature withV4l2M2m "v4l2-m2m") 488 - (enableFeature withVaapi "vaapi") 489 - (enableFeature withVdpau "vdpau") 490 - (enableFeature withVorbis "libvorbis") 491 - (enableFeature withVmaf "libvmaf") 492 - (enableFeature withVpx "libvpx") 493 - (enableFeature withWebp "libwebp") 494 - (enableFeature withXlib "xlib") 495 - (enableFeature withXcb "libxcb") 496 - (enableFeature withXcbShm "libxcb-shm") 497 - (enableFeature withXcbxfixes "libxcb-xfixes") 498 - (enableFeature withXcbShape "libxcb-shape") 499 - (enableFeature withXml2 "libxml2") 500 - (enableFeature withLzma "lzma") 501 493 (enableFeature withNvdec "cuvid") 502 494 (enableFeature withNvdec "nvdec") 503 495 (enableFeature withNvenc "nvenc") ··· 508 500 (enableFeature withOpenh264 "libopenh264") 509 501 (enableFeature withOpenjpeg "libopenjpeg") 510 502 (enableFeature withOpenmpt "libopenmpt") 503 + (enableFeature withOpus "libopus") 504 + ] ++ optionals (versionAtLeast finalAttrs.version "5.0") [ 505 + (enableFeature withPlacebo "libplacebo") 506 + ] ++ [ 511 507 (enableFeature withPulse "libpulse") 512 508 (enableFeature withRav1e "librav1e") 513 - (enableFeature withSvtav1 "libsvtav1") 514 509 (enableFeature withRtmp "librtmp") 510 + (enableFeature withSamba "libsmbclient") 515 511 (enableFeature withSdl2 "sdl2") 512 + ] ++ optionals (versionAtLeast finalAttrs.version "5.0") [ 513 + (enableFeature withShaderc "libshaderc") 514 + ] ++ [ 516 515 (enableFeature withSoxr "libsoxr") 517 516 (enableFeature withSpeex "libspeex") 517 + (enableFeature withSrt "libsrt") 518 + (enableFeature withSsh "libssh") 519 + (enableFeature withSvg "librsvg") 520 + (enableFeature withSvtav1 "libsvtav1") 521 + (enableFeature withTensorflow "libtensorflow") 522 + (enableFeature withTheora "libtheora") 523 + (enableFeature withV4l2 "libv4l2") 524 + (enableFeature withV4l2M2m "v4l2-m2m") 525 + (enableFeature withVaapi "vaapi") 526 + (enableFeature withVdpau "vdpau") 518 527 (enableFeature withVidStab "libvidstab") # Actual min. version 2.0 528 + (enableFeature withVmaf "libvmaf") 519 529 (enableFeature withVoAmrwbenc "libvo-amrwbenc") 530 + (enableFeature withVorbis "libvorbis") 531 + (enableFeature withVpx "libvpx") 532 + (enableFeature withVulkan "vulkan") 533 + (enableFeature withWebp "libwebp") 520 534 (enableFeature withX264 "libx264") 521 535 (enableFeature withX265 "libx265") 522 536 (enableFeature withXavs "libxavs") 537 + (enableFeature withXcb "libxcb") 538 + (enableFeature withXcbShape "libxcb-shape") 539 + (enableFeature withXcbShm "libxcb-shm") 540 + (enableFeature withXcbxfixes "libxcb-xfixes") 541 + (enableFeature withXlib "xlib") 542 + (enableFeature withXml2 "libxml2") 523 543 (enableFeature withXvid "libxvid") 524 - (enableFeature withZmq "libzmq") 525 544 (enableFeature withZimg "libzimg") 526 545 (enableFeature withZlib "zlib") 527 - (enableFeature withVulkan "vulkan") 528 - (optionalString (lib.versionAtLeast finalAttrs.version "5") (enableFeature withShaderc "libshaderc")) 529 - (enableFeature withSamba "libsmbclient") 546 + (enableFeature withZmq "libzmq") 530 547 /* 531 548 * Developer flags 532 549 */ ··· 558 575 nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ] 559 576 ++ optionals withCudaLLVM [ clang ]; 560 577 561 - # TODO This was always in buildInputs before, why? 562 - buildInputs = optionals withFullDeps [ libdc1394 ] 563 - ++ optionals (withFullDeps && !stdenv.isDarwin) [ libraw1394 ] # TODO where does this belong to 564 - ++ optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast finalAttrs.version "6") then nv-codec-headers-12 else nv-codec-headers) ] 578 + buildInputs = optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast finalAttrs.version "6") then nv-codec-headers-12 else nv-codec-headers) ] 565 579 ++ optionals withAlsa [ alsa-lib ] 566 580 ++ optionals withAom [ libaom ] 567 581 ++ optionals withAribcaption [ libaribcaption ] ··· 571 585 ++ optionals withBzlib [ bzip2 ] 572 586 ++ optionals withCaca [ libcaca ] 573 587 ++ optionals withCelt [ celt ] 588 + ++ optionals withChromaprint [ chromaprint ] 574 589 ++ optionals withDav1d [ dav1d ] 590 + ++ optionals withDc1394 [ libdc1394 libraw1394 ] 575 591 ++ optionals withDrm [ libdrm ] 576 592 ++ optionals withFdkAac [ fdk_aac ] 593 + ++ optionals withFlite [ flite ] 577 594 ++ optionals withFontconfig [ fontconfig ] 578 595 ++ optionals withFreetype [ freetype ] 579 596 ++ optionals withFrei0r [ frei0r ] ··· 584 601 ++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it? 585 602 ++ optionals withJack [ libjack2 ] 586 603 ++ optionals withLadspa [ ladspaH ] 587 - ++ optionals withLibplacebo [ (if (lib.versionAtLeast finalAttrs.version "6.1") then libplacebo else libplacebo_5) vulkan-headers ] 588 604 ++ optionals withLzma [ xz ] 589 605 ++ optionals withMfx [ intel-media-sdk ] 590 606 ++ optionals withModplug [ libmodplug ] ··· 599 615 ++ optionals withOpenjpeg [ openjpeg ] 600 616 ++ optionals withOpenmpt [ libopenmpt ] 601 617 ++ optionals withOpus [ libopus ] 618 + ++ optionals withPlacebo [ (if (lib.versionAtLeast finalAttrs.version "6.1") then libplacebo else libplacebo_5) vulkan-headers ] 602 619 ++ optionals withPulse [ libpulseaudio ] 603 620 ++ optionals withRav1e [ rav1e ] 604 621 ++ optionals withRtmp [ rtmpdump ] ··· 613 630 ++ optionals withSvtav1 [ svt-av1 ] 614 631 ++ optionals withTensorflow [ libtensorflow ] 615 632 ++ optionals withTheora [ libtheora ] 633 + ++ optionals withV4l2 [ libv4l ] 616 634 ++ optionals withVaapi [ (if withSmallDeps then libva else libva-minimal) ] 617 635 ++ optionals withVdpau [ libvdpau ] 618 636 ++ optionals withVidStab [ vid-stab ] ··· 620 638 ++ optionals withVoAmrwbenc [ vo-amrwbenc ] 621 639 ++ optionals withVorbis [ libvorbis ] 622 640 ++ optionals withVpx [ libvpx ] 623 - ++ optionals withV4l2 [ libv4l ] 624 641 ++ optionals withVulkan [ vulkan-headers vulkan-loader ] 625 642 ++ optionals withWebp [ libwebp ] 626 643 ++ optionals withX264 [ x264 ] ··· 703 720 ''; 704 721 license = with licenses; [ lgpl21Plus ] 705 722 ++ optional withGPL gpl2Plus 723 + ++ optional withVersion3 lgpl3Plus 706 724 ++ optional withGPLv3 gpl3Plus 707 - ++ optional withUnfree unfreeRedistributable; 725 + ++ optional withUnfree unfreeRedistributable 726 + ++ optional (withGPL && withUnfree) unfree; 708 727 pkgConfigModules = [ "libavutil" ]; 709 728 platforms = platforms.all; 710 - maintainers = with maintainers; [ atemu arthsmn ]; 729 + maintainers = with maintainers; [ atemu arthsmn jopejoe1 ]; 711 730 mainProgram = "ffmpeg"; 712 731 }; 713 732 })
+2 -2
pkgs/development/libraries/gjs/default.nix
··· 32 32 ]; 33 33 in stdenv.mkDerivation (finalAttrs: { 34 34 pname = "gjs"; 35 - version = "1.78.1"; 35 + version = "1.78.3"; 36 36 37 37 outputs = [ "out" "dev" "installedTests" ]; 38 38 39 39 src = fetchurl { 40 40 url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz"; 41 - hash = "sha256-fpBRHEKRJ8OerABoxKyaNT335vu8ZG9fGOiWKILBhkE="; 41 + hash = "sha256-QtUDZMql15LHZzT+W7zEudu0iBnaIKQGAGHouVJhNKQ="; 42 42 }; 43 43 44 44 patches = [
+2 -2
pkgs/development/libraries/glib/default.nix
··· 50 50 51 51 stdenv.mkDerivation (finalAttrs: { 52 52 pname = "glib"; 53 - version = "2.78.3"; 53 + version = "2.78.4"; 54 54 55 55 src = fetchurl { 56 56 url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; 57 - sha256 = "YJgB3Tc3luUVlyv5X8Cy2qRFRUge4vRlxPIE0iSyvCE="; 57 + sha256 = "sha256-JLjgZy3KEgzDLTlLzLhYROcy4E/nXRi7BXOy28dUj2M="; 58 58 }; 59 59 60 60 patches = lib.optionals stdenv.isDarwin [
pkgs/development/libraries/glibc/2.38-master.patch.gz

This is a binary file and will not be displayed.

+8 -3
pkgs/development/libraries/glibc/common.nix
··· 44 44 45 45 let 46 46 version = "2.38"; 47 - patchSuffix = "-27"; 47 + patchSuffix = "-44"; 48 48 sha256 = "sha256-+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I="; 49 49 in 50 50 ··· 60 60 [ 61 61 /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. 62 62 $ git fetch --all -p && git checkout origin/release/2.38/master && git describe 63 - glibc-2.38-27-g750a45a783 63 + glibc-2.38-44-gd37c2b20a4 64 64 $ git show --minimal --reverse glibc-2.38.. | gzip -9n --rsyncable - > 2.38-master.patch.gz 65 65 66 66 To compare the archive contents zdiff can be used. ··· 96 96 & https://github.com/NixOS/nixpkgs/pull/188492#issuecomment-1233802991 97 97 */ 98 98 ./reenable_DT_HASH.patch 99 + 100 + /* Retrieved from https://salsa.debian.org/glibc-team/glibc/-/commit/662dbc4f9287139a0d9c91df328a5ba6cc6abee1#0f3c6d67cb8cf5bb35c421c20f828fea97b68edf 101 + Qualys advisory: https://www.qualys.com/2024/01/30/qsort.txt 102 + */ 103 + ./local-qsort-memory-corruption.patch 99 104 ] 100 105 /* NVCC does not support ARM intrinsics. Since <math.h> is pulled in by almost 101 106 every HPC piece of software, without this patch CUDA compilation on ARM ··· 155 160 # and on aarch64 with binutils 2.30 or later. 156 161 # https://sourceware.org/glibc/wiki/PortStatus 157 162 "--enable-static-pie" 158 - ] ++ lib.optionals stdenv.hostPlatform.isx86 [ 163 + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ 159 164 # Enable Intel Control-flow Enforcement Technology (CET) support 160 165 "--enable-cet" 161 166 ] ++ lib.optionals withLinuxHeaders [
+14
pkgs/development/libraries/glibc/local-qsort-memory-corruption.patch
··· 1 + diff -rup a/stdlib/qsort.c b/stdlib/qsort.c 2 + --- a/stdlib/qsort.c 2023-07-31 10:54:16.000000000 -0700 3 + +++ b/stdlib/qsort.c 2024-01-15 09:08:25.596167959 -0800 4 + @@ -224,7 +224,8 @@ _quicksort (void *const pbase, size_t to 5 + while ((run_ptr += size) <= end_ptr) 6 + { 7 + tmp_ptr = run_ptr - size; 8 + - while ((*cmp) ((void *) run_ptr, (void *) tmp_ptr, arg) < 0) 9 + + while (tmp_ptr != base_ptr 10 + + && (*cmp) ((void *) run_ptr, (void *) tmp_ptr, arg) < 0) 11 + tmp_ptr -= size; 12 + 13 + tmp_ptr += size; 14 +
+2 -2
pkgs/development/libraries/gperftools/default.nix
··· 9 9 10 10 stdenv.mkDerivation rec { 11 11 pname = "gperftools"; 12 - version = "2.10"; 12 + version = "2.15"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = pname; 16 16 repo = pname; 17 17 rev = "${pname}-${version}"; 18 - sha256 = "sha256-lUX9T31cYZEi+0DgF52EDSL9yiSHa8ToMxhpQFKHOGk="; 18 + sha256 = "sha256-3ibr8AHzo7txX1U+9oOWA60qeeJs/OGeevv+sgBwQa0="; 19 19 }; 20 20 21 21 patches = [
+15 -8
pkgs/development/libraries/graphene/default.nix
··· 11 11 , mutest 12 12 , nixosTests 13 13 , glib 14 + , withDocumentation ? !stdenv.hostPlatform.isStatic 14 15 , gtk-doc 15 16 , docbook_xsl 16 17 , docbook_xml_dtd_43 18 + , buildPackages 17 19 , gobject-introspection 20 + , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages 18 21 , makeWrapper 19 22 }: 20 23 ··· 22 25 pname = "graphene"; 23 26 version = "1.10.8"; 24 27 25 - outputs = [ "out" "dev" "devdoc" ] 28 + outputs = [ "out" "dev" ] 29 + ++ lib.optionals withDocumentation [ "devdoc" ] 26 30 ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "installedTests" ]; 27 31 28 32 src = fetchFromGitHub { ··· 51 55 ]; 52 56 53 57 nativeBuildInputs = [ 54 - docbook_xml_dtd_43 55 - docbook_xsl 56 - gtk-doc 57 58 meson 58 59 ninja 59 60 pkg-config 60 - gobject-introspection 61 61 python3 62 62 makeWrapper 63 + ] ++ lib.optionals withDocumentation [ 64 + docbook_xml_dtd_43 65 + docbook_xsl 66 + gtk-doc 67 + ] ++ lib.optionals withIntrospection [ 68 + gobject-introspection 63 69 ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ 64 70 mesonEmulatorHook 65 71 ]; ··· 73 79 ]; 74 80 75 81 mesonFlags = [ 76 - "-Dgtk_doc=true" 77 - "-Dintrospection=enabled" 82 + (lib.mesonBool "gtk_doc" withDocumentation) 83 + (lib.mesonEnable "introspection" withIntrospection) 78 84 "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" 79 85 "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" 80 86 ] ++ lib.optionals stdenv.isAarch32 [ ··· 87 93 88 94 postPatch = '' 89 95 patchShebangs tests/gen-installed-test.py 96 + '' + lib.optionalString withIntrospection '' 90 97 PATH=${python3.withPackages (pp: [ pp.pygobject3 pp.tappy ])}/bin:$PATH patchShebangs tests/introspection.py 91 98 ''; 92 99 93 100 postFixup = let 94 101 introspectionPy = "${placeholder "installedTests"}/libexec/installed-tests/graphene-1.0/introspection.py"; 95 - in '' 102 + in lib.optionalString withIntrospection '' 96 103 if [ -x '${introspectionPy}' ] ; then 97 104 wrapProgram '${introspectionPy}' \ 98 105 --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0"
+8 -2
pkgs/development/libraries/grpc/default.nix
··· 21 21 22 22 stdenv.mkDerivation rec { 23 23 pname = "grpc"; 24 - version = "1.60.0"; # N.B: if you change this, please update: 24 + version = "1.61.0"; # N.B: if you change this, please update: 25 25 # pythonPackages.grpcio-tools 26 26 # pythonPackages.grpcio-status 27 27 ··· 29 29 owner = "grpc"; 30 30 repo = "grpc"; 31 31 rev = "v${version}"; 32 - hash = "sha256-0mn+nQAgaurd1WomzcLUAYwp88l26qGkP+cP1SSYxsE="; 32 + hash = "sha256-NLxcGFQ1F5RLoSFC0XYMjvGXkSWc/vLzgtk5qsOndEo="; 33 33 fetchSubmodules = true; 34 34 }; 35 35 ··· 39 39 name = "grpc-link-libatomic.patch"; 40 40 url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch"; 41 41 hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8="; 42 + }) 43 + (fetchpatch { 44 + # Fix compatibility with Abseil 202401. Remove with the next release. 45 + url = "https://github.com/grpc/grpc/commit/bc044174401a0842b36b8682936fc93b5041cf88.patch"; 46 + hash = "sha256-VKAuPtLqsR2dmrpKuFXq2HIhuDxPJVSH2w1G00N07RI="; 47 + excludes = [ "src/core/lib/transport/message.cc" ]; 42 48 }) 43 49 ]; 44 50
+2 -2
pkgs/development/libraries/httplib/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "httplib"; 10 - version = "0.15.2"; 10 + version = "0.15.3"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "yhirose"; 14 14 repo = "cpp-httplib"; 15 15 rev = "v${version}"; 16 - hash = "sha256-DNktnRckqiZf0EQ96LfweDvBNgcX8u3Gry1LCs/Qj74="; 16 + hash = "sha256-+YAjmsZvBkOk5bsjE07weTNUmevHd1ZXP0bv5QbkZMs="; 17 17 }; 18 18 19 19 nativeBuildInputs = [ cmake ];
+2 -2
pkgs/development/libraries/iso-codes/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "iso-codes"; 5 - version = "4.15.0"; 5 + version = "4.16.0"; 6 6 7 7 src = fetchurl { 8 8 url = "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v${version}/${pname}-v${version}.tar.gz"; 9 - sha256 = "sha256-uDtUudfdbrh3OAs+xG83CwXa8sv6ExxhLwNZjWVMDvg="; 9 + sha256 = "sha256-fJkPw5oFl1vtsBdeP/Cfw4MEiBX2i0Yqu/BVqAMuZsw="; 10 10 }; 11 11 12 12 nativeBuildInputs = [ gettext python3 ];
-4
pkgs/development/libraries/jellyfin-ffmpeg/default.nix
··· 1 1 { ffmpeg_6-full 2 - , chromaprint 3 2 , fetchFromGitHub 4 3 , lib 5 4 }: ··· 18 17 # Clobber upstream patches as they don't apply to the Jellyfin fork 19 18 patches = []; 20 19 21 - buildInputs = old.buildInputs ++ [ chromaprint ]; 22 - 23 20 configureFlags = old.configureFlags ++ [ 24 21 "--extra-version=Jellyfin" 25 22 "--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067 26 - "--enable-chromaprint" 27 23 ]; 28 24 29 25 postPatch = ''
-1
pkgs/development/libraries/kf5gpgmepp/default.nix
··· 17 17 18 18 meta = with lib; { 19 19 license = [ licenses.lgpl2 ]; 20 - maintainers = [ maintainers.ehmry ]; 21 20 platforms = platforms.linux; 22 21 }; 23 22
+3 -7
pkgs/development/libraries/libaom/default.nix
··· 1 1 { lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3 2 - , enableButteraugli ? true, libjxl 3 2 , enableVmaf ? true, libvmaf 4 3 , gitUpdater 5 4 }: ··· 9 8 in 10 9 stdenv.mkDerivation rec { 11 10 pname = "libaom"; 12 - version = "3.8.0"; 11 + version = "3.8.1"; 13 12 14 13 src = fetchzip { 15 14 url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; 16 - hash = "sha256-JxMz+XnjmUvk8TlTqdU2HP1Gq3bXfcLkXp5AEv9+7hM="; 15 + hash = "sha256-qng9fEbm71HqPnPzfgqswSium9egIgpB6ZLesOQVg6c="; 17 16 stripRoot = false; 18 17 }; 19 18 ··· 23 22 yasm perl cmake pkg-config python3 24 23 ]; 25 24 26 - propagatedBuildInputs = lib.optional enableButteraugli libjxl 27 - ++ lib.optional enableVmaf libvmaf; 25 + propagatedBuildInputs = lib.optional enableVmaf libvmaf; 28 26 29 27 preConfigure = '' 30 28 # build uses `git describe` to set the build version ··· 42 40 cmakeFlags = [ 43 41 "-DBUILD_SHARED_LIBS=ON" 44 42 "-DENABLE_TESTS=OFF" 45 - ] ++ lib.optionals enableButteraugli [ 46 - "-DCONFIG_TUNE_BUTTERAUGLI=1" 47 43 ] ++ lib.optionals enableVmaf [ 48 44 "-DCONFIG_TUNE_VMAF=1" 49 45 ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
+11 -17
pkgs/development/libraries/libcamera/default.nix pkgs/by-name/li/libcamera/package.nix
··· 1 1 { stdenv 2 2 , fetchgit 3 - , fetchpatch 4 3 , lib 4 + , fetchpatch 5 5 , meson 6 6 , ninja 7 7 , pkg-config ··· 18 18 , python3 19 19 , python3Packages 20 20 , systemd # for libudev 21 + , withQcam ? false 22 + , qt5 # withQcam 23 + , libtiff # withQcam 21 24 }: 22 25 23 26 stdenv.mkDerivation rec { 24 27 pname = "libcamera"; 25 - version = "0.1.0"; 28 + version = "0.2.0"; 26 29 27 30 src = fetchgit { 28 31 url = "https://git.libcamera.org/libcamera/libcamera.git"; 29 32 rev = "v${version}"; 30 - hash = "sha256-icHZtv25QvJEv0DlELT3cDxho3Oz2BJAMNKr5W4bshk="; 33 + hash = "sha256-x0Im9m9MoACJhQKorMI34YQ+/bd62NdAPc2nWwaJAvM="; 31 34 }; 32 35 33 36 outputs = [ "out" "dev" "doc" ]; 34 37 35 - patches = [ 36 - (fetchpatch { 37 - # https://git.libcamera.org/libcamera/libcamera.git/commit/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5 38 - name = "libcamera-sphinx7.0-compat.patch"; 39 - url = "https://git.libcamera.org/libcamera/libcamera.git/patch/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5"; 40 - hash = "sha256-gs0EiT3gWlmRjDim+o2C0VmnoWqEouP5pNTD4XbNSdE="; 41 - }) 42 - ]; 43 - 44 38 postPatch = '' 45 39 patchShebangs utils/ 46 40 ''; ··· 69 63 libyaml 70 64 71 65 gtest 72 - ]; 66 + ] ++ lib.optionals withQcam [ libtiff qt5.qtbase qt5.qttools ]; 73 67 74 68 nativeBuildInputs = [ 75 69 meson ··· 83 77 graphviz 84 78 doxygen 85 79 openssl 86 - ]; 80 + ] ++ lib.optional withQcam qt5.wrapQtAppsHook; 87 81 88 82 mesonFlags = [ 89 83 "-Dv4l2=true" 90 - "-Dqcam=disabled" 84 + "-Dqcam=${if withQcam then "enabled" else "disabled"}" 91 85 "-Dlc-compliance=disabled" # tries unconditionally to download gtest when enabled 92 86 # Avoid blanket -Werror to evade build failures on less 93 87 # tested compilers. 94 88 "-Dwerror=false" 95 - ]; 89 + ]; 96 90 97 91 # Fixes error on a deprecated declaration 98 92 env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; 99 93 100 94 # Silence fontconfig warnings about missing config 101 - FONTCONFIG_FILE = makeFontsConf { fontDirectories = []; }; 95 + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; 102 96 103 97 # libcamera signs the IPA module libraries at install time, but they are then 104 98 # modified by stripping and RPATH fixup. Therefore, we need to generate the
+3 -3
pkgs/development/libraries/libcbor/default.nix
··· 14 14 15 15 stdenv.mkDerivation (finalAttrs: { 16 16 pname = "libcbor"; 17 - version = "unstable-2023-01-29"; # Musl fix hasn't been released yet. 17 + version = "0.10.2"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "PJK"; 21 21 repo = "libcbor"; 22 - rev = "cb4162f40d94751141b4d43b07c4add83e738a68"; 23 - sha256 = "sha256-ZTa+wG1g9KsVoqJG/yqxo2fJ7OhPnaI9QcfOmpOT3pg="; 22 + rev = "v${finalAttrs.version}"; 23 + hash = "sha256-eE11hYPsOKqfoX8fx/oYfOAichhUe4mMpNQNVZ6vAUI="; 24 24 }; 25 25 26 26 outputs = [ "out" "dev" ];
+4 -2
pkgs/development/libraries/libdecor/default.nix
··· 10 10 , cairo 11 11 , dbus 12 12 , pango 13 + , gtk3 13 14 }: 14 15 15 16 stdenv.mkDerivation rec { 16 17 pname = "libdecor"; 17 - version = "0.1.1"; 18 + version = "0.2.2"; 18 19 19 20 src = fetchFromGitLab { 20 21 domain = "gitlab.freedesktop.org"; 21 22 owner = "libdecor"; 22 23 repo = "libdecor"; 23 24 rev = version; 24 - hash = "sha256-8b6qCqOSDDbhYwAeAaUyI71tSopTkGtCJaxZaJw1vQQ="; 25 + hash = "sha256-mID19uHXFKJUZtQsSOXjRdz541YVjMxmSHVa+DlkPRc="; 25 26 }; 26 27 27 28 outputs = [ "out" "dev" ]; ··· 45 46 cairo 46 47 dbus 47 48 pango 49 + gtk3 48 50 ]; 49 51 50 52 meta = with lib; {
+2 -2
pkgs/development/libraries/libedit/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "libedit"; 5 - version = "20221030-3.1"; 5 + version = "20230828-3.1"; 6 6 7 7 src = fetchurl { 8 8 url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz"; 9 - sha256 = "sha256-8JJaWt9LG/EW7hl2a32qdmkXrsGYdHlDscTt9npL4rs="; 9 + sha256 = "sha256-TugYK25WkpDn0fRPD3jayHFrNfZWt2Uo9pnGnJiBTa0="; 10 10 }; 11 11 12 12 outputs = [ "out" "dev" ];
+2 -2
pkgs/development/libraries/libei/default.nix
··· 23 23 in 24 24 stdenv.mkDerivation rec { 25 25 pname = "libei"; 26 - version = "1.1.0"; 26 + version = "1.2.0"; 27 27 28 28 src = fetchFromGitLab { 29 29 domain = "gitlab.freedesktop.org"; 30 30 owner = "libinput"; 31 31 repo = "libei"; 32 32 rev = version; 33 - hash = "sha256-ebZZ2dGXrPBUDPsuu5GZY5kDv9qndnxepQUGFDe9PUg="; 33 + hash = "sha256-MHPWEBMtxoEJ8j3LyDPD+m3DsO9u8nE+/pPtRHHXEXA="; 34 34 }; 35 35 36 36 buildInputs = [
+18 -1
pkgs/development/libraries/libgit2/default.nix
··· 23 23 version = "1.7.1"; 24 24 # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib 25 25 26 + outputs = ["lib" "dev" "out"]; 27 + 26 28 src = fetchFromGitHub { 27 29 owner = "libgit2"; 28 30 repo = "libgit2"; ··· 47 49 48 50 propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; 49 51 50 - doCheck = false; # hangs. or very expensive? 52 + doCheck = true; 53 + checkPhase = '' 54 + testArgs=(-v -xonline) 55 + 56 + # slow 57 + testArgs+=(-xclone::nonetwork::bad_urls) 58 + 59 + # failed to set permissions on ...: Operation not permitted 60 + testArgs+=(-xrepo::init::extended_1) 61 + testArgs+=(-xrepo::template::extended_with_template_and_shared_mode) 62 + 63 + ( 64 + set -x 65 + ./libgit2_tests ''${testArgs[@]} 66 + ) 67 + ''; 51 68 52 69 passthru.tests = { 53 70 inherit libgit2-glib;
+12 -1
pkgs/development/libraries/libgudev/default.nix
··· 9 9 , gnome 10 10 , vala 11 11 , gobject-introspection 12 - , fetchpatch 13 12 , glibcLocales 14 13 , umockdev 15 14 }: ··· 24 23 url = "mirror://gnome/sources/libgudev/${lib.versions.majorMinor finalAttrs.version}/libgudev-${finalAttrs.version}.tar.xz"; 25 24 hash = "sha256-YSZqsa/J1z28YKiyr3PpnS/f9H2ZVE0IV2Dk+mZ7XdE="; 26 25 }; 26 + 27 + patches = [ 28 + # Conditionally disable one test that requires a locale implementation 29 + # https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/31 30 + ./tests-skip-double-test-on-stub-locale-impls.patch 31 + ]; 32 + 33 + postPatch = '' 34 + # The relative location of LD_PRELOAD works for Glibc but not for other loaders (e.g. pkgsMusl) 35 + substituteInPlace tests/meson.build \ 36 + --replace "LD_PRELOAD=libumockdev-preload.so.0" "LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0" 37 + ''; 27 38 28 39 strictDeps = true; 29 40
+41
pkgs/development/libraries/libgudev/tests-skip-double-test-on-stub-locale-impls.patch
··· 1 + From ad8b10870ee2092268f87144d8e5ab7db2011139 Mon Sep 17 00:00:00 2001 2 + From: Alyssa Ross <hi@alyssa.is> 3 + Date: Tue, 30 Jan 2024 20:47:21 +0100 4 + Subject: [PATCH] tests: Skip double test on stub locale impls 5 + 6 + On musl, setlocale() with an unknown locale name will succeed, but 7 + treat the requested locale as if it were C.UTF-8. Therefore, to 8 + properly check whether the locale is supported, we need to actually 9 + verify whether it works the way we expect when deciding whether to 10 + skip the test. 11 + --- 12 + tests/test-double.c | 6 ++++-- 13 + 1 file changed, 4 insertions(+), 2 deletions(-) 14 + 15 + diff --git a/tests/test-double.c b/tests/test-double.c 16 + index 91e77c9..e9d9232 100644 17 + --- a/tests/test-double.c 18 + +++ b/tests/test-double.c 19 + @@ -39,8 +39,6 @@ fixture_teardown (Fixture *f, G_GNUC_UNUSED const void *data) 20 + static void 21 + test_double (Fixture *f, G_GNUC_UNUSED const void *data) 22 + { 23 + - g_assert_cmpstr (nl_langinfo(RADIXCHAR), ==, ","); 24 + - 25 + umockdev_testbed_add_device (f->testbed, "platform", "dev1", NULL, 26 + "in_accel_scale", "0.0000098", NULL, 27 + "ID_MODEL", "KoolGadget", "SCALE", "0.0000098", NULL); 28 + @@ -73,6 +71,10 @@ int main(int argc, char **argv) 29 + if (setlocale (LC_NUMERIC, "fr_FR.UTF-8") == NULL) 30 + return GNU_SKIP_RETURNCODE; 31 + 32 + + /* Skip if locale doesn't work how we expect. */ 33 + + if (strcmp (nl_langinfo(RADIXCHAR), ",")) 34 + + return GNU_SKIP_RETURNCODE; 35 + + 36 + g_test_init (&argc, &argv, NULL); 37 + 38 + g_test_add ("/gudev/double", Fixture, NULL, 39 + -- 40 + GitLab 41 +
+2 -2
pkgs/development/libraries/libidn/default.nix
··· 4 4 5 5 stdenv.mkDerivation (finalAttrs: { 6 6 pname = "libidn"; 7 - version = "1.41"; 7 + version = "1.42"; 8 8 9 9 src = fetchurl { 10 10 url = "mirror://gnu/libidn/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; 11 - sha256 = "sha256-iE1wY2S4Gr3Re+6Whtj/KudDHFoUZRBHxorfizH9iUU="; 11 + sha256 = "sha256-1sGZ3NgG5P4nk2DLSwg0mg05Vg7VSP/RzK3ajN7LRyM="; 12 12 }; 13 13 14 14 outputs = [ "bin" "dev" "out" "info" "devdoc" ];
+2 -2
pkgs/development/libraries/libidn2/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "libidn2"; 10 - version = "2.3.4"; 10 + version = "2.3.7"; 11 11 12 12 src = fetchurl { 13 13 url = "https://ftp.gnu.org/gnu/libidn/${pname}-${version}.tar.gz"; 14 - sha256 = "sha256-k8q6crTgUdH41PWgdqtjyZt3+u4Bm3K5eDsmeYbbtF8="; 14 + hash = "sha256-TCGnkbYQuVGbnQ4SuAl78vNZsS+N2SZHYRqSnmv9fWQ="; 15 15 }; 16 16 17 17 strictDeps = true;
+77 -50
pkgs/development/libraries/libimagequant/Cargo.lock
··· 10 10 11 11 [[package]] 12 12 name = "ahash" 13 - version = "0.8.3" 13 + version = "0.8.7" 14 14 source = "registry+https://github.com/rust-lang/crates.io-index" 15 - checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" 15 + checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" 16 16 dependencies = [ 17 17 "cfg-if", 18 18 "once_cell", 19 19 "version_check", 20 + "zerocopy", 20 21 ] 21 22 22 23 [[package]] ··· 26 27 checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" 27 28 28 29 [[package]] 29 - name = "autocfg" 30 - version = "1.1.0" 31 - source = "registry+https://github.com/rust-lang/crates.io-index" 32 - checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" 33 - 34 - [[package]] 35 30 name = "bitflags" 36 - version = "2.4.0" 31 + version = "2.4.2" 37 32 source = "registry+https://github.com/rust-lang/crates.io-index" 38 - checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" 33 + checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" 39 34 40 35 [[package]] 41 36 name = "bytemuck" ··· 77 72 78 73 [[package]] 79 74 name = "crossbeam-deque" 80 - version = "0.8.3" 75 + version = "0.8.5" 81 76 source = "registry+https://github.com/rust-lang/crates.io-index" 82 - checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" 77 + checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" 83 78 dependencies = [ 84 - "cfg-if", 85 79 "crossbeam-epoch", 86 80 "crossbeam-utils", 87 81 ] 88 82 89 83 [[package]] 90 84 name = "crossbeam-epoch" 91 - version = "0.9.15" 85 + version = "0.9.18" 92 86 source = "registry+https://github.com/rust-lang/crates.io-index" 93 - checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" 87 + checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" 94 88 dependencies = [ 95 - "autocfg", 96 - "cfg-if", 97 89 "crossbeam-utils", 98 - "memoffset", 99 - "scopeguard", 100 90 ] 101 91 102 92 [[package]] 103 93 name = "crossbeam-utils" 104 - version = "0.8.16" 94 + version = "0.8.19" 105 95 source = "registry+https://github.com/rust-lang/crates.io-index" 106 - checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" 107 - dependencies = [ 108 - "cfg-if", 109 - ] 96 + checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" 110 97 111 98 [[package]] 112 99 name = "either" ··· 144 131 145 132 [[package]] 146 133 name = "imagequant" 147 - version = "4.2.2" 134 + version = "4.3.0" 148 135 dependencies = [ 149 136 "arrayvec", 150 137 "lodepng", ··· 156 143 157 144 [[package]] 158 145 name = "imagequant-sys" 159 - version = "4.0.3" 146 + version = "4.0.4" 160 147 dependencies = [ 161 148 "bitflags", 162 149 "imagequant", ··· 165 152 166 153 [[package]] 167 154 name = "libc" 168 - version = "0.2.149" 155 + version = "0.2.152" 169 156 source = "registry+https://github.com/rust-lang/crates.io-index" 170 - checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" 157 + checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" 171 158 172 159 [[package]] 173 160 name = "lodepng" 174 - version = "3.9.1" 161 + version = "3.10.1" 175 162 source = "registry+https://github.com/rust-lang/crates.io-index" 176 - checksum = "a3cdccd0cf57a5d456f0656ebcff72c2e19503287e1afbf3b84382812adc0606" 163 + checksum = "a42d298694b14401847de29abd44adf278b42e989e516deac7b72018400002d8" 177 164 dependencies = [ 178 165 "crc32fast", 179 166 "fallible_collections", ··· 183 170 ] 184 171 185 172 [[package]] 186 - name = "memoffset" 187 - version = "0.9.0" 173 + name = "miniz_oxide" 174 + version = "0.7.1" 188 175 source = "registry+https://github.com/rust-lang/crates.io-index" 189 - checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" 176 + checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" 190 177 dependencies = [ 191 - "autocfg", 178 + "adler", 192 179 ] 193 180 194 181 [[package]] 195 - name = "miniz_oxide" 196 - version = "0.7.1" 182 + name = "once_cell" 183 + version = "1.19.0" 184 + source = "registry+https://github.com/rust-lang/crates.io-index" 185 + checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" 186 + 187 + [[package]] 188 + name = "proc-macro2" 189 + version = "1.0.78" 197 190 source = "registry+https://github.com/rust-lang/crates.io-index" 198 - checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" 191 + checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" 199 192 dependencies = [ 200 - "adler", 193 + "unicode-ident", 201 194 ] 202 195 203 196 [[package]] 204 - name = "once_cell" 205 - version = "1.18.0" 197 + name = "quote" 198 + version = "1.0.35" 206 199 source = "registry+https://github.com/rust-lang/crates.io-index" 207 - checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" 200 + checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" 201 + dependencies = [ 202 + "proc-macro2", 203 + ] 208 204 209 205 [[package]] 210 206 name = "rayon" 211 - version = "1.8.0" 207 + version = "1.8.1" 212 208 source = "registry+https://github.com/rust-lang/crates.io-index" 213 - checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" 209 + checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" 214 210 dependencies = [ 215 211 "either", 216 212 "rayon-core", ··· 218 214 219 215 [[package]] 220 216 name = "rayon-core" 221 - version = "1.12.0" 217 + version = "1.12.1" 222 218 source = "registry+https://github.com/rust-lang/crates.io-index" 223 - checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" 219 + checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" 224 220 dependencies = [ 225 221 "crossbeam-deque", 226 222 "crossbeam-utils", ··· 228 224 229 225 [[package]] 230 226 name = "rgb" 231 - version = "0.8.36" 227 + version = "0.8.37" 232 228 source = "registry+https://github.com/rust-lang/crates.io-index" 233 - checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" 229 + checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" 234 230 dependencies = [ 235 231 "bytemuck", 236 232 ] 237 233 238 234 [[package]] 239 - name = "scopeguard" 240 - version = "1.2.0" 235 + name = "syn" 236 + version = "2.0.48" 241 237 source = "registry+https://github.com/rust-lang/crates.io-index" 242 - checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" 238 + checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" 239 + dependencies = [ 240 + "proc-macro2", 241 + "quote", 242 + "unicode-ident", 243 + ] 243 244 244 245 [[package]] 245 246 name = "thread_local" ··· 252 253 ] 253 254 254 255 [[package]] 256 + name = "unicode-ident" 257 + version = "1.0.12" 258 + source = "registry+https://github.com/rust-lang/crates.io-index" 259 + checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" 260 + 261 + [[package]] 255 262 name = "version_check" 256 263 version = "0.9.4" 257 264 source = "registry+https://github.com/rust-lang/crates.io-index" 258 265 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" 266 + 267 + [[package]] 268 + name = "zerocopy" 269 + version = "0.7.32" 270 + source = "registry+https://github.com/rust-lang/crates.io-index" 271 + checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" 272 + dependencies = [ 273 + "zerocopy-derive", 274 + ] 275 + 276 + [[package]] 277 + name = "zerocopy-derive" 278 + version = "0.7.32" 279 + source = "registry+https://github.com/rust-lang/crates.io-index" 280 + checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" 281 + dependencies = [ 282 + "proc-macro2", 283 + "quote", 284 + "syn", 285 + ]
+23 -4
pkgs/development/libraries/libimagequant/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, fetchurl, rust, rustPlatform, cargo-c, python3 }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , fetchurl 5 + , rust 6 + , rustPlatform 7 + , cargo-c 8 + , python3 9 + 10 + # tests 11 + , testers 12 + , vips 13 + , libimagequant 14 + }: 2 15 3 16 rustPlatform.buildRustPackage rec { 4 17 pname = "libimagequant"; 5 - version = "4.2.2"; 18 + version = "4.3.0"; 6 19 7 20 src = fetchFromGitHub { 8 21 owner = "ImageOptim"; 9 - repo = pname; 22 + repo = "libimagequant"; 10 23 rev = version; 11 - hash = "sha256-cZgnJOmj+xJDcewsxH2Jp5AAnFZKVuYxKPtoGeN03g4="; 24 + hash = "sha256-/gHe3LQaBWOQImBesKvHK46T42TtRld988wgxbut4i0="; 12 25 }; 13 26 14 27 cargoLock = { ··· 34 47 ''; 35 48 36 49 passthru.tests = { 50 + inherit vips; 37 51 inherit (python3.pkgs) pillow; 52 + 53 + pkg-config = testers.hasPkgConfigModules { 54 + package = libimagequant; 55 + moduleNames = [ "imagequant" ]; 56 + }; 38 57 }; 39 58 40 59 meta = with lib; {
+2 -2
pkgs/development/libraries/libinput/default.nix
··· 45 45 46 46 stdenv.mkDerivation rec { 47 47 pname = "libinput"; 48 - version = "1.24.0"; 48 + version = "1.25.0"; 49 49 50 50 outputs = [ "bin" "out" "dev" ]; 51 51 ··· 54 54 owner = "libinput"; 55 55 repo = "libinput"; 56 56 rev = version; 57 - sha256 = "sha256-gTcgEZ7cs4jq8w5Genxtio9nVFy7y3n0nNXJ6SVtYHY="; 57 + hash = "sha256-c2FU5OW+CIgtYTQy+bwIbaw3SP1pVxaLokhO+ag5/1s="; 58 58 }; 59 59 60 60 patches = [
+2 -2
pkgs/development/libraries/libipt/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "libipt"; 5 - version = "2.0.6"; 5 + version = "2.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "intel"; 9 9 repo = "libipt"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-RuahOkDLbac9bhXn8QSf7lMRw11PIpXQo3eaQ9N4Rtc="; 11 + sha256 = "sha256-SLCuNTFRGFh0mTv1xLCIDg7b6DbWCxgHhrCoPu9xpmw="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ cmake ];
+11 -81
pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch
··· 1 - From 4a0584f7c05641143151ebdc1be1163bebf9d35d Mon Sep 17 00:00:00 2001 1 + From 6442d11617f95d13e2a371bd3e01f5082a9c356d Mon Sep 17 00:00:00 2001 2 2 From: Las <las@protonmail.ch> 3 3 Date: Sun, 3 Jan 2021 18:35:37 +0000 4 4 Subject: [PATCH] Compile transupp.c as part of the library 5 5 6 - The exported symbols are made weak to not conflict with users 7 - of the library that already vendor this functionality. 8 6 --- 9 7 CMakeLists.txt | 4 ++-- 10 - transupp.c | 14 +++++++------- 11 - 2 files changed, 9 insertions(+), 9 deletions(-) 8 + 1 file changed, 2 insertions(+), 2 deletions(-) 12 9 13 10 diff --git a/CMakeLists.txt b/CMakeLists.txt 14 - index 0ca6f98..a9a0fae 100644 11 + index adb0ca45..46fc16dd 100644 15 12 --- a/CMakeLists.txt 16 13 +++ b/CMakeLists.txt 17 - @@ -533,7 +533,7 @@ set(JPEG_SOURCES jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c 18 - jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdicc.c jdinput.c 19 - jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c jdpostct.c jdsample.c 20 - jdtrans.c jerror.c jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c 21 - - jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c) 22 - + jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c transupp.c) 14 + @@ -581,7 +581,7 @@ set(JPEG_SOURCES ${JPEG12_SOURCES} jcapimin.c jchuff.c jcicc.c jcinit.c 15 + jclhuff.c jcmarker.c jcmaster.c jcomapi.c jcparam.c jcphuff.c jctrans.c 16 + jdapimin.c jdatadst.c jdatasrc.c jdhuff.c jdicc.c jdinput.c jdlhuff.c 17 + jdmarker.c jdmaster.c jdphuff.c jdtrans.c jerror.c jfdctflt.c jmemmgr.c 18 + - jmemnobs.c jpeg_nbits.c) 19 + + jmemnobs.c jpeg_nbits.c transupp.c) 23 20 24 21 if(WITH_ARITH_ENC OR WITH_ARITH_DEC) 25 22 set(JPEG_SOURCES ${JPEG_SOURCES} jaricom.c) 26 - @@ -1489,7 +1489,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets 23 + @@ -1803,7 +1803,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets 27 24 28 25 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h 29 26 ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h ··· 32 29 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) 33 30 34 31 include(cmakescripts/BuildPackages.cmake) 35 - diff --git a/transupp.c b/transupp.c 36 - index 6e86077..2da49a7 100644 37 - --- a/transupp.c 38 - +++ b/transupp.c 39 - @@ -1386,7 +1386,7 @@ jt_read_integer(const char **strptr, JDIMENSION *result) 40 - * This code is loosely based on XParseGeometry from the X11 distribution. 41 - */ 42 - 43 - -GLOBAL(boolean) 44 - +GLOBAL(boolean) __attribute__((weak)) 45 - jtransform_parse_crop_spec(jpeg_transform_info *info, const char *spec) 46 - { 47 - info->crop = FALSE; 48 - @@ -1486,7 +1486,7 @@ trim_bottom_edge(jpeg_transform_info *info, JDIMENSION full_height) 49 - * and transformation is not perfect. Otherwise returns TRUE. 50 - */ 51 - 52 - -GLOBAL(boolean) 53 - +GLOBAL(boolean) __attribute__((weak)) 54 - jtransform_request_workspace(j_decompress_ptr srcinfo, 55 - jpeg_transform_info *info) 56 - { 57 - @@ -2033,7 +2033,7 @@ adjust_exif_parameters(JOCTET *data, unsigned int length, JDIMENSION new_width, 58 - * to jpeg_write_coefficients(). 59 - */ 60 - 61 - -GLOBAL(jvirt_barray_ptr *) 62 - +GLOBAL(jvirt_barray_ptr *) __attribute__((weak)) 63 - jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 64 - jvirt_barray_ptr *src_coef_arrays, 65 - jpeg_transform_info *info) 66 - @@ -2152,7 +2152,7 @@ jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 67 - * Note that some transformations will modify the source data arrays! 68 - */ 69 - 70 - -GLOBAL(void) 71 - +GLOBAL(void) __attribute__((weak)) 72 - jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 73 - jvirt_barray_ptr *src_coef_arrays, 74 - jpeg_transform_info *info) 75 - @@ -2264,7 +2264,7 @@ jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 76 - * (may use custom action then) 77 - */ 78 - 79 - -GLOBAL(boolean) 80 - +GLOBAL(boolean) __attribute__((weak)) 81 - jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, 82 - int MCU_width, int MCU_height, 83 - JXFORM_CODE transform) 84 - @@ -2303,7 +2303,7 @@ jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, 85 - * This must be called before jpeg_read_header() to have the desired effect. 86 - */ 87 - 88 - -GLOBAL(void) 89 - +GLOBAL(void) __attribute__((weak)) 90 - jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) 91 - { 92 - #ifdef SAVE_MARKERS_SUPPORTED 93 - @@ -2331,7 +2331,7 @@ jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) 94 - * JFIF APP0 or Adobe APP14 markers if selected. 95 - */ 96 - 97 - -GLOBAL(void) 98 - +GLOBAL(void) __attribute__((weak)) 99 - jcopy_markers_execute(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 100 - JCOPY_OPTION option) 101 - { 102 32 -- 103 - 2.29.2 33 + 2.43.0 104 34
+81
pkgs/development/libraries/libjpeg-turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch
··· 1 + From 6442d11617f95d13e2a371bd3e01f5082a9c356d Mon Sep 17 00:00:00 2001 2 + From: Las <las@protonmail.ch> 3 + Date: Sun, 3 Jan 2021 18:35:37 +0000 4 + Subject: [PATCH] Make exported symbols in transupp.c weak 5 + 6 + The exported symbols are made weak to not conflict with users 7 + of the library that already vendor this functionality. 8 + --- 9 + transupp.c | 14 +++++++------- 10 + 1 file changed, 7 insertions(+), 7 deletions(-) 11 + 12 + diff --git a/transupp.c b/transupp.c 13 + index 34fbb371..c0ade5a9 100644 14 + --- a/transupp.c 15 + +++ b/transupp.c 16 + @@ -1388,7 +1388,7 @@ jt_read_integer(const char **strptr, JDIMENSION *result) 17 + * This code is loosely based on XParseGeometry from the X11 distribution. 18 + */ 19 + 20 + -GLOBAL(boolean) 21 + +GLOBAL(boolean) __attribute__((weak)) 22 + jtransform_parse_crop_spec(jpeg_transform_info *info, const char *spec) 23 + { 24 + info->crop = FALSE; 25 + @@ -1488,7 +1488,7 @@ trim_bottom_edge(jpeg_transform_info *info, JDIMENSION full_height) 26 + * and transformation is not perfect. Otherwise returns TRUE. 27 + */ 28 + 29 + -GLOBAL(boolean) 30 + +GLOBAL(boolean) __attribute__((weak)) 31 + jtransform_request_workspace(j_decompress_ptr srcinfo, 32 + jpeg_transform_info *info) 33 + { 34 + @@ -2035,7 +2035,7 @@ adjust_exif_parameters(JOCTET *data, unsigned int length, JDIMENSION new_width, 35 + * to jpeg_write_coefficients(). 36 + */ 37 + 38 + -GLOBAL(jvirt_barray_ptr *) 39 + +GLOBAL(jvirt_barray_ptr *) __attribute__((weak)) 40 + jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 41 + jvirt_barray_ptr *src_coef_arrays, 42 + jpeg_transform_info *info) 43 + @@ -2154,7 +2154,7 @@ jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 44 + * Note that some transformations will modify the source data arrays! 45 + */ 46 + 47 + -GLOBAL(void) 48 + +GLOBAL(void) __attribute__((weak)) 49 + jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 50 + jvirt_barray_ptr *src_coef_arrays, 51 + jpeg_transform_info *info) 52 + @@ -2266,7 +2266,7 @@ jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 53 + * (may use custom action then) 54 + */ 55 + 56 + -GLOBAL(boolean) 57 + +GLOBAL(boolean) __attribute__((weak)) 58 + jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, 59 + int MCU_width, int MCU_height, 60 + JXFORM_CODE transform) 61 + @@ -2305,7 +2305,7 @@ jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, 62 + * This must be called before jpeg_read_header() to have the desired effect. 63 + */ 64 + 65 + -GLOBAL(void) 66 + +GLOBAL(void) __attribute__((weak)) 67 + jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) 68 + { 69 + #ifdef SAVE_MARKERS_SUPPORTED 70 + @@ -2337,7 +2337,7 @@ jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option) 71 + * JFIF APP0 or Adobe APP14 markers if selected. 72 + */ 73 + 74 + -GLOBAL(void) 75 + +GLOBAL(void) __attribute__((weak)) 76 + jcopy_markers_execute(j_decompress_ptr srcinfo, j_compress_ptr dstinfo, 77 + JCOPY_OPTION option) 78 + { 79 + -- 80 + 2.43.0 81 +
+17 -6
pkgs/development/libraries/libjpeg-turbo/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 , cmake 5 6 , nasm 6 7 , openjdk ··· 32 33 stdenv.mkDerivation (finalAttrs: { 33 34 34 35 pname = "libjpeg-turbo"; 35 - version = "2.1.5.1"; 36 + version = "3.0.2"; 36 37 37 38 src = fetchFromGitHub { 38 39 owner = "libjpeg-turbo"; 39 40 repo = "libjpeg-turbo"; 40 41 rev = finalAttrs.version; 41 - sha256 = "sha256-96SBBZp+/4WkXLvHKSPItNi5WuzdVccI/ZcbJOFjYYk="; 42 + hash = "sha256-xHjd0WHN50b75wdWPHUwfmJGsiWKmj+zA59UwakIo74="; 42 43 }; 43 44 44 - # This is needed by freeimage 45 - patches = [ ./0001-Compile-transupp.c-as-part-of-the-library.patch ] 46 - ++ lib.optional stdenv.hostPlatform.isMinGW 47 - ./mingw-boolean.patch; 45 + patches = [ 46 + (fetchpatch { 47 + name = "CMAKE_CROSSCOMPILING_EMULATOR=env-fix.patch"; 48 + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/compare/36c51dd3eb60ebde3ca77d3cfa7df3422f1aaaf1..b6ee1016abbc55116304ad396cf88aa19391e10a.patch"; 49 + hash = "sha256-dNwXicvZEsG02TBaM5nYMlZ+VczT/Dfx6ZM/6huZpwE="; 50 + }) 51 + 52 + # This is needed by freeimage 53 + ./0001-Compile-transupp.c-as-part-of-the-library.patch 54 + ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ 55 + ./0002-Make-exported-symbols-in-transupp.c-weak.patch 56 + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ 57 + ./mingw-boolean.patch 58 + ]; 48 59 49 60 outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; 50 61
+3 -15
pkgs/development/libraries/libjxl/default.nix
··· 1 1 { stdenv, lib, fetchFromGitHub 2 - , fetchpatch 3 2 , brotli 4 3 , cmake 5 4 , giflib ··· 12 11 , openexr_3 13 12 , pkg-config 14 13 , zlib 15 - , buildDocs ? true 16 14 , asciidoc 17 15 , graphviz 18 16 , doxygen ··· 21 19 22 20 stdenv.mkDerivation rec { 23 21 pname = "libjxl"; 24 - version = "0.8.2"; 22 + version = "0.9.1"; 25 23 26 24 outputs = [ "out" "dev" ]; 27 25 ··· 29 27 owner = "libjxl"; 30 28 repo = "libjxl"; 31 29 rev = "v${version}"; 32 - hash = "sha256-I3PGgh0XqRkCFz7lUZ3Q4eU0+0GwaQcVb6t4Pru1kKo="; 30 + hash = "sha256-n5KNbbw6NQRROEM7Cojla/igRCFNawUq7nfhzJlMlPI="; 33 31 # There are various submodules in `third_party/`. 34 32 fetchSubmodules = true; 35 33 }; 36 34 37 - patches = [ 38 - # Add missing <atomic> content to fix gcc compilation for RISCV architecture 39 - # https://github.com/libjxl/libjxl/pull/2211 40 - (fetchpatch { 41 - url = "https://github.com/libjxl/libjxl/commit/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc.patch"; 42 - hash = "sha256-X4fbYTMS+kHfZRbeGzSdBW5jQKw8UN44FEyFRUtw0qo="; 43 - }) 44 - ]; 45 - 46 35 nativeBuildInputs = [ 47 36 cmake 48 37 gtest 49 38 pkg-config 50 - ] ++ lib.optionals buildDocs [ 51 39 asciidoc 52 40 doxygen 53 41 python3 54 42 ]; 55 43 56 - depsBuildBuild = lib.optionals buildDocs [ 44 + depsBuildBuild = [ 57 45 graphviz 58 46 ]; 59 47
+2 -2
pkgs/development/libraries/libmaxminddb/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "libmaxminddb"; 5 - version = "1.7.1"; 5 + version = "1.9.1"; 6 6 7 7 src = fetchurl { 8 8 url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; 9 - sha256 = "sha256-6EFPDe3Oy8H2wxy2XNgWUJUqsGd6TYxJyrYDs7j7CD4="; 9 + sha256 = "sha256-qAaCqJ2RX99gs10xYjL7BOvzb/8n/am9Of6KONPNPxI="; 10 10 }; 11 11 12 12 meta = with lib; {
+2 -2
pkgs/development/libraries/libplacebo/default.nix
··· 19 19 20 20 stdenv.mkDerivation rec { 21 21 pname = "libplacebo"; 22 - version = "6.338.1"; 22 + version = "6.338.2"; 23 23 24 24 src = fetchFromGitLab { 25 25 domain = "code.videolan.org"; 26 26 owner = "videolan"; 27 27 repo = pname; 28 28 rev = "v${version}"; 29 - hash = "sha256-NZmwR3+lIC2PF+k+kqCjoMYkMM/PKOJmDwAq7t6YONY="; 29 + hash = "sha256-gE6yKnFvsOFh8bFYc7b+bS+zmdDU7jucr0HwhdDeFzU="; 30 30 }; 31 31 32 32 nativeBuildInputs = [
+3 -16
pkgs/development/libraries/libpsl/default.nix
··· 14 14 , publicsuffix-list 15 15 }: 16 16 17 - let 18 - enableValgrindTests = !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind 19 - # Apparently valgrind doesn't support some new ARM features on (some) Hydra machines: 20 - # VEX: Mismatch detected between RDMA and atomics features. 21 - && !stdenv.isAarch64 22 - # Valgrind on musl does not hook malloc calls properly, resulting in errors `Invalid free() / delete / delete[] / realloc()` 23 - # https://bugs.kde.org/show_bug.cgi?id=435441 24 - && !stdenv.hostPlatform.isMusl 25 - ; 26 - in stdenv.mkDerivation rec { 17 + stdenv.mkDerivation rec { 27 18 pname = "libpsl"; 28 - version = "0.21.2"; 19 + version = "0.21.5"; 29 20 30 21 src = fetchurl { 31 22 url = "https://github.com/rockdaboot/libpsl/releases/download/${version}/libpsl-${version}.tar.lz"; 32 - sha256 = "sha256-qj1wbEUnhtE0XglNriAc022B8Dz4HWNtXPwQ02WQfxc="; 23 + hash = "sha256-mp9qjG7bplDPnqVUdc0XLdKEhzFoBOnHMgLZdXLNOi0="; 33 24 }; 34 25 35 26 nativeBuildInputs = [ ··· 41 32 pkg-config 42 33 python3 43 34 libxslt 44 - ] ++ lib.optionals enableValgrindTests [ 45 - valgrind 46 35 ]; 47 36 48 37 buildInputs = [ ··· 69 58 "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" 70 59 "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" 71 60 "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt" 72 - ] ++ lib.optionals enableValgrindTests [ 73 - "--enable-valgrind-tests" 74 61 ]; 75 62 76 63 enableParallelBuilding = true;
-12
pkgs/development/libraries/libunwind/default.nix
··· 45 45 maintainers = with maintainers; [ orivej ]; 46 46 # https://github.com/libunwind/libunwind#libunwind 47 47 platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd13" "i686-linux" "loongarch64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-freebsd13" "x86_64-linux" "x86_64-solaris" ]; 48 - # libunwind relies on getcontext/setcontext, 49 - # and only has a musl implementation for some platforms 50 - # https://github.com/libunwind/libunwind/issues/33 51 - # https://github.com/libunwind/libunwind/issues/69 52 - badPlatforms = [ { 53 - isAarch64 = false; 54 - isRiscV64 = false; 55 - isS390x = false; 56 - isx86_64 = false; 57 - isMusl = true; 58 - parsed = {}; 59 - } ]; 60 48 license = licenses.mit; 61 49 }; 62 50 }
+2 -2
pkgs/development/libraries/libusb1/default.nix
··· 15 15 16 16 stdenv.mkDerivation rec { 17 17 pname = "libusb"; 18 - version = "1.0.26"; 18 + version = "1.0.27"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "libusb"; 22 22 repo = "libusb"; 23 23 rev = "v${version}"; 24 - sha256 = "sha256-LEy45YiFbueCCi8d2hguujMsxBezaTUERHUpFsTKGZQ="; 24 + sha256 = "sha256-OtzYxWwiba0jRK9X+4deWWDDTeZWlysEt0qMyGUarDo="; 25 25 }; 26 26 27 27 outputs = [ "out" "dev" ];
+3
pkgs/development/libraries/libuv/default.nix
··· 69 69 "fs_event_watch_dir_recursive" "fs_event_watch_file" 70 70 "fs_event_watch_file_current_dir" "fs_event_watch_file_exact_path" 71 71 "process_priority" "udp_create_early_bad_bind" 72 + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ 73 + # fail on macos < 10.15 (starting in libuv 1.47.0) 74 + "fs_write_alotof_bufs_with_offset" "fs_write_multiple_bufs" "fs_read_bufs" 72 75 ] ++ lib.optionals stdenv.isAarch32 [ 73 76 # I observe this test failing with some regularity on ARMv7: 74 77 # https://github.com/libuv/libuv/issues/1871
+3
pkgs/development/libraries/libvirt/default.nix
··· 250 250 substituteInPlace src/util/virpolkit.h \ 251 251 --replace '"/usr/bin/pkttyagent"' '"${if isLinux then polkit.bin else "/usr"}/bin/pkttyagent"' 252 252 253 + substituteInPlace src/util/virpci.c \ 254 + --replace '/lib/modules' '${if isLinux then "/run/booted-system/kernel-modules" else ""}/lib/modules' 255 + 253 256 patchShebangs . 254 257 '' 255 258 + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides));
+2 -2
pkgs/development/libraries/libvpx/default.nix
··· 75 75 76 76 stdenv.mkDerivation rec { 77 77 pname = "libvpx"; 78 - version = "1.13.1"; 78 + version = "1.14.0"; 79 79 80 80 src = fetchFromGitHub { 81 81 owner = "webmproject"; 82 82 repo = pname; 83 83 rev = "v${version}"; 84 - hash = "sha256-KTbzZ5/qCH+bCvatYZhFiWcT+L2duD40E2w/BUaRorQ="; 84 + hash = "sha256-duU1exUg7JiKCtZfNxyb/y40hxsXeTIMShf9YounTWA="; 85 85 }; 86 86 87 87 postPatch = ''
+2 -2
pkgs/development/libraries/libwpe/default.nix
··· 12 12 13 13 stdenv.mkDerivation rec { 14 14 pname = "libwpe"; 15 - version = "1.14.1"; 15 + version = "1.14.2"; 16 16 17 17 src = fetchurl { 18 18 url = "https://wpewebkit.org/releases/libwpe-${version}.tar.xz"; 19 - sha256 = "sha256-sdDNzw+Nu0lOZbD3kT41cQbamg1X9Pu3udEjim2+mt4="; 19 + sha256 = "sha256-iuOAIsUMs0DJb9vuEhfx5Gq1f7wci6mBQlZau+2+Iu8="; 20 20 }; 21 21 22 22 nativeBuildInputs = [
+4 -8
pkgs/development/libraries/libxml2/default.nix
··· 1 1 { stdenv 2 2 , lib 3 3 , fetchurl 4 - , fetchFromGitLab 5 4 , zlib 6 5 , pkg-config 7 6 , autoreconfHook ··· 35 34 let 36 35 libxml = stdenv.mkDerivation rec { 37 36 pname = "libxml2"; 38 - version = "2.12.3-unstable-2023-12-14"; 37 + version = "2.12.4"; 39 38 40 39 outputs = [ "bin" "dev" "out" "doc" ] 41 40 ++ lib.optional pythonSupport "py" 42 41 ++ lib.optional (enableStatic && enableShared) "static"; 43 42 outputMan = "bin"; 44 43 45 - src = fetchFromGitLab { 46 - domain = "gitlab.gnome.org"; 47 - owner = "GNOME"; 48 - repo = "libxml2"; 49 - rev = "f006355eda722cae204606b9f95ba51f5ce9189b"; 50 - hash = "sha256-3WE90KDZq4Uaawuulc3t2+R8duCqgjEGUDN4HSXxohY="; 44 + src = fetchurl { 45 + url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; 46 + hash = "sha256-SXNg5CPPC9merNt8YhXeqS5tbonulAOTwrrg53y5t9A="; 51 47 }; 52 48 53 49 strictDeps = true;
+3 -2
pkgs/development/libraries/lmdb/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "lmdb"; 5 - version = "0.9.31"; 5 + version = "0.9.32"; 6 6 7 7 src = fetchFromGitLab { 8 8 domain = "git.openldap.org"; 9 9 owner = "openldap"; 10 10 repo = "openldap"; 11 11 rev = "LMDB_${version}"; 12 - sha256 = "sha256-SBbo7MX3NST+OFPDtQshevIYrIsZD9bOkSsH91inMBw="; 12 + sha256 = "sha256-29ZrGIiGqrvX+WsPRs2V25hPmAJSHTHaGo19nMldsb8="; 13 13 }; 14 14 15 15 postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; ··· 66 66 limited to the size of the virtual address space. 67 67 ''; 68 68 homepage = "https://symas.com/lmdb/"; 69 + changelog = "https://git.openldap.org/openldap/openldap/-/blob/LMDB_${version}/libraries/liblmdb/CHANGES"; 69 70 maintainers = with maintainers; [ jb55 vcunat ]; 70 71 license = licenses.openldap; 71 72 platforms = platforms.all;
-32
pkgs/development/libraries/lzlib/default.nix
··· 1 - { lib, stdenv, fetchurl, texinfo, lzip }: 2 - 3 - stdenv.mkDerivation rec { 4 - pname = "lzlib"; 5 - version = "1.13"; 6 - outputs = [ "out" "info" ]; 7 - 8 - nativeBuildInputs = [ texinfo lzip ]; 9 - 10 - src = fetchurl { 11 - url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz"; 12 - sha256 = "sha256-3ea9WzJTXxeyjJrCS2ZgfgJQUGrBQypBEso8c/XWYsM="; 13 - }; 14 - 15 - postPatch = lib.optionalString stdenv.isDarwin '' 16 - substituteInPlace Makefile.in --replace '-Wl,--soname=' '-Wl,-install_name,$(out)/lib/' 17 - ''; 18 - 19 - makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ]; 20 - doCheck = true; 21 - 22 - configureFlags = [ "--enable-shared" ]; 23 - 24 - meta = with lib; { 25 - homepage = "https://www.nongnu.org/lzip/${pname}.html"; 26 - description = 27 - "Data compression library providing in-memory LZMA compression and decompression functions, including integrity checking of the decompressed data"; 28 - license = licenses.bsd2; 29 - platforms = platforms.all; 30 - maintainers = with maintainers; [ ehmry ]; 31 - }; 32 - }
+2 -2
pkgs/development/libraries/mdk-sdk/default.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "mdk-sdk"; 8 - version = "0.24.0"; 8 + version = "0.25.0"; 9 9 10 10 src = fetchurl { 11 11 url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz"; 12 - hash = "sha256-kRihFM2+vPg6OAL4ARz0dLLUvAFvZsbrCu5TBI6b2RI="; 12 + hash = "sha256-0m0Rg5Gv7o748iXqHafHvHYX5jHjjnmYE09TbG4PNNY="; 13 13 }; 14 14 15 15 nativeBuildInputs = [ autoPatchelfHook ];
+5 -6
pkgs/development/libraries/mesa/default.nix
··· 86 86 */ 87 87 88 88 let 89 - version = "23.3.3"; 90 - hash = "sha256-UYMHwAV/o87otY33i+Qx1N9ar6ftxg0JJ4stegqA87Q="; 89 + version = "23.3.5"; 90 + hash = "sha256-acyxJ4ZB/1utccoPhmGIrrGpKq3E27nTX1CuvsW4tQ8="; 91 91 92 92 # Release calendar: https://www.mesa3d.org/release-calendar.html 93 93 # Release frequency: https://www.mesa3d.org/releasing.html#schedule ··· 121 121 ./musl.patch 122 122 123 123 ./opencl.patch 124 - ./disk_cache-include-dri-driver-path-in-cache-key.patch 125 124 126 125 # Backports to fix build 127 126 # FIXME: remove when applied upstream ··· 170 169 # https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/meson.html#L327 171 170 "-Db_ndebug=true" 172 171 173 - "-Ddisk-cache-key=${placeholder "drivers"}" 174 172 "-Ddri-search-path=${libglvnd.driverLink}/lib/dri" 175 173 176 174 "-Dplatforms=${lib.concatStringsSep "," eglPlatforms}" ··· 316 314 317 315 postFixup = lib.optionalString stdenv.isLinux '' 318 316 # set the default search path for DRI drivers; used e.g. by X server 319 - substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace "$drivers" "${libglvnd.driverLink}" 320 - [ -f "$dev/lib/pkgconfig/d3d.pc" ] && substituteInPlace "$dev/lib/pkgconfig/d3d.pc" --replace "$drivers" "${libglvnd.driverLink}" 317 + for pc in lib/pkgconfig/{dri,d3d}.pc; do 318 + [ -f "$dev/$pc" ] && substituteInPlace "$dev/$pc" --replace "$drivers" "${libglvnd.driverLink}" 319 + done 321 320 322 321 # remove pkgconfig files for GL/EGL; they are provided by libGL. 323 322 rm -f $dev/lib/pkgconfig/{gl,egl}.pc
-59
pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
··· 1 - diff --git a/meson_options.txt b/meson_options.txt 2 - index 591ed957c85..6cb550593e3 100644 3 - --- a/meson_options.txt 4 - +++ b/meson_options.txt 5 - @@ -519,6 +519,13 @@ option( 6 - description : 'Enable direct rendering in GLX and EGL for DRI', 7 - ) 8 - 9 - +option( 10 - + 'disk-cache-key', 11 - + type : 'string', 12 - + value : '', 13 - + description : 'Mesa cache key.' 14 - +) 15 - + 16 - option('egl-lib-suffix', 17 - type : 'string', 18 - value : '', 19 - diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c 20 - index 1d23b92af7e..fbb4b04f3cf 100644 21 - --- a/src/util/disk_cache.c 22 - +++ b/src/util/disk_cache.c 23 - @@ -218,8 +218,10 @@ disk_cache_type_create(const char *gpu_name, 24 - 25 - /* Create driver id keys */ 26 - size_t id_size = strlen(driver_id) + 1; 27 - + size_t key_size = strlen(DISK_CACHE_KEY) + 1; 28 - size_t gpu_name_size = strlen(gpu_name) + 1; 29 - cache->driver_keys_blob_size += id_size; 30 - + cache->driver_keys_blob_size += key_size; 31 - cache->driver_keys_blob_size += gpu_name_size; 32 - 33 - /* We sometimes store entire structs that contains a pointers in the cache, 34 - @@ -240,6 +242,7 @@ disk_cache_type_create(const char *gpu_name, 35 - uint8_t *drv_key_blob = cache->driver_keys_blob; 36 - DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) 37 - DRV_KEY_CPY(drv_key_blob, driver_id, id_size) 38 - + DRV_KEY_CPY(drv_key_blob, DISK_CACHE_KEY, key_size) 39 - DRV_KEY_CPY(drv_key_blob, gpu_name, gpu_name_size) 40 - DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) 41 - DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) 42 - diff --git a/src/util/meson.build b/src/util/meson.build 43 - index eb88f235c47..eae5c54cc10 100644 44 - --- a/src/util/meson.build 45 - +++ b/src/util/meson.build 46 - @@ -286,7 +286,12 @@ _libmesa_util = static_library( 47 - include_directories : [inc_util, include_directories('format')], 48 - dependencies : deps_for_libmesa_util, 49 - link_with: [libmesa_util_sse41], 50 - - c_args : [c_msvc_compat_args], 51 - + c_args : [ 52 - + c_msvc_compat_args, 53 - + '-DDISK_CACHE_KEY="@0@"'.format( 54 - + get_option('disk-cache-key') 55 - + ), 56 - + ], 57 - gnu_symbol_visibility : 'hidden', 58 - build_by_default : false 59 - )
-8
pkgs/development/libraries/minizip/default.nix
··· 4 4 pname = "minizip"; 5 5 inherit (zlib) src version; 6 6 7 - patches = [ 8 - (fetchpatch { 9 - name = "CVE-2023-45853.patch"; 10 - url = "https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c.patch"; 11 - hash = "sha256-yayfe1g9HsvgMN28WF/MYkH7dGMX4PsK53FcnfL3InM="; 12 - }) 13 - ]; 14 - 15 7 patchFlags = [ "-p3" ]; 16 8 17 9 nativeBuildInputs = [ autoreconfHook ];
+2 -2
pkgs/development/libraries/mpdecimal/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "mpdecimal"; 5 - version = "4.0.0"; 5 + version = "2.5.1"; 6 6 outputs = [ "out" "cxx" "doc" "dev" ]; 7 7 8 8 src = fetchurl { 9 9 url = "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-${version}.tar.gz"; 10 - hash = "sha256-lCRFwyRbInMP1Bpnp8XCMdEcsbmTa5wPdjNPt9C0Row="; 10 + hash = "sha256-n5zUwEH5m1xJ/7e1nZ8S2VtoPYhYVgiqVqYwdmeysh8="; 11 11 }; 12 12 13 13 configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ];
+2 -2
pkgs/development/libraries/nghttp2/default.nix
··· 32 32 33 33 stdenv.mkDerivation rec { 34 34 pname = "nghttp2"; 35 - version = "1.57.0"; 35 + version = "1.59.0"; 36 36 37 37 src = fetchurl { 38 38 url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; 39 - sha256 = "sha256-xjdnfLrESU6q+LDgOGFzFGhFgw76/+To3JL7O0KOWtI="; 39 + sha256 = "sha256-A1P8u6ENKl9304ouSS5eZ3tjexdxI0WkcyXDw1+0d/g="; 40 40 }; 41 41 42 42 outputs = [ "out" "dev" "lib" "doc" "man" ];
+2 -2
pkgs/development/libraries/nng/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "nng"; 5 - version = "1.7.1"; 5 + version = "1.7.2"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "nanomsg"; 9 9 repo = "nng"; 10 10 rev = "v${version}"; 11 - hash = "sha256-6JFmoCELDkvDvTNy2ET4igFCc/J9wraN6Cl1lq9So1Q="; 11 + hash = "sha256-CG6Gw/Qrbi96koF2VxKMYPMPT2Zj9U97vNk2JdrfRro="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ cmake ninja ]
+1 -1
pkgs/development/libraries/opencv/4.x.nix
··· 233 233 printEnabled = enabled: if enabled then "ON" else "OFF"; 234 234 withOpenblas = (enableBlas && blas.provider.pname == "openblas"); 235 235 #multithreaded openblas conflicts with opencv multithreading, which manifest itself in hung tests 236 - #https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded 236 + #https://github.com/OpenMathLib/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded 237 237 openblas_ = blas.provider.override { singleThreaded = true; }; 238 238 239 239 inherit (cudaPackages) cudaFlags cudaVersion;
+7 -2
pkgs/development/libraries/openldap/default.nix
··· 17 17 18 18 stdenv.mkDerivation rec { 19 19 pname = "openldap"; 20 - version = "2.6.6"; 20 + version = "2.6.7"; 21 21 22 22 src = fetchurl { 23 23 url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; 24 - hash = "sha256-CC6ZjPVCmE1DY0RC2+EdqGB1nlEJBxUupXm9xC/jnqA="; 24 + hash = "sha256-zXdfYlyUTteKPaGKA7A7CO6nPIqryXtBuzNumhCVSTA="; 25 25 }; 26 26 27 27 # TODO: separate "out" and "bin" ··· 99 99 100 100 # skip flaky tests 101 101 rm -f tests/scripts/test063-delta-multiprovider 102 + 103 + # https://bugs.openldap.org/show_bug.cgi?id=10009 104 + # can probably be re-added once https://github.com/cyrusimap/cyrus-sasl/pull/772 105 + # has made it to a release 106 + rm -f tests/scripts/test076-authid-rewrite 102 107 ''; 103 108 104 109 doCheck = true;
+4 -4
pkgs/development/libraries/openssl/default.nix
··· 264 264 }; 265 265 266 266 openssl_3 = common { 267 - version = "3.0.12"; 268 - hash = "sha256-+Tyejt3l6RZhGd4xdV/Ie0qjSGNmL2fd/LoU0La2m2E="; 267 + version = "3.0.13"; 268 + hash = "sha256-iFJXU/edO+wn0vp8ZqoLkrOqlJja/ZPXz6SzeAza4xM="; 269 269 270 270 patches = [ 271 271 ./3.0/nix-ssl-cert-file.patch ··· 287 287 }; 288 288 289 289 openssl_3_2 = common { 290 - version = "3.2.0"; 291 - hash = "sha256-FMgm8Hx+QzcG+1xp+p4l2rlWhIRLTJYqLPG/GD60aQ4="; 290 + version = "3.2.1"; 291 + hash = "sha256-g8cyn+UshQZ3115dCwyiRTCbl+jsvP3B39xKufrDWzk="; 292 292 293 293 patches = [ 294 294 ./3.0/nix-ssl-cert-file.patch
+7
pkgs/development/libraries/p11-kit/default.nix
··· 73 73 --replace 'install_dir: prefix / p11_system_config' "install_dir: '$out/etc/pkcs11'" 74 74 ''; 75 75 76 + preCheck = '' 77 + # Tests run in fakeroot for non-root users (with Nix single-user install) 78 + if [ "$(id -u)" != "0" ]; then 79 + export FAKED_MODE=1 80 + fi 81 + ''; 82 + 76 83 meta = with lib; { 77 84 description = "Library for loading and sharing PKCS#11 modules"; 78 85 longDescription = ''
+124 -133
pkgs/development/libraries/pipewire/default.nix
··· 1 1 { stdenv 2 2 , lib 3 - , buildPackages 4 3 , fetchFromGitLab 5 - , fetchpatch 6 4 , python3 7 5 , meson 8 6 , ninja ··· 28 26 , readline # meson can't find <7 as those versions don't have a .pc file 29 27 , lilv 30 28 , makeFontsConf 31 - , callPackage 32 29 , nixosTests 33 30 , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind 34 31 , valgrind ··· 76 73 # Bluetooth codec only makes sense if general bluetooth enabled 77 74 assert ldacbtSupport -> bluezSupport; 78 75 79 - let 80 - mesonEnableFeature = b: if b then "enabled" else "disabled"; 76 + stdenv.mkDerivation(finalAttrs: { 77 + pname = "pipewire"; 78 + version = "1.0.3"; 81 79 82 - self = stdenv.mkDerivation rec { 83 - pname = "pipewire"; 84 - version = "1.0.1"; 80 + outputs = [ 81 + "out" 82 + "jack" 83 + "dev" 84 + "doc" 85 + "man" 86 + "installedTests" 87 + ]; 85 88 86 - outputs = [ 87 - "out" 88 - "jack" 89 - "dev" 90 - "doc" 91 - "man" 92 - "installedTests" 93 - ]; 89 + src = fetchFromGitLab { 90 + domain = "gitlab.freedesktop.org"; 91 + owner = "pipewire"; 92 + repo = "pipewire"; 93 + rev = finalAttrs.version; 94 + sha256 = "sha256-QVw7Q+RNo8BBy/uxoZeSQQn/vQcIl1bOiA9fYMR0+oI="; 95 + }; 94 96 95 - src = fetchFromGitLab { 96 - domain = "gitlab.freedesktop.org"; 97 - owner = "pipewire"; 98 - repo = "pipewire"; 99 - rev = version; 100 - sha256 = "sha256-rvf0sZRgDDLcqroLg7hcMUqXD/4JT+3lBRX6/m+3Ry8="; 101 - }; 97 + patches = [ 98 + # Load libjack from a known location 99 + ./0060-libjack-path.patch 100 + # Move installed tests into their own output. 101 + ./0070-installed-tests-path.patch 102 + ]; 102 103 103 - patches = [ 104 - # Load libjack from a known location 105 - ./0060-libjack-path.patch 106 - # Move installed tests into their own output. 107 - ./0070-installed-tests-path.patch 108 - ]; 104 + strictDeps = true; 105 + nativeBuildInputs = [ 106 + docutils 107 + doxygen 108 + graphviz 109 + meson 110 + ninja 111 + pkg-config 112 + python3 113 + glib 114 + ]; 109 115 110 - strictDeps = true; 111 - nativeBuildInputs = [ 112 - docutils 113 - doxygen 114 - graphviz 115 - meson 116 - ninja 117 - pkg-config 118 - python3 119 - glib 120 - ]; 116 + buildInputs = [ 117 + alsa-lib 118 + dbus 119 + glib 120 + libjack2 121 + libusb1 122 + libselinux 123 + libsndfile 124 + lilv 125 + ncurses 126 + readline 127 + udev 128 + vulkan-headers 129 + vulkan-loader 130 + tinycompress 131 + ] ++ (if enableSystemd then [ systemd ] else [ eudev ]) 132 + ++ (if lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing_1 then [ webrtc-audio-processing_1 ] else [ webrtc-audio-processing ]) 133 + ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] 134 + ++ lib.optionals libcameraSupport [ libcamera libdrm ] 135 + ++ lib.optional ffmpegSupport ffmpeg 136 + ++ lib.optionals bluezSupport [ bluez libfreeaptx liblc3 sbc fdk_aac libopus ] 137 + ++ lib.optional ldacbtSupport ldacbt 138 + ++ lib.optional nativeModemManagerSupport modemmanager 139 + ++ lib.optional pulseTunnelSupport libpulseaudio 140 + ++ lib.optional zeroconfSupport avahi 141 + ++ lib.optional raopSupport openssl 142 + ++ lib.optional rocSupport roc-toolkit 143 + ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ] 144 + ++ lib.optional mysofaSupport libmysofa 145 + ++ lib.optional ffadoSupport ffado; 121 146 122 - buildInputs = [ 123 - alsa-lib 124 - dbus 125 - glib 126 - libjack2 127 - libusb1 128 - libselinux 129 - libsndfile 130 - lilv 131 - ncurses 132 - readline 133 - udev 134 - vulkan-headers 135 - vulkan-loader 136 - tinycompress 137 - ] ++ (if enableSystemd then [ systemd ] else [ eudev ]) 138 - ++ (if lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing_1 then [ webrtc-audio-processing_1 ] else [ webrtc-audio-processing ]) 139 - ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] 140 - ++ lib.optionals libcameraSupport [ libcamera libdrm ] 141 - ++ lib.optional ffmpegSupport ffmpeg 142 - ++ lib.optionals bluezSupport [ bluez libfreeaptx liblc3 sbc fdk_aac libopus ] 143 - ++ lib.optional ldacbtSupport ldacbt 144 - ++ lib.optional nativeModemManagerSupport modemmanager 145 - ++ lib.optional pulseTunnelSupport libpulseaudio 146 - ++ lib.optional zeroconfSupport avahi 147 - ++ lib.optional raopSupport openssl 148 - ++ lib.optional rocSupport roc-toolkit 149 - ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ] 150 - ++ lib.optional mysofaSupport libmysofa 151 - ++ lib.optional ffadoSupport ffado; 147 + # Valgrind binary is required for running one optional test. 148 + nativeCheckInputs = lib.optional withValgrind valgrind; 152 149 153 - # Valgrind binary is required for running one optional test. 154 - nativeCheckInputs = lib.optional withValgrind valgrind; 155 - 156 - mesonFlags = [ 157 - "-Ddocs=enabled" 158 - "-Dudevrulesdir=lib/udev/rules.d" 159 - "-Dinstalled_tests=enabled" 160 - "-Dinstalled_test_prefix=${placeholder "installedTests"}" 161 - "-Dlibjack-path=${placeholder "jack"}/lib" 162 - "-Dlibcamera=${mesonEnableFeature libcameraSupport}" 163 - "-Dlibffado=${mesonEnableFeature ffadoSupport}" 164 - "-Droc=${mesonEnableFeature rocSupport}" 165 - "-Dlibpulse=${mesonEnableFeature pulseTunnelSupport}" 166 - "-Davahi=${mesonEnableFeature zeroconfSupport}" 167 - "-Dgstreamer=${mesonEnableFeature gstreamerSupport}" 168 - "-Dsystemd-system-service=${mesonEnableFeature enableSystemd}" 169 - "-Dudev=${mesonEnableFeature (!enableSystemd)}" 170 - "-Dffmpeg=${mesonEnableFeature ffmpegSupport}" 171 - "-Dbluez5=${mesonEnableFeature bluezSupport}" 172 - "-Dbluez5-backend-hsp-native=${mesonEnableFeature nativeHspSupport}" 173 - "-Dbluez5-backend-hfp-native=${mesonEnableFeature nativeHfpSupport}" 174 - "-Dbluez5-backend-native-mm=${mesonEnableFeature nativeModemManagerSupport}" 175 - "-Dbluez5-backend-ofono=${mesonEnableFeature ofonoSupport}" 176 - "-Dbluez5-backend-hsphfpd=${mesonEnableFeature hsphfpdSupport}" 177 - # source code is not easily obtainable 178 - "-Dbluez5-codec-lc3plus=disabled" 179 - "-Dbluez5-codec-lc3=${mesonEnableFeature bluezSupport}" 180 - "-Dbluez5-codec-ldac=${mesonEnableFeature ldacbtSupport}" 181 - "-Dsysconfdir=/etc" 182 - "-Draop=${mesonEnableFeature raopSupport}" 183 - "-Dsession-managers=" 184 - "-Dvulkan=enabled" 185 - "-Dx11=${mesonEnableFeature x11Support}" 186 - "-Dx11-xfixes=${mesonEnableFeature x11Support}" 187 - "-Dlibcanberra=${mesonEnableFeature x11Support}" 188 - "-Dlibmysofa=${mesonEnableFeature mysofaSupport}" 189 - "-Dsdl2=disabled" # required only to build examples, causes dependency loop 190 - "-Drlimits-install=false" # installs to /etc, we won't use this anyway 191 - "-Dcompress-offload=enabled" 192 - "-Dman=enabled" 193 - ]; 150 + mesonFlags = [ 151 + (lib.mesonEnable "docs" true) 152 + (lib.mesonOption "udevrulesdir" "lib/udev/rules.d") 153 + (lib.mesonEnable "installed_tests" true) 154 + (lib.mesonOption "installed_test_prefix" (placeholder "installedTests")) 155 + (lib.mesonOption "libjack-path" "${placeholder "jack"}/lib") 156 + (lib.mesonEnable "libcamera" libcameraSupport) 157 + (lib.mesonEnable "libffado" ffadoSupport) 158 + (lib.mesonEnable "roc" rocSupport) 159 + (lib.mesonEnable "libpulse" pulseTunnelSupport) 160 + (lib.mesonEnable "avahi" zeroconfSupport) 161 + (lib.mesonEnable "gstreamer" gstreamerSupport) 162 + (lib.mesonEnable "systemd-system-service" enableSystemd) 163 + (lib.mesonEnable "udev" (!enableSystemd)) 164 + (lib.mesonEnable "ffmpeg" ffmpegSupport) 165 + (lib.mesonEnable "bluez5" bluezSupport) 166 + (lib.mesonEnable "bluez5-backend-hsp-native" nativeHspSupport) 167 + (lib.mesonEnable "bluez5-backend-hfp-native" nativeHfpSupport) 168 + (lib.mesonEnable "bluez5-backend-native-mm" nativeModemManagerSupport) 169 + (lib.mesonEnable "bluez5-backend-ofono" ofonoSupport) 170 + (lib.mesonEnable "bluez5-backend-hsphfpd" hsphfpdSupport) 171 + # source code is not easily obtainable 172 + (lib.mesonEnable "bluez5-codec-lc3plus" false) 173 + (lib.mesonEnable "bluez5-codec-lc3" bluezSupport) 174 + (lib.mesonEnable "bluez5-codec-ldac" ldacbtSupport) 175 + (lib.mesonOption "sysconfdir" "/etc") 176 + (lib.mesonEnable "raop" raopSupport) 177 + (lib.mesonOption "session-managers" "") 178 + (lib.mesonEnable "vulkan" true) 179 + (lib.mesonEnable "x11" x11Support) 180 + (lib.mesonEnable "x11-xfixes" x11Support) 181 + (lib.mesonEnable "libcanberra" x11Support) 182 + (lib.mesonEnable "libmysofa" mysofaSupport) 183 + (lib.mesonEnable "sdl2" false) # required only to build examples, causes dependency loop 184 + (lib.mesonBool "rlimits-install" false) # installs to /etc, we won't use this anyway 185 + (lib.mesonEnable "compress-offload" true) 186 + (lib.mesonEnable "man" true) 187 + ]; 194 188 195 - # Fontconfig error: Cannot load default config file 196 - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; 189 + # Fontconfig error: Cannot load default config file 190 + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; 197 191 198 - doCheck = true; 192 + doCheck = true; 199 193 200 - postUnpack = '' 201 - patchShebangs source/doc/*.py 202 - patchShebangs source/doc/input-filter-h.sh 203 - ''; 194 + postUnpack = '' 195 + patchShebangs source/doc/*.py 196 + patchShebangs source/doc/input-filter-h.sh 197 + ''; 204 198 205 - postInstall = '' 206 - moveToOutput "bin/pw-jack" "$jack" 207 - ''; 199 + postInstall = '' 200 + moveToOutput "bin/pw-jack" "$jack" 201 + ''; 208 202 209 - passthru.tests.installed-tests = nixosTests.installed-tests.pipewire; 203 + passthru.tests.installed-tests = nixosTests.installed-tests.pipewire; 210 204 211 - meta = with lib; { 212 - description = "Server and user space API to deal with multimedia pipelines"; 213 - changelog = "https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/${version}"; 214 - homepage = "https://pipewire.org/"; 215 - license = licenses.mit; 216 - platforms = platforms.linux; 217 - maintainers = with maintainers; [ kranzes k900 ]; 218 - }; 205 + meta = with lib; { 206 + description = "Server and user space API to deal with multimedia pipelines"; 207 + changelog = "https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/${version}"; 208 + homepage = "https://pipewire.org/"; 209 + license = licenses.mit; 210 + platforms = platforms.linux; 211 + maintainers = with maintainers; [ kranzes k900 ]; 219 212 }; 220 - 221 - in 222 - self 213 + })
+2 -2
pkgs/development/libraries/pixman/default.nix
··· 20 20 21 21 stdenv.mkDerivation rec { 22 22 pname = "pixman"; 23 - version = "0.43.0"; 23 + version = "0.43.2"; 24 24 25 25 src = fetchurl { 26 26 urls = [ 27 27 "mirror://xorg/individual/lib/${pname}-${version}.tar.gz" 28 28 "https://cairographics.org/releases/${pname}-${version}.tar.gz" 29 29 ]; 30 - hash = "sha256-plwoIJhY+xa+5Q2AnID5Co5BXA5P2DIQeKGCJ4WlVgo="; 30 + hash = "sha256-6nkpflQY+1KNBGbotbkdG+iIV/o3BvSXd7KSWnKumSQ="; 31 31 }; 32 32 33 33 separateDebugInfo = !stdenv.hostPlatform.isStatic;
+2 -2
pkgs/development/libraries/qca/default.nix
··· 4 4 isQt6 = lib.versions.major qtbase.version == "6"; 5 5 in stdenv.mkDerivation rec { 6 6 pname = "qca"; 7 - version = "2.3.7"; 7 + version = "2.3.8"; 8 8 9 9 src = fetchurl { 10 10 url = "mirror://kde/stable/qca/${version}/qca-${version}.tar.xz"; 11 - sha256 = "sha256-/uI0O1RofVvj4w+zPOKW7lCseuXiPXq3JfY//fevP0M="; 11 + sha256 = "sha256-SHWcqGoCAkYdkIumYTQ4DMO7fSD+08AxufwCiXlqgmQ="; 12 12 }; 13 13 14 14 buildInputs = [ openssl qtbase qt5compat ];
+2 -2
pkgs/development/libraries/qpdf/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "qpdf"; 5 - version = "11.6.3"; 5 + version = "11.8.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "qpdf"; 9 9 repo = "qpdf"; 10 10 rev = "v${version}"; 11 - hash = "sha256-asGNZ/5iEkyIjRO9FECV1bN4k/YHv4/7I125BUr9+fE="; 11 + hash = "sha256-EoFCRAWia8LAaLdoBW0ByndzIAjSvQ7bJFh0SZ/FKtY="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ cmake perl ];
+1 -1
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
··· 204 204 ] ++ lib.optionals enableProprietaryCodecs [ 205 205 "-DQT_FEATURE_webengine_proprietary_codecs=ON" 206 206 ] ++ lib.optionals stdenv.isDarwin [ 207 - "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.targetPlatform.darwinSdkVersion}" 207 + "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinSdkVersion}" 208 208 ]; 209 209 210 210 propagatedBuildInputs = [
+2 -2
pkgs/development/libraries/qxmpp/default.nix
··· 12 12 13 13 mkDerivation rec { 14 14 pname = "qxmpp"; 15 - version = "1.5.5"; 15 + version = "1.6.0"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "qxmpp-project"; 19 19 repo = pname; 20 20 rev = "v${version}"; 21 - sha256 = "sha256-V24VlfXR1Efk5kzxHWh/OIZzx4L/jLoXyjoNjtDDyTY="; 21 + sha256 = "sha256-5NPqNQuVuRz9GfrJULSmTiYHUMe6VxoaQZDHhYCguWQ="; 22 22 }; 23 23 24 24 nativeBuildInputs = [
+2 -2
pkgs/development/libraries/s2n-tls/default.nix
··· 8 8 9 9 stdenv.mkDerivation rec { 10 10 pname = "s2n-tls"; 11 - version = "1.4.1"; 11 + version = "1.4.3"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "aws"; 15 15 repo = pname; 16 16 rev = "v${version}"; 17 - hash = "sha256-Kq4jl/ss+Xf5/zv18QWuIyXZDyz8mk3av4mdRoQrvJY="; 17 + hash = "sha256-E3Giiu8xiTCSAPkbxOaVL/LXZWjhAS1M/n//Pe5eOKg="; 18 18 }; 19 19 20 20 nativeBuildInputs = [ cmake ];
+16 -11
pkgs/development/libraries/science/math/openblas/default.nix
··· 6 6 # Multi-threaded applications must not call a threaded OpenBLAS 7 7 # (the only exception is when an application uses OpenMP as its 8 8 # *only* form of multi-threading). See 9 - # https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded 10 - # https://github.com/xianyi/OpenBLAS/issues/2543 9 + # https://github.com/OpenMathLib/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded 10 + # https://github.com/OpenMathLib/OpenBLAS/issues/2543 11 11 # This flag builds a single-threaded OpenBLAS using the flags 12 12 # stated in thre. 13 13 , singleThreaded ? false 14 14 , buildPackages 15 15 # Select a specific optimization target (other than the default) 16 - # See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt 16 + # See https://github.com/OpenMathLib/OpenBLAS/blob/develop/TargetList.txt 17 17 , target ? null 18 18 # Select whether DYNAMIC_ARCH is enabled or not. 19 19 , dynamicArch ? null ··· 30 30 , octave 31 31 , opencv 32 32 , python3 33 + , openmp ? null 33 34 }: 34 35 35 36 let blas64_ = blas64; in ··· 141 142 in 142 143 stdenv.mkDerivation rec { 143 144 pname = "openblas"; 144 - version = "0.3.25"; 145 + version = "0.3.26"; 145 146 146 147 outputs = [ "out" "dev" ]; 147 148 148 149 src = fetchFromGitHub { 149 - owner = "xianyi"; 150 + owner = "OpenMathLib"; 150 151 repo = "OpenBLAS"; 151 152 rev = "v${version}"; 152 - hash = "sha256-eY/R7gLDOls3csuwZkUS+x+v3GeL3dCsOD+4STxDpCg="; 153 + hash = "sha256-AA3+x3SXkcg3g7bROZYLpWAbxnRedmQBZPe+rBJKxJ8="; 153 154 }; 154 155 155 156 postPatch = '' ··· 179 180 which 180 181 ]; 181 182 183 + buildInputs = lib.optional (stdenv.cc.isClang && config.USE_OPENMP) openmp; 184 + 182 185 depsBuildBuild = [ 183 186 buildPackages.gfortran 184 187 buildPackages.stdenv.cc ··· 206 209 else stdenv.hostPlatform != stdenv.buildPlatform; 207 210 # This disables automatic build job count detection (which honours neither enableParallelBuilding nor NIX_BUILD_CORES) 208 211 # and uses the main make invocation's job count, falling back to 1 if no parallelism is used. 209 - # https://github.com/xianyi/OpenBLAS/blob/v0.3.20/getarch.c#L1781-L1792 212 + # https://github.com/OpenMathLib/OpenBLAS/blob/v0.3.20/getarch.c#L1781-L1792 210 213 MAKE_NB_JOBS = 0; 211 - } // (lib.optionalAttrs singleThreaded { 212 - # As described on https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded 214 + } // (lib.optionalAttrs stdenv.cc.isClang { 215 + LDFLAGS = "-L${lib.getLib buildPackages.gfortran.cc}/lib"; # contains `libgfortran.so`; building with clang needs this, gcc has it implicit 216 + }) // (lib.optionalAttrs singleThreaded { 217 + # As described on https://github.com/OpenMathLib/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded 213 218 USE_THREAD = false; 214 219 USE_LOCKING = true; # available with openblas >= 0.3.7 215 220 USE_OPENMP = false; # openblas will refuse building with both USE_OPENMP=1 and USE_THREAD=0 ··· 220 225 221 226 postInstall = '' 222 227 # Write pkgconfig aliases. Upstream report: 223 - # https://github.com/xianyi/OpenBLAS/issues/1740 228 + # https://github.com/OpenMathLib/OpenBLAS/issues/1740 224 229 for alias in blas cblas lapack; do 225 230 cat <<EOF > $out/lib/pkgconfig/$alias.pc 226 231 Name: $alias ··· 257 262 meta = with lib; { 258 263 description = "Basic Linear Algebra Subprograms"; 259 264 license = licenses.bsd3; 260 - homepage = "https://github.com/xianyi/OpenBLAS"; 265 + homepage = "https://github.com/OpenMathLib/OpenBLAS"; 261 266 platforms = attrNames configs; 262 267 maintainers = with maintainers; [ ttuegel ]; 263 268 };
+3
pkgs/development/libraries/science/math/suitesparse/default.nix
··· 9 9 , config 10 10 , enableCuda ? config.cudaSupport 11 11 , cudaPackages 12 + , openmp ? null 12 13 }: 13 14 14 15 stdenv.mkDerivation rec { ··· 38 39 gfortran.cc.lib 39 40 gmp 40 41 mpfr 42 + ] ++ lib.optionals stdenv.cc.isClang [ 43 + openmp 41 44 ] ++ lib.optionals enableCuda [ 42 45 cudaPackages.cuda_cudart.dev 43 46 cudaPackages.cuda_cudart.lib
+2 -2
pkgs/development/libraries/speexdsp/default.nix
··· 4 4 , autoreconfHook 5 5 , pkg-config 6 6 , fftw 7 - , withFftw3 ? true 7 + , withFftw3 ? (!stdenv.hostPlatform.isMinGW) 8 8 }: 9 9 10 10 stdenv.mkDerivation rec { ··· 31 31 homepage = "https://www.speex.org/"; 32 32 description = "An Open Source/Free Software patent-free audio compression format designed for speech"; 33 33 license = licenses.bsd3; 34 - platforms = platforms.unix; 34 + platforms = platforms.unix ++ platforms.windows; 35 35 }; 36 36 }
+3 -3
pkgs/development/libraries/sqlite/default.nix
··· 15 15 16 16 stdenv.mkDerivation rec { 17 17 pname = "sqlite${lib.optionalString interactive "-interactive"}"; 18 - version = "3.44.2"; 18 + version = "3.45.1"; 19 19 20 20 # nixpkgs-update: no auto update 21 21 # NB! Make sure to update ./tools.nix src (in the same directory). 22 22 src = fetchurl { 23 - url = "https://sqlite.org/2023/sqlite-autoconf-${archiveVersion version}.tar.gz"; 24 - hash = "sha256-HGcZoUi8Qc8PK7vjkm184/XKCdh48SRvzCB2exdbtAc="; 23 + url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz"; 24 + hash = "sha256-zZwnhBt6WTLJiXZR4guGxwHddAVWmJsByllvz6PUmgo="; 25 25 }; 26 26 27 27 outputs = [ "bin" "dev" "out" ];
+3 -3
pkgs/development/libraries/sqlite/tools.nix
··· 4 4 archiveVersion = import ./archive-version.nix lib; 5 5 mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { 6 6 inherit pname; 7 - version = "3.44.2"; 7 + version = "3.45.1"; 8 8 9 9 # nixpkgs-update: no auto update 10 10 src = assert version == sqlite.version; fetchurl { 11 - url = "https://sqlite.org/2023/sqlite-src-${archiveVersion version}.zip"; 12 - hash = "sha256-cxh0c/63RQk1fo+my5/WcVOy0BDQCusv3bbO6xirryc="; 11 + url = "https://sqlite.org/2024/sqlite-src-${archiveVersion version}.zip"; 12 + hash = "sha256-f3sUpo7bzUpX3zqMTb1W0tNUam583VDeQM6wOvM9NLo="; 13 13 }; 14 14 15 15 nativeBuildInputs = [ unzip ];
+21 -3
pkgs/development/libraries/umockdev/default.nix
··· 2 2 , lib 3 3 , docbook-xsl-nons 4 4 , fetchurl 5 + , fetchpatch 5 6 , glib 6 7 , gobject-introspection 7 8 , gtk-doc ··· 12 13 , ninja 13 14 , pkg-config 14 15 , python3 15 - , systemd 16 + , substituteAll 17 + , systemdMinimal 16 18 , usbutils 17 19 , vala 18 20 , which ··· 33 35 # Hardcode absolute paths to libraries so that consumers 34 36 # do not need to set LD_LIBRARY_PATH themselves. 35 37 ./hardcode-paths.patch 38 + 39 + # Replace references to udevadm with an absolute paths, so programs using 40 + # umockdev will just work without having to provide it in their test environment 41 + # $PATH. 42 + (substituteAll { 43 + src = ./substitute-udevadm.patch; 44 + udevadm = "${systemdMinimal}/bin/udevadm"; 45 + }) 46 + 47 + (fetchpatch { 48 + name = "musl.patch"; 49 + url = "https://github.com/martinpitt/umockdev/commit/d4efe24be59bd859b87473ea3d7efe8100bedc74.patch"; 50 + hash = "sha256-whf3p2e7FWN1xk5+HF9KsbMW74DPOQ0R0+FxBfCZTX0="; 51 + }) 36 52 ]; 37 53 38 54 nativeBuildInputs = [ ··· 49 65 50 66 buildInputs = [ 51 67 glib 52 - systemd 68 + systemdMinimal 53 69 libpcap 54 70 ]; 55 71 ··· 59 75 60 76 nativeCheckInputs = [ 61 77 python3 62 - which 63 78 usbutils 79 + which 64 80 ]; 81 + 82 + strictDeps = true; 65 83 66 84 mesonFlags = [ 67 85 "-Dgtk_doc=true"
+41
pkgs/development/libraries/umockdev/substitute-udevadm.patch
··· 1 + From 09efbe8090f501c60975d5467fb587ed633d6a01 Mon Sep 17 00:00:00 2001 2 + From: Florian Klink <flokli@flokli.de> 3 + Date: Wed, 24 Jan 2024 14:29:28 +0200 4 + Subject: [PATCH] substitute udevadm 5 + 6 + --- 7 + src/umockdev-record.vala | 2 +- 8 + tests/test-umockdev-run.vala | 4 ++-- 9 + 2 files changed, 3 insertions(+), 3 deletions(-) 10 + 11 + diff --git a/src/umockdev-record.vala b/src/umockdev-record.vala 12 + index 2d49bc8..272f25e 100644 13 + --- a/src/umockdev-record.vala 14 + +++ b/src/umockdev-record.vala 15 + @@ -223,7 +223,7 @@ record_device(string dev) 16 + int exitcode; 17 + try { 18 + Process.spawn_sync(null, 19 + - {"udevadm", "info", "--query=all", "--path", dev}, 20 + + {"@udevadm@", "info", "--query=all", "--path", dev}, 21 + null, 22 + SpawnFlags.SEARCH_PATH, 23 + null, 24 + diff --git a/tests/test-umockdev-run.vala b/tests/test-umockdev-run.vala 25 + index cd00a08..94616cb 100644 26 + --- a/tests/test-umockdev-run.vala 27 + +++ b/tests/test-umockdev-run.vala 28 + @@ -199,8 +199,8 @@ A: size=1048576\n 29 + 30 + // unfortunately the udevadm output between distros is not entirely constant 31 + assert (get_program_out ( 32 + - "udevadm", 33 + - umockdev_run_command + "-d " + umockdev_file + " -- udevadm info --query=all --name=/dev/loop23", 34 + + "@udevadm@", 35 + + umockdev_run_command + "-d " + umockdev_file + " -- @udevadm@ info --query=all --name=/dev/loop23", 36 + out sout, out serr, out exit)); 37 + 38 + assert_cmpstr (serr, CompareOperator.EQ, ""); 39 + -- 40 + 2.43.0 41 +
+1 -1
pkgs/development/libraries/vaapi-vdpau/default.nix
··· 20 20 sha256 = "15snqf60ib0xb3cnav5b2r55qv8lv2fa4p6jwxajh8wbvqpw0ibz"; }) 21 21 (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/implement-vaquerysurfaceattributes.patch"; 22 22 sha256 = "1dapx3bqqblw6l2iqqw1yff6qifam8q4m2rq343kwb3dqhy2ymy5"; }) 23 - (fetchpatch { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch"; 23 + (fetchpatch { url = "https://github.com/gentoo/gentoo/raw/34d5cc6fcf1d76c1c2833cb534717246c221214c/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch"; 24 24 sha256 = "1m4is6lk580mppsx2mvdv1xifj6gvx724si4qynsm9qrdfdc9fby"; }) 25 25 ]; 26 26
+2 -2
pkgs/development/libraries/wayland/protocols.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "wayland-protocols"; 9 - version = "1.32"; 9 + version = "1.33"; 10 10 11 11 # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 12 12 doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.linker == "bfd" && wayland.withLibraries; 13 13 14 14 src = fetchurl { 15 15 url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; 16 - hash = "sha256-dFl5nTQMgpa2le+FfAfd7yTFoJsJq2p097kmQNKxuhE="; 16 + hash = "sha256-lPDFCwkNbmGgP2IEhGexmrvoUb5OEa57NvZfi5jDljo="; 17 17 }; 18 18 19 19 postPatch = lib.optionalString doCheck ''
+10
pkgs/development/libraries/webrtc-audio-processing/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitLab 4 + , fetchurl 4 5 , darwin 5 6 , abseil-cpp 6 7 , meson ··· 19 20 rev = "v${version}"; 20 21 hash = "sha256-8CDt4kMt2Owzyv22dqWIcFuHeg4Y3FxB405cLw3FZ+g="; 21 22 }; 23 + 24 + patches = [ 25 + # Fix an include oppsie that happens to not happen on glibc 26 + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/merge_requests/38 27 + (fetchurl { 28 + url = "https://git.alpinelinux.org/aports/plain/community/webrtc-audio-processing-1/0001-rtc_base-Include-stdint.h-to-fix-build-failures.patch?id=625e19c19972e69e034c0870a31b375833d1ab5d"; 29 + hash = "sha256-9nI22SJoU0H3CzsPSAObtCFTadtvkzdnqIh6mxmUuds="; 30 + }) 31 + ]; 22 32 23 33 outputs = [ "out" "dev" ]; 24 34
+8 -3
pkgs/development/libraries/zlib/default.nix
··· 9 9 # If false, and if `{ static = true; }`, the .a stays in the main output. 10 10 , splitStaticOutput ? shared && static 11 11 , testers 12 + , minizip 12 13 }: 13 14 14 15 # Without either the build will actually still succeed because the build ··· 24 25 25 26 stdenv.mkDerivation (finalAttrs: { 26 27 pname = "zlib"; 27 - version = "1.3"; 28 + version = "1.3.1"; 28 29 29 30 src = let 30 31 inherit (finalAttrs) version; ··· 35 36 # Stable archive path, but captcha can be encountered, causing hash mismatch. 36 37 "https://www.zlib.net/fossils/zlib-${version}.tar.gz" 37 38 ]; 38 - hash = "sha256-/wukwpIBPbwnUws6geH5qBPNOd4Byl4Pi/NVcC76WT4="; 39 + hash = "sha256-mpOyt9/ax3zrpaVYpYDnRmfdb+3kWFuR7vtg8Dty3yM="; 39 40 }; 40 41 41 42 postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' ··· 128 129 "SHARED_MODE=1" 129 130 ]; 130 131 131 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 132 + passthru.tests = { 133 + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 134 + # uses `zlib` derivation: 135 + inherit minizip; 136 + }; 132 137 133 138 meta = with lib; { 134 139 homepage = "https://zlib.net";
+3
pkgs/development/misc/resholve/oildev.nix
··· 120 120 rm cpp/stdlib.h # keep modules from finding the wrong stdlib? 121 121 # work around hard parse failure documented in oilshell/oil#1468 122 122 substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False' 123 + '' + lib.optionalString (!stdenv.hostPlatform.isGnu && !stdenv.hostPlatform.isDarwin) '' 124 + # disable fragile libc tests 125 + substituteInPlace build/py.sh --replace "py-ext-test pyext/libc_test.py" "#py-ext-test pyext/libc_test.py" 123 126 ''; 124 127 125 128 # See earlier note on glibcLocales TODO: verify needed?
+2 -2
pkgs/development/php-packages/phalcon/default.nix
··· 2 2 3 3 buildPecl rec { 4 4 pname = "phalcon"; 5 - version = "5.6.0"; 5 + version = "5.6.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "phalcon"; 9 9 repo = "cphalcon"; 10 10 rev = "v${version}"; 11 - hash = "sha256-EtwhWRBqJOMndmsy+Rgc4MVjFZg/Fm97qkSuTGxqHhI="; 11 + hash = "sha256-1dCtj3pJGOY7sRe6xx8JgPPLSj/6qMemUnqrt9guPIk="; 12 12 }; 13 13 14 14 internalDeps = [ php.extensions.session php.extensions.pdo ];
+16 -9
pkgs/development/php-packages/swoole/default.nix
··· 1 - { lib, stdenv, buildPecl, php, valgrind, pcre2, fetchFromGitHub }: 1 + { lib 2 + , stdenv 3 + , buildPecl 4 + , php 5 + , valgrind 6 + , pcre2 7 + , fetchFromGitHub 8 + }: 2 9 3 10 let 4 - version = "5.0.3"; 11 + version = "5.1.2"; 5 12 in buildPecl { 6 13 inherit version; 7 14 pname = "swoole"; ··· 10 17 owner = "swoole"; 11 18 repo = "swoole-src"; 12 19 rev = "v${version}"; 13 - sha256 = "sha256-xadseYMbA+llzTf9JFIitJK2iR0dN8vAjv3n9/e7FGs="; 20 + hash = "sha256-WTsntvauiooj081mOoFcK6CVpnCCR/cEQtJbsOIJ/wo="; 14 21 }; 15 22 16 23 buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; 17 24 18 - doCheck = true; 19 - checkTarget = "tests"; 25 + # tests require internet access 26 + doCheck = false; 20 27 21 - meta = with lib; { 28 + meta = { 22 29 changelog = "https://github.com/swoole/swoole-src/releases/tag/v${version}"; 23 30 description = "Coroutine-based concurrency library for PHP"; 24 - license = licenses.asl20; 25 - homepage = "https://www.swoole.co.uk/"; 26 - maintainers = teams.php.members; 31 + homepage = "https://www.swoole.com"; 32 + license = lib.licenses.asl20; 33 + maintainers = lib.teams.php.members; 27 34 }; 28 35 }
+4 -4
pkgs/development/python-modules/aiohttp/default.nix
··· 18 18 , aiodns 19 19 , brotli 20 20 # tests_require 21 + , freezegun 21 22 , gunicorn 22 23 , pytest-mock 23 24 , pytestCheckHook 24 25 , python-on-whales 25 26 , re-assert 26 - , time-machine 27 27 , trustme 28 28 }: 29 29 30 30 buildPythonPackage rec { 31 31 pname = "aiohttp"; 32 - version = "3.9.1"; 32 + version = "3.9.3"; 33 33 pyproject = true; 34 34 35 35 disabled = pythonOlder "3.8"; ··· 38 38 owner = "aio-libs"; 39 39 repo = "aiohttp"; 40 40 rev = "refs/tags/v${version}"; 41 - hash = "sha256-uiqBUDbmROrhkanfBz4avvTSrnKxgVqw54k4jKhfRGY="; 41 + hash = "sha256-dEeMHruFJ1o0J6VUJcpUk7LhEC8sV8hUKXoKcd618lE="; 42 42 }; 43 43 44 44 patches = [ ··· 79 79 80 80 # NOTE: pytest-xdist cannot be added because it is flaky. See https://github.com/NixOS/nixpkgs/issues/230597 for more info. 81 81 nativeCheckInputs = [ 82 + freezegun 82 83 gunicorn 83 84 pytest-mock 84 85 pytestCheckHook 85 86 python-on-whales 86 87 re-assert 87 - time-machine 88 88 ] ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ 89 89 # Optional test dependency. Depends indirectly on pyopenssl, which is 90 90 # broken on aarch64-darwin.
+2 -2
pkgs/development/python-modules/ansible/core.nix
··· 29 29 30 30 buildPythonPackage rec { 31 31 pname = "ansible-core"; 32 - version = "2.16.2"; 32 + version = "2.16.3"; 33 33 34 34 src = fetchPypi { 35 35 inherit pname version; 36 - hash = "sha256-5KtVnn5SWxxvmQhPyoc7sBR3XV7L6EW3wHuOnWycBIs="; 36 + hash = "sha256-dqh2WoWGBk7wc6KZVi4wj6LBgKdbX3Vpu9D2HUFxzbM="; 37 37 }; 38 38 39 39 # ansible_connection is already wrapped, so don't pass it through
+2 -2
pkgs/development/python-modules/ansible/default.nix
··· 21 21 22 22 let 23 23 pname = "ansible"; 24 - version = "9.1.0"; 24 + version = "9.2.0"; 25 25 in 26 26 buildPythonPackage { 27 27 inherit pname version; ··· 31 31 32 32 src = fetchPypi { 33 33 inherit pname version; 34 - hash = "sha256-WtlJkfsODlOncKn/zxtoBH9hsigtlIp9JoLs2PuPob8="; 34 + hash = "sha256-ogekoApF5c0Xin+UykKv4m8jydJ75JkB6oxF0YoHt8Y="; 35 35 }; 36 36 37 37 postPatch = ''
+2 -2
pkgs/development/python-modules/boto3-stubs/default.nix
··· 365 365 366 366 buildPythonPackage rec { 367 367 pname = "boto3-stubs"; 368 - version = "1.34.37"; 368 + version = "1.34.38"; 369 369 pyproject = true; 370 370 371 371 disabled = pythonOlder "3.7"; 372 372 373 373 src = fetchPypi { 374 374 inherit pname version; 375 - hash = "sha256-xmGMcSa6wDN8BeFh6cQo/rxX1qJNf/Yt5G5ndh9ALFc="; 375 + hash = "sha256-0eS0vVozFiDs3yXKEParV3EUrTxUoPSLHziz+GJ1eZA="; 376 376 }; 377 377 378 378 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/botocore-stubs/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "botocore-stubs"; 12 - version = "1.34.37"; 12 + version = "1.34.38"; 13 13 format = "pyproject"; 14 14 15 15 disabled = pythonOlder "3.7"; ··· 17 17 src = fetchPypi { 18 18 pname = "botocore_stubs"; 19 19 inherit version; 20 - hash = "sha256-1rzqimhyqkbTiQJ9xcAiJB/QogR6i4WKpQBeYVHtMKc="; 20 + hash = "sha256-2oA3lMD3BMZuQI/oCaFDzMnH6p4zXpBmKtp9AfweUgg="; 21 21 }; 22 22 23 23 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
··· 17 17 18 18 let 19 19 pname = "chacha20poly1305-reuseable"; 20 - version = "0.12.0"; 20 + version = "0.12.1"; 21 21 in 22 22 23 23 buildPythonPackage { ··· 30 30 owner = "bdraco"; 31 31 repo = pname; 32 32 rev = "v${version}"; 33 - hash = "sha256-g1sLmYy5SClkdBSjFFYtikh2nuxfTIoaCyktqoFl+Ho="; 33 + hash = "sha256-jgbtDpl2hXmfzmsiIIG6+B3QoekuAjBJGMxQJPX4ynA="; 34 34 }; 35 35 36 36 nativeBuildInputs = [
+17 -14
pkgs/development/python-modules/cryptography/default.nix
··· 3 3 , buildPythonPackage 4 4 , callPackage 5 5 , cargo 6 + , certifi 6 7 , cffi 7 8 , cryptography-vectors ? (callPackage ./vectors.nix { }) 8 9 , fetchPypi 9 - , hypothesis 10 - , iso8601 10 + , fetchpatch2 11 11 , isPyPy 12 12 , libiconv 13 13 , libxcrypt 14 14 , openssl 15 15 , pkg-config 16 16 , pretend 17 - , py 18 - , pytest-subtests 17 + , pytest-xdist 19 18 , pytestCheckHook 20 19 , pythonOlder 21 - , pytz 22 20 , rustc 23 21 , rustPlatform 24 22 , Security ··· 27 25 28 26 buildPythonPackage rec { 29 27 pname = "cryptography"; 30 - version = "41.0.7"; # Also update the hash in vectors.nix 28 + version = "42.0.2"; # Also update the hash in vectors.nix 31 29 pyproject = true; 32 30 33 31 disabled = pythonOlder "3.7"; 34 32 35 33 src = fetchPypi { 36 34 inherit pname version; 37 - hash = "sha256-E/k86b6oAWwlOzSvxr1qdZk+XEBnLtVAWpyDLw1KALw="; 35 + hash = "sha256-4OxSujx/G32BPNUmSaWz7x/A1DMhncjJOCfFfqts+Ig="; 38 36 }; 39 37 40 38 cargoDeps = rustPlatform.fetchCargoTarball { 41 39 inherit src; 42 40 sourceRoot = "${pname}-${version}/${cargoRoot}"; 43 41 name = "${pname}-${version}"; 44 - hash = "sha256-VeZhKisCPDRvmSjGNwCgJJeVj65BZ0Ge+yvXbZw86Rw="; 42 + hash = "sha256-jw/FC5rQO77h6omtBp0Nc2oitkVbNElbkBUduyprTIc="; 45 43 }; 46 44 45 + patches = [ 46 + (fetchpatch2 { 47 + # skip overflowing tests on 32 bit; https://github.com/pyca/cryptography/pull/10366 48 + url = "https://github.com/pyca/cryptography/commit/d741901dddd731895346636c0d3556c6fa51fbe6.patch"; 49 + hash = "sha256-eC+MZg5O8Ia5CbjRE4y+JhaFs3Q5c62QtPHr3x9T+zw="; 50 + }) 51 + ]; 52 + 47 53 postPatch = '' 48 54 substituteInPlace pyproject.toml \ 49 - --replace "--benchmark-disable" "" 55 + --replace-fail "--benchmark-disable" "" 50 56 ''; 51 57 52 58 cargoRoot = "src/rust"; ··· 75 81 ]; 76 82 77 83 nativeCheckInputs = [ 84 + certifi 78 85 cryptography-vectors 79 - hypothesis 80 - iso8601 81 86 pretend 82 - py 83 87 pytestCheckHook 84 - pytest-subtests 85 - pytz 88 + pytest-xdist 86 89 ]; 87 90 88 91 pytestFlagsArray = [
+3 -3
pkgs/development/python-modules/cryptography/vectors.nix
··· 2 2 , buildPythonPackage 3 3 , fetchPypi 4 4 , cryptography 5 - , setuptools 5 + , flit-core 6 6 }: 7 7 8 8 buildPythonPackage rec { ··· 14 14 src = fetchPypi { 15 15 pname = "cryptography_vectors"; 16 16 inherit version; 17 - hash = "sha256-ezb5drbljMGAExDhyTxYTGU503Haf4U47dj8Rj3IDVs="; 17 + hash = "sha256-rc3M9dnuZhqWAq0h0lJfZ4ugem52jOeYNZlOIIurDhY="; 18 18 }; 19 19 20 20 nativeBuildInputs = [ 21 - setuptools 21 + flit-core 22 22 ]; 23 23 24 24 # No tests included
+2 -2
pkgs/development/python-modules/deebot-client/default.nix
··· 20 20 21 21 buildPythonPackage rec { 22 22 pname = "deebot-client"; 23 - version = "5.1.0"; 23 + version = "5.1.1"; 24 24 pyproject = true; 25 25 26 26 disabled = pythonOlder "3.11"; ··· 29 29 owner = "DeebotUniverse"; 30 30 repo = "client.py"; 31 31 rev = "refs/tags/${version}"; 32 - hash = "sha256-XKsS0Ty3n6rQW+f+4lLCc4i9DBqs3b6R5FEIr8L11UE="; 32 + hash = "sha256-axz31GboqaWAcBU8DtG700Se6rX7VV7eBrQBDazG+Ig="; 33 33 }; 34 34 35 35 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/django/4.nix
··· 42 42 43 43 buildPythonPackage rec { 44 44 pname = "Django"; 45 - version = "4.2.9"; 45 + version = "4.2.10"; 46 46 format = "pyproject"; 47 47 48 48 disabled = pythonOlder "3.8"; 49 49 50 50 src = fetchPypi { 51 51 inherit pname version; 52 - hash = "sha256-EkmMw8uLyAOFOf756Q6V9QdQJDbB8MOmc0ETJPpnXRQ="; 52 + hash = "sha256-sSYO04GxChF1PHNERAjhmGnzJB/EXJhc1VowF3x4nRM="; 53 53 }; 54 54 55 55 patches = [
+2 -2
pkgs/development/python-modules/evohome-async/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "evohome-async"; 13 - version = "0.4.17"; 13 + version = "0.4.18"; 14 14 pyproject = true; 15 15 16 16 disabled = pythonOlder "3.11"; ··· 19 19 owner = "zxdavb"; 20 20 repo = "evohome-async"; 21 21 rev = "refs/tags/${version}"; 22 - hash = "sha256-8Dl23U0LynNPxDpo79CmA4H8o2knU2rrtNYwDPZBVRQ="; 22 + hash = "sha256-EXgq74/RfQ9AHlyZlDLfXtKFgYg37WA1Q3x3g+W9lz0="; 23 23 }; 24 24 25 25 nativeBuildInputs = [
+13 -8
pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
··· 5 5 , packaging 6 6 , pytestCheckHook 7 7 , pythonOlder 8 + , setuptools 8 9 }: 9 10 10 11 buildPythonPackage rec { 11 12 pname = "faraday-agent-parameters-types"; 12 - version = "1.3.1"; 13 - format = "setuptools"; 13 + version = "1.4.0"; 14 + pyproject = true; 14 15 15 16 disabled = pythonOlder "3.7"; 16 17 17 18 src = fetchPypi { 18 19 pname = "faraday_agent_parameters_types"; 19 20 inherit version; 20 - hash = "sha256-yWDZPa9+DZh2Bj9IIeIVFpAt9nhQOk2tTZh02difsCs="; 21 + hash = "sha256-pene97VKOX8mZEQgHkOBDu72Dpww2D9nDjA94s5F9rM="; 21 22 }; 22 23 24 + postPatch = '' 25 + substituteInPlace setup.py \ 26 + --replace-warn '"pytest-runner",' "" 27 + ''; 28 + 29 + nativeBuildInputs = [ 30 + setuptools 31 + ]; 32 + 23 33 propagatedBuildInputs = [ 24 34 marshmallow 25 35 packaging ··· 28 38 nativeCheckInputs = [ 29 39 pytestCheckHook 30 40 ]; 31 - 32 - postPatch = '' 33 - substituteInPlace setup.py \ 34 - --replace '"pytest-runner",' "" 35 - ''; 36 41 37 42 pythonImportsCheck = [ 38 43 "faraday_agent_parameters_types"
+9 -4
pkgs/development/python-modules/faraday-plugins/default.nix
··· 12 12 , pythonOlder 13 13 , pytz 14 14 , requests 15 + , setuptools 15 16 , simplejson 16 17 , tabulate 17 18 }: 18 19 19 20 buildPythonPackage rec { 20 21 pname = "faraday-plugins"; 21 - version = "1.15.1"; 22 - format = "setuptools"; 22 + version = "1.16.0"; 23 + pyproject = true; 23 24 24 25 disabled = pythonOlder "3.7"; 25 26 ··· 27 28 owner = "infobyte"; 28 29 repo = "faraday_plugins"; 29 30 rev = "refs/tags/${version}"; 30 - hash = "sha256-cJ7gFE8zTN+7fp4EY8ZRwjS8i0r+8WaIH/EdY89nZew="; 31 + hash = "sha256-1haWRuWK9WCgdR4geT2w3E95+CapBYDohGowUmnJ2H4="; 31 32 }; 32 33 33 34 postPatch = '' 34 35 substituteInPlace setup.py \ 35 - --replace "version=version," "version='${version}'," 36 + --replace-warn "version=version," "version='${version}'," 36 37 ''; 38 + 39 + nativeBuildInputs = [ 40 + setuptools 41 + ]; 37 42 38 43 propagatedBuildInputs = [ 39 44 beautifulsoup4
+4 -27
pkgs/development/python-modules/fastapi/default.nix
··· 38 38 39 39 buildPythonPackage rec { 40 40 pname = "fastapi"; 41 - version = "0.104.1"; 42 - format = "pyproject"; 41 + version = "0.109.0"; 42 + pyproject = true; 43 43 44 44 disabled = pythonOlder "3.7"; 45 45 ··· 47 47 owner = "tiangolo"; 48 48 repo = pname; 49 49 rev = "refs/tags/${version}"; 50 - hash = "sha256-xTTFBc+fswLYUhKRkWP/eiYSbG3j1E7CASkEtHVNTlk="; 50 + hash = "sha256-iZBc0tYGmhQuOL/pdthhBYYnZhe+wEttoinePNAIgEs="; 51 51 }; 52 52 53 53 nativeBuildInputs = [ ··· 98 98 # ignoring deprecation warnings to avoid test failure from 99 99 # tests/test_tutorial/test_testing/test_tutorial001.py 100 100 "-W ignore::DeprecationWarning" 101 - 102 - # http code mismatches 103 - "--deselect=tests/test_annotated.py::test_get" 104 101 ]; 105 102 106 103 disabledTestPaths = [ 107 - # Disabled tests require orjson which requires rust nightly 108 - "tests/test_default_response_class.py" 109 104 # Don't test docs and examples 110 105 "docs_src" 111 106 # databases is incompatible with SQLAlchemy 2.0 ··· 113 108 "tests/test_tutorial/test_sql_databases" 114 109 ]; 115 110 116 - disabledTests = [ 117 - "test_get_custom_response" 118 - # Failed: DID NOT RAISE <class 'starlette.websockets.WebSocketDisconnect'> 119 - "test_websocket_invalid_data" 120 - "test_websocket_no_credentials" 121 - # TypeError: __init__() missing 1...starlette-releated 122 - "test_head" 123 - "test_options" 124 - "test_trace" 125 - # Unexpected number of warnings caught 126 - "test_warn_duplicate_operation_id" 127 - # assert state["except"] is True 128 - "test_dependency_gets_exception" 129 - # Fixtures drift 130 - "test_openapi_schema_sub" 131 - # 200 != 404 132 - "test_flask" 133 - ]; 134 - 135 111 pythonImportsCheck = [ 136 112 "fastapi" 137 113 ]; 138 114 139 115 meta = with lib; { 116 + changelog = "https://github.com/tiangolo/fastapi/releases/tag/${version}"; 140 117 description = "Web framework for building APIs"; 141 118 homepage = "https://github.com/tiangolo/fastapi"; 142 119 license = licenses.mit;
+10 -5
pkgs/development/python-modules/findimports/default.nix
··· 3 3 , fetchFromGitHub 4 4 , python 5 5 , pythonOlder 6 + , setuptools 6 7 }: 7 8 8 9 buildPythonPackage rec { 9 10 pname = "findimports"; 10 - version = "2.3.0"; 11 - format = "setuptools"; 11 + version = "2.4.0"; 12 + pyproject = true; 12 13 13 - disabled = pythonOlder "3.6"; 14 + disabled = pythonOlder "3.7"; 14 15 15 16 src = fetchFromGitHub { 16 17 owner = "mgedmin"; 17 - repo = pname; 18 + repo = "findimports"; 18 19 rev = "refs/tags/${version}"; 19 - hash = "sha256-yA1foeGhgOXZArc/nZfS1tbGyONXJZ9lW+Zcx7hCedM="; 20 + hash = "sha256-ar05DYSc/raYC1RJyLCxDYnd7Zjx20aczywlb6wc67Y="; 20 21 }; 22 + 23 + nativeBuildInputs = [ 24 + setuptools 25 + ]; 21 26 22 27 pythonImportsCheck = [ 23 28 "findimports"
+27 -2
pkgs/development/python-modules/flask-api/default.nix
··· 2 2 , buildPythonPackage 3 3 , pythonOlder 4 4 , fetchFromGitHub 5 + , fetchpatch 6 + 7 + # build-system 8 + , setuptools 9 + 10 + # dependencies 5 11 , flask 12 + 13 + # tests 6 14 , markdown 15 + , pytestCheckHook 7 16 }: 8 17 9 18 buildPythonPackage rec { 10 - pname = "Flask-API"; 19 + pname = "flask-api"; 11 20 version = "3.1"; 12 - format = "setuptools"; 21 + pyproject = true; 13 22 14 23 disabled = pythonOlder "3.6"; 15 24 ··· 20 29 hash = "sha256-nHgeI5FLKkDp4uWO+0eaT4YSOMkeQ0wE3ffyJF+WzTM="; 21 30 }; 22 31 32 + patches = [ 33 + (fetchpatch { 34 + # werkzeug 3.0 support 35 + url = "https://github.com/flask-api/flask-api/commit/9c998897f67d8aa959dc3005d7d22f36568b6938.patch"; 36 + hash = "sha256-vaCZ4gVlfQXyeksA44ydkjz2FxODHt3gTTP+ukJwEGY="; 37 + }) 38 + ]; 39 + 40 + nativeBuildInputs = [ 41 + setuptools 42 + ]; 43 + 23 44 propagatedBuildInputs = [ 24 45 flask 46 + ]; 47 + 48 + nativeCheckInputs = [ 25 49 markdown 50 + pytestCheckHook 26 51 ]; 27 52 28 53 meta = with lib; {
-51
pkgs/development/python-modules/flask-autoindex/default.nix
··· 1 - { lib 2 - , buildPythonPackage 3 - , fetchPypi 4 - , flask 5 - , flask-silk 6 - , future 7 - , pythonOlder 8 - , unittestCheckHook 9 - }: 10 - 11 - buildPythonPackage rec { 12 - pname = "flask-autoindex"; 13 - version = "0.6.6"; 14 - format = "setuptools"; 15 - 16 - disabled = pythonOlder "3.7"; 17 - 18 - src = fetchPypi { 19 - pname = "Flask-AutoIndex"; 20 - inherit version; 21 - sha256 = "ea319f7ccadf68ddf98d940002066278c779323644f9944b300066d50e2effc7"; 22 - }; 23 - 24 - propagatedBuildInputs = [ 25 - flask 26 - flask-silk 27 - future 28 - ]; 29 - 30 - nativeCheckInputs = [ 31 - unittestCheckHook 32 - ]; 33 - 34 - pythonImportsCheck = [ 35 - "flask_autoindex" 36 - ]; 37 - 38 - meta = with lib; { 39 - description = "The mod_autoindex for Flask"; 40 - longDescription = '' 41 - Flask-AutoIndex generates an index page for your Flask application automatically. 42 - The result is just like mod_autoindex, but the look is more awesome! 43 - ''; 44 - homepage = "https://flask-autoindex.readthedocs.io/"; 45 - changelog = "https://github.com/general03/flask-autoindex/blob/v${version}/CHANGELOG.md"; 46 - license = licenses.bsd2; 47 - maintainers = teams.sage.members; 48 - # https://github.com/general03/flask-autoindex/issues/67 49 - broken = true; 50 - }; 51 - }
-55
pkgs/development/python-modules/flask-basicauth/default.nix
··· 1 - { lib 2 - , buildPythonPackage 3 - , fetchFromGitHub 4 - , fetchpatch 5 - , flask 6 - , python 7 - }: 8 - 9 - buildPythonPackage rec { 10 - pname = "flask-basicauth"; 11 - version = "0.2.0"; 12 - format = "setuptools"; 13 - 14 - src = fetchFromGitHub { 15 - owner = "jpvanhal"; 16 - repo = pname; 17 - rev = "v${version}"; 18 - hash = "sha256-han0OjMI1XmuWKHGVpk+xZB+/+cpV1I+659zOG3hcPY="; 19 - }; 20 - 21 - patches = [ 22 - (fetchpatch { 23 - # The unit tests fail due to an invalid import: 24 - # from flask.ext.basicauth import BasicAuth 25 - # 26 - # This patch replaces it with the correct import: 27 - # from flask_basicauth import BasicAuth 28 - # 29 - # The patch uses the changes from this pull request, 30 - # and therefore can be removed once this pull request 31 - # has been merged: 32 - # https://github.com/jpvanhal/flask-basicauth/pull/29 33 - name = "fix-test-flask-ext-imports.patch"; 34 - url = "https://github.com/jpvanhal/flask-basicauth/commit/23f57dc1c3d85ea6fc7f468e8d8c6f19348a0a81.patch"; 35 - hash = "sha256-njUYjO0TRe3vr5D0XjIfCNcsFlShbGxtFV/DJerAKDE="; 36 - }) 37 - ]; 38 - 39 - propagatedBuildInputs = [ flask ]; 40 - 41 - checkPhase = '' 42 - runHook preCheck 43 - ${python.interpreter} -m unittest discover 44 - runHook postCheck 45 - ''; 46 - 47 - pythonImportsCheck = [ "flask_basicauth" ]; 48 - 49 - meta = with lib; { 50 - homepage = "https://github.com/jpvanhal/flask-basicauth"; 51 - description = "HTTP basic access authentication for Flask"; 52 - license = licenses.mit; 53 - maintainers = with maintainers; [ wesnel ]; 54 - }; 55 - }
+23 -1
pkgs/development/python-modules/flask-gravatar/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchPypi 4 + , fetchpatch 5 + 6 + # build-system 7 + , setuptools 8 + 9 + # dependencies 4 10 , flask 11 + 12 + # tests 5 13 , pytestCheckHook 6 14 , pygments 7 15 }: ··· 17 25 sha256 = "YGZfMcLGEokdto/4Aek+06CIHGyOw0arxk0qmSP1YuE="; 18 26 }; 19 27 28 + patches = [ 29 + (fetchpatch { 30 + # flask 3.0 compat 31 + url = "https://github.com/zzzsochi/Flask-Gravatar/commit/d74d70d9695c464b602c96c2383d391b38ed51ac.patch"; 32 + hash = "sha256-tCKkA2io/jhvrh6RhTeEw4AKnIZc9hsqTf2qItUsdjo="; 33 + }) 34 + ]; 35 + 20 36 postPatch = '' 21 37 sed -i setup.py \ 22 38 -e "s|tests_require=tests_require,||g" \ ··· 28 44 --replace "--cov=flask_gravatar --cov-report=term-missing" "" 29 45 ''; 30 46 47 + nativeBuildInputs = [ 48 + setuptools 49 + ]; 50 + 31 51 propagatedBuildInputs = [ 32 52 flask 33 53 ]; ··· 37 57 pygments 38 58 ]; 39 59 40 - pythonImportsCheck = [ "flask_gravatar" ]; 60 + pythonImportsCheck = [ 61 + "flask_gravatar" 62 + ]; 41 63 42 64 meta = with lib; { 43 65 homepage = "https://github.com/zzzsochi/Flask-Gravatar";
+2 -2
pkgs/development/python-modules/flask-marshmallow/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "flask-marshmallow"; 15 - version = "1.1.0"; 15 + version = "1.2.0"; 16 16 pyproject = true; 17 17 18 18 disabled = pythonOlder "3.8"; ··· 21 21 owner = "marshmallow-code"; 22 22 repo = "flask-marshmallow"; 23 23 rev = "refs/tags/${version}"; 24 - hash = "sha256-+5L4OfBRMkS6WRXT7dI/uuqloc/PZgu+DFvOCinByh8="; 24 + hash = "sha256-QoktZcyVJXkHr8fCVYt3ZkYq52nxCsZu+AgaDyrZHWs="; 25 25 }; 26 26 27 27 nativeBuildInputs = [
+2
pkgs/development/python-modules/flask-restful/default.nix
··· 29 29 # conditional so that overrides are easier for web applications 30 30 patches = lib.optionals (lib.versionAtLeast werkzeug.version "2.1.0") [ 31 31 ./werkzeug-2.1.0-compat.patch 32 + ] ++ lib.optionals (lib.versionAtLeast flask.version "3.0.0") [ 33 + ./flask-3.0-compat.patch 32 34 ]; 33 35 34 36 propagatedBuildInputs = [
+24
pkgs/development/python-modules/flask-restful/flask-3.0-compat.patch
··· 1 + diff --git a/tests/test_api.py b/tests/test_api.py 2 + index 582ee5a..20db1f5 100644 3 + --- a/tests/test_api.py 4 + +++ b/tests/test_api.py 5 + @@ -1,7 +1,7 @@ 6 + import unittest 7 + import json 8 + from flask import Flask, Blueprint, redirect, views, abort as flask_abort 9 + -from flask.signals import got_request_exception, signals_available 10 + +from flask.signals import got_request_exception 11 + try: 12 + from mock import Mock 13 + except: 14 + @@ -491,10 +491,6 @@ class APITestCase(unittest.TestCase): 15 + self.assertEqual(api.default_mediatype, resp.headers['Content-Type']) 16 + 17 + def test_handle_error_signal(self): 18 + - if not signals_available: 19 + - # This test requires the blinker lib to run. 20 + - print("Can't test signals without signal support") 21 + - return 22 + app = Flask(__name__) 23 + api = flask_restful.Api(app) 24 +
+35 -6
pkgs/development/python-modules/flask-session-captcha/default.nix
··· 1 1 { lib 2 2 , fetchFromGitHub 3 + , fetchpatch 3 4 , buildPythonPackage 5 + 6 + # build-system 7 + , setuptools 8 + 9 + # dependencies 10 + , captcha 4 11 , flask 5 - , flask-sessionstore 12 + , markupsafe 13 + 14 + # tests 6 15 , flask-sqlalchemy 7 - , captcha 8 16 , pytestCheckHook 9 17 }: 10 18 11 19 buildPythonPackage rec { 12 20 pname = "flask-session-captcha"; 13 21 version = "1.3.0"; 14 - format = "setuptools"; 22 + pyproject = true; 15 23 16 24 src = fetchFromGitHub { 17 25 owner = "Tethik"; ··· 20 28 hash = "sha256-V0f3mXCfqwH2l3OtJKOHGdrlKAFxs2ynqXvNve7Amkc="; 21 29 }; 22 30 23 - propagatedBuildInputs = [ flask flask-sessionstore captcha ]; 31 + patches = [ 32 + (fetchpatch { 33 + # https://github.com/Tethik/flask-session-captcha/pull/44 34 + url = "https://github.com/Tethik/flask-session-captcha/commit/3f79c22a71c60dd60e9df61b550cce641603dcb6.patch"; 35 + hash = "sha256-MXsoSytBNbcg3HU6IWlvf2MgNUL78T5ToxKGv4YMtZw="; 36 + }) 37 + ]; 24 38 25 - pythonImportsCheck = [ "flask_session_captcha" ]; 39 + nativeBuildInputs = [ 40 + setuptools 41 + ]; 26 42 27 - nativeCheckInputs = [ flask-sqlalchemy pytestCheckHook ]; 43 + propagatedBuildInputs = [ 44 + captcha 45 + flask 46 + markupsafe 47 + ]; 48 + 49 + pythonImportsCheck = [ 50 + "flask_session_captcha" 51 + ]; 28 52 29 53 # RuntimeError: Working outside of application context. 30 54 doCheck = false; 55 + 56 + nativeCheckInputs = [ 57 + flask-sqlalchemy 58 + pytestCheckHook 59 + ]; 31 60 32 61 meta = with lib; { 33 62 description = "A captcha implemention for flask";
-35
pkgs/development/python-modules/flask-sessionstore/default.nix
··· 1 - { lib 2 - , fetchPypi 3 - , buildPythonPackage 4 - , flask 5 - , nose 6 - }: 7 - 8 - buildPythonPackage rec { 9 - pname = "flask-sessionstore"; 10 - version = "0.4.5"; 11 - format = "setuptools"; 12 - 13 - src = fetchPypi { 14 - pname = "Flask-Sessionstore"; 15 - inherit version; 16 - hash = "sha256-AQ3jWrnw2UI8L3nFEx4AhDwGP4R8Tr7iBMsDS5jLQPQ="; 17 - }; 18 - 19 - propagatedBuildInputs = [ flask ]; 20 - 21 - pythonImportsCheck = [ "flask_sessionstore" ]; 22 - 23 - nativeCheckInputs = [ nose ]; 24 - 25 - checkPhase = '' 26 - nosetests -s 27 - ''; 28 - 29 - meta = with lib; { 30 - description = "Session Storage Backends for Flask"; 31 - homepage = "https://github.com/mcrowson/flask-sessionstore"; 32 - license = licenses.bsd3; 33 - maintainers = with maintainers; [ Flakebi ]; 34 - }; 35 - }
+33 -13
pkgs/development/python-modules/flask/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchPypi 4 - , asgiref 4 + , pythonOlder 5 + 6 + # build-system 7 + , flit-core 8 + 9 + # dependencies 5 10 , blinker 6 11 , click 7 - , flit-core 8 12 , importlib-metadata 9 13 , itsdangerous 10 14 , jinja2 15 + , werkzeug 16 + 17 + # optional-dependencies 18 + , asgiref 11 19 , python-dotenv 12 - , werkzeug 20 + 21 + # tests 22 + , greenlet 13 23 , pytestCheckHook 14 - , pythonOlder 15 - # used in passthru.tests 24 + 25 + # reverse dependencies 16 26 , flask-limiter 17 27 , flask-restful 18 28 , flask-restx ··· 21 31 22 32 buildPythonPackage rec { 23 33 pname = "flask"; 24 - version = "2.3.3"; 34 + version = "3.0.1"; 25 35 format = "pyproject"; 26 36 27 37 src = fetchPypi { 28 38 inherit pname version; 29 - hash = "sha256-CcNHqSqn/0qOfzIGeV8w2CZlS684uHPQdEzVccpgnvw="; 39 + hash = "sha256-ZIn1G7Nmbe9vMU4V8Z1QoYaaGa4OjJo2Qf/mbHfUJAM="; 30 40 }; 31 41 32 42 nativeBuildInputs = [ ··· 39 49 itsdangerous 40 50 jinja2 41 51 werkzeug 42 - ] ++ lib.optional (pythonOlder "3.10") importlib-metadata; 52 + ] ++ lib.optionals (pythonOlder "3.10") [ 53 + importlib-metadata 54 + ]; 55 + 56 + passthru.optional-dependencies = { 57 + async = [ 58 + asgiref 59 + ]; 60 + dotenv = [ 61 + python-dotenv 62 + ]; 63 + }; 43 64 44 65 nativeCheckInputs = [ 45 66 pytestCheckHook 46 - ]; 67 + ] ++ lib.optionals (pythonOlder "3.11") [ 68 + greenlet 69 + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); 47 70 48 71 passthru.tests = { 49 72 inherit flask-limiter flask-restful flask-restx moto; 50 73 }; 51 - passthru.optional-dependencies = { 52 - dotenv = [ python-dotenv ]; 53 - async = [ asgiref ]; 54 - }; 55 74 56 75 meta = with lib; { 76 + changelog = "https://flask.palletsprojects.com/en/${versions.majorMinor version}.x/changes/#version-${replaceStrings [ "." ] [ "-" ] version}"; 57 77 homepage = "https://flask.palletsprojects.com/"; 58 78 description = "The Python micro framework for building web applications"; 59 79 longDescription = ''
+41 -14
pkgs/development/python-modules/fontparts/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi, python, pythonOlder 2 - , fonttools, lxml, fs, unicodedata2 3 - , defcon, fontpens, fontmath, booleanoperations 4 - , pytest, setuptools-scm 1 + { lib 2 + , buildPythonPackage 3 + , fetchPypi 4 + , fetchpatch2 5 + , pythonOlder 6 + 7 + # build-system 8 + , setuptools 9 + , setuptools-scm 10 + 11 + # dependencies 12 + , fonttools 13 + , defcon 14 + , fontmath 15 + , booleanoperations 16 + 17 + # tests 18 + , python 5 19 }: 6 20 7 21 buildPythonPackage rec { 8 - pname = "fontParts"; 22 + pname = "fontparts"; 9 23 version = "0.12.1"; 24 + pyproject = true; 10 25 11 26 disabled = pythonOlder "3.7"; 12 27 13 28 src = fetchPypi { 14 - inherit pname version; 29 + pname = "fontParts"; 30 + inherit version; 15 31 hash = "sha256-eeU13S1IcC+bsiK3YDlT4rVDeXDGcxx1wY/is8t5pCA="; 16 32 extension = "zip"; 17 33 }; 18 34 19 - nativeBuildInputs = [ setuptools-scm ]; 35 + patches = [ 36 + (fetchpatch2 { 37 + # replace remaining usage of assertEquals for Python 3.12 support 38 + # https://github.com/robotools/fontParts/pull/720 39 + url = "https://github.com/robotools/fontParts/commit/d7484cd98051aa1588683136da0bb99eac31523b.patch"; 40 + hash = "sha256-maoUgbmXY/RC4TUZI4triA9OIfB4T98qjUaQ94uhsbg="; 41 + }) 42 + ]; 43 + 44 + nativeBuildInputs = [ 45 + setuptools 46 + setuptools-scm 47 + ]; 20 48 21 49 propagatedBuildInputs = [ 22 50 booleanoperations 23 - fonttools 24 - unicodedata2 # fonttools[unicode] extra 25 - lxml # fonttools[lxml] extra 26 - fs # fonttools[ufo] extra 27 51 defcon 28 - fontpens # defcon[pens] extra 29 52 fontmath 30 - ]; 53 + fonttools 54 + ] 55 + ++ defcon.optional-dependencies.pens 56 + ++ fonttools.optional-dependencies.ufo 57 + ++ fonttools.optional-dependencies.lxml 58 + ++ fonttools.optional-dependencies.unicode; 31 59 32 60 checkPhase = '' 33 61 runHook preCheck 34 62 ${python.interpreter} Lib/fontParts/fontshell/test.py 35 63 runHook postCheck 36 64 ''; 37 - nativeCheckInputs = [ pytest ]; 38 65 39 66 meta = with lib; { 40 67 description = "An API for interacting with the parts of fonts during the font development process.";
+5 -3
pkgs/development/python-modules/fpdf2/default.nix
··· 12 12 , qrcode 13 13 , camelot 14 14 , uharfbuzz 15 + , lxml 15 16 }: 16 17 17 18 buildPythonPackage rec { 18 19 pname = "fpdf2"; 19 - version = "2.7.6"; 20 + version = "2.7.7"; 20 21 pyproject = true; 21 22 22 23 src = fetchFromGitHub { 23 24 owner = "py-pdf"; 24 25 repo = "fpdf2"; 25 26 rev = version; 26 - hash = "sha256-wiCKmS+GlrYV2/6TEdXUbmWIMWU4hyzswFJZR9EOWxc="; 27 + hash = "sha256-6B68kwxAW3cHpwMTDhj3C4zEOR6o6USqpSXB7uxcEXs="; 27 28 }; 28 29 29 30 postPatch = '' 30 31 substituteInPlace setup.cfg \ 31 - --replace "--cov=fpdf --cov-report=xml" "" 32 + --replace-fail "--cov=fpdf --cov-report=xml" "" 32 33 ''; 33 34 34 35 nativeBuildInputs = [ setuptools ]; ··· 44 45 qrcode 45 46 camelot 46 47 uharfbuzz 48 + lxml 47 49 ]; 48 50 49 51 disabledTestPaths = [
+2 -2
pkgs/development/python-modules/geoalchemy2/default.nix
··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "geoalchemy2"; 16 - version = "0.14.3"; 16 + version = "0.14.4"; 17 17 pyproject = true; 18 18 19 19 disabled = pythonOlder "3.7"; ··· 22 22 owner = "geoalchemy"; 23 23 repo = "geoalchemy2"; 24 24 rev = "refs/tags/${version}"; 25 - hash = "sha256-L3/gLbiEF2VEqyhfVPnREMUPFbf9cD3tqGJ+AbThPkQ="; 25 + hash = "sha256-zMd/hHobFBPre0bZA1e2S9gPWnIkeImZhSySlIDxYsg="; 26 26 }; 27 27 28 28 nativeBuildInputs = [
+8 -3
pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
··· 9 9 , pytest-asyncio 10 10 , pytestCheckHook 11 11 , pythonOlder 12 + , setuptools 12 13 }: 13 14 14 15 buildPythonPackage rec { 15 16 pname = "google-cloud-appengine-logging"; 16 - version = "1.4.0"; 17 - format = "setuptools"; 17 + version = "1.4.1"; 18 + pyproject = true; 18 19 19 20 disabled = pythonOlder "3.7"; 20 21 21 22 src = fetchPypi { 22 23 inherit pname version; 23 - hash = "sha256-/nT0GNCwHr6+g64hKr8FGtQmkqY2Z345fePUWeANe2Q="; 24 + hash = "sha256-mQXHwww8K77dCxMuKycfyCRzM+vJMdLSOvG7vRG0Nf4="; 24 25 }; 26 + 27 + nativeBuildInputs = [ 28 + setuptools 29 + ]; 25 30 26 31 propagatedBuildInputs = [ 27 32 google-api-core
+2 -2
pkgs/development/python-modules/google-cloud-datacatalog/default.nix
··· 15 15 16 16 buildPythonPackage rec { 17 17 pname = "google-cloud-datacatalog"; 18 - version = "3.18.0"; 18 + version = "3.18.1"; 19 19 pyproject = true; 20 20 21 21 disabled = pythonOlder "3.7"; 22 22 23 23 src = fetchPypi { 24 24 inherit pname version; 25 - hash = "sha256-rqWuOJlyB2EN3+qydRMJHLwK7RAFxUT7eEUZiAfOseE="; 25 + hash = "sha256-xjf6yWXgfJFEHw1lYSryfe86UMsM1Y4fGRffDTne20U="; 26 26 }; 27 27 28 28 nativeBuildInputs = [
+8 -3
pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
··· 8 8 , pytest-asyncio 9 9 , pytestCheckHook 10 10 , pythonOlder 11 + , setuptools 11 12 }: 12 13 13 14 buildPythonPackage rec { 14 15 pname = "google-cloud-websecurityscanner"; 15 - version = "1.14.0"; 16 - format = "setuptools"; 16 + version = "1.14.1"; 17 + pyproject = true; 17 18 18 19 disabled = pythonOlder "3.7"; 19 20 20 21 src = fetchPypi { 21 22 inherit pname version; 22 - hash = "sha256-tb8BCpQtEj/0/dGSqTf+c0V0NwGZYx8y0oEHpoJWqhM="; 23 + hash = "sha256-+RupyR6W5fYR1n28anASGIXI6J53CU4WG1QC+HIZi/Y="; 23 24 }; 25 + 26 + nativeBuildInputs = [ 27 + setuptools 28 + ]; 24 29 25 30 propagatedBuildInputs = [ 26 31 google-api-core
+2 -2
pkgs/development/python-modules/griffe/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "griffe"; 15 - version = "0.40.0"; 15 + version = "0.40.1"; 16 16 format = "pyproject"; 17 17 18 18 disabled = pythonOlder "3.8"; ··· 21 21 owner = "mkdocstrings"; 22 22 repo = pname; 23 23 rev = "refs/tags/${version}"; 24 - hash = "sha256-VUQmyNO2e4SoXzGbd751l7TtRgvaiWOr75gSGwKGPUI="; 24 + hash = "sha256-DaLxGEwR2Z9IEkKbLkOy7Q3dvvmwTNBNMzYxNoeZMJE="; 25 25 }; 26 26 27 27 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/grpcio-status/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "grpcio-status"; 12 - version = "1.60.0"; 12 + version = "1.60.1"; 13 13 format = "setuptools"; 14 14 15 15 disabled = pythonOlder "3.6"; 16 16 17 17 src = fetchPypi { 18 18 inherit pname version; 19 - hash = "sha256-8Q4LbbOtwP3CRLcZYoFO6YKZbvBhhkRrVpW5+mNaoas="; 19 + hash = "sha256-YbWquJiUmOiqFCwguIgp6l2Q0YwYyFO5+ebUB9N7+LQ="; 20 20 }; 21 21 22 22 postPatch = ''
+2 -2
pkgs/development/python-modules/grpcio-testing/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "grpcio-testing"; 12 - version = "1.60.0"; 12 + version = "1.60.1"; 13 13 format = "setuptools"; 14 14 15 15 disabled = pythonOlder "3.7"; 16 16 17 17 src = fetchPypi { 18 18 inherit pname version; 19 - hash = "sha256-XF+za8O9x4m/8ewEBQG5reoPiK64vh7VyA1oic0Jq0A="; 19 + hash = "sha256-vvrZX0fes/OTTr1VEpl0jqo/Y+44btlq1pemZFNWixc="; 20 20 }; 21 21 22 22 postPatch = ''
+2 -2
pkgs/development/python-modules/grpcio-tools/default.nix
··· 2 2 3 3 buildPythonPackage rec { 4 4 pname = "grpcio-tools"; 5 - version = "1.60.0"; 5 + version = "1.60.1"; 6 6 format = "setuptools"; 7 7 8 8 src = fetchPypi { 9 9 inherit pname version; 10 - hash = "sha256-7TBJk0AijXM/9p/PSmZZDteSH5TrWiv2kiWLEoC52sc="; 10 + hash = "sha256-2ggiSrhnXG1GS5iL2MoCzM0r8Cdbzu/o9iGb/UpPXoU="; 11 11 }; 12 12 13 13 postPatch = ''
+2 -2
pkgs/development/python-modules/grpcio/default.nix
··· 18 18 buildPythonPackage rec { 19 19 pname = "grpcio"; 20 20 format = "setuptools"; 21 - version = "1.60.0"; 21 + version = "1.60.1"; 22 22 23 23 src = fetchPypi { 24 24 inherit pname version; 25 - hash = "sha256-IZkWWhr/tmaqJK3wyXQ2aG0KYbxfwRPAN3Aft8f865Y="; 25 + hash = "sha256-3R06jR0uUK2bWeEKp/B8fRvis2fz8tM8X63pbtVGCWI="; 26 26 }; 27 27 28 28 outputs = [ "out" "dev" ];
+2 -2
pkgs/development/python-modules/hatchling/default.nix
··· 20 20 21 21 buildPythonPackage rec { 22 22 pname = "hatchling"; 23 - version = "1.21.0"; 23 + version = "1.21.1"; 24 24 format = "pyproject"; 25 25 disabled = pythonOlder "3.8"; 26 26 27 27 src = fetchPypi { 28 28 inherit pname version; 29 - hash = "sha256-XAhncjV6UHI7gl/V2lJ4rH42l833eX0HVBpskLb/dUw="; 29 + hash = "sha256-u6RARToiTn1EeEV/oujYw2M3Zbr6Apdaa1O5v5F5gLw="; 30 30 }; 31 31 32 32 # listed in backend/pyproject.toml
+2 -2
pkgs/development/python-modules/hdf5plugin/default.nix
··· 6 6 7 7 buildPythonPackage rec { 8 8 pname = "hdf5plugin"; 9 - version = "4.3.0"; 9 + version = "4.4.0"; 10 10 format = "setuptools"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "silx-kit"; 14 14 repo = "hdf5plugin"; 15 15 rev = "refs/tags/v${version}"; 16 - hash = "sha256-xOSGykG6D2Am/gnAPoqLOvIQz6FfxRQe9lPyRHxUoew="; 16 + hash = "sha256-MnqY1PyGzo31H696J9CekiA2rJrUYzUMDC3UJMZaFLA="; 17 17 }; 18 18 19 19 propagatedBuildInputs = [
+9
pkgs/development/python-modules/httpbin/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchPypi 4 + , fetchpatch 4 5 , pythonRelaxDepsHook 5 6 6 7 # build-system ··· 32 33 inherit pname version; 33 34 hash = "sha256-e4WWvrDnWntlPDnR888mPW1cR20p4d9ve7K3C/nwaj0="; 34 35 }; 36 + 37 + patches = [ 38 + (fetchpatch { 39 + # backport flask 3.0 support; drop after 0.10.1 40 + url = "https://github.com/psf/httpbin/commit/c1d9e33049263fed3cb27806a97f094acc350905.patch"; 41 + hash = "sha256-SYJgQN3ERDgLIaBc4eqDfey+EX4z6CSxLoAA7j+16xI="; 42 + }) 43 + ]; 35 44 36 45 nativeBuildInputs = [ 37 46 setuptools
+2 -2
pkgs/development/python-modules/httpx/default.nix
··· 30 30 31 31 buildPythonPackage rec { 32 32 pname = "httpx"; 33 - version = "0.25.2"; 33 + version = "0.26.0"; 34 34 format = "pyproject"; 35 35 36 36 disabled = pythonOlder "3.7"; ··· 39 39 owner = "encode"; 40 40 repo = pname; 41 41 rev = "refs/tags/${version}"; 42 - hash = "sha256-rGtIrs4dffs7Ndtjb400q7JrZh+HG9k0uwHw9pRlC5s="; 42 + hash = "sha256-qMMx1CYu2/yH4NRvZFzJOflAPIbcvMYJqU4r+chuzl0="; 43 43 }; 44 44 45 45 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/iminuit/default.nix
··· 20 20 21 21 buildPythonPackage rec { 22 22 pname = "iminuit"; 23 - version = "2.25.0"; 23 + version = "2.25.1"; 24 24 format = "pyproject"; 25 25 26 26 disabled = pythonOlder "3.6"; 27 27 28 28 src = fetchPypi { 29 29 inherit pname version; 30 - hash = "sha256-e99ZRg05Dy0DznVcAVGy7D0gMwC8UVQb+Ch7Q8EgTGY="; 30 + hash = "sha256-uCn/wdte1nHc0aSeBFk3duZXXPOmbMfOdHf8ZkI/hj4="; 31 31 }; 32 32 33 33 nativeBuildInputs = [
+4 -4
pkgs/development/python-modules/ipython/default.nix
··· 29 29 30 30 buildPythonPackage rec { 31 31 pname = "ipython"; 32 - version = "8.18.1"; 33 - format = "pyproject"; 34 - disabled = pythonOlder "3.8"; 32 + version = "8.20.0"; 33 + pyproject = true; 34 + disabled = pythonOlder "3.10"; 35 35 36 36 src = fetchPypi { 37 37 inherit pname version; 38 - sha256 = "sha256-ym8Hm7M0V8ZuIz5FgOv8QSiFW0z2Nw3d1zhCqVY+iic="; 38 + hash = "sha256-LyG9P8HVFVDInuOUSuBLvHvHnhKeoJN9pubGi/2/EXo="; 39 39 }; 40 40 41 41 nativeBuildInputs = [
+27 -8
pkgs/development/python-modules/jaxlib/bin.nix
··· 33 33 }: 34 34 35 35 let 36 - inherit (cudaPackagesGoogle) cudatoolkit cudnn; 36 + inherit (cudaPackagesGoogle) cudatoolkit cudnn cudaVersion; 37 37 38 38 version = "0.4.23"; 39 39 ··· 118 118 }; 119 119 }; 120 120 121 - # Find new releases at https://storage.googleapis.com/jax-releases/jax_releases.html. 121 + # Note that the prebuilt jaxlib binary requires specific version of CUDA to 122 + # work. The cuda12 jaxlib binaries only works with CUDA 12.2, and cuda11 123 + # jaxlib binaries only works with CUDA 11.8. This is why we need to find a 124 + # binary that matches the provided cudaVersion. 125 + gpuSrcVersionString = "cuda${cudaVersion}-${pythonVersion}"; 126 + 127 + # Find new releases at https://storage.googleapis.com/jax-releases 122 128 # When upgrading, you can get these hashes from prefetch.sh. See 123 129 # https://github.com/google/jax/issues/12879 as to why this specific URL is the correct index. 124 130 gpuSrcs = { 125 - "3.9" = fetchurl { 131 + "cuda12.2-3.9" = fetchurl { 126 132 url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp39-cp39-manylinux2014_x86_64.whl"; 127 133 hash = "sha256-our2mSwHPdjVoDAZP+9aNUkJ+vxv1Tq7G5UqA9HvhNI="; 128 134 }; 129 - "3.10" = fetchurl { 135 + "cuda12.2-3.10" = fetchurl { 130 136 url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp310-cp310-manylinux2014_x86_64.whl"; 131 137 hash = "sha256-jkIABnJZnn7A6n9VGs/MldzdDiKwWh0fEvl7Vqn85Kg="; 132 138 }; 133 - "3.11" = fetchurl { 139 + "cuda12.2-3.11" = fetchurl { 134 140 url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp311-cp311-manylinux2014_x86_64.whl"; 135 141 hash = "sha256-dMUcRnHjl8NyUeO3P1x7CNgF0iAHFKIzUtHh+/CNkow="; 136 142 }; 137 - "3.12" = fetchurl { 143 + "cuda12.2-3.12" = fetchurl { 138 144 url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp312-cp312-manylinux2014_x86_64.whl"; 139 145 hash = "sha256-kXJ6bUwX+QybqYPV9Kpwv+lhdoGEFRr4+1T0vfXoWRo="; 140 146 }; 147 + "cuda11.8-3.9" = fetchurl { 148 + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp39-cp39-manylinux2014_x86_64.whl"; 149 + hash = "sha256-m2Y5p12gF3OaADu+aGw5RjcKFrj9RB8xzNWnKNpSz60="; 150 + }; 151 + "cuda11.8-3.10" = fetchurl { 152 + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp310-cp310-manylinux2014_x86_64.whl"; 153 + hash = "osha256-aQ7iX3o0kQ4liPexv7dkBVWVTUpaty83L083MybGkf0="; 154 + }; 155 + "cuda11.8-3.11" = fetchurl { 156 + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp311-cp311-manylinux2014_x86_64.whl"; 157 + hash = "sha256-uIEyjEmv0HBaiYVl5PuICTI9XnH4zAfQ1l9tjALRcP4="; 158 + }; 141 159 }; 142 160 143 161 in ··· 154 172 ( 155 173 cpuSrcs."${pythonVersion}-${stdenv.hostPlatform.system}" 156 174 or (throw "jaxlib-bin is not supported on ${stdenv.hostPlatform.system}") 157 - ) else gpuSrcs."${pythonVersion}"; 175 + ) else gpuSrcs."${gpuSrcVersionString}"; 158 176 159 177 # Prebuilt wheels are dynamically linked against things that nix can't find. 160 178 # Run `autoPatchelfHook` to automagically fix them. ··· 212 230 broken = 213 231 !(cudaSupport -> (cudaPackagesGoogle ? cudatoolkit) && lib.versionAtLeast cudatoolkit.version "11.1") 214 232 || !(cudaSupport -> (cudaPackagesGoogle ? cudnn) && lib.versionAtLeast cudnn.version "8.2") 215 - || !(cudaSupport -> stdenv.isLinux); 233 + || !(cudaSupport -> stdenv.isLinux) 234 + || !(cudaSupport -> (gpuSrcs ? "cuda${cudaVersion}-${pythonVersion}")); 216 235 }; 217 236 }
+2 -1
pkgs/development/python-modules/json-logging/default.nix
··· 6 6 , httpx 7 7 , pytestCheckHook 8 8 , pythonOlder 9 + , quart 9 10 , requests 10 11 , sanic 11 12 , uvicorn ··· 31 32 flask 32 33 httpx 33 34 pytestCheckHook 34 - # quart 35 + quart 35 36 requests 36 37 sanic 37 38 uvicorn
+2 -2
pkgs/development/python-modules/meilisearch/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "meilisearch"; 12 - version = "0.29.0"; 12 + version = "0.30.0"; 13 13 pyproject = true; 14 14 15 15 disabled = pythonOlder "3.7"; ··· 18 18 owner = "meilisearch"; 19 19 repo = "meilisearch-python"; 20 20 rev = "refs/tags/v${version}"; 21 - hash = "sha256-jquaxJ+4/yaPsPqer+v2UY1N60U71ig4nowqm/KRIeA="; 21 + hash = "sha256-gcDJUTg84JugytbUzQzvm3I9YAIboiyvcHe4AcBmpFM="; 22 22 }; 23 23 24 24 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/molecule/plugins.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "molecule-plugins"; 12 - version = "23.5.0"; 12 + version = "23.5.3"; 13 13 format = "pyproject"; 14 14 15 15 src = fetchPypi { 16 16 inherit pname version; 17 - hash = "sha256-8T6gR7hlDIkmBLgbdjgryAu0riXqULI/MOgf2dWAKv8="; 17 + hash = "sha256-orFDfVMtc24/vG23pp7FM+IzSyEV/5JFoLJ3LtlzjSM="; 18 18 }; 19 19 20 20 # reverse the dependency
-1
pkgs/development/python-modules/mplfinance/default.nix
··· 22 22 description = "Matplotlib utilities for the visualization, and visual analysis, of financial data"; 23 23 homepage = "https://github.com/matplotlib/mplfinance"; 24 24 license = [ licenses.bsd3 ]; 25 - maintainers = [ maintainers.ehmry ]; 26 25 }; 27 26 }
+1 -1
pkgs/development/python-modules/numpy/default.nix
··· 114 114 115 115 # we default openblas to build with 64 threads 116 116 # if a machine has more than 64 threads, it will segfault 117 - # see https://github.com/xianyi/OpenBLAS/issues/2993 117 + # see https://github.com/OpenMathLib/OpenBLAS/issues/2993 118 118 preConfigure = '' 119 119 sed -i 's/-faltivec//' numpy/distutils/system_info.py 120 120 export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES))
+2 -2
pkgs/development/python-modules/openai/default.nix
··· 26 26 27 27 buildPythonPackage rec { 28 28 pname = "openai"; 29 - version = "1.10.0"; 29 + version = "1.11.1"; 30 30 pyproject = true; 31 31 32 32 disabled = pythonOlder "3.7.1"; ··· 35 35 owner = "openai"; 36 36 repo = "openai-python"; 37 37 rev = "refs/tags/v${version}"; 38 - hash = "sha256-VffgHJLsfnT3xqELV7Ze1o1rqohKxscC3SDthP8TwzI="; 38 + hash = "sha256-PtxKQQfcM4aOlqU0qIJDpB/24Wkt/omx+uDk4mRZU4s="; 39 39 }; 40 40 41 41 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/pcbnew-transition/default.nix
··· 7 7 }: 8 8 buildPythonPackage rec { 9 9 pname = "pcbnewTransition"; 10 - version = "0.3.4"; 10 + version = "0.4.0"; 11 11 format = "setuptools"; 12 12 13 13 disabled = pythonOlder "3.7"; 14 14 15 15 src = fetchPypi { 16 16 inherit pname version; 17 - hash = "sha256-3CJUG1kd63Lg0r9HpJRIvttHS5s2EuZRoxeXrqsJ/kQ="; 17 + hash = "sha256-M4r6IeARVZq+KO7Q0tbHFD/BMeLN6vmuxfnstmMPgdg="; 18 18 }; 19 19 20 20 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/pdm-backend/default.nix
··· 15 15 16 16 buildPythonPackage rec { 17 17 pname = "pdm-backend"; 18 - version = "2.1.7"; 18 + version = "2.1.8"; 19 19 format = "pyproject"; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "pdm-project"; 23 23 repo = "pdm-backend"; 24 24 rev = "refs/tags/${version}"; 25 - hash = "sha256-1YM/vba+8+2wKcWzPKzkpaWVmHqbFsYdhQSY/VBBAfo="; 25 + hash = "sha256-d8i+FvxNFPM18W7NmOwh9bqZnMUenF7eCPdcCw4BT7s="; 26 26 }; 27 27 28 28 env.PDM_BUILD_SCM_VERSION = version;
+3 -3
pkgs/development/python-modules/pillow/default.nix
··· 12 12 13 13 import ./generic.nix (rec { 14 14 pname = "pillow"; 15 - version = "10.1.0"; 15 + version = "10.2.0"; 16 16 format = "pyproject"; 17 17 18 18 disabled = pythonOlder "3.8"; 19 19 20 20 src = fetchPypi { 21 - pname = "Pillow"; 21 + pname = "pillow"; 22 22 inherit version; 23 - hash = "sha256-5r+N5sNu2WyG6jtuHVJzxT9G71GKBiRkzX713Sz5Ljg="; 23 + hash = "sha256-6H8LLHgVfhLXaGsn1jwHD9ZdmU6N2ubzKODc9KDNAH4="; 24 24 }; 25 25 26 26 passthru.tests = {
+3 -3
pkgs/development/python-modules/pluggy/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "pluggy"; 12 - version = "1.3.0"; 12 + version = "1.4.0"; 13 13 14 14 disabled = pythonOlder "3.8"; 15 15 16 - format = "pyproject"; 16 + pyproject = true; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "pytest-dev"; 20 20 repo = "pluggy"; 21 21 rev = "refs/tags/${version}"; 22 - hash = "sha256-jLasnqmATIOoheGu90Wo1+iTCwslYzNOKckqHIZDJec="; 22 + hash = "sha256-1XHJwODmpYQkYZvnZck6RrtT4lOeCf8cr1QFx9DCbzw="; 23 23 }; 24 24 25 25 nativeBuildInputs = [ setuptools-scm ];
+10 -2
pkgs/development/python-modules/psutil/default.nix
··· 11 11 12 12 buildPythonPackage rec { 13 13 pname = "psutil"; 14 - version = "5.9.6"; 14 + version = "5.9.8"; 15 15 format = "setuptools"; 16 16 17 17 inherit stdenv; ··· 20 20 21 21 src = fetchPypi { 22 22 inherit pname version; 23 - hash = "sha256-5Lkt3NfdTN0/kAGA6h4QSTLHvOI0+4iXbio7KWRBIlo="; 23 + hash = "sha256-a+Em4yJUht/yhqj7mgYkalJT9MfFO0depfWsk05kGUw="; 24 24 }; 25 + 26 + postPatch = '' 27 + # stick to the old SDK name for now 28 + # https://developer.apple.com/documentation/iokit/kiomasterportdefault/ 29 + # https://developer.apple.com/documentation/iokit/kiomainportdefault/ 30 + substituteInPlace psutil/arch/osx/cpu.c \ 31 + --replace-fail kIOMainPortDefault kIOMasterPortDefault 32 + ''; 25 33 26 34 buildInputs = 27 35 # workaround for https://github.com/NixOS/nixpkgs/issues/146760
+8 -3
pkgs/development/python-modules/pubnub/default.nix
··· 10 10 , pytest-asyncio 11 11 , requests 12 12 , pythonOlder 13 + , setuptools 13 14 }: 14 15 15 16 buildPythonPackage rec { 16 17 pname = "pubnub"; 17 - version = "7.3.2"; 18 - format = "setuptools"; 18 + version = "7.4.0"; 19 + pyproject = true; 19 20 20 21 disabled = pythonOlder "3.7"; 21 22 ··· 23 24 owner = pname; 24 25 repo = "python"; 25 26 rev = "refs/tags/v${version}"; 26 - hash = "sha256-J6vwdOI/GM/K0TxRwIgkXibNAc+n9wVCpmMkzMhBepw="; 27 + hash = "sha256-XYovKAk2GEMi7GE/DVtLjMbww7guGkZzDOHC7Z6ZpJo="; 27 28 }; 29 + 30 + nativeBuildInputs = [ 31 + setuptools 32 + ]; 28 33 29 34 propagatedBuildInputs = [ 30 35 aiohttp
+4 -2
pkgs/development/python-modules/py-aosmith/default.nix
··· 4 4 , fetchFromGitHub 5 5 , poetry-core 6 6 , aiohttp 7 + , tenacity 7 8 }: 8 9 9 10 buildPythonPackage rec { 10 11 pname = "py-aosmith"; 11 - version = "1.0.6"; 12 + version = "1.0.8"; 12 13 pyproject = true; 13 14 14 15 disabled = pythonOlder "3.10"; ··· 17 18 owner = "bdr99"; 18 19 repo = "py-aosmith"; 19 20 rev = "refs/tags/${version}"; 20 - hash = "sha256-4KODe+urqYMbN0+tNwQnvO3A9Zc/Xdo4uhJErn3BYS4="; 21 + hash = "sha256-TjBjyWxBPrZEY/o1DZ+GiFTHTW37WwFN0oyJSyGru28="; 21 22 }; 22 23 23 24 nativeBuildInputs = [ ··· 26 27 27 28 propagatedBuildInputs = [ 28 29 aiohttp 30 + tenacity 29 31 ]; 30 32 31 33 pythonImportsCheck = [ "py_aosmith" ];
+2 -2
pkgs/development/python-modules/pycaption/default.nix
··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "pycaption"; 16 - version = "2.2.3"; 16 + version = "2.2.4"; 17 17 18 18 disabled = pythonOlder "3.8"; 19 19 ··· 23 23 owner = "pbs"; 24 24 repo = "pycaption"; 25 25 rev = "refs/tags/${version}"; 26 - hash = "sha256-uPzeMuYoNgluXnwSMQE5lSkduBzwi8mP8K5cAKdTZUw="; 26 + hash = "sha256-aUhNvqeSNtbnRVp4yxsk4q3szNfR0m1zo0MpkBOCokY="; 27 27 }; 28 28 29 29 nativeBuildInputs = [
+4 -5
pkgs/development/python-modules/pycfmodel/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 4 , httpx 5 - , pydantic 5 + , pydantic_1 6 6 , pytestCheckHook 7 7 , pythonOlder 8 8 , setuptools ··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "pycfmodel"; 13 - version = "0.21.2"; 13 + version = "0.22.0"; 14 14 pyproject = true; 15 15 16 16 disabled = pythonOlder "3.7"; ··· 19 19 owner = "Skyscanner"; 20 20 repo = "pycfmodel"; 21 21 rev = "refs/tags/v${version}"; 22 - hash = "sha256-nQIZ9fwk8CdqJawYsU5qiu9xxhi9X0IxhlPohHUDTL8="; 22 + hash = "sha256-NLi94W99LhrBXNFItMfJczV9EZlgvmvkavrfDQJs0YU="; 23 23 }; 24 24 25 25 nativeBuildInputs = [ ··· 27 27 ]; 28 28 29 29 propagatedBuildInputs = [ 30 - pydantic 30 + pydantic_1 31 31 ]; 32 32 33 33 nativeCheckInputs = [ ··· 54 54 changelog = "https://github.com/Skyscanner/pycfmodel/releases/tag/v${version}"; 55 55 license = licenses.asl20; 56 56 maintainers = with maintainers; [ fab ]; 57 - broken = versionAtLeast pydantic.version "2"; 58 57 }; 59 58 }
+11 -2
pkgs/development/python-modules/pydantic-settings/default.nix
··· 10 10 , pytest-mock 11 11 }: 12 12 13 - buildPythonPackage rec { 13 + let self = buildPythonPackage rec { 14 14 pname = "pydantic-settings"; 15 15 version = "2.1.0"; 16 16 pyproject = true; ··· 50 50 export HOME=$TMPDIR 51 51 ''; 52 52 53 + # ruff is a dependency of pytest-examples which is required to run the tests. 54 + # We do not want all of the downstream packages that depend on pydantic-settings to also depend on ruff. 55 + doCheck = false; 56 + passthru.tests = { 57 + pytest = self.overridePythonAttrs { 58 + doCheck = true; 59 + }; 60 + }; 61 + 53 62 meta = with lib; { 54 63 description = "Settings management using pydantic"; 55 64 homepage = "https://github.com/pydantic/pydantic-settings"; ··· 57 66 broken = lib.versionOlder pydantic.version "2.0.0"; 58 67 maintainers = with maintainers; [ ]; 59 68 }; 60 - } 69 + }; in self
+2 -2
pkgs/development/python-modules/pymicrobot/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "pymicrobot"; 12 - version = "0.0.10"; 12 + version = "0.0.12"; 13 13 pyproject = true; 14 14 15 15 disabled = pythonOlder "3.9"; ··· 17 17 src = fetchPypi { 18 18 pname = "PyMicroBot"; 19 19 inherit version; 20 - hash = "sha256-A7qfRl958x0vsr/sxvK50M7fGUBFhdGiA+tbHOdk8gE="; 20 + hash = "sha256-Ysg97ApwbraRn19Mn5pJsg91dzf/njnNZiBJQKZqIbQ="; 21 21 }; 22 22 23 23 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/pymodbus/default.nix
··· 19 19 20 20 buildPythonPackage rec { 21 21 pname = "pymodbus"; 22 - version = "3.5.4"; 22 + version = "3.6.4"; 23 23 pyproject = true; 24 24 25 25 disabled = pythonOlder "3.8"; ··· 28 28 owner = "pymodbus-dev"; 29 29 repo = pname; 30 30 rev = "refs/tags/v${version}"; 31 - hash = "sha256-IgGDYNIRS39t8vHkJSGnDGCTKxpeIYZyedLzyS5pOI0="; 31 + hash = "sha256-SYdjM3wFZD+bAOd0vRFe6N5UwF+1Wv97ooihJjKV8K0="; 32 32 }; 33 33 34 34 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/pyorthanc/default.nix
··· 11 11 12 12 buildPythonPackage rec { 13 13 pname = "pyorthanc"; 14 - version = "1.16.0"; 14 + version = "1.16.1"; 15 15 disabled = pythonOlder "3.8"; 16 16 17 17 format = "pyproject"; ··· 20 20 owner = "gacou54"; 21 21 repo = pname; 22 22 rev = "refs/tags/v${version}"; 23 - hash = "sha256-qwH3kJzJRHuuGW7tgcaQjT+JwDsAZksQDZciaJLC55Q="; 23 + hash = "sha256-6l3L0YUAqedyRjlQ6K3SaAMdGK2C0AeKpJj6MyXi4RA="; 24 24 }; 25 25 26 26 nativeBuildInputs = [ pythonRelaxDepsHook poetry-core ];
+2 -2
pkgs/development/python-modules/pytest/default.nix
··· 29 29 30 30 buildPythonPackage rec { 31 31 pname = "pytest"; 32 - version = "7.4.3"; 32 + version = "7.4.4"; 33 33 pyproject = true; 34 34 35 35 src = fetchPypi { 36 36 inherit pname version; 37 - hash = "sha256-2YnRNpgt5OOynavMg4rVgcZOjtUsEfvobd69naCBjNU="; 37 + hash = "sha256-LPAAWSLGrOSj4uyLQIDrDZdT/ckxB0FTMvUM6eeZQoA="; 38 38 }; 39 39 40 40 outputs = [
+13 -4
pkgs/development/python-modules/python-memcached/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 4 , setuptools 5 + , memcached 5 6 , mock 6 7 , pytestCheckHook 7 8 }: 8 9 9 10 buildPythonPackage rec { 10 11 pname = "python-memcached"; 11 - version = "1.61"; 12 + version = "1.62"; 12 13 pyproject = true; 13 14 14 15 src = fetchFromGitHub { 15 16 owner = "linsomniac"; 16 17 repo = "python-memcached"; 17 18 rev = version; 18 - hash = "sha256-7bUCVAmOJ6znVmTZg9AJokOuym07NHL12gZgQ2uhfNo="; 19 + hash = "sha256-Qko4Qr9WofeklU0uRRrSPrT8YaBYMCy0GP+TF7YZHLI="; 19 20 }; 20 21 21 22 nativeBuildInputs = [ ··· 23 24 ]; 24 25 25 26 nativeCheckInputs = [ 27 + memcached 26 28 mock 27 29 pytestCheckHook 28 30 ]; 29 31 30 - # all tests fail 31 - doCheck = false; 32 + preCheck = '' 33 + memcached & 34 + ''; 35 + 36 + postCheck = '' 37 + kill %% 38 + ''; 39 + 40 + __darwinAllowLocalNetworking = true; 32 41 33 42 pythonImportsCheck = [ "memcache" ]; 34 43
+2 -2
pkgs/development/python-modules/qdrant-client/default.nix
··· 18 18 19 19 buildPythonPackage rec { 20 20 pname = "qdrant-client"; 21 - version = "1.7.2"; 21 + version = "1.7.3"; 22 22 format = "pyproject"; 23 23 24 24 disabled = pythonOlder "3.7"; ··· 27 27 owner = "qdrant"; 28 28 repo = pname; 29 29 rev = "refs/tags/v${version}"; 30 - hash = "sha256-nGZV8ORThVxH+Q1xfpqUwPGw6LUoTZXj4KgfTLCvUEc="; 30 + hash = "sha256-VU2/kK7zpiuHbPtt1Qh8pdgen4KoIIKsyC479LATO84="; 31 31 }; 32 32 33 33 nativeBuildInputs = [
+33 -10
pkgs/development/python-modules/qpsolvers/default.nix
··· 4 4 , buildPythonPackage 5 5 , unittestCheckHook 6 6 , flit-core 7 + , numpy 8 + , scipy 9 + 10 + # optional dependencies 11 + , clarabel 12 + , cvxopt 7 13 , daqp 8 14 , ecos 9 - , numpy 15 + , gurobipy 10 16 , osqp 11 - , scipy 17 + , quadprog 12 18 , scs 13 - , quadprog 14 19 }: 15 20 buildPythonPackage rec { 16 21 pname = "qpsolvers"; ··· 24 29 hash = "sha256-/HLc9dFf9F/6W7ux2Fj2yJuV/xCVeGyO6MblddwIGdM="; 25 30 }; 26 31 32 + nativeBuildInputs = [ 33 + flit-core 34 + ]; 35 + 27 36 pythonImportsCheck = [ "qpsolvers" ]; 28 37 29 38 propagatedBuildInputs = [ 30 - daqp 31 - ecos 32 39 numpy 33 - osqp 34 40 scipy 35 - scs 36 41 ]; 37 42 43 + passthru.optional-dependencies = { 44 + # FIXME commented out solvers have not been packaged yet 45 + clarabel = [ clarabel ]; 46 + cvxopt = [ cvxopt ]; 47 + daqp = [ daqp ]; 48 + ecos = [ ecos ]; 49 + gurobi = [ gurobipy ]; 50 + # highs = [ highspy ]; 51 + # mosek = [ cvxopt mosek ]; 52 + osqp = [ osqp ]; 53 + # piqp = [ piqp ]; 54 + # proxqp = [ proxsuite ]; 55 + # qpalm = [ qpalm ]; 56 + quadprog = [ quadprog ]; 57 + scs = [ scs ]; 58 + open_source_solvers = with passthru.optional-dependencies; lib.flatten [ 59 + clarabel cvxopt daqp ecos /* highs */ osqp /* piqp proxqp qpalm */ quadprog scs 60 + ]; 61 + }; 62 + 38 63 nativeCheckInputs = [ 39 - flit-core 40 - quadprog 41 64 unittestCheckHook 42 - ]; 65 + ] ++ passthru.optional-dependencies.open_source_solvers; 43 66 44 67 meta = with lib; { 45 68 changelog = "https://github.com/qpsolvers/qpsolvers/blob/${src.rev}/CHANGELOG.md";
+8 -9
pkgs/development/python-modules/quart/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 + , pythonOlder 4 5 5 6 # build-system 6 7 , poetry-core ··· 9 10 , aiofiles 10 11 , blinker 11 12 , click 13 + , flask 12 14 , hypercorn 13 15 , importlib-metadata 14 16 , itsdangerous ··· 29 31 30 32 buildPythonPackage rec { 31 33 pname = "quart"; 32 - version = "0.18.4"; 34 + version = "0.19.4"; 33 35 format = "pyproject"; 34 36 35 37 src = fetchFromGitHub { 36 38 owner = "pallets"; 37 39 repo = "quart"; 38 40 rev = "refs/tags/${version}"; 39 - hash = "sha256-iT/pePUtH1hwNIOG8Y/YbqCVseNXVOKC0nrXfB2RTlQ="; 41 + hash = "sha256-EgCZ0AXK2vGxo55BWAcDVv6zNUrWNbAYNnEXEBJk+84="; 40 42 }; 41 43 42 44 nativeBuildInputs = [ ··· 52 54 aiofiles 53 55 blinker 54 56 click 57 + flask 55 58 hypercorn 56 - importlib-metadata 57 59 itsdangerous 58 60 jinja2 59 61 markupsafe 60 62 pydata-sphinx-theme 61 63 python-dotenv 64 + werkzeug 65 + ] ++ lib.optionals (pythonOlder "3.10") [ 66 + importlib-metadata 62 67 typing-extensions 63 - werkzeug 64 68 ]; 65 69 66 70 pythonImportsCheck = [ ··· 73 77 py 74 78 pytest-asyncio 75 79 pytestCheckHook 76 - ]; 77 - 78 - disabledTestPaths = [ 79 - # remove after 0.18.4 80 - "tests/test_signals.py" 81 80 ]; 82 81 83 82 meta = with lib; {
+2 -2
pkgs/development/python-modules/rflink/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "rflink"; 15 - version = "0.0.65"; 15 + version = "0.0.66"; 16 16 format = "setuptools"; 17 17 18 18 disabled = pythonOlder "3.7"; ··· 21 21 owner = "aequitas"; 22 22 repo = "python-rflink"; 23 23 rev = "refs/tags/${version}"; 24 - hash = "sha256-DUnhuA84nkmYkREa7vUiyLg7JUdEEeLewg3vFFlcar8="; 24 + hash = "sha256-n6VLa0xX1qewMS7Kv+kiitezWRbRvDJRNuOmA7IV6u0="; 25 25 }; 26 26 27 27 propagatedBuildInputs = [
+5
pkgs/development/python-modules/scipy/default.nix
··· 76 76 "doc/source/dev/contributor/meson_advanced.rst" 77 77 ]; 78 78 }) 79 + (fetchpatch { 80 + name = "openblas-0.3.26-compat.patch"; 81 + url = "https://github.com/scipy/scipy/commit/8c96a1f742335bca283aae418763aaba62c03378.patch"; 82 + hash = "sha256-SGoYDxwSAkr6D5/XEqHLerF4e4nmmI+PX+z+3taWAps="; 83 + }) 79 84 ]; 80 85 81 86 # Upstream complicated numpy version pinning is causing issues in the
+4 -3
pkgs/development/python-modules/sentry-sdk/default.nix
··· 27 27 , pytest-watch 28 28 , pytestCheckHook 29 29 , pythonOlder 30 + , quart 30 31 , rq 31 32 , sanic 32 33 , setuptools ··· 37 38 38 39 buildPythonPackage rec { 39 40 pname = "sentry-sdk"; 40 - version = "1.39.2"; 41 + version = "1.40.0"; 41 42 pyproject = true; 42 43 43 44 disabled = pythonOlder "3.7"; ··· 46 47 owner = "getsentry"; 47 48 repo = "sentry-python"; 48 49 rev = "refs/tags/${version}"; 49 - hash = "sha256-MC+9w53fsC5XB7CR9SS+z4bu2GgxkqdeYWERhk8lhcA="; 50 + hash = "sha256-cVBqSFMBSRoIIv2RmkSLhlQ+jrofJVT9QoAPyjyX0ms="; 50 51 }; 51 52 52 53 nativeBuildInputs = [ ··· 96 97 pure-eval 97 98 ]; 98 99 quart = [ 99 - # quart missing 100 + quart 100 101 blinker 101 102 ]; 102 103 rq = [
+2 -2
pkgs/development/python-modules/setuptools/default.nix
··· 8 8 9 9 buildPythonPackage rec { 10 10 pname = "setuptools"; 11 - version = "69.0.2"; 11 + version = "69.0.3"; 12 12 format = "pyproject"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "pypa"; 16 16 repo = "setuptools"; 17 17 rev = "refs/tags/v${version}"; 18 - hash = "sha256-7xOZC85glpXPKdPTYOpwjQHRpkKL1hgbMFgJF3q5EW0="; 18 + hash = "sha256-38csULki+SBcg7StScj0/09A+JZesm8iwOBjSgXyXMA="; 19 19 }; 20 20 21 21 patches = [
+6 -1
pkgs/development/python-modules/sip/default.nix
··· 9 9 , ply 10 10 , toml 11 11 , tomli 12 + 13 + # tests 12 14 , poppler-qt5 15 + , qgis 16 + , qgis-ltr 13 17 }: 14 18 15 19 buildPythonPackage rec { ··· 38 42 pythonImportsCheck = [ "sipbuild" ]; 39 43 40 44 passthru.tests = { 41 - inherit poppler-qt5; 45 + # test depending packages 46 + inherit poppler-qt5 qgis qgis-ltr; 42 47 }; 43 48 44 49 meta = with lib; {
+7
pkgs/development/python-modules/sqlalchemy-utils/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchPypi 4 + , fetchpatch 4 5 , pythonOlder 5 6 6 7 # runtime ··· 48 49 49 50 patches = [ 50 51 ./skip-database-tests.patch 52 + 53 + (fetchpatch { 54 + # sqlalchemy 2.0.22+ compat; https://github.com/kvesteri/sqlalchemy-utils/pull/725 55 + url = "https://github.com/kvesteri/sqlalchemy-utils/commit/712aabaefc5c8ca3680751c705cf5a5984c74af1.patch"; 56 + hash = "sha256-xBdiUtFWjlUhBzHgGFbaKBt3at6NDo+mv9sd8WwiPOA="; 57 + }) 51 58 ]; 52 59 53 60 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/sqlalchemy/default.nix
··· 40 40 41 41 buildPythonPackage rec { 42 42 pname = "SQLAlchemy"; 43 - version = "2.0.21"; 43 + version = "2.0.25"; 44 44 format = "pyproject"; 45 45 46 46 disabled = pythonOlder "3.7"; ··· 49 49 owner = "sqlalchemy"; 50 50 repo = "sqlalchemy"; 51 51 rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; 52 - hash = "sha256-ldBn+pdZfqnBKdYkOcG47ScH/hBgeJBeIvn1hCIBw/A="; 52 + hash = "sha256-nfkYzLpWyNXDuRUJl5pzaedw5v7jHpG7kpmr6VTGUaw="; 53 53 }; 54 54 55 55 postPatch = ''
+23 -19
pkgs/development/python-modules/starlette/default.nix
··· 1 1 { lib 2 - , stdenv 3 2 , buildPythonPackage 4 3 , fetchFromGitHub 4 + 5 + # build-system 5 6 , hatchling 6 7 7 - # runtime 8 - , ApplicationServices 8 + # dependencies 9 9 , anyio 10 + , typing-extensions 11 + 12 + # optional dependencies 10 13 , itsdangerous 11 14 , jinja2 12 15 , python-multipart 13 16 , pyyaml 14 17 , httpx 15 - , typing-extensions 16 18 17 19 # tests 18 20 , pytestCheckHook 19 21 , pythonOlder 20 22 , trio 23 + 24 + # reverse dependencies 25 + , fastapi 21 26 }: 22 27 23 28 buildPythonPackage rec { 24 29 pname = "starlette"; 25 - version = "0.32.0.post1"; 26 - format = "pyproject"; 30 + version = "0.35.1"; 31 + pyproject = true; 27 32 28 - disabled = pythonOlder "3.7"; 33 + disabled = pythonOlder "3.8"; 29 34 30 35 src = fetchFromGitHub { 31 36 owner = "encode"; 32 37 repo = pname; 33 38 rev = "refs/tags/${version}"; 34 - hash = "sha256-1twyN3fSlxwfDtyqaFFuCAVehLZ8vCV4voCT7CVSEbk="; 39 + hash = "sha256-ynT1KowVJ1QdKLSOXYWVe5Q/PrYEWQDUbj395ebfk6Y="; 35 40 }; 36 41 37 42 nativeBuildInputs = [ ··· 40 45 41 46 propagatedBuildInputs = [ 42 47 anyio 48 + ] ++ lib.optionals (pythonOlder "3.10") [ 49 + typing-extensions 50 + ]; 51 + 52 + passthru.optional-dependencies.full = [ 43 53 itsdangerous 44 54 jinja2 45 55 python-multipart 46 56 pyyaml 47 57 httpx 48 - ] ++ lib.optionals (pythonOlder "3.10") [ 49 - typing-extensions 50 - ] ++ lib.optionals stdenv.isDarwin [ 51 - ApplicationServices 52 58 ]; 53 59 54 60 nativeCheckInputs = [ 55 61 pytestCheckHook 56 62 trio 57 63 typing-extensions 58 - ]; 64 + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); 59 65 60 66 pytestFlagsArray = [ 61 67 "-W" "ignore::DeprecationWarning" 62 68 "-W" "ignore::trio.TrioDeprecationWarning" 63 69 ]; 64 70 65 - disabledTests = [ 66 - # asserts fail due to inclusion of br in Accept-Encoding 67 - "test_websocket_headers" 68 - "test_request_headers" 69 - ]; 70 - 71 71 pythonImportsCheck = [ 72 72 "starlette" 73 73 ]; 74 + 75 + passthru.tests = { 76 + inherit fastapi; 77 + }; 74 78 75 79 meta = with lib; { 76 80 changelog = "https://github.com/encode/starlette/releases/tag/${version}";
+4 -4
pkgs/development/python-modules/tqdm/default.nix
··· 2 2 , stdenv 3 3 , buildPythonPackage 4 4 , fetchPypi 5 - , pythonAtLeast 5 + , pythonOlder 6 6 , setuptools 7 7 , setuptools-scm 8 8 , wheel ··· 20 20 version = "4.66.1"; 21 21 format = "pyproject"; 22 22 23 - # https://github.com/tqdm/tqdm/issues/1537 24 - disabled = pythonAtLeast "3.12"; 25 - 26 23 src = fetchPypi { 27 24 inherit pname version; 28 25 hash = "sha256-2I5lH5242FUaYlVtPP+eMDQnTKXWbpMZfPJJDi3Lacc="; ··· 33 30 setuptools-scm 34 31 wheel 35 32 ]; 33 + 34 + # https://github.com/tqdm/tqdm/issues/1537 35 + doCheck = pythonOlder "3.12"; 36 36 37 37 nativeCheckInputs = [ 38 38 pytestCheckHook
+2 -2
pkgs/development/python-modules/trove-classifiers/default.nix
··· 10 10 let 11 11 self = buildPythonPackage rec { 12 12 pname = "trove-classifiers"; 13 - version = "2023.11.29"; 13 + version = "2024.1.8"; 14 14 pyproject = true; 15 15 16 16 disabled = pythonOlder "3.7"; 17 17 18 18 src = fetchPypi { 19 19 inherit pname version; 20 - hash = "sha256-/49/2Cx5MhE7RufvZ0LHAJHMY2QMjGXbANkfLpQLlRQ="; 20 + hash = "sha256-bjbK9DD/ZIXEtXpMazZKE/aomNFrlBfGw3Rn5ZwUsFo="; 21 21 }; 22 22 23 23 postPatch = ''
+22 -6
pkgs/development/python-modules/werkzeug/default.nix
··· 3 3 , buildPythonPackage 4 4 , pythonOlder 5 5 , fetchPypi 6 + 7 + # build-system 6 8 , flit-core 9 + 10 + # dependencies 11 + , markupsafe 12 + 13 + # optional-dependencies 7 14 , watchdog 15 + 16 + # tests 17 + , cryptography 8 18 , ephemeral-port-reserve 19 + , greenlet 9 20 , pytest-timeout 10 21 , pytest-xprocess 11 22 , pytestCheckHook 12 - , markupsafe 13 - # for passthru.tests 14 - , moto, sentry-sdk 23 + 24 + # reverse dependencies 25 + , moto 26 + , sentry-sdk 15 27 }: 16 28 17 29 buildPythonPackage rec { 18 30 pname = "werkzeug"; 19 - version = "2.3.8"; 31 + version = "3.0.1"; 20 32 format = "pyproject"; 21 33 22 34 disabled = pythonOlder "3.8"; 23 35 24 36 src = fetchPypi { 25 37 inherit pname version; 26 - hash = "sha256-VUslfHS763oNJUFgpPj/4YUkP1KlIDUGC3Ycpi2XfwM="; 38 + hash = "sha256-UH6BHs6nKxikBJR63tSzOQ4duPgmtJTXZVDvRbs7Hcw="; 27 39 }; 28 40 29 41 nativeBuildInputs = [ ··· 36 48 37 49 passthru.optional-dependencies = { 38 50 watchdog = lib.optionals (!stdenv.isDarwin) [ 39 - # watchdog requires macos-sdk 10.13[ 51 + # watchdog requires macos-sdk 10.13 40 52 watchdog 41 53 ]; 42 54 }; 43 55 44 56 nativeCheckInputs = [ 57 + cryptography 45 58 ephemeral-port-reserve 46 59 pytest-timeout 47 60 pytest-xprocess 48 61 pytestCheckHook 62 + ] ++ lib.optionals (pythonOlder "3.11") [ 63 + greenlet 49 64 ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); 50 65 51 66 disabledTests = lib.optionals stdenv.isDarwin [ ··· 68 83 }; 69 84 70 85 meta = with lib; { 86 + changelog = "https://werkzeug.palletsprojects.com/en/${versions.majorMinor version}.x/changes/#version-${replaceStrings [ "." ] [ "-" ] version}"; 71 87 homepage = "https://palletsprojects.com/p/werkzeug/"; 72 88 description = "The comprehensive WSGI web application library"; 73 89 longDescription = ''
+24 -24
pkgs/development/tools/azure-static-sites-client/versions.json
··· 1 1 [ 2 2 { 3 3 "version": "latest", 4 - "buildId": "1.0.025241", 5 - "publishDate": "2023-11-30T02:51:40.8356813Z", 4 + "buildId": "1.0.025891", 5 + "publishDate": "2024-02-02T19:23:37.1915908Z", 6 6 "files": { 7 7 "linux-x64": { 8 - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/linux/StaticSitesClient", 9 - "sha": "e4ccb44c516e03e6dcc2a26a35ffd4c84a61dfea581990dd5c0edb7c12662db0" 8 + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/linux/StaticSitesClient", 9 + "sha": "798b4032d1b6cd3f7057a6b7510c502dd69fa8cb4d27d47433542e8e80e9f87c" 10 10 }, 11 11 "win-x64": { 12 - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/windows/StaticSitesClient.exe", 13 - "sha": "4146ac01a488910d6ea066e1c46505048b0c9af2e74ef273c4236b387796712d" 12 + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/windows/StaticSitesClient.exe", 13 + "sha": "097f9633c12b55e85e4ea9c053576a94b4f5847ce3a5a7671112c881878cfc4b" 14 14 }, 15 15 "osx-x64": { 16 - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/macOS/StaticSitesClient", 17 - "sha": "05b213d7861454368d2c9801b0ccc75cfd13cb48f8e121fffaa2ab7e9b5671cd" 16 + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/macOS/StaticSitesClient", 17 + "sha": "142310370774f91526c5d08ebde2f0b224b4f7f88bb6e514d25c1ef6f04fd8c8" 18 18 } 19 19 } 20 20 }, 21 21 { 22 22 "version": "stable", 23 - "buildId": "1.0.025241", 24 - "publishDate": "2023-11-30T02:51:40.8356813Z", 23 + "buildId": "1.0.025891", 24 + "publishDate": "2024-02-02T19:23:37.1915908Z", 25 25 "files": { 26 26 "linux-x64": { 27 - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/linux/StaticSitesClient", 28 - "sha": "e4ccb44c516e03e6dcc2a26a35ffd4c84a61dfea581990dd5c0edb7c12662db0" 27 + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/linux/StaticSitesClient", 28 + "sha": "798b4032d1b6cd3f7057a6b7510c502dd69fa8cb4d27d47433542e8e80e9f87c" 29 29 }, 30 30 "win-x64": { 31 - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/windows/StaticSitesClient.exe", 32 - "sha": "4146ac01a488910d6ea066e1c46505048b0c9af2e74ef273c4236b387796712d" 31 + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/windows/StaticSitesClient.exe", 32 + "sha": "097f9633c12b55e85e4ea9c053576a94b4f5847ce3a5a7671112c881878cfc4b" 33 33 }, 34 34 "osx-x64": { 35 - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/macOS/StaticSitesClient", 36 - "sha": "05b213d7861454368d2c9801b0ccc75cfd13cb48f8e121fffaa2ab7e9b5671cd" 35 + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/macOS/StaticSitesClient", 36 + "sha": "142310370774f91526c5d08ebde2f0b224b4f7f88bb6e514d25c1ef6f04fd8c8" 37 37 } 38 38 } 39 39 }, 40 40 { 41 41 "version": "backup", 42 - "buildId": "1.0.025142", 43 - "publishDate": "2023-11-20T09:32:48.489649Z", 42 + "buildId": "1.0.025241", 43 + "publishDate": "2023-11-30T02:51:40.8356813Z", 44 44 "files": { 45 45 "linux-x64": { 46 - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025142/linux/StaticSitesClient", 47 - "sha": "f36cce34f04b045e3ea5de5c201ce6663925d9680e3b5986b417534898b995b2" 46 + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/linux/StaticSitesClient", 47 + "sha": "e4ccb44c516e03e6dcc2a26a35ffd4c84a61dfea581990dd5c0edb7c12662db0" 48 48 }, 49 49 "win-x64": { 50 - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025142/windows/StaticSitesClient.exe", 51 - "sha": "1e8932e2c4189d40657db888f82dfb030c2d41951421dd9a68712960e7c7fa7b" 50 + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/windows/StaticSitesClient.exe", 51 + "sha": "4146ac01a488910d6ea066e1c46505048b0c9af2e74ef273c4236b387796712d" 52 52 }, 53 53 "osx-x64": { 54 - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025142/macOS/StaticSitesClient", 55 - "sha": "891faef16ae06fc609f787ffce7d6a1816e24fddfcaef9bc10e3b50208fe29aa" 54 + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/macOS/StaticSitesClient", 55 + "sha": "05b213d7861454368d2c9801b0ccc75cfd13cb48f8e121fffaa2ab7e9b5671cd" 56 56 } 57 57 } 58 58 }
+10 -10
pkgs/development/tools/cocoapods/Gemfile-beta.lock
··· 3 3 specs: 4 4 CFPropertyList (3.0.6) 5 5 rexml 6 - activesupport (7.1.2) 6 + activesupport (7.1.3) 7 7 base64 8 8 bigdecimal 9 9 concurrent-ruby (~> 1.0, >= 1.0.2) ··· 13 13 minitest (>= 5.1) 14 14 mutex_m 15 15 tzinfo (~> 2.0) 16 - addressable (2.8.5) 16 + addressable (2.8.6) 17 17 public_suffix (>= 2.0.2, < 6.0) 18 18 algoliasearch (1.27.5) 19 19 httpclient (~> 2.8, >= 2.8.3) 20 20 json (>= 1.5.1) 21 21 atomos (0.1.3) 22 22 base64 (0.2.0) 23 - bigdecimal (3.1.4) 23 + bigdecimal (3.1.6) 24 24 claide (1.1.0) 25 - cocoapods (1.14.3) 25 + cocoapods (1.15.1) 26 26 addressable (~> 2.8) 27 27 claide (>= 1.0.2, < 2.0) 28 - cocoapods-core (= 1.14.3) 28 + cocoapods-core (= 1.15.1) 29 29 cocoapods-deintegrate (>= 1.0.3, < 2.0) 30 30 cocoapods-downloader (>= 2.1, < 3.0) 31 31 cocoapods-plugins (>= 1.0.0, < 2.0) ··· 40 40 nap (~> 1.0) 41 41 ruby-macho (>= 2.3.0, < 3.0) 42 42 xcodeproj (>= 1.23.0, < 2.0) 43 - cocoapods-core (1.14.3) 43 + cocoapods-core (1.15.1) 44 44 activesupport (>= 5.0, < 8) 45 45 addressable (~> 2.8) 46 46 algoliasearch (~> 1.0) ··· 60 60 netrc (~> 0.11) 61 61 cocoapods-try (1.2.0) 62 62 colored2 (3.1.2) 63 - concurrent-ruby (1.2.2) 63 + concurrent-ruby (1.2.3) 64 64 connection_pool (2.4.1) 65 65 drb (2.2.0) 66 66 ruby2_keywords ··· 74 74 httpclient (2.8.3) 75 75 i18n (1.14.1) 76 76 concurrent-ruby (~> 1.0) 77 - json (2.6.3) 78 - minitest (5.20.0) 77 + json (2.7.1) 78 + minitest (5.22.0) 79 79 molinillo (0.8.0) 80 80 mutex_m (0.2.0) 81 81 nanaimo (0.3.0) ··· 89 89 ethon (>= 0.9.0) 90 90 tzinfo (2.0.6) 91 91 concurrent-ruby (~> 1.0) 92 - xcodeproj (1.23.0) 92 + xcodeproj (1.24.0) 93 93 CFPropertyList (>= 2.3.3, < 4.0) 94 94 atomos (~> 0.1.3) 95 95 claide (>= 1.0.2, < 2.0)
+10 -10
pkgs/development/tools/cocoapods/Gemfile.lock
··· 3 3 specs: 4 4 CFPropertyList (3.0.6) 5 5 rexml 6 - activesupport (7.1.2) 6 + activesupport (7.1.3) 7 7 base64 8 8 bigdecimal 9 9 concurrent-ruby (~> 1.0, >= 1.0.2) ··· 13 13 minitest (>= 5.1) 14 14 mutex_m 15 15 tzinfo (~> 2.0) 16 - addressable (2.8.5) 16 + addressable (2.8.6) 17 17 public_suffix (>= 2.0.2, < 6.0) 18 18 algoliasearch (1.27.5) 19 19 httpclient (~> 2.8, >= 2.8.3) 20 20 json (>= 1.5.1) 21 21 atomos (0.1.3) 22 22 base64 (0.2.0) 23 - bigdecimal (3.1.4) 23 + bigdecimal (3.1.6) 24 24 claide (1.1.0) 25 - cocoapods (1.14.3) 25 + cocoapods (1.15.1) 26 26 addressable (~> 2.8) 27 27 claide (>= 1.0.2, < 2.0) 28 - cocoapods-core (= 1.14.3) 28 + cocoapods-core (= 1.15.1) 29 29 cocoapods-deintegrate (>= 1.0.3, < 2.0) 30 30 cocoapods-downloader (>= 2.1, < 3.0) 31 31 cocoapods-plugins (>= 1.0.0, < 2.0) ··· 40 40 nap (~> 1.0) 41 41 ruby-macho (>= 2.3.0, < 3.0) 42 42 xcodeproj (>= 1.23.0, < 2.0) 43 - cocoapods-core (1.14.3) 43 + cocoapods-core (1.15.1) 44 44 activesupport (>= 5.0, < 8) 45 45 addressable (~> 2.8) 46 46 algoliasearch (~> 1.0) ··· 60 60 netrc (~> 0.11) 61 61 cocoapods-try (1.2.0) 62 62 colored2 (3.1.2) 63 - concurrent-ruby (1.2.2) 63 + concurrent-ruby (1.2.3) 64 64 connection_pool (2.4.1) 65 65 drb (2.2.0) 66 66 ruby2_keywords ··· 74 74 httpclient (2.8.3) 75 75 i18n (1.14.1) 76 76 concurrent-ruby (~> 1.0) 77 - json (2.6.3) 78 - minitest (5.20.0) 77 + json (2.7.1) 78 + minitest (5.22.0) 79 79 molinillo (0.8.0) 80 80 mutex_m (0.2.0) 81 81 nanaimo (0.3.0) ··· 89 89 ethon (>= 0.9.0) 90 90 tzinfo (2.0.6) 91 91 concurrent-ruby (~> 1.0) 92 - xcodeproj (1.23.0) 92 + xcodeproj (1.24.0) 93 93 CFPropertyList (>= 2.3.3, < 4.0) 94 94 atomos (~> 0.1.3) 95 95 claide (>= 1.0.2, < 2.0)
+18 -18
pkgs/development/tools/cocoapods/gemset-beta.nix
··· 5 5 platforms = []; 6 6 source = { 7 7 remotes = ["https://rubygems.org"]; 8 - sha256 = "1l6hmf99zgckpn812qfxfz60rbh0zixv1hxnxhjlg8942pvixn2v"; 8 + sha256 = "09zrw3sydkk6lwzjhzia38wg1as5aab2lgnysfdr1qxh39zi7z7v"; 9 9 type = "gem"; 10 10 }; 11 - version = "7.1.2"; 11 + version = "7.1.3"; 12 12 }; 13 13 addressable = { 14 14 dependencies = ["public_suffix"]; ··· 16 16 platforms = []; 17 17 source = { 18 18 remotes = ["https://rubygems.org"]; 19 - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; 19 + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; 20 20 type = "gem"; 21 21 }; 22 - version = "2.8.5"; 22 + version = "2.8.6"; 23 23 }; 24 24 algoliasearch = { 25 25 dependencies = ["httpclient" "json"]; ··· 57 57 platforms = []; 58 58 source = { 59 59 remotes = ["https://rubygems.org"]; 60 - sha256 = "07y615s8yldk3k13lmkhpk1k190lcqvmxmnjwgh4bzjan9xrc36y"; 60 + sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; 61 61 type = "gem"; 62 62 }; 63 - version = "3.1.4"; 63 + version = "3.1.6"; 64 64 }; 65 65 CFPropertyList = { 66 66 dependencies = ["rexml"]; ··· 89 89 platforms = []; 90 90 source = { 91 91 remotes = ["https://rubygems.org"]; 92 - sha256 = "1r2w719d5zfzl3wnc5npnjv4194b7gdh4vib09vifdm8yab14br3"; 92 + sha256 = "19rmw9518zlcalr7vy6f10rbiya7ch86z3nfk2d6klw41ihc5hrq"; 93 93 type = "gem"; 94 94 }; 95 - version = "1.14.3"; 95 + version = "1.15.1"; 96 96 }; 97 97 cocoapods-core = { 98 98 dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; ··· 100 100 platforms = []; 101 101 source = { 102 102 remotes = ["https://rubygems.org"]; 103 - sha256 = "04qyzcwkwbm7l4kjp6m8g2pvsryfvsllwpqf0mxfnzwbdid40zwn"; 103 + sha256 = "03dh7vfr9r248c8vbkssa6q0y9imvv1ms6mx28w06ysmdvn4vbgv"; 104 104 type = "gem"; 105 105 }; 106 - version = "1.14.3"; 106 + version = "1.15.1"; 107 107 }; 108 108 cocoapods-deintegrate = { 109 109 groups = ["default"]; ··· 182 182 platforms = []; 183 183 source = { 184 184 remotes = ["https://rubygems.org"]; 185 - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; 185 + sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; 186 186 type = "gem"; 187 187 }; 188 - version = "1.2.2"; 188 + version = "1.2.3"; 189 189 }; 190 190 connection_pool = { 191 191 groups = ["default"]; ··· 295 295 platforms = []; 296 296 source = { 297 297 remotes = ["https://rubygems.org"]; 298 - sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; 298 + sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; 299 299 type = "gem"; 300 300 }; 301 - version = "2.6.3"; 301 + version = "2.7.1"; 302 302 }; 303 303 minitest = { 304 304 groups = ["default"]; 305 305 platforms = []; 306 306 source = { 307 307 remotes = ["https://rubygems.org"]; 308 - sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; 308 + sha256 = "0hv03j1ac349pjymis7jxmbqr5jalc60cg27529bbb3zymswhdjz"; 309 309 type = "gem"; 310 310 }; 311 - version = "5.20.0"; 311 + version = "5.22.0"; 312 312 }; 313 313 molinillo = { 314 314 groups = ["default"]; ··· 428 428 platforms = []; 429 429 source = { 430 430 remotes = ["https://rubygems.org"]; 431 - sha256 = "176ndahc5fssyx04q176vy6wngs1av4vrsdrkdpjij700hqll8hn"; 431 + sha256 = "1wpg4n7b8571j2h8h7v2kk8pr141rgf6m8mhk221k990fissrq56"; 432 432 type = "gem"; 433 433 }; 434 - version = "1.23.0"; 434 + version = "1.24.0"; 435 435 }; 436 436 }
+18 -18
pkgs/development/tools/cocoapods/gemset.nix
··· 5 5 platforms = []; 6 6 source = { 7 7 remotes = ["https://rubygems.org"]; 8 - sha256 = "1l6hmf99zgckpn812qfxfz60rbh0zixv1hxnxhjlg8942pvixn2v"; 8 + sha256 = "09zrw3sydkk6lwzjhzia38wg1as5aab2lgnysfdr1qxh39zi7z7v"; 9 9 type = "gem"; 10 10 }; 11 - version = "7.1.2"; 11 + version = "7.1.3"; 12 12 }; 13 13 addressable = { 14 14 dependencies = ["public_suffix"]; ··· 16 16 platforms = []; 17 17 source = { 18 18 remotes = ["https://rubygems.org"]; 19 - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; 19 + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; 20 20 type = "gem"; 21 21 }; 22 - version = "2.8.5"; 22 + version = "2.8.6"; 23 23 }; 24 24 algoliasearch = { 25 25 dependencies = ["httpclient" "json"]; ··· 55 55 platforms = []; 56 56 source = { 57 57 remotes = ["https://rubygems.org"]; 58 - sha256 = "07y615s8yldk3k13lmkhpk1k190lcqvmxmnjwgh4bzjan9xrc36y"; 58 + sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; 59 59 type = "gem"; 60 60 }; 61 - version = "3.1.4"; 61 + version = "3.1.6"; 62 62 }; 63 63 CFPropertyList = { 64 64 dependencies = ["rexml"]; ··· 87 87 platforms = []; 88 88 source = { 89 89 remotes = ["https://rubygems.org"]; 90 - sha256 = "1r2w719d5zfzl3wnc5npnjv4194b7gdh4vib09vifdm8yab14br3"; 90 + sha256 = "19rmw9518zlcalr7vy6f10rbiya7ch86z3nfk2d6klw41ihc5hrq"; 91 91 type = "gem"; 92 92 }; 93 - version = "1.14.3"; 93 + version = "1.15.1"; 94 94 }; 95 95 cocoapods-core = { 96 96 dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; ··· 98 98 platforms = []; 99 99 source = { 100 100 remotes = ["https://rubygems.org"]; 101 - sha256 = "04qyzcwkwbm7l4kjp6m8g2pvsryfvsllwpqf0mxfnzwbdid40zwn"; 101 + sha256 = "03dh7vfr9r248c8vbkssa6q0y9imvv1ms6mx28w06ysmdvn4vbgv"; 102 102 type = "gem"; 103 103 }; 104 - version = "1.14.3"; 104 + version = "1.15.1"; 105 105 }; 106 106 cocoapods-deintegrate = { 107 107 groups = ["default"]; ··· 176 176 platforms = []; 177 177 source = { 178 178 remotes = ["https://rubygems.org"]; 179 - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; 179 + sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; 180 180 type = "gem"; 181 181 }; 182 - version = "1.2.2"; 182 + version = "1.2.3"; 183 183 }; 184 184 connection_pool = { 185 185 groups = ["default"]; ··· 283 283 platforms = []; 284 284 source = { 285 285 remotes = ["https://rubygems.org"]; 286 - sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; 286 + sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; 287 287 type = "gem"; 288 288 }; 289 - version = "2.6.3"; 289 + version = "2.7.1"; 290 290 }; 291 291 minitest = { 292 292 groups = ["default"]; 293 293 platforms = []; 294 294 source = { 295 295 remotes = ["https://rubygems.org"]; 296 - sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; 296 + sha256 = "0hv03j1ac349pjymis7jxmbqr5jalc60cg27529bbb3zymswhdjz"; 297 297 type = "gem"; 298 298 }; 299 - version = "5.20.0"; 299 + version = "5.22.0"; 300 300 }; 301 301 molinillo = { 302 302 groups = ["default"]; ··· 412 412 platforms = []; 413 413 source = { 414 414 remotes = ["https://rubygems.org"]; 415 - sha256 = "176ndahc5fssyx04q176vy6wngs1av4vrsdrkdpjij700hqll8hn"; 415 + sha256 = "1wpg4n7b8571j2h8h7v2kk8pr141rgf6m8mhk221k990fissrq56"; 416 416 type = "gem"; 417 417 }; 418 - version = "1.23.0"; 418 + version = "1.24.0"; 419 419 }; 420 420 }
+2 -2
pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "cirrus-cli"; 9 - version = "0.110.0"; 9 + version = "0.110.3"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "cirruslabs"; 13 13 repo = pname; 14 14 rev = "v${version}"; 15 - sha256 = "sha256-5BMaOuiXz8SMfaB7qFvCyboGFKxzenkEVwj25Qh4MKw="; 15 + sha256 = "sha256-+OzBWooLpI4WnyBPRlwLGZVFrckXGeoDJilsEE00slk="; 16 16 }; 17 17 18 18 vendorHash = "sha256-xJnBMSfYwx6uHuMjyR9IWGHwt3fNajDr6DW8o+J+lj8=";
+2 -2
pkgs/development/tools/devbox/default.nix
··· 5 5 }: 6 6 buildGoModule rec { 7 7 pname = "devbox"; 8 - version = "0.9.0"; 8 + version = "0.9.1"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "jetpack-io"; 12 12 repo = pname; 13 13 rev = version; 14 - hash = "sha256-cM4PiNbfE2sEQHzklBgsJdN/iVK0nT9iZ1F/Cb5tLtM="; 14 + hash = "sha256-3KZWXVwvzy3mZkh6pGZpeQQp2aU4V9TyBcJXU4Au4Rs="; 15 15 }; 16 16 17 17 ldflags = [
+2 -2
pkgs/development/tools/fermyon-spin/default.nix
··· 17 17 }.${system} or (throw "Unsupported system: ${system}"); 18 18 19 19 packageHash = { 20 - x86_64-linux = "sha256-i06Zp176zl7y8P32Hss64QkMc/+vXtkQy/tkOPSX3dc="; 20 + x86_64-linux = "sha256-Y0Inew0PncpnEpdLWtl/85t93eGSRewKh5mvGnn+yck="; 21 21 aarch64-linux = "sha256-HEm3TaLeaws8G73CU9BmxeplQdeF9nQbBSnbctaVhqI="; 22 22 x86_64-darwin = "sha256-mlshpN/4Od4qrXiqIEYo7G84Dtb+tp2nK2VnrRG2rto="; 23 23 aarch64-darwin = "sha256-aJH/vOidj0vbkttGDgelaAC/dMYguQPLjxl+V3pOVzI="; ··· 25 25 26 26 in stdenv.mkDerivation rec { 27 27 pname = "fermyon-spin"; 28 - version = "2.1.0"; 28 + version = "2.2.0"; 29 29 30 30 src = fetchzip { 31 31 url = "https://github.com/fermyon/spin/releases/download/v${version}/spin-v${version}-${platform}.tar.gz";
+1 -1
pkgs/development/tools/global-platform-pro/default.nix
··· 47 47 cp tool/target/gp.jar "$out/share/java" 48 48 makeWrapper "${jre8_headless}/bin/java" "$out/bin/gp" \ 49 49 --add-flags "-jar '$out/share/java/gp.jar'" \ 50 - --prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib" 50 + --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib" 51 51 ''; 52 52 53 53 meta = with lib; {
+15 -9
pkgs/development/tools/misc/lsof/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, buildPackages, perl, which, ncurses }: 1 + { lib, stdenv, fetchFromGitHub, buildPackages, perl, which, ncurses, nukeReferences }: 2 2 3 3 let 4 4 dialect = with lib; last (splitString "-" stdenv.hostPlatform.system); ··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "lsof"; 9 - version = "4.98.0"; 9 + version = "4.99.3"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "lsof-org"; 13 13 repo = "lsof"; 14 14 rev = version; 15 - sha256 = "sha256-DQLY0a0sOCZFEJA4Y4b18OcWZw47RyqKZ0mVG0CDVTI="; 15 + hash = "sha256-XW3l+E9D8hgI9jGJGKkIAKa8O9m0JHgZhEASqg4gYuw="; 16 16 }; 17 17 18 - patches = [ 19 - ./no-build-info.patch 20 - ]; 21 - 22 - postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' 18 + postPatch = '' 19 + patchShebangs --build lib/dialects/*/Mksrc 20 + # Do not re-build version.h in every 'make' to allow nuke-refs below. 21 + # We remove phony 'FRC' target that forces rebuilds: 22 + # 'version.h: FRC ...' is translated to 'version.h: ...'. 23 + sed -i lib/dialects/*/Makefile -e 's/version.h:\s*FRC/version.h:/' 24 + '' + lib.optionalString stdenv.hostPlatform.isMusl '' 23 25 substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 24 26 '' + lib.optionalString stdenv.isDarwin '' 25 27 sed -i 's|lcurses|lncurses|g' Configure 26 28 ''; 27 29 28 30 depsBuildBuild = [ buildPackages.stdenv.cc ]; 29 - nativeBuildInputs = [ perl which ]; 31 + nativeBuildInputs = [ nukeReferences perl which ]; 30 32 buildInputs = [ ncurses ]; 31 33 32 34 # Stop build scripts from searching global include paths ··· 37 39 for filepath in $(find dialects/${dialect} -type f); do 38 40 sed -i "s,/usr/include,$LSOF_INCLUDE,g" $filepath 39 41 done 42 + 43 + # Wipe out development-only flags from CFLAGS embedding 44 + make version.h 45 + nuke-refs version.h 40 46 ''; 41 47 42 48 installPhase = ''
-40
pkgs/development/tools/misc/lsof/no-build-info.patch
··· 1 - --- a/usage.c 2 - +++ b/usage.c 3 - @@ -931,24 +931,6 @@ usage(err, fh, version) 4 - (void) fprintf(stderr, " configuration info: %s\n", cp); 5 - #endif /* defined(LSOF_CINFO) */ 6 - 7 - - cp = isnullstr(LSOF_HOST); 8 - - if (!(cp1 = isnullstr(LSOF_LOGNAME))) 9 - - cp1 = isnullstr(LSOF_USER); 10 - - if (cp || cp1) { 11 - - if (cp && cp1) 12 - - cp2 = "by and on"; 13 - - else if (cp) 14 - - cp2 = "on"; 15 - - else 16 - - cp2 = "by"; 17 - - (void) fprintf(stderr, " constructed %s: %s%s%s\n", 18 - - cp2, 19 - - cp1 ? cp1 : "", 20 - - (cp && cp1) ? "@" : "", 21 - - cp ? cp : "" 22 - - ); 23 - - } 24 - - 25 - #if defined(LSOF_BLDCMT) 26 - if ((cp = isnullstr(LSOF_BLDCMT))) 27 - (void) fprintf(stderr, " builder's comment: %s\n", cp); 28 - @@ -958,12 +940,6 @@ usage(err, fh, version) 29 - (void) fprintf(stderr, " compiler: %s\n", cp); 30 - if ((cp = isnullstr(LSOF_CCV))) 31 - (void) fprintf(stderr, " compiler version: %s\n", cp); 32 - - if ((cp = isnullstr(LSOF_CCFLAGS))) 33 - - (void) fprintf(stderr, " compiler flags: %s\n", cp); 34 - - if ((cp = isnullstr(LSOF_LDFLAGS))) 35 - - (void) fprintf(stderr, " loader flags: %s\n", cp); 36 - - if ((cp = isnullstr(LSOF_SYSINFO))) 37 - - (void) fprintf(stderr, " system info: %s\n", cp); 38 - // display configurations that might affect output 39 - char *features[] = { 40 - #if defined(HASEFFNLINK)
+11 -7
pkgs/development/tools/ruff/default.nix
··· 5 5 , stdenv 6 6 , darwin 7 7 , rust-jemalloc-sys 8 - # tests 9 8 , ruff-lsp 10 9 }: 11 10 12 11 rustPlatform.buildRustPackage rec { 13 12 pname = "ruff"; 14 - version = "0.1.13"; 13 + version = "0.1.15"; 15 14 16 15 src = fetchFromGitHub { 17 16 owner = "astral-sh"; 18 17 repo = "ruff"; 19 18 rev = "refs/tags/v${version}"; 20 - hash = "sha256-cH/Vw04QQ3U7E1ZCwozjhPcn0KVljP976/p3okrBpEU="; 19 + hash = "sha256-DzdzMO9PEwf4HmpG8SxRJTmdrmkXuQ8RsIchvsKstH8="; 21 20 }; 22 21 23 - cargoHash = "sha256-tmoFnghHQEsyv0vO9fnWyTsxiIhmovhi/zHXOCi5u10="; 22 + # The following specific substitution is not working as the current directory is `/build/source` and thus has no mention of `ruff` in it. 23 + # https://github.com/astral-sh/ruff/blob/866bea60a5de3c59d2537b0f3a634ae0ac9afd94/crates/ruff/tests/show_settings.rs#L12 24 + # -> Just patch it so that it expects the actual current directory and not `"[BASEPATH]"`. 25 + postPatch = '' 26 + substituteInPlace crates/ruff/tests/snapshots/show_settings__display_default_settings.snap \ 27 + --replace '"[BASEPATH]"' '"'$PWD'"' 28 + ''; 29 + 30 + cargoHash = "sha256-MpiWdNUs66OGYfOJo1kJQTCqjrk/DAYecaLf6GUUKew="; 24 31 25 32 nativeBuildInputs = [ 26 33 installShellFiles ··· 31 38 ] ++ lib.optionals stdenv.isDarwin [ 32 39 darwin.apple_sdk.frameworks.CoreServices 33 40 ]; 34 - 35 - cargoBuildFlags = [ "--package=ruff_cli" ]; 36 - cargoTestFlags = cargoBuildFlags; 37 41 38 42 # tests expect no colors 39 43 preCheck = ''
+3 -3
pkgs/development/tools/rust/bindgen/unwrapped.nix
··· 7 7 rustfmt-nightly = rustfmt.override { asNightly = true; }; 8 8 in rustPlatform.buildRustPackage rec { 9 9 pname = "rust-bindgen-unwrapped"; 10 - version = "0.69.1"; 10 + version = "0.69.2"; 11 11 12 12 src = fetchCrate { 13 13 pname = "bindgen-cli"; 14 14 inherit version; 15 - sha256 = "sha256-zqyIc07RLti2xb23bWzL7zFjreEZuUstnYSp+jUX8Lw="; 15 + sha256 = "sha256-ytbaXCVNXXBtJet5CBkCNUoISxdFXt/kgb4VVZisUXE="; 16 16 }; 17 17 18 - cargoHash = "sha256-o1B8jq7Ze97pBLE9gvNsmCaD/tsW4f6DL0upzQkxbA4="; 18 + cargoHash = "sha256-pnoCq25CrZIAQNkDsokIVVyUYLlg7WY6th17IgeW9x8="; 19 19 20 20 buildInputs = [ clang.cc.lib ]; 21 21
+5 -3
pkgs/development/tools/rust/cargo-espflash/default.nix pkgs/by-name/es/espflash/package.nix
··· 12 12 }: 13 13 14 14 rustPlatform.buildRustPackage rec { 15 - pname = "cargo-espflash"; 15 + pname = "espflash"; 16 16 version = "2.1.0"; 17 17 18 18 src = fetchFromGitHub { ··· 36 36 SystemConfiguration 37 37 ]; 38 38 39 - cargoHash = "sha256-FpBc92a2JQHRLe5S6yh3l0FpRI8LpkGGEma/4v5X4xs="; 39 + cargoHash = "sha256-Xj5FVTssC3e+mMhDHmKqV6lUQgaIv3aVc1yewbQSy9E="; 40 40 41 41 passthru.updateScript = nix-update-script { }; 42 42 43 43 meta = with lib; { 44 44 description = "Serial flasher utility for Espressif SoCs and modules based on esptool.py"; 45 - homepage = "https://github.com/esp-rs/cargo-espflash"; 45 + homepage = "https://github.com/esp-rs/espflash"; 46 + changelog = "https://github.com/esp-rs/espflash/blob/v${version}/CHANGELOG.md"; 47 + mainProgram = "espflash"; 46 48 license = with licenses; [ mit /* or */ asl20 ]; 47 49 maintainers = with maintainers; [ matthiasbeyer ]; 48 50 };
+3 -3
pkgs/development/tools/rust/cargo-flamegraph/default.nix
··· 4 4 5 5 rustPlatform.buildRustPackage rec { 6 6 pname = "cargo-flamegraph"; 7 - version = "0.6.4"; 7 + version = "0.6.5"; 8 8 9 9 src = fetchFromGitHub { 10 10 owner = "flamegraph-rs"; 11 11 repo = "flamegraph"; 12 12 rev = "v${version}"; 13 - sha256 = "sha256-yeNA6HkhWEUqarBDRbyD3RBIlBZZVrbAMng7d5beBB4="; 13 + sha256 = "sha256-VrC3c3a1G8mn9U6txeynsaWOL4HQQk2IOiQqS52iPGo="; 14 14 }; 15 15 16 - cargoSha256 = "sha256-IHOVaRfjopaSRY8HF8ATdNNLfhTVrIKvYsAuocqRdWI="; 16 + cargoSha256 = "sha256-KwpveTiViY+C4A+fE5yeGuT9PXbDyi+YsOc75mX2KdU="; 17 17 18 18 nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; 19 19 buildInputs = lib.optionals stdenv.isDarwin [
+3 -3
pkgs/development/tools/yq-go/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "yq-go"; 5 - version = "4.40.5"; 5 + version = "4.40.7"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "mikefarah"; 9 9 repo = "yq"; 10 10 rev = "v${version}"; 11 - hash = "sha256-CCgertXgnA6q259Ngmy4EBD6GDuvSb0bREDddR2ht8E="; 11 + hash = "sha256-VvA6PYJYRejGlYDb/gyHDQSNOwDWSE7vXPqYGrVLtko="; 12 12 }; 13 13 14 - vendorHash = "sha256-SQGJj5syay4LllqmK/cRoZbprgDQhLGdQM3T1m/dZsI="; 14 + vendorHash = "sha256-5jc9AQ1T4818kvAF6SU6JEdCQWt1gRJnESXRMGvqrB0="; 15 15 16 16 nativeBuildInputs = [ installShellFiles ]; 17 17
+13
pkgs/games/crossfire/add-cstdint-include-to-crossfire-server.patch
··· 1 + diff --git a/include/Treasures.h b/include/Treasures.h 2 + index 614078f..a00b4f6 100644 3 + --- a/include/Treasures.h 4 + +++ b/include/Treasures.h 5 + @@ -13,6 +13,8 @@ 6 + #ifndef TREASURES_H 7 + #define TREASURES_H 8 + 9 + +#include <cstdint> 10 + + 11 + #include "AssetsCollection.h" 12 + 13 + extern "C" {
+4
pkgs/games/crossfire/crossfire-server.nix
··· 27 27 rev = "r${rev}"; 28 28 }; 29 29 30 + patches = [ 31 + ./add-cstdint-include-to-crossfire-server.patch 32 + ]; 33 + 30 34 nativeBuildInputs = [ autoconf automake libtool flex perl check pkg-config python39 ]; 31 35 hardeningDisable = [ "format" ]; 32 36
+6 -3
pkgs/games/dxx-rebirth/default.nix
··· 11 11 , libGL 12 12 , libpng 13 13 , physfs 14 + , unstableGitUpdater 14 15 }: 15 16 16 17 let ··· 22 23 in 23 24 stdenv.mkDerivation rec { 24 25 pname = "dxx-rebirth"; 25 - version = "unstable-2023-03-23"; 26 + version = "0-unstable-2024-01-13"; 26 27 27 28 src = fetchFromGitHub { 28 29 owner = "dxx-rebirth"; 29 30 repo = "dxx-rebirth"; 30 - rev = "841ebcc11d249febe48911bc239606ade3bd78b3"; 31 - hash = "sha256-cr5QdkKO/HNvtc2w4ynJixuLauhPCwtsSC3UEV7+C1A="; 31 + rev = "5c710857a9312e1b2f3249c51c12b55f9390a2b1"; 32 + hash = "sha256-nEPMJiTeePAmourAksUNqyy5whs+8+qy/qrycfNw2lo="; 32 33 }; 33 34 34 35 nativeBuildInputs = [ pkg-config scons ]; ··· 48 49 install -Dm644 ${music} $out/share/games/dxx-rebirth/${music.name} 49 50 install -Dm644 -t $out/share/doc/dxx-rebirth *.txt 50 51 ''; 52 + 53 + passthru.updateScript = unstableGitUpdater {}; 51 54 52 55 meta = with lib; { 53 56 description = "Source Port of the Descent 1 and 2 engines";
+2 -2
pkgs/games/fheroes2/default.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "fheroes2"; 9 - version = "1.0.11"; 9 + version = "1.0.12"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "ihhub"; 13 13 repo = "fheroes2"; 14 14 rev = version; 15 - hash = "sha256-R7hl5VzzdRcU9TF6WfiLYgUFpVixuppLobMsan0jKsQ="; 15 + hash = "sha256-FqtxTRgjFqFu4zml6xePXtK8yn/dkHP+5aU2/9S7gSQ="; 16 16 }; 17 17 18 18 nativeBuildInputs = [ imagemagick ];
+13 -3
pkgs/misc/uboot/default.nix
··· 15 15 , openssl 16 16 , swig 17 17 , which 18 + , python3 18 19 , armTrustedFirmwareAllwinner 19 20 , armTrustedFirmwareAllwinnerH6 20 21 , armTrustedFirmwareAllwinnerH616 ··· 44 45 version ? null 45 46 , src ? null 46 47 , filesToInstall 48 + , pythonScriptsToInstall ? { } 47 49 , installDir ? "$out" 48 50 , defconfig 49 51 , extraConfig ? "" ··· 63 65 ] ++ extraPatches; 64 66 65 67 postPatch = '' 68 + ${lib.concatMapStrings (script: '' 69 + substituteInPlace ${script} \ 70 + --replace "#!/usr/bin/env python3" "#!${pythonScriptsToInstall.${script}}/bin/python3" 71 + '') (builtins.attrNames pythonScriptsToInstall)} 66 72 patchShebangs tools 67 73 patchShebangs scripts 68 74 ''; ··· 110 116 runHook preInstall 111 117 112 118 mkdir -p ${installDir} 113 - cp ${lib.concatStringsSep " " filesToInstall} ${installDir} 119 + cp ${lib.concatStringsSep " " (filesToInstall ++ builtins.attrNames pythonScriptsToInstall)} ${installDir} 114 120 115 121 mkdir -p "$out/nix-support" 116 122 ${lib.concatMapStrings (file: '' 117 123 echo "file binary-dist ${installDir}/${builtins.baseNameOf file}" >> "$out/nix-support/hydra-build-products" 118 - '') filesToInstall} 124 + '') (filesToInstall ++ builtins.attrNames pythonScriptsToInstall)} 119 125 120 126 runHook postInstall 121 127 ''; ··· 128 134 license = licenses.gpl2; 129 135 maintainers = with maintainers; [ bartsch dezgeg samueldr lopsided98 ]; 130 136 } // extraMeta; 131 - } // removeAttrs args [ "extraMeta" ])); 137 + } // removeAttrs args [ "extraMeta" "pythonScriptsToInstall" ])); 132 138 in { 133 139 inherit buildUBoot; 134 140 ··· 154 160 "tools/mkenvimage" 155 161 "tools/mkimage" 156 162 ]; 163 + 164 + pythonScriptsToInstall = { 165 + "tools/efivar.py" = (python3.withPackages (ps: [ ps.pyopenssl ])); 166 + }; 157 167 }; 158 168 159 169 ubootA20OlinuxinoLime = buildUBoot {
+7 -4
pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
··· 61 61 mkStdenv = stdenv: 62 62 if stdenv.isAarch64 then stdenv 63 63 else 64 + let 65 + darwinMinVersion = "10.12"; 66 + darwinSdkVersion = "11.0"; 67 + in 64 68 (overrideCC stdenv (mkCc stdenv.cc)).override { 65 69 extraBuildInputs = [ pkgs.darwin.apple_sdk_11_0.frameworks.CoreFoundation ]; 66 - targetPlatform = stdenv.targetPlatform // { 67 - darwinMinVersion = "10.12"; 68 - darwinSdkVersion = "11.0"; 69 - }; 70 + buildPlatform = stdenv.buildPlatform // { inherit darwinMinVersion darwinSdkVersion; }; 71 + hostPlatform = stdenv.hostPlatform // { inherit darwinMinVersion darwinSdkVersion; }; 72 + targetPlatform = stdenv.targetPlatform // { inherit darwinMinVersion darwinSdkVersion; }; 70 73 }; 71 74 72 75 stdenvs = {
+2 -2
pkgs/os-specific/linux/cryptsetup/default.nix
··· 14 14 15 15 stdenv.mkDerivation rec { 16 16 pname = "cryptsetup"; 17 - version = "2.6.1"; 17 + version = "2.7.0"; 18 18 19 19 outputs = [ "bin" "out" "dev" "man" ]; 20 20 separateDebugInfo = true; 21 21 22 22 src = fetchurl { 23 23 url = "mirror://kernel/linux/utils/cryptsetup/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 24 - hash = "sha256-QQ3tZaEHKrnI5Brd7Te5cpwIf+9NLbArtO9SmtbaRpM="; 24 + hash = "sha256-lAA6AM1agZRPRejcUp4M/Spv9im9LNIc9eV05GXa95U="; 25 25 }; 26 26 27 27 patches = [
+4 -2
pkgs/os-specific/linux/ffado/default.nix
··· 24 24 in 25 25 mkDerivation rec { 26 26 pname = "ffado"; 27 - version = "2.4.7"; 27 + version = "2.4.8"; 28 28 29 29 src = fetchurl { 30 30 url = "http://www.ffado.org/files/libffado-${version}.tgz"; 31 - sha256 = "0vsn3y52g6f77lqh9qfkd7dslmb7bbgy46cv5idynx4frqscc23s"; 31 + hash = "sha256-f0x561ehKw6uMSri0RZip+v1JHZuhixtywl0PVU/N44="; 32 32 }; 33 + 34 + sourceRoot = "libffado-${version}/libffado"; 33 35 34 36 prePatch = '' 35 37 substituteInPlace ./support/tools/ffado-diag.in \
+2 -2
pkgs/os-specific/linux/iotop-c/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "iotop-c"; 5 - version = "1.25"; 5 + version = "1.26"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "Tomas-M"; 9 9 repo = "iotop"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-ZIvWdNxGSUmQtMKB/MVHEZ0fJ8b//zSXz+1r/P9ZDkE="; 11 + sha256 = "sha256-m75BHvKMk9ckZ6TgT1QDfHYcEfvfEwWu0bQacnVgSmU="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ pkg-config ];
+2 -2
pkgs/os-specific/linux/iproute/default.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "iproute2"; 9 - version = "6.6.0"; 9 + version = "6.7.0"; 10 10 11 11 src = fetchurl { 12 12 url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; 13 - hash = "sha256-hzjIBK/Qnwv3VpN/DD3iMReDKpjYy79QOGz1AFzWE84="; 13 + hash = "sha256-/5Qt2YKNfR+Gf2H+cs5DMHjDHl2OSnjiDwLLWJLohB0="; 14 14 }; 15 15 16 16 postPatch = ''
+2 -2
pkgs/os-specific/linux/iputils/default.nix
··· 15 15 16 16 stdenv.mkDerivation rec { 17 17 pname = "iputils"; 18 - version = "20231222"; 18 + version = "20240117"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = pname; 22 22 repo = pname; 23 23 rev = version; 24 - hash = "sha256-/blxT6k79fgbxX8qCQuJMf7zDPwMjJUt7FCscaMXx6U="; 24 + hash = "sha256-sERY8ZKuXiY85cXdNWOm4byiNU7mOVIeA55dgQJHdoE="; 25 25 }; 26 26 27 27 outputs = [ "out" "apparmor" ];
+2 -2
pkgs/os-specific/linux/kbd/default.nix
··· 17 17 18 18 stdenv.mkDerivation rec { 19 19 pname = "kbd"; 20 - version = "2.6.3"; 20 + version = "2.6.4"; 21 21 22 22 src = fetchurl { 23 23 url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; 24 - sha256 = "sha256-BJlsCNfRxGCWb7JEo9OIM1LCZ0t61SIAPZ9Oy4q0jes="; 24 + sha256 = "sha256-UZ+NCHrsyn4KM80IS++SwGbrGXMWZmU9zHDJ1xqkCSY="; 25 25 }; 26 26 27 27 # vlock is moved into its own output, since it depends on pam. This
+2 -2
pkgs/os-specific/linux/kernel-headers/default.nix
··· 111 111 in { 112 112 inherit makeLinuxHeaders; 113 113 114 - linuxHeaders = let version = "6.6"; in 114 + linuxHeaders = let version = "6.7"; in 115 115 makeLinuxHeaders { 116 116 inherit version; 117 117 src = fetchurl { 118 118 url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; 119 - hash = "sha256-2SagbGPdisffP4buH/ws4qO4Gi0WhITna1s4mrqOVtA="; 119 + hash = "sha256-7zEUSiV20IDYwxaY6D7J9mv5fGd/oqrw1bu58zRbEGk="; 120 120 }; 121 121 patches = [ 122 122 ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
+4 -4
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
··· 6 6 # NOTE: When updating these, please also take a look at the changes done to 7 7 # kernel config in the xanmod version commit 8 8 ltsVariant = { 9 - version = "6.1.74"; 10 - hash = "sha256-PqCojvh7JwTcavtQHB8l/WxCTg94ndOy9KGVXsmGO/Y="; 9 + version = "6.1.76"; 10 + hash = "sha256-0nBdUFRGMWM3IL/q8CYiDEUA/sIrYPMkzsBQen30o2E="; 11 11 variant = "lts"; 12 12 }; 13 13 14 14 mainVariant = { 15 - version = "6.6.13"; 16 - hash = "sha256-RTfa9eIGYDqnffFnOFNaghKoGcHVy4rGYQkYumcw6Tk="; 15 + version = "6.6.15"; 16 + hash = "sha256-KHn4Ntm1QStgJRWzwmPYXEbEcuZcF4pWJ964wc6J2Wk="; 17 17 variant = "main"; 18 18 }; 19 19
+2 -2
pkgs/os-specific/linux/libsepol/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "libsepol"; 5 - version = "3.5"; 5 + version = "3.6"; 6 6 se_url = "https://github.com/SELinuxProject/selinux/releases/download"; 7 7 8 8 outputs = [ "bin" "out" "dev" "man" ]; 9 9 10 10 src = fetchurl { 11 11 url = "${se_url}/${version}/libsepol-${version}.tar.gz"; 12 - sha256 = "sha256-eP2vaZJNt4C6x4VG5D2cRAdLrXmMLEFdC5u5bQZe6KI="; 12 + sha256 = "sha256-ydxYXqlJA9eE1ZfIYc1dzmRZFo+V4isxoOqxzdgAl1o="; 13 13 }; 14 14 15 15 postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
+2 -2
pkgs/os-specific/linux/openvswitch/default.nix
··· 1 1 import ./generic.nix { 2 - version = "3.2.1"; 3 - hash = "sha256-nXdyDJIU60Lx9cvpLuUp3E7MUnaZvvGDm+UKbXJRH0o="; 2 + version = "3.2.2"; 3 + hash = "sha256-BCesNAYE3RyxfBAzK2/6+PcV1W+1ZEZQKVSLSq/pWC8="; 4 4 }
+2 -2
pkgs/os-specific/linux/openvswitch/lts.nix
··· 1 1 import ./generic.nix { 2 - version = "2.17.8"; 3 - hash = "sha256-DWAwepAxl90ay7MXPCz++BicaeSHYuZ06O8VeFZac+U="; 2 + version = "2.17.9"; 3 + hash = "sha256-4bP6RyZ2YmhT8i1j+VnlrQYeG/V+G71ETQ7Yj5R++LE="; 4 4 updateScriptArgs = "--lts=true --regex '2\.17.*'"; 5 5 }
+10 -19
pkgs/os-specific/linux/pam/default.nix
··· 1 - { lib, stdenv, buildPackages, fetchurl 2 - , fetchpatch 1 + { lib, stdenv, buildPackages, fetchurl, fetchpatch 3 2 , flex, cracklib, db4, gettext, audit, libxcrypt 4 3 , nixosTests 5 4 , autoreconfHook269, pkg-config-unwrapped ··· 7 6 8 7 stdenv.mkDerivation rec { 9 8 pname = "linux-pam"; 10 - version = "1.5.3"; 9 + version = "1.6.0"; 11 10 12 11 src = fetchurl { 13 12 url = "https://github.com/linux-pam/linux-pam/releases/download/v${version}/Linux-PAM-${version}.tar.xz"; 14 - hash = "sha256-esS1D+7gBKn6iPHf0tL6c4qCiWdjBQzXc7PFSwqBgoM="; 13 + hash = "sha256-//SjTlu+534ujxmS8nYx4jKby/igVj3etcM4m04xaa0="; 15 14 }; 16 15 17 16 patches = [ 18 17 ./suid-wrapper-path.patch 19 - # Pull support for localization on non-default --prefix: 20 - # https://github.com/NixOS/nixpkgs/issues/249010 21 - # https://github.com/linux-pam/linux-pam/pull/604 18 + 19 + # Backport fix for missing include breaking musl builds. 22 20 (fetchpatch { 23 - name = "bind-locales.patch"; 24 - url = "https://github.com/linux-pam/linux-pam/commit/77bd338125cde583ecdfb9fd69619bcd2baf15c2.patch"; 25 - hash = "sha256-tlc9RcLZpEH315NFD4sdN9yOco8qhC6+bszl4OHm+AI="; 21 + name = "pam_namespace-stdint.h.patch"; 22 + url = "https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13.patch"; 23 + hash = "sha256-tCnH2yPO4dBbJOZA0fP2gm1EavHRMEJyfzB5Vy7YjAA="; 26 24 }) 27 - ] 28 - ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { 29 - name = "missing-termio.patch"; 30 - url = "https://github.com/linux-pam/linux-pam/commit/5374f677e4cae669eb9accf2449178b602e8a40a.patch"; 31 - hash = "sha256-b6n8f16ETSNj5h+5/Yhn32XMfVO8xEnZRRhw+nuLP/8="; 32 - }) 33 - ; 25 + ]; 34 26 35 27 # Case-insensitivity workaround for https://github.com/linux-pam/linux-pam/issues/569 36 28 postPatch = if stdenv.buildPlatform.isDarwin && stdenv.buildPlatform != stdenv.hostPlatform then '' ··· 41 33 outputs = [ "out" "doc" "man" /* "modules" */ ]; 42 34 43 35 depsBuildBuild = [ buildPackages.stdenv.cc ]; 44 - # autoreconfHook269 is needed for `suid-wrapper-path.patch` and 45 - # `bind-locales.patch` above. 36 + # autoreconfHook269 is needed for `suid-wrapper-path.patch` above. 46 37 # pkg-config-unwrapped is needed for `AC_CHECK_LIB` and `AC_SEARCH_LIBS` 47 38 nativeBuildInputs = [ flex autoreconfHook269 pkg-config-unwrapped ] 48 39 ++ lib.optional stdenv.buildPlatform.isDarwin gettext;
+2 -2
pkgs/os-specific/linux/shadow/default.nix
··· 17 17 18 18 stdenv.mkDerivation rec { 19 19 pname = "shadow"; 20 - version = "4.14.2"; 20 + version = "4.14.3"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "shadow-maint"; 24 24 repo = pname; 25 25 rev = version; 26 - hash = "sha256-8sFXxP4MPFzKfBHzlKlsibj0lVQKJbC/Z7pWCy3WEuc="; 26 + hash = "sha256-Y5wyvmTh66Bjb1/UPdDF78lgvH7HFTCFowhQQ+Fo9ak="; 27 27 }; 28 28 29 29 outputs = [ "out" "su" "dev" "man" ];
+132 -61
pkgs/os-specific/linux/systemd/default.nix
··· 68 68 , libpwquality 69 69 , qrencode 70 70 71 - # the (optional) BPF feature requires bpftool, libbpf, clang and llvm-strip to be available during build time. 71 + # the (optional) BPF feature requires bpftool, libbpf, clang and llvm-strip to 72 + # be available during build time. 72 73 # Only libbpf should be a runtime dependency. 73 74 # Note: llvmPackages is explicitly taken from buildPackages instead of relying 74 75 # on splicing. Splicing will evaluate the adjacent (pkgsHostTarget) llvmPackages 75 76 # which is sometimes problematic: llvmPackages.clang looks at targetPackages.stdenv.cc 76 - # which, in the unfortunate case of pkgsCross.ghcjs, `throw`s. If we explicitly 77 - # take buildPackages.llvmPackages, this is no problem because 78 - # `buildPackages.targetPackages.stdenv.cc == stdenv.cc` relative to us. Working 79 - # around this is important, because systemd is in the dependency closure of 80 - # GHC via emscripten and jdk. 77 + # which, in the unfortunate case of pkgsCross.ghcjs, `throw`s. If we 78 + # explicitly take buildPackages.llvmPackages, this is no problem because 79 + # `buildPackages.targetPackages.stdenv.cc == stdenv.cc` relative to 80 + # us. Working around this is important, because systemd is in the dependency 81 + # closure of GHC via emscripten and jdk. 81 82 , bpftools 82 83 , libbpf 83 84 ··· 93 94 && !stdenv.hostPlatform.isMusl 94 95 # "Unknown 64-bit data model" 95 96 && !stdenv.hostPlatform.isRiscV32 96 - , withCompression ? true # adds bzip2, lz4, xz and zstd 97 + # adds bzip2, lz4, xz and zstd 98 + , withCompression ? true 97 99 , withCoredump ? true 98 100 , withCryptsetup ? true 99 101 , withRepart ? true 100 102 , withDocumentation ? true 101 103 , withEfi ? stdenv.hostPlatform.isEfi 102 104 , withFido2 ? true 103 - , withFirstboot ? false # conflicts with the NixOS /etc management 105 + # conflicts with the NixOS /etc management 106 + , withFirstboot ? false 104 107 , withHomed ? !stdenv.hostPlatform.isMusl 105 108 , withHostnamed ? true 106 109 , withHwdb ? true ··· 108 111 , withIptables ? true 109 112 , withKmod ? true 110 113 , withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0" 111 - && (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") # assumes hard floats 112 - && !stdenv.hostPlatform.isMips64 # see https://github.com/NixOS/nixpkgs/pull/194149#issuecomment-1266642211 114 + # assumes hard floats 115 + && (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") 116 + # see https://github.com/NixOS/nixpkgs/pull/194149#issuecomment-1266642211 117 + && !stdenv.hostPlatform.isMips64 113 118 # can't find gnu/stubs-32.h 114 119 && (stdenv.hostPlatform.isPower64 -> stdenv.hostPlatform.isBigEndian) 115 120 # https://reviews.llvm.org/D43106#1019077 ··· 139 144 , withTimedated ? true 140 145 , withTimesyncd ? true 141 146 , withTpm2Tss ? true 142 - , withUkify ? false # adds python to closure which is too much by default 147 + # adds python to closure which is too much by default 148 + , withUkify ? false 143 149 , withUserDb ? true 144 150 , withUtmp ? !stdenv.hostPlatform.isMusl 145 151 , withVmspawn ? true ··· 148 154 # build only libudev and libsystemd 149 155 , buildLibsOnly ? false 150 156 151 - # name argument 157 + # yes, pname is an argument here 152 158 , pname ? "systemd" 153 159 154 160 , libxslt ··· 171 177 wantGcrypt = withResolved || withImportd; 172 178 version = "255.2"; 173 179 174 - # Bump this variable on every (major) version change. See below (in the meson options list) for why. 180 + # Use the command below to update `releaseTimestamp` on every (major) version 181 + # change. More details in the commentary at mesonFlags. 175 182 # command: 176 183 # $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \ 177 184 # jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime' ··· 189 196 hash = "sha256-8SfJY/pcH4yrDeJi0GfIUpetTbpMwyswvSu+RSfgqfY="; 190 197 }; 191 198 192 - # On major changes, or when otherwise required, you *must* reformat the patches, 193 - # `git am path/to/00*.patch` them into a systemd worktree, rebase to the more recent 194 - # systemd version, and export the patches again via 195 - # `git -c format.signoff=false format-patch v${version} --no-numbered --zero-commit --no-signature`. 196 - # Use `find . -name "*.patch" | sort` to get an up-to-date listing of all patches 199 + # On major changes, or when otherwise required, you *must* : 200 + # 1. reformat the patches, 201 + # 2. `git am path/to/00*.patch` them into a systemd worktree, 202 + # 3. rebase to the more recent systemd version, 203 + # 4. and export the patches again via 204 + # `git -c format.signoff=false format-patch v${version} --no-numbered --zero-commit --no-signature`. 205 + # Use `find . -name "*.patch" | sort` to get an up-to-date listing of all 206 + # patches 197 207 patches = [ 198 208 ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch 199 209 ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch ··· 262 272 "$out/lib/systemd/boot/efi" 263 273 '' + ( 264 274 let 265 - # The following patches references to dynamic libraries to ensure that 266 - # all the features that are implemented via dlopen(3) are available (or 275 + # The following patches references to dynamic libraries to ensure that all 276 + # the features that are implemented via dlopen(3) are available (or 267 277 # explicitly deactivated) by pointing dlopen to the absolute store path 268 278 # instead of relying on the linkers runtime lookup code. 269 279 # ··· 275 285 # found` when using e.g. --grep with journalctl. Those errors should 276 286 # become less unexpected now. 277 287 # 278 - # There are generally two classes of dlopen(3) calls. Those that we want to 279 - # support and those that should be deactivated / unsupported. This change 280 - # enforces that we handle all dlopen calls explicitly. Meaning: There is 281 - # not a single dlopen call in the source code tree that we did not 282 - # explicitly handle. 288 + # There are generally two classes of dlopen(3) calls. Those that we want 289 + # to support and those that should be deactivated / unsupported. This 290 + # change enforces that we handle all dlopen calls explicitly. Meaning: 291 + # There is not a single dlopen call in the source code tree that we did 292 + # not explicitly handle. 283 293 # 284 294 # In order to do this we introduced a list of attributes that maps from 285 295 # shared object name to the package that contains them. The package can be ··· 288 298 # path location). 289 299 # 290 300 # To get a list of dynamically loaded libraries issue something like 291 - # `grep -ri '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"'' $src` and update the below list. 301 + # `grep -ri '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"'' $src` 302 + # and update the list below. 292 303 dlopenLibs = 293 304 let 294 305 opt = condition: pkg: if condition then pkg else null; ··· 374 385 # patch all the dlopen calls to contain absolute paths to the libraries 375 386 lib.concatMapStringsSep "\n" patchDlOpen dlopenLibs 376 387 ) 377 - # finally ensure that there are no left-over dlopen calls (or rather strings pointing to shared libraries) that we didn't handle 388 + # finally ensure that there are no left-over dlopen calls (or rather strings 389 + # pointing to shared libraries) that we didn't handle 378 390 + '' 379 391 if grep -qr '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"' src; then 380 392 echo "Found unhandled dynamic library calls: " ··· 461 473 mesonFlags = [ 462 474 # Options 463 475 464 - # We bump this variable on every (major) version change to ensure 465 - # that we have known-good value for a timestamp that is in the (not so distant) past. 466 - # This serves as a lower bound for valid system timestamps during startup. Systemd will 467 - # reset the system timestamp if this date is +- 15 years from the system time. 476 + # We bump this attribute on every (major) version change to ensure that we 477 + # have known-good value for a timestamp that is in the (not so distant) 478 + # past. This serves as a lower bound for valid system timestamps during 479 + # startup. Systemd will reset the system timestamp if this date is +- 15 480 + # years from the system time. 468 481 # See the systemd v250 release notes for further details: 469 - # https://github.com/systemd/systemd/blob/60e930fc3e6eb8a36fbc184773119eb8d2f30364/NEWS#L258-L266 482 + # https://github.com/systemd/systemd/blob/60e930fc3e6eb8a36fbc184773119eb8d2f30364/NEWS#L258-L266 470 483 (lib.mesonOption "time-epoch" releaseTimestamp) 471 484 472 485 (lib.mesonOption "version-tag" version) ··· 616 629 ]; 617 630 preConfigure = 618 631 let 619 - # A list of all the runtime binaries that the systemd executables, tests and libraries are referencing in their source code, scripts and unit files. 620 - # As soon as a dependency isn't required anymore we should remove it from the list. The `where` attribute for each of the replacement patterns must be exhaustive. If another (unhandled) case is found in the source code the build fails with an error message. 632 + # A list of all the runtime binaries referenced by the source code (plus 633 + # scripts and unit files) of systemd executables, tests and libraries. 634 + # As soon as a dependency is lo longer required we should remove it from 635 + # the list. 636 + # The `where` attribute for each of the replacement patterns must be 637 + # exhaustive. If another (unhandled) case is found in the source code the 638 + # build fails with an error message. 621 639 binaryReplacements = [ 622 - { search = "/usr/bin/getent"; replacement = "${getent}/bin/getent"; where = [ "src/nspawn/nspawn-setuid.c" ]; } 623 - 640 + { 641 + search = "/usr/bin/getent"; 642 + replacement = "${getent}/bin/getent"; 643 + where = [ "src/nspawn/nspawn-setuid.c" ]; 644 + } 624 645 { 625 646 search = "/sbin/mkswap"; 626 647 replacement = "${lib.getBin util-linux}/sbin/mkswap"; ··· 628 649 "man/systemd-makefs@.service.xml" 629 650 ]; 630 651 } 631 - { search = "/sbin/swapon"; replacement = "${lib.getOutput "swap" util-linux}/sbin/swapon"; where = [ "src/core/swap.c" "src/basic/unit-def.h" ]; } 632 - { search = "/sbin/swapoff"; replacement = "${lib.getOutput "swap" util-linux}/sbin/swapoff"; where = [ "src/core/swap.c" ]; } 652 + { 653 + search = "/sbin/swapon"; 654 + replacement = "${lib.getOutput "swap" util-linux}/sbin/swapon"; 655 + where = [ 656 + "src/core/swap.c" 657 + "src/basic/unit-def.h" 658 + ]; 659 + } 660 + { 661 + search = "/sbin/swapoff"; 662 + replacement = "${lib.getOutput "swap" util-linux}/sbin/swapoff"; 663 + where = [ "src/core/swap.c" ]; 664 + } 633 665 { 634 666 search = "/bin/echo"; 635 667 replacement = "${coreutils}/bin/echo"; ··· 646 678 { 647 679 search = "/bin/cat"; 648 680 replacement = "${coreutils}/bin/cat"; 649 - where = [ "test/test-execute/exec-noexecpaths-simple.service" "src/journal/cat.c" ]; 681 + where = [ 682 + "test/test-execute/exec-noexecpaths-simple.service" 683 + "src/journal/cat.c" 684 + ]; 650 685 } 651 686 { 652 687 search = "/usr/lib/systemd/systemd-fsck"; 653 688 replacement = "$out/lib/systemd/systemd-fsck"; 654 - where = [ 655 - "man/systemd-fsck@.service.xml" 656 - ]; 689 + where = [ "man/systemd-fsck@.service.xml" ]; 657 690 } 658 691 ] ++ lib.optionals withImportd [ 659 692 { ··· 682 715 ]; 683 716 } 684 717 ] ++ lib.optionals withKmod [ 685 - { search = "/sbin/modprobe"; replacement = "${lib.getBin kmod}/sbin/modprobe"; where = [ "units/modprobe@.service" ]; } 718 + { 719 + search = "/sbin/modprobe"; 720 + replacement = "${lib.getBin kmod}/sbin/modprobe"; 721 + where = [ "units/modprobe@.service" ]; 722 + } 686 723 ]; 687 724 688 - # { replacement, search, where } -> List[str] 725 + # { replacement, search, where, ignore } -> List[str] 689 726 mkSubstitute = { replacement, search, where, ignore ? [ ] }: 690 727 map (path: "substituteInPlace ${path} --replace '${search}' \"${replacement}\"") where; 691 728 mkEnsureSubstituted = { replacement, search, where, ignore ? [ ] }: ··· 778 815 mv $out/lib/sysusers.d $out/example 779 816 ''; 780 817 781 - # Avoid *.EFI binary stripping. At least on aarch64-linux strip 782 - # removes too much from PE32+ files: 818 + # Avoid *.EFI binary stripping. 819 + # At least on aarch64-linux strip removes too much from PE32+ files: 783 820 # https://github.com/NixOS/nixpkgs/issues/169693 784 - # The hack is to move EFI file out of lib/ before doStrip 785 - # run and return it after doStrip run. 821 + # The hack is to move EFI file out of lib/ before doStrip run and return it 822 + # after doStrip run. 786 823 preFixup = lib.optionalString withBootloader '' 787 824 mv $out/lib/systemd/boot/efi $out/dont-strip-me 788 825 ''; ··· 807 844 (builtins.map (p: p.__spliced.buildHost or p) finalAttrs.nativeBuildInputs); 808 845 809 846 passthru = { 810 - # The interface version prevents NixOS from switching to an 811 - # incompatible systemd at runtime. (Switching across reboots is 812 - # fine, of course.) It should be increased whenever systemd changes 813 - # in a backwards-incompatible way. If the interface version of two 814 - # systemd builds is the same, then we can switch between them at 815 - # runtime; otherwise we can't and we need to reboot. 847 + # The `interfaceVersion` attribute below points out the incompatibilities 848 + # between systemd versions. When the new systemd build is 849 + # backwards-compatible with the previous one, then they can be switched at 850 + # runtime (the reboot being optional in this case); otherwise, a reboot is 851 + # needed - and therefore `interfaceVersion` should be incremented. 816 852 interfaceVersion = 2; 817 853 818 - inherit withCryptsetup withHostnamed withImportd withKmod withLocaled withMachined withPortabled withTimedated withUtmp util-linux kmod kbd; 854 + inherit withCryptsetup withHostnamed withImportd withKmod withLocaled 855 + withMachined withPortabled withTimedated withUtmp util-linux kmod kbd; 819 856 820 857 tests = { 821 858 inherit (nixosTests) ··· 823 860 systemd-journal 824 861 systemd-journal-gateway 825 862 systemd-journal-upload; 826 - cross = pkgsCross.${if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform"}.systemd; 863 + cross = 864 + let 865 + systemString = 866 + if stdenv.buildPlatform.isAarch64 867 + then "gnu64" 868 + else "aarch64-multiplatform"; 869 + in 870 + pkgsCross.${systemString}.systemd; 827 871 }; 828 872 }; 829 873 830 - meta = with lib; { 874 + meta = { 831 875 homepage = "https://www.freedesktop.org/wiki/Software/systemd/"; 832 876 description = "A system and service manager for Linux"; 833 - license = licenses.lgpl21Plus; 834 - platforms = platforms.linux; 877 + longDescription = '' 878 + systemd is a suite of basic building blocks for a Linux system. It 879 + provides a system and service manager that runs as PID 1 and starts the 880 + rest of the system. systemd provides aggressive parallelization 881 + capabilities, uses socket and D-Bus activation for starting services, 882 + offers on-demand starting of daemons, keeps track of processes using Linux 883 + control groups, maintains mount and automount points, and implements an 884 + elaborate transactional dependency-based service control logic. systemd 885 + supports SysV and LSB init scripts and works as a replacement for 886 + sysvinit. Other parts include a logging daemon, utilities to control basic 887 + system configuration like the hostname, date, locale, maintain a list of 888 + logged-in users and running containers and virtual machines, system 889 + accounts, runtime directories and settings, and daemons to manage simple 890 + network configuration, network time synchronization, log forwarding, and 891 + name resolution. 892 + ''; 893 + license = with lib.licenses; [ 894 + # Taken from https://raw.githubusercontent.com/systemd/systemd-stable/${finalAttrs.src.rev}/LICENSES/README.md 895 + bsd2 896 + bsd3 897 + cc0 898 + lgpl21Plus 899 + lgpl2Plus 900 + mit 901 + mit0 902 + ofl 903 + publicDomain 904 + ]; 905 + maintainers = with lib.maintainers; [ flokli kloenk ]; 906 + platforms = lib.platforms.linux; 907 + priority = 10; 835 908 badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; 836 909 # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965 837 910 broken = stdenv.hostPlatform.isStatic; 838 - priority = 10; 839 - maintainers = with maintainers; [ flokli kloenk ]; 840 911 }; 841 912 })
+1 -1
pkgs/servers/mpd/default.nix
··· 188 188 description = "A flexible, powerful daemon for playing music"; 189 189 homepage = "https://www.musicpd.org/"; 190 190 license = licenses.gpl2Only; 191 - maintainers = with maintainers; [ astsmtl ehmry tobim ]; 191 + maintainers = with maintainers; [ astsmtl tobim ]; 192 192 platforms = platforms.unix; 193 193 mainProgram = "mpd"; 194 194
+2 -2
pkgs/servers/redpanda/default.nix
··· 7 7 , stdenv 8 8 }: 9 9 let 10 - version = "23.3.4"; 10 + version = "23.3.5"; 11 11 src = fetchFromGitHub { 12 12 owner = "redpanda-data"; 13 13 repo = "redpanda"; 14 14 rev = "v${version}"; 15 - sha256 = "sha256-Bcr+bMqurwpd7IFTBR73RcgekkiuQQ3JPjvrp03fpJ0="; 15 + sha256 = "sha256-rERKoaSZ/lscMW9IcHU00+l4BzvFCz3RMDCQyiEam0E="; 16 16 }; 17 17 server = callPackage ./server.nix { inherit src version; }; 18 18 in
+4 -3
pkgs/servers/slimserver/default.nix
··· 22 22 in 23 23 perlPackages.buildPerlPackage rec { 24 24 pname = "slimserver"; 25 - version = "8.3.1"; 25 + version = "8.4.0"; 26 26 27 27 src = fetchFromGitHub { 28 28 owner = "Logitech"; 29 29 repo = "slimserver"; 30 30 rev = version; 31 - hash = "sha256-yMFOwh/oPiJnUsKWBGvd/GZLjkWocMAUK0r+Hx/SUPo="; 31 + hash = "sha256-92mKchgAWRIrNOeK/zXUYRqIAk6THdtz1zQe3fg2kE0="; 32 32 }; 33 33 34 34 nativeBuildInputs = [ makeWrapper ]; ··· 150 150 151 151 meta = with lib; { 152 152 homepage = "https://github.com/Logitech/slimserver"; 153 + changelog = "https://github.com/Logitech/slimserver/blob/${version}/Changelog${lib.versions.major version}.html"; 153 154 description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; 154 - # the firmware is not under a free license, but not included in the default package 155 + # the firmware is not under a free license, so we do not include firmware in the default package 155 156 # https://github.com/Logitech/slimserver/blob/public/8.3/License.txt 156 157 license = if enableUnfreeFirmware then licenses.unfree else licenses.gpl2Only; 157 158 mainProgram = "slimserver";
+2 -2
pkgs/servers/sql/postgresql/ext/postgis.nix
··· 20 20 in 21 21 stdenv.mkDerivation rec { 22 22 pname = "postgis"; 23 - version = "3.4.1"; 23 + version = "3.4.2"; 24 24 25 25 outputs = [ "out" "doc" ]; 26 26 27 27 src = fetchurl { 28 28 url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; 29 - sha256 = "sha256-/vahQSE9D/J79FszuEnMOWwi3bH/xv7UNUacnokfyB0="; 29 + sha256 = "sha256-yMh0wAukqYSocDCva/lUSCFQIGCtRz1clvHU0INcWJI="; 30 30 }; 31 31 32 32 buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ]
+2 -2
pkgs/servers/sql/postgresql/ext/timescaledb.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; 5 - version = "2.13.1"; 5 + version = "2.14.0"; 6 6 7 7 nativeBuildInputs = [ cmake ]; 8 8 buildInputs = [ postgresql openssl libkrb5 ]; ··· 11 11 owner = "timescale"; 12 12 repo = "timescaledb"; 13 13 rev = version; 14 - hash = "sha256-7OMeH818f/wu55jQS/6pP+hl7ph2Ul5LiLrSDA47SeM="; 14 + hash = "sha256-CtuJSLhrgvUAyJDnPvCNH2Rizl0W6SuMjWA6wpDqRtE="; 15 15 }; 16 16 17 17 cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]
+2 -2
pkgs/servers/web-apps/rss-bridge/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "rss-bridge"; 5 - version = "2023-09-24"; 5 + version = "2024-02-02"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "RSS-Bridge"; 9 9 repo = "rss-bridge"; 10 10 rev = version; 11 - sha256 = "sha256-N1pbveOgJrB1M+WelKD07Jmv9Vz5NqT+IJf//L8UEnU="; 11 + sha256 = "sha256-VycEgu7uHYwDnNE1eoVxgaWZAnC6mZLBxT8Le3PI4Rs="; 12 12 }; 13 13 14 14 patches = [
+18 -23
pkgs/servers/web-apps/rss-bridge/paths.patch
··· 1 1 diff --git a/lib/Configuration.php b/lib/Configuration.php 2 - index c38d7cc9..d95e5174 100644 2 + index 63f67a3c..f0a53a24 100644 3 3 --- a/lib/Configuration.php 4 4 +++ b/lib/Configuration.php 5 - @@ -104,8 +104,8 @@ final class Configuration 5 + @@ -81,8 +81,8 @@ public static function loadConfiguration(array $customConfig = [], array $env = 6 6 } 7 7 } 8 8 ··· 13 13 if ($enabledBridges === '*') { 14 14 self::setConfig('system', 'enabled_bridges', ['*']); 15 15 } else { 16 - diff --git a/lib/RssBridge.php b/lib/RssBridge.php 17 - index 6ba952eb..a0bbaf03 100644 18 - --- a/lib/RssBridge.php 19 - +++ b/lib/RssBridge.php 20 - @@ -11,8 +11,8 @@ final class RssBridge 21 - Configuration::verifyInstallation(); 22 - 23 - $customConfig = []; 24 - - if (file_exists(__DIR__ . '/../config.ini.php')) { 25 - - $customConfig = parse_ini_file(__DIR__ . '/../config.ini.php', true, INI_SCANNER_TYPED); 26 - + if (file_exists(getenv('RSSBRIDGE_DATA') . '/config.ini.php')) { 27 - + $customConfig = parse_ini_file(getenv('RSSBRIDGE_DATA') . '/config.ini.php', true, INI_SCANNER_TYPED); 28 - } 29 - Configuration::loadConfiguration($customConfig, getenv()); 30 - 31 16 diff --git a/lib/bootstrap.php b/lib/bootstrap.php 32 - index dc1c0f04..194a3f8f 100644 17 + index 6465f5f9..4605596f 100644 33 18 --- a/lib/bootstrap.php 34 19 +++ b/lib/bootstrap.php 35 - @@ -27,7 +27,7 @@ const PATH_LIB_CACHES = __DIR__ . '/../caches/'; 36 - const PATH_LIB_ACTIONS = __DIR__ . '/../actions/'; 20 + @@ -1,7 +1,7 @@ 21 + <?php 37 22 38 - /** Path to the cache folder */ 23 + const PATH_LIB_CACHES = __DIR__ . '/../caches/'; 39 24 -const PATH_CACHE = __DIR__ . '/../cache/'; 40 25 +define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/'); 41 26 42 - /** URL to the RSS-Bridge repository */ 43 - const REPOSITORY = 'https://github.com/RSS-Bridge/rss-bridge/'; 27 + // Allow larger files for simple_html_dom 28 + // todo: extract to config (if possible) 29 + @@ -43,7 +43,7 @@ 30 + }); 31 + 32 + $customConfig = []; 33 + -if (file_exists(__DIR__ . '/../config.ini.php')) { 34 + - $customConfig = parse_ini_file(__DIR__ . '/../config.ini.php', true, INI_SCANNER_TYPED); 35 + +if (file_exists(getenv('RSSBRIDGE_DATA') . '/config.ini.php')) { 36 + + $customConfig = parse_ini_file(getenv('RSSBRIDGE_DATA') . '/config.ini.php', true, INI_SCANNER_TYPED); 37 + } 38 + Configuration::loadConfiguration($customConfig, getenv());
+3 -3
pkgs/servers/x11/xorg/default.nix
··· 998 998 # THIS IS A GENERATED FILE. DO NOT EDIT! 999 999 imake = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { 1000 1000 pname = "imake"; 1001 - version = "1.0.9"; 1001 + version = "1.0.10"; 1002 1002 builder = ./builder.sh; 1003 1003 src = fetchurl { 1004 - url = "mirror://xorg/individual/util/imake-1.0.9.tar.xz"; 1005 - sha256 = "10wgw3l0rsnvc2191awyg5j24n3g552xgc671qr5vnbliwkrvpkj"; 1004 + url = "mirror://xorg/individual/util/imake-1.0.10.tar.xz"; 1005 + sha256 = "1xgcsamfij22ggc4p8anvvihwyf4adg6gjdd6v7m9cypm37cppkm"; 1006 1006 }; 1007 1007 hardeningDisable = [ "bindnow" "relro" ]; 1008 1008 strictDeps = true;
+1 -1
pkgs/servers/x11/xorg/tarballs.list
··· 213 213 mirror://xorg/individual/proto/xorgproto-2023.2.tar.xz 214 214 mirror://xorg/individual/util/bdftopcf-1.1.1.tar.xz 215 215 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 216 - mirror://xorg/individual/util/imake-1.0.9.tar.xz 216 + mirror://xorg/individual/util/imake-1.0.10.tar.xz 217 217 mirror://xorg/individual/util/lndir-1.0.4.tar.xz 218 218 mirror://xorg/individual/util/makedepend-1.0.8.tar.xz 219 219 mirror://xorg/individual/util/util-macros-1.20.0.tar.xz
+4 -3
pkgs/shells/bash/5.nix
··· 22 22 }); 23 23 in 24 24 stdenv.mkDerivation rec { 25 - name = "bash-${lib.optionalString interactive "interactive-"}${version}-p${toString (builtins.length upstreamPatches)}"; 26 - version = "5.2"; 25 + pname = "bash${lib.optionalString interactive "-interactive"}"; 26 + version = "5.2${patch_suffix}"; 27 + patch_suffix = "p${toString (builtins.length upstreamPatches)}"; 27 28 28 29 src = fetchurl { 29 - url = "mirror://gnu/bash/bash-${version}.tar.gz"; 30 + url = "mirror://gnu/bash/bash-${lib.removeSuffix patch_suffix version}.tar.gz"; 30 31 sha256 = "sha256-oTnBZt9/9EccXgczBRZC7lVWwcyKSnjxRVg8XIGrMvs="; 31 32 }; 32 33
+5
pkgs/shells/bash/bash-5.2-patches.nix
··· 22 22 (patch "019" "10njgv5mrc5rhsp5lvxcbm0pnzn59a8spi2nhdasifyl1a32cp1j") 23 23 (patch "020" "07f0wlmqjdfarp44w3gj9gdqbqm5x20rvlhpn34ngklmxcm2bz5n") 24 24 (patch "021" "1kahfqqalcwi4m73pg3ssz6lh0kcqsqax09myac7a15d2y0vhd43") 25 + (patch "022" "0w74aym0g1fh48864a3qxh89f26iaq7wsbg7244c6kjr94527dbq") 26 + (patch "023" "1lywjqbc36j5pdzfcvnz1zy30j76aqmsm190p888av0hw815b45g") 27 + (patch "024" "1hq23djqbr7s9y2324jq9mxr5bwdkmgizn3zgpchbsqp054k85cp") 28 + (patch "025" "0x9hc4silzl4d3zw4p43i5dm7w86k50j47f87lracwfgwy3z8f2i") 29 + (patch "026" "1b1fhm1dsi67r8ip17s0xvx2qq31fsxc1g9n3r931dd0k9a1zvln") 25 30 ]
+4 -1
pkgs/stdenv/darwin/default.nix
··· 317 317 ln -s ${bootstrapTools}/lib/clang $out/lib 318 318 ln -s ${bootstrapTools}/include $out 319 319 ''; 320 - passthru.isFromBootstrapFiles = true; 320 + passthru = { 321 + isFromBootstrapFiles = true; 322 + hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ]; 323 + }; 321 324 }; 322 325 clang-unwrapped = selfTools.libclang; 323 326 libllvm = self.stdenv.mkDerivation {
+1
pkgs/stdenv/generic/make-derivation.nix
··· 249 249 "relro" 250 250 "stackprotector" 251 251 "strictoverflow" 252 + "zerocallusedregs" 252 253 ]; 253 254 defaultHardeningFlags = 254 255 (if stdenv.hasCC then stdenv.cc else {}).defaultHardeningFlags or
+16 -7
pkgs/stdenv/linux/bootstrap-files/i686-unknown-linux-gnu.nix
··· 1 + # Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: 2 + # $ ./refresh-tarballs.bash --targets=i686-unknown-linux-gnu 3 + # 4 + # Metadata: 5 + # - nixpkgs revision: 125cefd4cf8f857e5ff1aceaef9230ba578a033d 6 + # - hydra build: https://hydra.nixos.org/job/nixpkgs/trunk/stdenvBootstrapTools.i686-unknown-linux-gnu.build/latest 7 + # - resolved hydra build: https://hydra.nixos.org/build/247889988 8 + # - instantiated derivation: /nix/store/chcf0brhdyn7ihmb14n0w4rm2a59gqrw-stdenv-bootstrap-tools.drv 9 + # - output directory: /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools 10 + # - build time: Fri, 26 Jan 2024 22:04:03 +0000 1 11 { 12 + bootstrapTools = import <nix/fetchurl.nix> { 13 + url = "http://tarballs.nixos.org/stdenv/i686-unknown-linux-gnu/125cefd4cf8f857e5ff1aceaef9230ba578a033d/bootstrap-tools.tar.xz"; 14 + hash = "sha256-KTAh3t91aJMiMO/7NFOjUz6fXI9Iu+H7cuODreWz9N8="; 15 + }; 2 16 busybox = import <nix/fetchurl.nix> { 3 - url = "http://tarballs.nixos.org/stdenv-linux/i686/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/busybox"; 4 - sha256 = "ef4c1be6c7ae57e4f654efd90ae2d2e204d6769364c46469fa9ff3761195cba1"; 17 + url = "http://tarballs.nixos.org/stdenv/i686-unknown-linux-gnu/125cefd4cf8f857e5ff1aceaef9230ba578a033d/busybox"; 18 + hash = "sha256-omz+ZT0bhMkAZcDs9evA2PNpO6VHUozdtjMgdui6fxw="; 5 19 executable = true; 6 - }; 7 - 8 - bootstrapTools = import <nix/fetchurl.nix> { 9 - url = "http://tarballs.nixos.org/stdenv-linux/i686/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz"; 10 - sha256 = "b9bf20315f8c5c0411679c5326084420b522046057a0850367c67d9514794f1c"; 11 20 }; 12 21 }
+1 -1
pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
··· 15 15 langC = true; 16 16 langCC = true; 17 17 isGNU = true; 18 - hardeningUnsupportedFlags = [ "fortify3" ]; 18 + hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ]; 19 19 } // extraAttrs)
+1 -1
pkgs/stdenv/linux/bootstrap-tools/default.nix
··· 15 15 langC = true; 16 16 langCC = true; 17 17 isGNU = true; 18 - hardeningUnsupportedFlags = [ "fortify3" ]; 18 + hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ]; 19 19 } // extraAttrs)
+2 -2
pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json
··· 1 1 { 2 - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", 3 - "ci-path": "/nix/store/ghfxriicygwcrxvm45r0cm9g0vshpw01-nixpkgs-check-by-name" 2 + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", 3 + "ci-path": "/nix/store/4kv4fyb6x5ivn0qncg7d9i5zhqhzy7bi-nixpkgs-check-by-name" 4 4 }
+222 -46
pkgs/tools/X11/xdg-utils/default.nix
··· 1 - { lib, stdenv, fetchFromGitLab, fetchFromGitHub, fetchpatch 2 - , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto 3 - , w3m, gnugrep, gnused, coreutils, xset, perlPackages 4 - , mimiSupport ? false, gawk 5 - , bash 6 - , glib 1 + { lib, stdenv, fetchFromGitLab, fetchFromGitHub, fetchpatch, writeText 2 + # docs deps 3 + , libxslt, docbook_xml_dtd_412, docbook_xml_dtd_43, docbook_xsl, xmlto 4 + # runtime deps 5 + , resholve, bash, coreutils, dbus, file, gawk, glib, gnugrep, gnused, jq, lockfileProgs, nettools, procmail, procps, xdg-user-dirs 6 + , perl, perlPackages 7 + , mimiSupport ? false 7 8 , withXdgOpenUsePortalPatch ? true }: 8 9 9 10 let ··· 15 16 sha256 = "15gw2nyrqmdsdin8gzxihpn77grhk9l97jp7s7pr7sl4n9ya2rpj"; 16 17 }; 17 18 18 - perlPath = with perlPackages; makePerlPath [ 19 - NetDBus XMLTwig XMLParser X11Protocol 19 + # Required by the common desktop detection code 20 + commonDeps = [ dbus coreutils gnugrep gnused ]; 21 + # These are all faked because the current desktop is detected 22 + # based on their presence, so we want them to be missing by default. 23 + commonFakes = [ 24 + "explorer.exe" 25 + "gnome-default-applications-properties" 26 + "kde-config" 27 + "xprop" 20 28 ]; 21 29 30 + # This is still required to work around the eval trickery some scripts do 31 + commonPrologue = "${writeText "xdg-utils-prologue" '' 32 + export PATH=$PATH:${coreutils}/bin 33 + ''}"; 34 + 35 + solutions = [ 36 + { 37 + scripts = [ "bin/xdg-desktop-icon" ]; 38 + interpreter = "${bash}/bin/bash"; 39 + inputs = commonDeps ++ [ xdg-user-dirs ]; 40 + execer = [ 41 + "cannot:${xdg-user-dirs}/bin/xdg-user-dir" 42 + ]; 43 + # These are desktop-specific, so we don't want xdg-utils to be able to 44 + # call them when in a different setup. 45 + fake.external = commonFakes ++ [ 46 + "gconftool-2" # GNOME2 47 + ]; 48 + keep."$KDE_SESSION_VERSION" = true; 49 + prologue = commonPrologue; 50 + } 51 + 52 + { 53 + scripts = [ "bin/xdg-desktop-menu" ]; 54 + interpreter = "${bash}/bin/bash"; 55 + inputs = commonDeps ++ [ gawk ]; 56 + fake.external = commonFakes; 57 + keep."$KDE_SESSION_VERSION" = true; 58 + prologue = commonPrologue; 59 + } 60 + 61 + { 62 + scripts = [ "bin/xdg-email" ]; 63 + interpreter = "${bash}/bin/bash"; 64 + inputs = commonDeps ++ [ gawk glib.bin "${placeholder "out"}/bin" ]; 65 + execer = [ 66 + "cannot:${placeholder "out"}/bin/xdg-mime" 67 + "cannot:${placeholder "out"}/bin/xdg-open" 68 + ]; 69 + # These are desktop-specific, so we don't want xdg-utils to be able to 70 + # call them when in a different setup. 71 + fake.external = commonFakes ++ [ 72 + "exo-open" # XFCE 73 + "gconftool-2" # GNOME 74 + "gio" # GNOME (new) 75 + "gnome-open" # GNOME (very old) 76 + "gvfs-open" # GNOME (old) 77 + "qtxdg-mat" # LXQT 78 + "xdg-email-hook.sh" # user-defined hook that may be available ambiently 79 + ]; 80 + fix."/bin/echo" = true; 81 + keep = { 82 + "$command" = true; 83 + "$kreadconfig" = true; 84 + "$THUNDERBIRD" = true; 85 + "$utf8" = true; 86 + }; 87 + } 88 + 89 + { 90 + scripts = [ "bin/xdg-icon-resource" ]; 91 + interpreter = "${bash}/bin/bash"; 92 + inputs = commonDeps; 93 + fake.external = commonFakes; 94 + keep."$KDE_SESSION_VERSION" = true; 95 + prologue = commonPrologue; 96 + } 97 + 98 + { 99 + scripts = [ "bin/xdg-mime" ]; 100 + interpreter = "${bash}/bin/bash"; 101 + inputs = commonDeps ++ [ file gawk ]; 102 + # These are desktop-specific, so we don't want xdg-utils to be able to 103 + # call them when in a different setup. 104 + fake.external = commonFakes ++ [ 105 + "gio" # GNOME (new) 106 + "gnomevfs-info" # GNOME (very old) 107 + "gvfs-info" # GNOME (old) 108 + "kde4-config" # Plasma 4 109 + "kfile" # KDE 3 110 + "kmimetypefinder" # Plasma (generic) 111 + "kmimetypefinder5" # Plasma 5 112 + "ktraderclient" # KDE 3 113 + "ktradertest" # KDE 3 114 + "mimetype" # alternative tool for file, pulls in perl, avoid 115 + "qtpaths" # Plasma 116 + "qtxdg-mat" # LXQT 117 + ]; 118 + fix."/usr/bin/file" = true; 119 + keep = { 120 + "$KDE_SESSION_VERSION" = true; 121 + "$KTRADER" = true; 122 + }; 123 + prologue = commonPrologue; 124 + } 125 + 126 + { 127 + scripts = [ "bin/xdg-open" ]; 128 + interpreter = "${bash}/bin/bash"; 129 + inputs = commonDeps ++ [ nettools glib.bin "${placeholder "out"}/bin" ]; 130 + execer = [ 131 + "cannot:${placeholder "out"}/bin/xdg-mime" 132 + ]; 133 + # These are desktop-specific, so we don't want xdg-utils to be able to 134 + # call them when in a different setup. 135 + fake.external = commonFakes ++ [ 136 + "cygstart" # Cygwin 137 + "dde-open" # Deepin 138 + "enlightenment_open" # Enlightenment 139 + "exo-open" # XFCE 140 + "gio" # GNOME (new) 141 + "gnome-open" # GNOME (very old) 142 + "gvfs-open" # GNOME (old) 143 + "kde-open" # Plasma 144 + "kfmclient" # KDE3 145 + "mate-open" # MATE 146 + "mimeopen" # alternative tool for file, pulls in perl, avoid 147 + "open" # macOS 148 + "pcmanfm" # LXDE 149 + "qtxdg-mat" # LXQT 150 + "run-mailcap" # generic 151 + "rundll32.exe" # WSL 152 + "wslpath" # WSL 153 + ]; 154 + fix."$printf" = [ "printf" ]; 155 + keep = { 156 + "env:$command" = true; 157 + "$browser" = true; 158 + "$KDE_SESSION_VERSION" = true; 159 + }; 160 + } 161 + 162 + { 163 + scripts = [ "bin/xdg-screensaver" ]; 164 + interpreter = "${bash}/bin/bash"; 165 + inputs = commonDeps ++ [ lockfileProgs nettools perl procmail procps ]; 166 + # These are desktop-specific, so we don't want xdg-utils to be able to 167 + # call them when in a different setup. 168 + fake.external = commonFakes ++ [ 169 + "dcop" # KDE3 170 + "mate-screensaver-command" # MATE 171 + "xautolock" # Xautolock 172 + "xscreensaver-command" # Xscreensaver 173 + "xset" # generic-ish X 174 + ]; 175 + fix."$lockfile_command" = [ "lockfile" ]; 176 + keep = { 177 + "$MV" = true; 178 + "$XPROP" = true; 179 + }; 180 + prologue = "${writeText "xdg-screensaver-prologue" '' 181 + export PERL5LIB=${with perlPackages; makePerlPath [ NetDBus XMLTwig XMLParser X11Protocol ]} 182 + export PATH=$PATH:${coreutils}/bin 183 + ''}"; 184 + } 185 + 186 + { 187 + scripts = [ "bin/xdg-settings" ]; 188 + interpreter = "${bash}/bin/bash"; 189 + inputs = commonDeps ++ [ jq "${placeholder "out"}/bin" ]; 190 + execer = [ 191 + "cannot:${placeholder "out"}/bin/xdg-mime" 192 + ]; 193 + # These are desktop-specific, so we don't want xdg-utils to be able to 194 + # call them when in a different setup. 195 + fake.external = commonFakes ++ [ 196 + "gconftool-2" # GNOME 197 + "kreadconfig" # Plasma (generic) 198 + "kreadconfig5" # Plasma 5 199 + "kreadconfig6" # Plasma 6 200 + "ktradertest" # KDE3 201 + "kwriteconfig" # Plasma (generic) 202 + "kwriteconfig5" # Plasma 5 203 + "kwriteconfig6" # Plasma 6 204 + "qtxdg-mat" # LXQT 205 + ]; 206 + keep = { 207 + "$KDE_SESSION_VERSION" = true; 208 + # get_browser_$handler 209 + "$handler" = true; 210 + }; 211 + } 212 + ]; 22 213 in 23 214 24 215 stdenv.mkDerivation rec { 25 216 pname = "xdg-utils"; 26 - version = "unstable-2022-11-06"; 217 + version = "1.2.0"; 27 218 28 219 src = fetchFromGitLab { 29 220 domain = "gitlab.freedesktop.org"; 30 221 owner = "xdg"; 31 222 repo = "xdg-utils"; 32 - rev = "8ae02631a9806da11b34cd6b274af02d28aee5da"; 33 - sha256 = "sha256-WdnnAiPYbREny633FnBi5tD9hDuF8NCVVbUaAVIKTxM="; 223 + rev = "v${version}"; 224 + hash = "sha256-rjNIO4B9jHsBmPaugWTMqTGNpjiw0MTEmf9/ds2Mud4="; 34 225 }; 35 226 36 - patches = lib.optionals withXdgOpenUsePortalPatch [ 227 + patches = [ 228 + # Backport typo fix 229 + (fetchpatch { 230 + url = "https://gitlab.freedesktop.org/xdg/xdg-utils/-/commit/af2fe0d1dcbcd982d84ddf2bbd174afe90976ed9.patch"; 231 + hash = "sha256-HhQk06wWkyWjSxjXet+sADKf1irswKxDA8WuOknZKRs="; 232 + }) 233 + # Backport docs rendering fixes 234 + # See: https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/106 235 + (fetchpatch { 236 + url = "https://gitlab.freedesktop.org/xdg/xdg-utils/-/commit/403a720ad18920030418a7c3d1f2caba9ce3892d.patch"; 237 + hash = "sha256-XxFUeyXENHCy+wplIJ5OzoU5oyA4v1bz/9qMXp1ZwsE="; 238 + }) 239 + (fetchpatch { 240 + url = "https://gitlab.freedesktop.org/xdg/xdg-utils/-/commit/a137f2ba87620402aca21b14fb1d79517782dd29.patch"; 241 + hash = "sha256-XFUAWn4uOyzgLdvupBxsO7wm6VDSzYj1SGZEM+9ouec="; 242 + }) 243 + ] ++ lib.optionals withXdgOpenUsePortalPatch [ 37 244 # Allow forcing the use of XDG portals using NIXOS_XDG_OPEN_USE_PORTAL environment variable. 38 245 # Upstream PR: https://github.com/freedesktop/xdg-utils/pull/12 39 246 ./allow-forcing-portal-use.patch 40 - # Allow opening files when using portal with xdg-open. 41 - # Upstream PR: https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/65 42 - (fetchpatch { 43 - name = "support-openfile-with-portal.patch"; 44 - url = "https://gitlab.freedesktop.org/xdg/xdg-utils/-/commit/5cd8c38f58d9db03240f4bc67267fe3853b66ec7.diff"; 45 - hash = "sha256-snkhxwGF9hpqEh5NGG8xixTi/ydAk5apXRtgYrVgNY8="; 46 - }) 47 247 ]; 48 248 49 249 # just needed when built from git 50 - nativeBuildInputs = [ libxslt docbook_xml_dtd_412 docbook_xsl xmlto w3m ]; 250 + nativeBuildInputs = [ libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl xmlto ]; 51 251 52 252 # explicitly provide a runtime shell so patchShebangs is consistent across build platforms 53 253 buildInputs = [ bash ]; 54 254 55 255 postInstall = lib.optionalString mimiSupport '' 56 256 cp ${mimisrc}/xdg-open $out/bin/xdg-open 57 - '' + '' 58 - sed '2s#.#\ 59 - sed() { ${gnused}/bin/sed "$@"; }\ 60 - grep() { ${gnugrep}/bin/grep "$@"; }\ 61 - egrep() { ${gnugrep}/bin/egrep "$@"; }\ 62 - file() { ${file}/bin/file "$@"; }\ 63 - awk() { ${gawk}/bin/awk "$@"; }\ 64 - xset() { ${xset}/bin/xset "$@"; }\ 65 - perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\ 66 - mimetype() { ${perlPackages.FileMimeInfo}/bin/mimetype "$@"; }\ 67 - PATH=$PATH:'$out'/bin:${coreutils}/bin\ 68 - &#' -i "$out"/bin/* 257 + ''; 69 258 70 - substituteInPlace $out/bin/xdg-open \ 71 - --replace "/usr/bin/printf" "${coreutils}/bin/printf" \ 72 - --replace "gdbus" "${glib}/bin/gdbus" \ 73 - --replace "mimeopen" "${perlPackages.FileMimeInfo}/bin/mimeopen" 74 - 75 - substituteInPlace $out/bin/xdg-mime \ 76 - --replace "/usr/bin/file" "${file}/bin/file" 77 - 78 - substituteInPlace $out/bin/xdg-email \ 79 - --replace "/bin/echo" "${coreutils}/bin/echo" \ 80 - --replace "gdbus" "${glib}/bin/gdbus" 81 - 82 - sed 's|\bwhich\b|type -P|g' -i "$out"/bin/* 83 - ''; 259 + preFixup = lib.concatStringsSep "\n" (map (resholve.phraseSolution "xdg-utils-resholved") solutions); 84 260 85 261 meta = with lib; { 86 262 homepage = "https://www.freedesktop.org/wiki/Software/xdg-utils/";
+2 -2
pkgs/tools/admin/ansible/lint.nix
··· 6 6 7 7 python3.pkgs.buildPythonApplication rec { 8 8 pname = "ansible-lint"; 9 - version = "6.22.2"; 9 + version = "24.2.0"; 10 10 format = "pyproject"; 11 11 12 12 src = fetchPypi { 13 13 inherit pname version; 14 - hash = "sha256-L0Cf6Y762mHan4q3zfNKW2feQ+EzjO4GGfXVH0+LFd0="; 14 + hash = "sha256-a8XWJz8zcR7G03Df5f2+l6ZLTDbCp6GaJJQBMm6wNhY="; 15 15 }; 16 16 17 17 postPatch = ''
+2 -12
pkgs/tools/archivers/cpio/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchurl 4 - , fetchpatch 5 4 , autoreconfHook 6 5 7 6 # for passthru.tests ··· 13 12 14 13 stdenv.mkDerivation rec { 15 14 pname = "cpio"; 16 - version = "2.14"; 15 + version = "2.15"; 17 16 18 17 src = fetchurl { 19 18 url = "mirror://gnu/cpio/cpio-${version}.tar.bz2"; 20 - sha256 = "/NwV1g9yZ6b8fvzWudt7bIlmxPL7u5ZMJNQTNv0/LBI="; 19 + hash = "sha256-k3YQuXwymh7JJoVT+3gAN7z/8Nz/6XJevE/ZwaqQdds="; 21 20 }; 22 - 23 - patches = [ 24 - # Pull upstream fix for clang-16 and gcc-14. 25 - (fetchpatch { 26 - name = "major-decl.patch"; 27 - url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=8179be21e664cedb2e9d238cc2f6d04965e97275"; 28 - hash = "sha256-k5Xiv3xuPU8kPT6D9B6p+V8SK55ybFgrIIPDgHuorpM="; 29 - }) 30 - ]; 31 21 32 22 nativeBuildInputs = [ autoreconfHook ]; 33 23
+1 -1
pkgs/tools/archivers/unrar/default.nix
··· 55 55 homepage = "https://www.rarlab.com/"; 56 56 license = licenses.unfreeRedistributable; 57 57 mainProgram = "unrar"; 58 - maintainers = with maintainers; [ ehmry wegank ]; 58 + maintainers = with maintainers; [ wegank ]; 59 59 platforms = platforms.all; 60 60 }; 61 61 })
+12
pkgs/tools/archivers/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch
··· 1 + diff -urp zip30/fileio.c zip30/fileio.c 2 + --- zip30/fileio.c 2008-05-29 03:13:24.000000000 +0300 3 + +++ zip30/fileio.c 2023-05-02 12:19:50.488314853 +0300 4 + @@ -3502,7 +3502,7 @@ zwchar *local_to_wide_string(local_strin 5 + if ((wc_string = (wchar_t *)malloc((wsize + 1) * sizeof(wchar_t))) == NULL) { 6 + ZIPERR(ZE_MEM, "local_to_wide_string"); 7 + } 8 + - wsize = mbstowcs(wc_string, local_string, strlen(local_string) + 1); 9 + + wsize = mbstowcs(wc_string, local_string, wsize + 1); 10 + wc_string[wsize] = (wchar_t) 0; 11 + 12 + /* in case wchar_t is not zwchar */
+3
pkgs/tools/archivers/zip/default.nix
··· 33 33 ./fix-memset-detection.patch 34 34 # Implicit declaration of `closedir` and `opendir` cause dirent detection to fail with clang 16. 35 35 ./fix-implicit-declarations.patch 36 + # Buffer overflow on Unicode characters in path names 37 + # https://bugzilla.redhat.com/show_bug.cgi?id=2165653 38 + ./buffer-overflow-on-utf8-rh-bug-2165653.patch 36 39 ] ++ lib.optionals (enableNLS && !stdenv.isCygwin) [ ./natspec-gentoo.patch.bz2 ]; 37 40 38 41 buildInputs = lib.optional enableNLS libnatspec
+3 -3
pkgs/tools/backup/sigtop/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 name = "sigtop"; 5 - version = "0.8.0"; 5 + version = "0.9.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "tbvdm"; 9 9 repo = "sigtop"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-vFs6/b2ypwMXDgmkZDgfKPqW0GRh9A2t4QQvkUdhYQw="; 11 + sha256 = "sha256-+TV3mlFW3SxgLyXyOPWKhMdkPf/ZTK2/EMWaZHC82YM="; 12 12 }; 13 13 14 - vendorHash = "sha256-H43XOupVicLpYfkWNjArpSxQWcFqh9h2Zb6zGZ5xtfs="; 14 + vendorHash = "sha256-kkRmyWYrWDq96fECe2YMsDjRZPX2K0jKFitMJycaVVA="; 15 15 16 16 makeFlags = [ 17 17 "PREFIX=\${out}"
-26
pkgs/tools/compression/plzip/default.nix
··· 1 - { lib, stdenv, fetchurl, lzip, lzlib, texinfo }: 2 - 3 - stdenv.mkDerivation rec { 4 - pname = "plzip"; 5 - version = "1.10"; 6 - outputs = [ "out" "man" "info" ]; 7 - 8 - src = fetchurl { 9 - url = "mirror://savannah/lzip/plzip/plzip-${version}.tar.lz"; 10 - sha256 = "62f16a67be0dabf0da7fd1cb7889fe5bfae3140cea6cafa1c39e7e35a5b3c661"; 11 - }; 12 - 13 - nativeBuildInputs = [ lzip texinfo ]; 14 - buildInputs = [ lzlib ]; 15 - 16 - enableParallelBuilding = true; 17 - 18 - meta = with lib; { 19 - homepage = "https://www.nongnu.org/lzip/plzip.html"; 20 - description = "A massively parallel lossless data compressor based on the lzlib compression library"; 21 - license = licenses.gpl2Plus; 22 - platforms = platforms.all; 23 - maintainers = with maintainers; [ _360ied ]; 24 - mainProgram = "plzip"; 25 - }; 26 - }
+3 -3
pkgs/tools/compression/xz/default.nix
··· 10 10 11 11 stdenv.mkDerivation rec { 12 12 pname = "xz"; 13 - version = "5.4.5"; 13 + version = "5.4.6"; 14 14 15 15 src = fetchurl { 16 - url = "https://tukaani.org/xz/xz-${version}.tar.bz2"; 17 - sha256 = "sha256-jM9f/4aMAG8pUi44b7TGobZkY/vKZaTPw8S9WW6JXnk="; 16 + url = "https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.bz2"; 17 + sha256 = "sha256-kThRsnTo4dMXgeyUnxwj6NvPDs9uc6JDbcIXad0+b0k="; 18 18 }; 19 19 20 20 strictDeps = true;
+3 -3
pkgs/tools/filesystems/juicefs/default.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "juicefs"; 9 - version = "1.1.1"; 9 + version = "1.1.2"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "juicedata"; 13 13 repo = pname; 14 14 rev = "v${version}"; 15 - sha256 = "sha256-dMzBgwd5tVxE6OFHf6QTZfoqgL/t2pX+OgI6Pki6PG8="; 15 + sha256 = "sha256-Sf68N5ZKveKM6xZEqF7Ah0KGgOx1cGZpJ2lYkUlgpI0="; 16 16 }; 17 17 18 - vendorHash = "sha256-orq03bwN1cbwHoZFXz92tcA2F0oivGR/C5EJDAPA+pk="; 18 + vendorHash = "sha256-ofUo/3EQPhXPNeD/3to5oFir/3eAaf9WBHR4DOzcxBQ="; 19 19 20 20 ldflags = [ "-s" "-w" ]; 21 21
+13 -10
pkgs/tools/graphics/amber/default.nix
··· 3 3 , cmake 4 4 , pkg-config 5 5 , cctools 6 + , makeWrapper 6 7 , python3 7 8 , vulkan-headers 8 9 , vulkan-loader 10 + , vulkan-validation-layers 9 11 }: 10 12 let 11 13 glslang = fetchFromGitHub { ··· 32 34 spirv-headers = fetchFromGitHub { 33 35 owner = "KhronosGroup"; 34 36 repo = "SPIRV-Headers"; 35 - rev = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"; 36 - hash = "sha256-ks9JCj5rj+Xu++7z5RiHDkU3/sFXhcScw8dATfB/ot0="; 37 + rev = "d13b52222c39a7e9a401b44646f0ca3a640fbd47"; 38 + hash = "sha256-bjiWGSmpEbydXtCLP8fRZfPBvdCzBoJxKXTx3BroQbg="; 37 39 }; 38 40 39 41 spirv-tools = fetchFromGitHub { 40 42 owner = "KhronosGroup"; 41 43 repo = "SPIRV-Tools"; 42 - rev = "a73e724359a274d7cf4f4248eba5be1e7764fbfd"; 43 - hash = "sha256-vooJHtgVRlBNkQG4hulYOxIgHH4GMhXw7N4OEbkKJvU="; 44 + rev = "d87f61605b3647fbceae9aaa922fce0031afdc63"; 45 + hash = "sha256-lB2i6wjehIFDOQdIPUvCy3zzcnJSsR5vNawPhGmb0es="; 44 46 }; 45 47 46 48 in 47 49 stdenv.mkDerivation rec { 48 50 pname = "amber"; 49 - version = "unstable-2022-04-21"; 51 + version = "unstable-2023-09-02"; 50 52 51 53 src = fetchFromGitHub { 52 54 owner = "google"; 53 55 repo = pname; 54 - rev = "8b145a6c89dcdb4ec28173339dd176fb7b6f43ed"; 55 - hash = "sha256-+xFYlUs13khT6r475eJJ+XS875h2sb+YbJ8ZN4MOSAA="; 56 + rev = "8e90b2d2f532bcd4a80069e3f37a9698209a21bc"; 57 + hash = "sha256-LuNCND/NXoNbbTWv7RYQUkq2QXL1qXR27uHwFIz0DXg="; 56 58 }; 57 59 58 60 buildInputs = [ ··· 62 64 63 65 nativeBuildInputs = [ 64 66 cmake 67 + makeWrapper 65 68 pkg-config 66 69 python3 67 70 ] ++ lib.optionals stdenv.isDarwin [ ··· 69 72 ]; 70 73 71 74 # Tests are disabled so we do not have to pull in googletest and more dependencies 72 - cmakeFlags = [ "-DAMBER_SKIP_TESTS=ON" ]; 75 + cmakeFlags = [ "-DAMBER_SKIP_TESTS=ON" "-DAMBER_DISABLE_WERROR=ON" ]; 73 76 74 77 prePatch = '' 75 78 cp -r ${glslang}/ third_party/glslang ··· 79 82 cp -r ${spirv-headers}/ third_party/spirv-headers 80 83 chmod u+w -R third_party 81 84 82 - substituteInPlace CMakeLists.txt \ 83 - --replace "-Werror" "" 84 85 substituteInPlace tools/update_build_version.py \ 85 86 --replace "not os.path.exists(directory)" "True" 86 87 ''; 87 88 88 89 installPhase = '' 89 90 install -Dm755 -t $out/bin amber image_diff 91 + wrapProgram $out/bin/amber \ 92 + --suffix VK_LAYER_PATH : ${vulkan-validation-layers}/share/vulkan/explicit_layer.d 90 93 ''; 91 94 92 95 meta = with lib; {
+2 -2
pkgs/tools/misc/cyberchef/default.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "cyberchef"; 8 - version = "10.6.0"; 8 + version = "10.7.0"; 9 9 10 10 src = fetchzip { 11 11 url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; 12 - sha256 = "sha256-vJ2NbD0SqUd5HKkjaZXPxn48xC1vMS95dnmp+u2W1SM="; 12 + sha256 = "sha256-/miIdPP00vIh3Em8BFDoxkYFpgU4Vty4V5RiCgqOKPo="; 13 13 stripRoot = false; 14 14 }; 15 15
+4 -1
pkgs/tools/misc/dust/default.nix pkgs/by-name/du/dust/package.nix
··· 1 1 { stdenv, lib, fetchFromGitHub, rustPlatform, AppKit, installShellFiles }: 2 2 3 3 rustPlatform.buildRustPackage rec { 4 + # Originally, this package was under the attribute `du-dust`, since `dust` was taken. 5 + # Since then, `dust` has been freed up, allowing this package to take that attribute. 6 + # However in order for tools like `nix-env` to detect package updates, keep `du-dust` for pname. 4 7 pname = "du-dust"; 5 8 version = "0.9.0"; 6 9 ··· 8 11 owner = "bootandy"; 9 12 repo = "dust"; 10 13 rev = "v${version}"; 11 - sha256 = "sha256-5X7gRMTUrG6ecZnwExBTadOJo/HByohTMDsgxFmp1HM="; 14 + hash = "sha256-5X7gRMTUrG6ecZnwExBTadOJo/HByohTMDsgxFmp1HM="; 12 15 # Remove unicode file names which leads to different checksums on HFS+ 13 16 # vs. other filesystems because of unicode normalisation. 14 17 postFetch = ''
+3 -3
pkgs/tools/misc/gotify-desktop/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "gotify-desktop"; 5 - version = "1.3.3"; 5 + version = "1.3.4"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "desbma"; 9 9 repo = pname; 10 10 rev = version; 11 - sha256 = "sha256-vyOXZQ2X/LT/saBxcEbD96U34ufxjcWTHAobGI3bAE4="; 11 + sha256 = "sha256-TuqzwmKB48xcdzrAr7MvDA9JChobraESQZPKoy24mPE="; 12 12 }; 13 13 14 - cargoHash = "sha256-MNxHJ1iirHj78wq6ChDjr6mQS0UmHPjVMs1EPFZyTV0="; 14 + cargoHash = "sha256-vg3al+eH9Q4D/T56jwWBlBT4IhuggiEVBl8WoZmUS2Y="; 15 15 16 16 nativeBuildInputs = [ pkg-config ]; 17 17
+1 -1
pkgs/tools/misc/hdfview/default.nix
··· 67 67 meta = { 68 68 description = "A visual tool for browsing and editing HDF4 and HDF5 files"; 69 69 license = lib.licenses.free; # BSD-like 70 - homepage = "https://portal.hdfgroup.org/display/HDFVIEW/HDFView"; 70 + homepage = "https://www.hdfgroup.org/downloads/hdfview"; 71 71 platforms = lib.platforms.linux ++ lib.platforms.darwin; 72 72 maintainers = with lib.maintainers; [ jiegec ]; 73 73 mainProgram = "HDFView";
+15 -3
pkgs/tools/misc/hid-tools/default.nix
··· 5 5 6 6 python3.pkgs.buildPythonPackage rec { 7 7 pname = "hid-tools"; 8 - version = "0.4"; 8 + version = "0.7"; 9 9 10 - format = "setuptools"; 10 + format = "pyproject"; 11 11 12 12 src = fetchFromGitLab { 13 13 domain = "gitlab.freedesktop.org"; 14 14 owner = "libevdev"; 15 15 repo = "hid-tools"; 16 16 rev = version; 17 - hash = "sha256-pxU1BvB+rjc5sptafMGnWi+vWPNDyCyUv8gTWg6z5hU="; 17 + hash = "sha256-h880jJcZDc9pIPf+nr30wu2i9y3saAKFZpooJ4MF67E="; 18 18 }; 19 19 20 + nativeBuildInputs = with python3.pkgs; [ 21 + hatchling 22 + pypandoc 23 + ]; 24 + 20 25 propagatedBuildInputs = with python3.pkgs; [ 21 26 libevdev 22 27 parse 23 28 pyyaml 24 29 click 25 30 pyudev 31 + typing-extensions 26 32 ]; 27 33 28 34 nativeCheckInputs = with python3.pkgs; [ ··· 30 36 ]; 31 37 32 38 # Tests require /dev/uhid 39 + # https://gitlab.freedesktop.org/libevdev/hid-tools/-/issues/18#note_166353 33 40 doCheck = false; 41 + 42 + postPatch = '' 43 + substituteInPlace pyproject.toml \ 44 + --replace-fail "pypandoc_binary" "pypandoc" 45 + ''; 34 46 35 47 meta = with lib; { 36 48 description = "Python scripts to manipulate HID data";
-1
pkgs/tools/misc/ipxe/default.nix
··· 107 107 { description = "Network boot firmware"; 108 108 homepage = "https://ipxe.org/"; 109 109 license = licenses.gpl2Only; 110 - maintainers = with maintainers; [ ehmry ]; 111 110 platforms = platforms.linux; 112 111 }; 113 112 }
+3 -3
pkgs/tools/misc/mise/default.nix
··· 17 17 18 18 rustPlatform.buildRustPackage rec { 19 19 pname = "mise"; 20 - version = "2024.2.4"; 20 + version = "2024.2.5"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "jdx"; 24 24 repo = "mise"; 25 25 rev = "v${version}"; 26 - hash = "sha256-SBfnfEY2ostzVWUWPB1f381XnzcNpkqeV+L9xRcRYaw="; 26 + hash = "sha256-dShe8h1aRDZPwzCKAhJag5xfylYqWJuCiB9A4afV8g0="; 27 27 }; 28 28 29 - cargoHash = "sha256-Q63h6ln1uswyvAhWlKhMLJGCZRJCbY3Rovu+jJ1O+0c="; 29 + cargoHash = "sha256-3yV26WZid5e7H9UsAaKLjSvL1MSQ+M5BjBR5Mt701Io="; 30 30 31 31 nativeBuildInputs = [ installShellFiles pkg-config ]; 32 32 buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
+2 -2
pkgs/tools/misc/moar/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "moar"; 5 - version = "1.23.0"; 5 + version = "1.23.4"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "walles"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - hash = "sha256-tnFJKHrK1QlACYsiLlc5EX3du4H+nekEaeV+7wUsx48="; 11 + hash = "sha256-gttx2AQMSaU7JE/UwZsUwsgTbUmkQKvCzlt+TuTGP0A="; 12 12 }; 13 13 14 14 vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE=";
+2 -2
pkgs/tools/misc/mongodb-compass/default.nix
··· 33 33 }: 34 34 35 35 let 36 - version = "1.41.0"; 36 + version = "1.42.0"; 37 37 38 38 rpath = lib.makeLibraryPath [ 39 39 alsa-lib ··· 82 82 if stdenv.hostPlatform.system == "x86_64-linux" then 83 83 fetchurl { 84 84 url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; 85 - sha256 = "sha256-uVIN2oSpaRSeJK1bhjzMqSMmnQm+1i6xsw1RWjmsvGY="; 85 + sha256 = "sha256-Y4ULngeAFljjQG9KTWhU/fIEXBUqbEx2qSakYYnOJoQ="; 86 86 } 87 87 else 88 88 throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
+2 -2
pkgs/tools/misc/plantuml/default.nix
··· 1 1 { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: 2 2 3 3 stdenv.mkDerivation rec { 4 - version = "1.2024.0"; 4 + version = "1.2024.1"; 5 5 pname = "plantuml"; 6 6 7 7 src = fetchurl { 8 8 url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; 9 - sha256 = "sha256-jpO4BhOyTS9y2e9d3AK911HDQa04zhPeFGyhz1FJN+Q="; 9 + sha256 = "sha256-lXo8eU6IX4JQFfhNUM2h6fi0HkShiwLsjMRTNbwLYwk="; 10 10 }; 11 11 12 12 nativeBuildInputs = [ makeWrapper ];
-46
pkgs/tools/networking/curl/configure-ipv6-autodetect.diff
··· 1 - diff --git a/configure b/configure 2 - index 04d1de1..5de1b41 100755 3 - --- a/configure 4 - +++ b/configure 5 - @@ -24949,15 +24949,12 @@ else $as_nop 6 - # include <netinet/in6.h> 7 - #endif 8 - #endif 9 - -#include <stdlib.h> /* for exit() */ 10 - -main() 11 - + 12 - +int main(void) 13 - { 14 - struct sockaddr_in6 s; 15 - (void)s; 16 - - if (socket(AF_INET6, SOCK_STREAM, 0) < 0) 17 - - exit(1); 18 - - else 19 - - exit(0); 20 - + return socket(AF_INET6, SOCK_STREAM, 0) < 0; 21 - } 22 - 23 - 24 - diff --git a/configure.ac b/configure.ac 25 - index 2d71c83..bd38dd9 100644 26 - --- a/configure.ac 27 - +++ b/configure.ac 28 - @@ -1679,15 +1679,12 @@ AS_HELP_STRING([--disable-ipv6],[Disable IPv6 support]), 29 - # include <netinet/in6.h> 30 - #endif 31 - #endif 32 - -#include <stdlib.h> /* for exit() */ 33 - -main() 34 - + 35 - +int main(void) 36 - { 37 - struct sockaddr_in6 s; 38 - (void)s; 39 - - if (socket(AF_INET6, SOCK_STREAM, 0) < 0) 40 - - exit(1); 41 - - else 42 - - exit(0); 43 - + return socket(AF_INET6, SOCK_STREAM, 0) < 0; 44 - } 45 - ]]) 46 - ],
+15 -8
pkgs/tools/networking/curl/default.nix
··· 33 33 , haskellPackages 34 34 , ocamlPackages 35 35 , phpExtensions 36 + , pkgsStatic 36 37 , python3 37 38 , tests 38 39 , testers ··· 48 49 49 50 stdenv.mkDerivation (finalAttrs: { 50 51 pname = "curl"; 51 - version = "8.5.0"; 52 + version = "8.6.0"; 52 53 53 54 src = fetchurl { 54 55 urls = [ 55 56 "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz" 56 57 "https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" 57 58 ]; 58 - hash = "sha256-QquNueINgpCjtjPn+7POwV2zTfZf0QFe+KweRyN1Dus="; 59 + hash = "sha256-PM1V2Rr5UWU534BiX4GMc03G8uz5utozx2dl6ZEh2xU="; 59 60 }; 60 61 61 - patches = [ 62 - # fix ipv6 autodetect compile error in configure script 63 - # remove once https://github.com/curl/curl/pull/12607 released (8.6.0) 64 - ./configure-ipv6-autodetect.diff 65 - ]; 62 + postPatch = '' 63 + patchShebangs scripts 64 + ''; 66 65 67 66 outputs = [ "bin" "dev" "out" "man" "devdoc" ]; 68 67 separateDebugInfo = stdenv.isLinux; ··· 104 103 preConfigure = '' 105 104 sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure 106 105 rm src/tool_hugehelp.c 106 + '' + lib.optionalString (pslSupport && stdenv.hostPlatform.isStatic) '' 107 + # curl doesn't understand that libpsl2 has deps because it doesn't use 108 + # pkg-config. 109 + # https://github.com/curl/curl/pull/12919 110 + configureFlagsArray+=("LIBS=-lidn2 -lunistring") 107 111 ''; 108 112 109 113 configureFlags = [ ··· 120 124 (lib.withFeature rtmpSupport "librtmp") 121 125 (lib.withFeature rustlsSupport "rustls") 122 126 (lib.withFeature zstdSupport "zstd") 127 + (lib.withFeature pslSupport "libpsl") 123 128 (lib.withFeatureAs brotliSupport "brotli" (lib.getDev brotli)) 124 129 (lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls)) 125 130 (lib.withFeatureAs idnSupport "libidn2" (lib.getDev libidn2)) ··· 180 185 inherit opensslSupport openssl; 181 186 tests = { 182 187 withCheck = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); 183 - fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; }; 184 188 curlpp = useThisCurl curlpp; 185 189 coeurl = useThisCurl coeurl; 186 190 haskell-curl = useThisCurl haskellPackages.curl; ··· 192 196 # nginx-http3 = useThisCurl nixosTests.nginx-http3; 193 197 nginx-http3 = nixosTests.nginx-http3; 194 198 pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 199 + static = pkgsStatic.curl; 200 + } // lib.optionalAttrs (!stdenv.isDarwin) { 201 + fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; }; 195 202 }; 196 203 }; 197 204
+3 -3
pkgs/tools/networking/dhcpcd/default.nix
··· 11 11 12 12 stdenv.mkDerivation rec { 13 13 pname = "dhcpcd"; 14 - version = "10.0.3"; 14 + version = "10.0.6"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "NetworkConfiguration"; 18 18 repo = "dhcpcd"; 19 19 rev = "v${version}"; 20 - sha256 = "sha256-NXLOfSPGHiRDSagaT+37TAn9XtdcG4+wP9AvyGJi4Dc="; 20 + sha256 = "sha256-tNC5XCA8dShaTIff15mQz8v+YK9sZkRNLCX5qnlpxx4="; 21 21 }; 22 22 23 23 nativeBuildInputs = [ pkg-config ]; ··· 26 26 runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts 27 27 ]; 28 28 29 - prePatch = '' 29 + postPatch = '' 30 30 substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell} 31 31 ''; 32 32
+2 -2
pkgs/tools/networking/openapi-generator-cli/default.nix
··· 1 1 { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: 2 2 3 3 let this = stdenv.mkDerivation (finalAttrs: { 4 - version = "7.2.0"; 4 + version = "7.3.0"; 5 5 pname = "openapi-generator-cli"; 6 6 7 7 jarfilename = "${finalAttrs.pname}-${finalAttrs.version}.jar"; ··· 12 12 13 13 src = fetchurl { 14 14 url = "mirror://maven/org/openapitools/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.jarfilename}"; 15 - sha256 = "sha256-HPDIDeEsD9yFlCicGeQUtAIQjvELjdC/2hlTFRNBq10="; 15 + sha256 = "sha256-h5wVNAp1oZp+cg78JCwyI+DkIHsGlNbRzqXH3YfPHM4="; 16 16 }; 17 17 18 18 dontUnpack = true;
+3 -3
pkgs/tools/networking/proxify/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "proxify"; 8 - version = "0.0.12"; 8 + version = "0.0.13"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "projectdiscovery"; 12 12 repo = "proxify"; 13 13 rev = "refs/tags/v${version}"; 14 - hash = "sha256-j2FuyoTCc9mcoI683xZkMCL6QXy0dGEheNaormlgUvY="; 14 + hash = "sha256-5sicN/Z26nkxtU/6vDkEMBxyRNHIP7hQ+BvzHuQqBhw="; 15 15 }; 16 16 17 - vendorHash = "sha256-kPj3KBi8Mbsj4BW7Vf1w4mW8EN07FuqgFhAkkLCl8Bc="; 17 + vendorHash = "sha256-90wNln2C5/K1WfX8rv6kKQpHMpxW3hv5zpZpCSHy8ys="; 18 18 19 19 meta = with lib; { 20 20 description = "Proxy tool for HTTP/HTTPS traffic capture";
+2 -2
pkgs/tools/package-management/dnf5/default.nix
··· 30 30 31 31 stdenv.mkDerivation (finalAttrs: { 32 32 pname = "dnf5"; 33 - version = "5.1.10"; 33 + version = "5.1.12"; 34 34 35 35 outputs = [ "out" "man" ]; 36 36 ··· 38 38 owner = "rpm-software-management"; 39 39 repo = "dnf5"; 40 40 rev = finalAttrs.version; 41 - hash = "sha256-u+UiiCl67VtIedW4kn3fycafkgBVsFFkWQcN3NXQKl4="; 41 + hash = "sha256-AzyFc+fBQyyCNzr8ulMEtFEotdUzStsyYOv9ppcIBw4="; 42 42 }; 43 43 44 44 nativeBuildInputs = [
+2 -2
pkgs/tools/package-management/libdnf/default.nix
··· 24 24 25 25 stdenv.mkDerivation rec { 26 26 pname = "libdnf"; 27 - version = "0.72.0"; 27 + version = "0.73.0"; 28 28 29 29 outputs = [ "out" "dev" "py" ]; 30 30 ··· 32 32 owner = "rpm-software-management"; 33 33 repo = pname; 34 34 rev = "refs/tags/${version}"; 35 - hash = "sha256-Ou7cXJz4g8cx2KjeX+IFRA2m158PGKcb9jCXFuAOKqU="; 35 + hash = "sha256-zduxlroqo7aeQYhiTWmEK47YG/ll8hLH/d3xtXdcYhk="; 36 36 }; 37 37 38 38 nativeBuildInputs = [
+7 -7
pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch
··· 1 1 diff --git a/pthread_stop_world.c b/pthread_stop_world.c 2 - index b5d71e62..aed7b0bf 100644 2 + index 2b45489..0e6d8ef 100644 3 3 --- a/pthread_stop_world.c 4 4 +++ b/pthread_stop_world.c 5 - @@ -768,6 +768,8 @@ STATIC void GC_restart_handler(int sig) 5 + @@ -776,6 +776,8 @@ STATIC void GC_restart_handler(int sig) 6 6 /* world is stopped. Should not fail if it isn't. */ 7 7 GC_INNER void GC_push_all_stacks(void) 8 8 { ··· 11 11 GC_bool found_me = FALSE; 12 12 size_t nthreads = 0; 13 13 int i; 14 - @@ -851,6 +853,31 @@ GC_INNER void GC_push_all_stacks(void) 15 - hi = p->altstack + p->altstack_size; 14 + @@ -868,6 +870,31 @@ GC_INNER void GC_push_all_stacks(void) 15 + hi = p->altstack + p->altstack_size; 16 + # endif 16 17 /* FIXME: Need to scan the normal stack too, but how ? */ 17 - /* FIXME: Assume stack grows down */ 18 18 + } else { 19 19 + if (pthread_getattr_np(p->id, &pattr)) { 20 20 + ABORT("GC_push_all_stacks: pthread_getattr_np failed!"); ··· 41 41 + #error "STACK_GROWS_UP not supported in boost_coroutine2 (as of june 2021), so we don't support it in Nix." 42 42 + #endif 43 43 } 44 - GC_push_all_stack_sections(lo, hi, traced_stack_sect); 45 - # ifdef STACK_GROWS_UP 44 + # ifdef STACKPTR_CORRECTOR_AVAILABLE 45 + if (GC_sp_corrector != 0)
+103
pkgs/tools/security/bitwarden-directory-connector/default.nix
··· 1 + { 2 + lib, 3 + buildNpmPackage, 4 + electron, 5 + fetchFromGitHub, 6 + buildPackages, 7 + python3, 8 + pkg-config, 9 + libsecret, 10 + nodejs_18, 11 + }: 12 + 13 + let 14 + common = { name, npmBuildScript, installPhase }: buildNpmPackage rec { 15 + pname = name; 16 + version = "2023.10.0"; 17 + nodejs = nodejs_18; 18 + 19 + src = fetchFromGitHub { 20 + owner = "bitwarden"; 21 + repo = "directory-connector"; 22 + rev = "v${version}"; 23 + hash = "sha256-PlOtTh+rpTxAv8ajHBDHZuL7yeeLVpbAfKEDPQlejIg="; 24 + }; 25 + 26 + postPatch = '' 27 + ${lib.getExe buildPackages.jq} 'del(.scripts.preinstall)' package.json > package.json.tmp 28 + mv -f package.json{.tmp,} 29 + 30 + substituteInPlace electron-builder.json \ 31 + --replace-fail '"afterSign": "scripts/notarize.js",' "" \ 32 + --replace-fail "AppImage" "dir" 33 + ''; 34 + 35 + npmDepsHash = "sha256-jBAWWY12qeX2EDhUvT3TQpnQvYXRsIilRrXGpVzxYvw="; 36 + 37 + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; 38 + 39 + makeCacheWritable = true; 40 + inherit npmBuildScript installPhase; 41 + 42 + buildInputs = [ 43 + libsecret 44 + ]; 45 + 46 + nativeBuildInputs = [ 47 + python3 48 + pkg-config 49 + ]; 50 + 51 + meta = with lib; { 52 + description = "LDAP connector for Bitwarden"; 53 + homepage = "https://github.com/bitwarden/directory-connector"; 54 + license = licenses.gpl3Only; 55 + maintainers = with maintainers; [ Silver-Golden SuperSandro2000 ]; 56 + platforms = platforms.linux; 57 + mainProgram = name; 58 + }; 59 + }; 60 + in { 61 + bitwarden-directory-connector = common { 62 + name = "bitwarden-directory-connector"; 63 + npmBuildScript = "build:dist"; 64 + installPhase = '' 65 + runHook preInstall 66 + 67 + npm exec electron-builder -- \ 68 + --dir \ 69 + -c.electronDist=${electron}/libexec/electron \ 70 + -c.electronVersion=${electron.version} \ 71 + -c.npmRebuild=false 72 + 73 + mkdir -p $out/share/bitwarden-directory-connector $out/bin 74 + cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/bitwarden-directory-connector 75 + 76 + makeWrapper ${lib.getExe electron} $out/bin/bitwarden-directory-connector \ 77 + --add-flags $out/share/bitwarden-directory-connector/resources/app.asar \ 78 + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ 79 + --set-default ELECTRON_IS_DEV 0 \ 80 + --inherit-argv0 81 + 82 + runHook postInstall 83 + ''; 84 + }; 85 + 86 + bitwarden-directory-connector-cli = common { 87 + name = "bitwarden-directory-connector-cli"; 88 + npmBuildScript = "build:cli:prod"; 89 + installPhase = '' 90 + runHook preInstall 91 + 92 + mkdir -p $out/libexec/bitwarden-directory-connector 93 + cp -R build-cli node_modules $out/libexec/bitwarden-directory-connector 94 + 95 + # needs to be wrapped with nodejs so that it can be executed 96 + chmod +x $out/libexec/bitwarden-directory-connector/build-cli/bwdc.js 97 + mkdir -p $out/bin 98 + ln -s $out/libexec/bitwarden-directory-connector/build-cli/bwdc.js $out/bin/bitwarden-directory-connector-cli 99 + 100 + runHook postInstall 101 + ''; 102 + }; 103 + }
+6 -6
pkgs/tools/security/bitwarden/default.nix
··· 3 3 , cargo 4 4 , copyDesktopItems 5 5 , dbus 6 - , electron_27 6 + , electron_28 7 7 , fetchFromGitHub 8 8 , fetchpatch2 9 9 , glib ··· 27 27 let 28 28 description = "A secure and free password manager for all of your devices"; 29 29 icon = "bitwarden"; 30 - electron = electron_27; 30 + electron = electron_28; 31 31 in buildNpmPackage rec { 32 32 pname = "bitwarden"; 33 - version = "2024.1.0"; 33 + version = "2024.2.0"; 34 34 35 35 src = fetchFromGitHub { 36 36 owner = "bitwarden"; 37 37 repo = "clients"; 38 38 rev = "desktop-v${version}"; 39 - hash = "sha256-lDDy1b1yfw3nZrwEEkpvh6xYucgn20XHsGACc45eb2w="; 39 + hash = "sha256-nCjcwe+7Riml/J0hAVv/t6/oHIDPhwFD5A3iQ/LNR5Y="; 40 40 }; 41 41 42 42 patches = [ ··· 52 52 makeCacheWritable = true; 53 53 npmFlags = [ "--legacy-peer-deps" ]; 54 54 npmWorkspace = "apps/desktop"; 55 - npmDepsHash = "sha256-RR8Ua41D9SXymiPuabOnIab3byu8DR63rOfdeTaQpy4="; 55 + npmDepsHash = "sha256-GJl9pVwFWEg9yku9IXLcu2XMJZz+ZoQOxCf1TrW715Y="; 56 56 57 57 cargoDeps = rustPlatform.fetchCargoTarball { 58 58 name = "${pname}-${version}"; ··· 68 68 patches; 69 69 patchFlags = [ "-p4" ]; 70 70 sourceRoot = "${src.name}/${cargoRoot}"; 71 - hash = "sha256-EiJjIWiyu8MvX3Tj0Fkeh0T0El5kdCko2maiY6kkPPA="; 71 + hash = "sha256-KJUz5hvdsurnohUWRZedXvuWMnLtR0dcdTeHtJGrZBs="; 72 72 }; 73 73 cargoRoot = "apps/desktop/desktop_native"; 74 74
+18 -8
pkgs/tools/security/bkcrack/default.nix
··· 2 2 , stdenv 3 3 , fetchFromGitHub 4 4 , cmake 5 + , nix-update-script 5 6 }: 6 7 7 - stdenv.mkDerivation rec { 8 + stdenv.mkDerivation (finalAttrs: { 8 9 pname = "bkcrack"; 9 - version = "1.6.0"; 10 + version = "1.6.1"; 10 11 11 12 src = fetchFromGitHub { 12 13 owner = "kimci86"; 13 - repo = pname; 14 - rev = "v${version}"; 15 - hash = "sha256-VfPRX9lOPyen8CujiBtTCbD5e7xd9X2OQ1uZ6JWKwtY="; 14 + repo = "bkcrack"; 15 + rev = "v${finalAttrs.version}"; 16 + hash = "sha256-x7JK7+DcD2uSWZRTJQPGCcF2mHBlu6FwYUbuYzbvD+s="; 16 17 }; 18 + 19 + passthru.updateScript = nix-update-script { }; 17 20 18 21 nativeBuildInputs = [ cmake ]; 19 22 23 + cmakeFlags = [ 24 + "-DBKCRACK_BUILD_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}" 25 + ]; 26 + 20 27 postInstall = '' 21 - mkdir -p $out/bin $out/share/licenses/bkcrack 28 + mkdir -p $out/bin $out/share/doc/bkcrack $out/share/licenses/bkcrack 22 29 mv $out/bkcrack $out/bin/ 23 30 mv $out/license.txt $out/share/licenses/bkcrack 24 - rm -r $out/example $out/tools $out/readme.md 31 + mv $out/example $out/tools $out/readme.md $out/share/doc/bkcrack 25 32 ''; 33 + 34 + doCheck = true; 26 35 27 36 meta = with lib; { 28 37 description = "Crack legacy zip encryption with Biham and Kocher's known plaintext attack"; ··· 30 39 license = licenses.zlib; 31 40 platforms = platforms.unix; 32 41 maintainers = with maintainers; [ erdnaxe ]; 42 + mainProgram = "bkcrack"; 33 43 }; 34 - } 44 + })
+14 -10
pkgs/tools/security/cfripper/default.nix
··· 5 5 6 6 python3.pkgs.buildPythonApplication rec { 7 7 pname = "cfripper"; 8 - version = "1.15.2"; 8 + version = "1.15.3"; 9 + pyproject = true; 9 10 10 11 src = fetchFromGitHub { 11 12 owner = "Skyscanner"; 12 - repo = pname; 13 - rev = "refs/tags/${version}"; 13 + repo = "cfripper"; 14 + rev = "refs/tags/v${version}"; 14 15 hash = "sha256-SmD3Dq5LicPRe3lWFsq4zqM/yDZ1LsgRwSUA5/RbN9I="; 15 16 }; 16 17 18 + postPatch = '' 19 + substituteInPlace setup.py \ 20 + --replace "pluggy~=0.13.1" "pluggy" \ 21 + ''; 22 + 23 + nativeBuildInputs = with python3.pkgs; [ 24 + setuptools 25 + ]; 26 + 17 27 propagatedBuildInputs = with python3.pkgs; [ 18 28 boto3 19 29 cfn-flip ··· 30 40 pytestCheckHook 31 41 ]; 32 42 33 - postPatch = '' 34 - substituteInPlace setup.py \ 35 - --replace "click~=7.1.1" "click" \ 36 - --replace "pluggy~=0.13.1" "pluggy" \ 37 - --replace "pydash~=4.7.6" "pydash" 38 - ''; 39 - 40 43 disabledTestPaths = [ 41 44 # Tests are failing 42 45 "tests/test_boto3_client.py" ··· 55 58 meta = with lib; { 56 59 description = "Tool for analysing CloudFormation templates"; 57 60 homepage = "https://github.com/Skyscanner/cfripper"; 61 + changelog = "https://github.com/Skyscanner/cfripper/releases/tag/v${version}"; 58 62 license = with licenses; [ asl20 ]; 59 63 maintainers = with maintainers; [ fab ]; 60 64 };
+3 -3
pkgs/tools/security/cnquery/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "cnquery"; 8 - version = "10.1.4"; 8 + version = "10.2.0"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "mondoohq"; 12 12 repo = "cnquery"; 13 13 rev = "v${version}"; 14 - hash = "sha256-JQg1tQs+WojtSweA+tP37LqKH8l+CkTEwvoTjKwg3S0="; 14 + hash = "sha256-bz4a4+mgssrRBthkN87aYxlZV6as2uocFvBKrKLmy8A="; 15 15 }; 16 16 17 17 subPackages = [ "apps/cnquery" ]; 18 18 19 - vendorHash = "sha256-+tKz2Zy+tmqOVj9NoYe5lfqmzgBxVkNJOh4/9o9XfmY="; 19 + vendorHash = "sha256-vq6R2FgvoET8SLTpktGLoFzZHqnmizDp0fWU7kqlLgU="; 20 20 21 21 meta = with lib; { 22 22 description = "cloud-native, graph-based asset inventory";
+2 -2
pkgs/tools/security/gnupg/24.nix
··· 13 13 14 14 stdenv.mkDerivation rec { 15 15 pname = "gnupg"; 16 - version = "2.4.3"; 16 + version = "2.4.4"; 17 17 18 18 src = fetchurl { 19 19 url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; 20 - hash = "sha256-onGubXMvb02AwlitnuiN2clMj9wzw+RTKMTXwSa9IZ0="; 20 + hash = "sha256-Z+vgFsqQ+naIzmejh+vYLGJh6ViX23sj3yT/M1voW8Y="; 21 21 }; 22 22 23 23 depsBuildBuild = [ buildPackages.stdenv.cc ];
+3 -3
pkgs/tools/security/osv-scanner/default.nix
··· 6 6 }: 7 7 buildGoModule rec { 8 8 pname = "osv-scanner"; 9 - version = "1.6.1"; 9 + version = "1.6.2"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "google"; 13 13 repo = pname; 14 14 rev = "v${version}"; 15 - hash = "sha256-ddzdOk2sHNzjCM4cLJY+H9h13MjamlC1RYcnOcDGV4M="; 15 + hash = "sha256-/V0zn4Aic6tBJw23YJWkyeCZXf/ehIZlKWd9TZXe40Y="; 16 16 }; 17 17 18 - vendorHash = "sha256-9cE4UcQipJYwQDZA4jlcV68BBTgft7oRVlngg/PAmWI="; 18 + vendorHash = "sha256-wIXc0YYTdcnUBNbypVwZJ/RNTmaeMteEujmgs5WJ1g0="; 19 19 20 20 subPackages = [ 21 21 "cmd/osv-scanner"
+10 -2
pkgs/tools/security/pcsclite/default.nix
··· 21 21 inherit pname; 22 22 version = "2.0.1"; 23 23 24 - outputs = [ "bin" "out" "dev" "doc" "man" ]; 24 + outputs = [ "out" "lib" "dev" "doc" "man" ]; 25 25 26 26 src = fetchFromGitLab { 27 27 domain = "salsa.debian.org"; ··· 39 39 (lib.enableFeature polkitSupport "polkit") 40 40 ] ++ lib.optionals stdenv.isLinux [ 41 41 "--enable-ipcdir=/run/pcscd" 42 - "--with-systemdsystemunitdir=${placeholder "bin"}/lib/systemd/system" 42 + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" 43 43 ]; 44 44 45 45 makeFlags = [ 46 46 "POLICY_DIR=$(out)/share/polkit-1/actions" 47 47 ]; 48 + 49 + # disable building pcsc-wirecheck{,-gen} when cross compiling 50 + # see also: https://github.com/LudovicRousseau/PCSC/issues/25 51 + postPatch = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' 52 + substituteInPlace src/Makefile.am \ 53 + --replace "noinst_PROGRAMS = testpcsc pcsc-wirecheck pcsc-wirecheck-gen" \ 54 + "noinst_PROGRAMS = testpcsc" 55 + ''; 48 56 49 57 postInstall = '' 50 58 # pcsc-spy is a debugging utility and it drags python into the closure
+7 -3
pkgs/tools/security/quark-engine/default.nix
··· 6 6 7 7 python3.pkgs.buildPythonApplication rec { 8 8 pname = "quark-engine"; 9 - version = "23.12.1"; 10 - format = "setuptools"; 9 + version = "24.2.1"; 10 + pyproject = true; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = pname; 14 14 repo = pname; 15 15 rev = "refs/tags/v${version}"; 16 - sha256 = "sha256-NeJGkqGpg2uOsz10gEYz/nzh21DhXSU4RgQtI1brASQ="; 16 + sha256 = "sha256-77yfysmFEneVOiejoCooi1buqEM/Ljv5xqjKv17DFWE="; 17 17 }; 18 + 19 + nativeBuildInputs = with python3.pkgs; [ 20 + setuptools 21 + ]; 18 22 19 23 propagatedBuildInputs = with python3.pkgs; [ 20 24 androguard
+33
pkgs/tools/security/tor/torsocks-gethostbyaddr-darwin.patch
··· 1 + diff --git a/tests/test_dns.c b/tests/test_dns.c 2 + index 7e07663..acf095c 100644 3 + --- a/tests/test_dns.c 4 + +++ b/tests/test_dns.c 5 + @@ -76,6 +76,8 @@ static void test_gethostbyname(const struct test_host *host) 6 + return; 7 + } 8 + 9 + +#ifdef __linux__ 10 + + 11 + static void test_gethostbyaddr_r_failed(void) 12 + { 13 + int result; 14 + @@ -129,6 +131,8 @@ static void test_gethostbyaddr_r(const struct test_host *host) 15 + ok(1, "Resolved address"); 16 + } 17 + 18 + +#endif 19 + + 20 + static void test_gethostbyaddr(const struct test_host *host) 21 + { 22 + struct hostent *he; 23 + @@ -199,8 +203,10 @@ int main(int argc, char **argv) 24 + test_getaddrinfo(&tor_check); 25 + test_gethostbyname(&tor_dir_auth1); 26 + test_gethostbyaddr(&tor_dir_auth2); 27 + +#ifdef __linux__ 28 + test_gethostbyaddr_r(&tor_dir_auth2); 29 + test_gethostbyaddr_r_failed(); 30 + +#endif 31 + test_getaddrinfo(&tor_localhost); 32 + 33 + end:
+33 -14
pkgs/tools/security/tor/torsocks.nix
··· 1 - { lib, stdenv, fetchgit, fetchurl, autoreconfHook, libcap }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitLab 4 + , fetchpatch 5 + , autoreconfHook 6 + , libcap 7 + }: 2 8 3 9 stdenv.mkDerivation rec { 4 10 pname = "torsocks"; 5 - version = "2.3.0"; 11 + version = "2.4.0"; 6 12 7 - src = fetchgit { 8 - url = "https://git.torproject.org/torsocks.git"; 9 - rev = "refs/tags/v${version}"; 10 - sha256 = "0x0wpcigf22sjxg7bm0xzqihmsrz51hl4v8xf91qi4qnmr4ny1hb"; 13 + src = fetchFromGitLab { 14 + domain = "gitlab.torproject.org"; 15 + group = "tpo"; 16 + owner = "core"; 17 + repo = "torsocks"; 18 + rev = "v${version}"; 19 + sha256 = "sha256-ocJkoF9LMLC84ukFrm5pzjp/1gaXqDz8lzr9TdG+f88="; 11 20 }; 12 21 13 - nativeBuildInputs = [ autoreconfHook ]; 14 - 15 - patches = lib.optional stdenv.isDarwin 16 - (fetchurl { 17 - url = "https://trac.torproject.org/projects/tor/raw-attachment/ticket/28538/0001-Fix-macros-for-accept4-2.patch"; 18 - sha256 = "97881f0b59b3512acc4acb58a0d6dfc840d7633ead2f400fad70dda9b2ba30b0"; 19 - }); 22 + patches = [ 23 + # fix compatibility with C99 24 + # https://gitlab.torproject.org/tpo/core/torsocks/-/merge_requests/9 25 + (fetchpatch { 26 + url = "https://gitlab.torproject.org/tpo/core/torsocks/-/commit/1171bf2fd4e7a0cab02cf5fca59090b65af9cd29.patch"; 27 + hash = "sha256-qu5/0fy72+02QI0cVE/6YrR1kPuJxsZfG8XeODqVOPY="; 28 + }) 29 + # tsocks_libc_accept4 only exists on Linux, use tsocks_libc_accept on other platforms 30 + (fetchpatch { 31 + url = "https://gitlab.torproject.org/tpo/core/torsocks/uploads/eeec9833512850306a42a0890d283d77/0001-Fix-macros-for-accept4-2.patch"; 32 + hash = "sha256-XWi8+UFB8XgBFSl5QDJ+hLu/dH4CvAwYbeZz7KB10Bs="; 33 + }) 34 + # no gethostbyaddr_r on darwin 35 + ./torsocks-gethostbyaddr-darwin.patch 36 + ]; 20 37 21 38 postPatch = '' 22 39 # Patch torify_app() ··· 29 46 src/bin/torsocks.in 30 47 ''; 31 48 49 + nativeBuildInputs = [ autoreconfHook ]; 50 + 32 51 doInstallCheck = true; 33 52 installCheckTarget = "check-recursive"; 34 53 35 54 meta = { 36 55 description = "Wrapper to safely torify applications"; 37 - homepage = "https://github.com/dgoulet/torsocks"; 56 + homepage = "https://gitlab.torproject.org/tpo/core/torsocks"; 38 57 license = lib.licenses.gpl2; 39 58 platforms = lib.platforms.unix; 40 59 maintainers = with lib.maintainers; [ thoughtpolice ];
-1
pkgs/tools/system/amtterm/default.nix
··· 22 22 { description = "Intel AMT® SoL client + tools"; 23 23 homepage = "https://www.kraxel.org/cgit/amtterm/"; 24 24 license = licenses.gpl2; 25 - maintainers = [ maintainers.ehmry ]; 26 25 platforms = platforms.linux; 27 26 }; 28 27 })
+7
pkgs/tools/system/efivar/default.nix
··· 29 29 url = "https://github.com/rhboot/efivar/commit/cece3ffd5be2f8641eb694513f2b73e5eb97ffd3.patch"; 30 30 sha256 = "7/E0gboU0A45/BY6jGPLuvds6qKtNjzpgKgdNTaVaZQ="; 31 31 }) 32 + 33 + # Fix build against gcc-13: https://github.com/rhboot/efivar/pull/242 34 + (fetchpatch { 35 + name = "gcc-13.patch"; 36 + url = "https://github.com/rhboot/efivar/commit/52fece47d4f3ebd588bd85598bfc7a0142365f7e.patch"; 37 + hash = "sha256-tOmxbY7kD6kzbBZ2RhQ5gCCpHtu+2gRNa7VUAWdCKu0="; 38 + }) 32 39 ]; 33 40 34 41 nativeBuildInputs = [ pkg-config mandoc ];
+3 -3
pkgs/tools/system/netdata/go.d.plugin.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "netdata-go-plugins"; 5 - version = "0.58.0"; 5 + version = "0.58.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "netdata"; 9 9 repo = "go.d.plugin"; 10 10 rev = "v${version}"; 11 - hash = "sha256-XZBF0uNXTo5UcBuhMVznij+QGhHM06j5J2xflZf40kI="; 11 + hash = "sha256-zzHm98jec7MXnzVsrLlYIk+ILA3Ei43853dM1LdFz5c="; 12 12 }; 13 13 14 - vendorHash = "sha256-bdW6ZDMYVFGWD7KEDU2kaoccgwbOPl7ADnZ1npGBLAc="; 14 + vendorHash = "sha256-eb+GRFhfWxDkfH4x2VF3ogyT5z4OcIoqHtEVJ1tGsdA="; 15 15 16 16 doCheck = false; 17 17
+12 -3
pkgs/tools/text/grip-search/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, boost, pkg-config, cmake, catch2 }: 1 + { lib, stdenv, fetchFromGitHub, fetchpatch, boost, pkg-config, cmake, catch2 }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "grip-search"; ··· 17 17 18 18 buildInputs = [ boost ]; 19 19 20 - patchPhase = '' 21 - substituteInPlace src/general/config.h --replace "CUSTOM-BUILD" "${version}" 20 + patches = [ 21 + # Can be removed after this upstream PR gets merged: https://github.com/sc0ty/grip/pull/6 22 + (fetchpatch { 23 + name = "include-cstdint.patch"; 24 + url = "https://github.com/sc0ty/grip/commit/da37b3c805306ee4ea617ce3f1487b8ee9876e50.patch"; 25 + hash = "sha256-Xh++oDn5qn5NPgng7gfeCkO5FN9OmW+8fGhDLpAJfR8="; 26 + }) 27 + ]; 28 + 29 + postPatch = '' 30 + substituteInPlace src/general/config.h --replace-fail "CUSTOM-BUILD" "${version}" 22 31 ''; 23 32 24 33 meta = with lib; {
+2
pkgs/top-level/aliases.nix
··· 141 141 cadence = throw "cadence has been removed from nixpkgs, as it was archived upstream"; # Added 2023-10-28 142 142 cask = emacs.pkgs.cask; # Added 2022-11-12 143 143 cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03 144 + cargo-espflash = espflash; 144 145 cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03 145 146 catfish = throw "'catfish' has been renamed to/replaced by 'xfce.catfish'"; # Converted to throw 2023-09-10 146 147 cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; ··· 231 232 drgeo = throw "'drgeo' has been removed as it is outdated and unmaintained"; # Added 2023-10-15 232 233 dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03 233 234 dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03 235 + du-dust = dust; # Added 2024-01-19 234 236 dylibbundler = macdylibbundler; # Added 2021-04-24 235 237 236 238 ### E ###
+17 -27
pkgs/top-level/all-packages.nix
··· 3553 3553 3554 3554 bitwarden-cli = callPackage ../tools/security/bitwarden/cli.nix { }; 3555 3555 3556 + inherit (callPackages ../tools/security/bitwarden-directory-connector { }) bitwarden-directory-connector-cli bitwarden-directory-connector; 3557 + 3556 3558 bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { }; 3557 3559 3558 3560 inherit (nodePackages) concurrently; ··· 7319 7321 7320 7322 curl = curlMinimal.override ({ 7321 7323 idnSupport = true; 7324 + pslSupport = true; 7322 7325 zstdSupport = true; 7323 7326 } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { 7324 7327 brotliSupport = true; ··· 7915 7918 7916 7919 efibootmgr = callPackage ../tools/system/efibootmgr { }; 7917 7920 7918 - efivar = disable-warnings-if-gcc13 (callPackage ../tools/system/efivar { }); 7921 + efivar = callPackage ../tools/system/efivar { }; 7919 7922 7920 7923 eget = callPackage ../tools/misc/eget { }; 7921 7924 ··· 10682 10685 10683 10686 lzip = callPackage ../tools/compression/lzip { }; 10684 10687 10685 - plzip = callPackage ../tools/compression/plzip { }; 10686 - 10687 10688 lziprecover = callPackage ../tools/compression/lziprecover { }; 10688 10689 10689 10690 xz = callPackage ../tools/compression/xz { }; ··· 16862 16863 buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; 16863 16864 16864 16865 cargo2junit = callPackage ../development/tools/rust/cargo2junit { }; 16865 - 16866 - cargo-espflash = callPackage ../development/tools/rust/cargo-espflash { 16867 - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; 16868 - }; 16869 16866 16870 16867 cargo-web = callPackage ../development/tools/rust/cargo-web { 16871 16868 inherit (darwin.apple_sdk.frameworks) CoreServices Security; ··· 20377 20374 then overrideSDK stdenv { darwinMinVersion = "10.13"; } 20378 20375 else stdenv; 20379 20376 }; 20380 - abseil-cpp = abseil-cpp_202301; 20377 + abseil-cpp = abseil-cpp_202401; 20381 20378 20382 20379 accountsservice = callPackage ../development/libraries/accountsservice { }; 20383 20380 ··· 22311 22308 22312 22309 libantlr3c = callPackage ../development/libraries/libantlr3c { }; 22313 22310 22314 - libaom = callPackage ../development/libraries/libaom { 22315 - # Remove circular dependency for libavif 22316 - libjxl = libjxl.override { buildDocs = false; }; 22317 - }; 22311 + libaom = callPackage ../development/libraries/libaom { }; 22318 22312 22319 22313 libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; }; 22320 22314 libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; ··· 22395 22389 22396 22390 libcacard = callPackage ../development/libraries/libcacard { }; 22397 22391 22398 - libcamera = callPackage ../development/libraries/libcamera { }; 22392 + libcamera-qcam = callPackage ../by-name/li/libcamera/package.nix { withQcam = true; }; 22399 22393 22400 22394 libcanberra = callPackage ../development/libraries/libcanberra { 22401 22395 inherit (darwin.apple_sdk.frameworks) Carbon CoreServices AppKit; ··· 23766 23760 }; 23767 23761 23768 23762 lyra = callPackage ../development/libraries/lyra { }; 23769 - 23770 - lzlib = callPackage ../development/libraries/lzlib { }; 23771 23763 23772 23764 lzo = callPackage ../development/libraries/lzo { }; 23773 23765 ··· 24229 24221 24230 24222 openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; 24231 24223 24232 - openldap = callPackage ../development/libraries/openldap { 24233 - openssl = openssl_legacy; 24234 - }; 24224 + openldap = callPackage ../development/libraries/openldap { }; 24235 24225 24236 24226 opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio { 24237 24227 inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa; ··· 30479 30469 30480 30470 banking = callPackage ../applications/office/banking { }; 30481 30471 30482 - baresip = callPackage ../applications/networking/instant-messengers/baresip { }; 30483 - 30484 30472 barrier = libsForQt5.callPackage ../applications/misc/barrier { }; 30485 30473 30486 30474 bashSnippets = callPackage ../applications/misc/bashSnippets { }; ··· 31067 31055 31068 31056 dunst = callPackage ../applications/misc/dunst { }; 31069 31057 31070 - du-dust = callPackage ../tools/misc/dust { 31058 + dust = callPackage ../by-name/du/dust/package.nix { 31071 31059 inherit (darwin.apple_sdk_11_0.frameworks) AppKit; 31072 31060 }; 31073 31061 ··· 31246 31234 31247 31235 espeakup = callPackage ../applications/accessibility/espeakup { }; 31248 31236 31249 - espflash = callPackage ../development/embedded/espflash { 31237 + espflash = callPackage ../by-name/es/espflash/package.nix { 31250 31238 inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; 31251 31239 }; 31252 31240 ··· 36500 36488 36501 36489 xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; 36502 36490 36503 - xdg-utils = callPackage ../tools/X11/xdg-utils { 36504 - w3m = buildPackages.w3m-batch; 36505 - }; 36491 + xdg-utils = callPackage ../tools/X11/xdg-utils {}; 36506 36492 36507 36493 xdgmenumaker = callPackage ../applications/misc/xdgmenumaker { }; 36508 36494 ··· 39053 39039 39054 39040 notus-scanner = with python3Packages; toPythonApplication notus-scanner; 39055 39041 39056 - openblas = callPackage ../development/libraries/science/math/openblas { }; 39042 + openblas = callPackage ../development/libraries/science/math/openblas { 39043 + inherit (llvmPackages) openmp; 39044 + }; 39057 39045 39058 39046 # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with 39059 39047 # standard BLAS and LAPACK. ··· 39171 39159 39172 39160 suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { }; 39173 39161 suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse/4.4.nix { }; 39174 - suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse { }; 39162 + suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse { 39163 + inherit (llvmPackages) openmp; 39164 + }; 39175 39165 suitesparse = suitesparse_5_3; 39176 39166 39177 39167 suitesparse-graphblas = callPackage ../development/libraries/science/math/suitesparse-graphblas { };
+1 -1
pkgs/top-level/java-packages.nix
··· 62 62 63 63 mkOpenjdkLinuxOnly = path-linux: args: let 64 64 openjdk = callPackage path-linux (gnomeArgs // args); 65 - in openjdk // { 65 + in assert stdenv.isLinux; openjdk // { 66 66 headless = openjdk.override { headless = true; }; 67 67 }; 68 68
+3
pkgs/top-level/python-aliases.nix
··· 164 164 flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 165 165 flask_testing = flask-testing; # added 2022-04-25 166 166 flask_wtf = flask-wtf; # added 2022-05-24 167 + flask-autoindex = throw "flask-autoindex was removed, as it is not compatible with flask 3.0 and unmaintained since 2020."; 168 + flask-basicauth = throw "flask-basicauth was removed, as it is not compatible with flask 3.0 and unmaintained since 2016."; 169 + flask-sessionstore = throw "flask-sessionstore was removed, as it is not compatible with flask 3.0 and unmaintained since 2017."; 167 170 flowlogs_reader = flowlogs-reader; # added 2024-01-03 168 171 FormEncode = formencode; # added 2023-02-19 169 172 foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
+4 -10
pkgs/top-level/python-packages.nix
··· 4121 4121 4122 4122 flask-assets = callPackage ../development/python-modules/flask-assets { }; 4123 4123 4124 - flask-autoindex = callPackage ../development/python-modules/flask-autoindex { }; 4125 - 4126 4124 flask-babel = callPackage ../development/python-modules/flask-babel { }; 4127 4125 4128 4126 flask-babelex = callPackage ../development/python-modules/flask-babelex { }; 4129 - 4130 - flask-basicauth = callPackage ../development/python-modules/flask-basicauth { }; 4131 4127 4132 4128 flask-bcrypt = callPackage ../development/python-modules/flask-bcrypt { }; 4133 4129 ··· 4194 4190 flask-session = callPackage ../development/python-modules/flask-session { }; 4195 4191 4196 4192 flask-session-captcha = callPackage ../development/python-modules/flask-session-captcha { }; 4197 - 4198 - flask-sessionstore = callPackage ../development/python-modules/flask-sessionstore { }; 4199 4193 4200 4194 flask-security-too = callPackage ../development/python-modules/flask-security-too { }; 4201 4195 ··· 9654 9648 9655 9649 python-mbedtls = callPackage ../development/python-modules/python-mbedtls { }; 9656 9650 9657 - python-memcached = callPackage ../development/python-modules/python-memcached { }; 9651 + python-memcached = callPackage ../development/python-modules/python-memcached { 9652 + inherit (pkgs) memcached; 9653 + }; 9658 9654 9659 9655 python-otbr-api = callPackage ../development/python-modules/python-otbr-api { }; 9660 9656 ··· 13885 13881 13886 13882 stanza = callPackage ../development/python-modules/stanza { }; 13887 13883 13888 - starlette = callPackage ../development/python-modules/starlette { 13889 - inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; 13890 - }; 13884 + starlette = callPackage ../development/python-modules/starlette { }; 13891 13885 13892 13886 starlette-wtf = callPackage ../development/python-modules/starlette-wtf { }; 13893 13887
+1
pkgs/top-level/release-attrpaths-superset.nix
··· 53 53 pkgsStatic = true; 54 54 pkgsCross = true; 55 55 pkgsi686Linux = true; 56 + pkgsExtraHardening = true; 56 57 }; 57 58 58 59 # No release package attrname may have any of these at a component
+13
pkgs/top-level/stage.nix
··· 276 276 gcc.abi = "elfv2"; 277 277 }; 278 278 }); 279 + 280 + pkgsExtraHardening = nixpkgsFun { 281 + overlays = [ 282 + (self': super': { 283 + pkgsExtraHardening = super'; 284 + stdenv = super'.withDefaultHardeningFlags ( 285 + super'.stdenv.cc.defaultHardeningFlags ++ [ 286 + "zerocallusedregs" 287 + ] 288 + ) super'.stdenv; 289 + }) 290 + ] ++ overlays; 291 + }; 279 292 }; 280 293 281 294 # The complete chain of package set builders, applied from top to bottom.