pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #138268 from NixOS/staging-next

Staging next 2021-09-17

authored by Luke Granger-Brown and committed by GitHub a78925d5 22e82f48

+3482 -2710
unified split
+10
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
··· 57 57 </listitem> 58 58 <listitem> 59 59 <para> 60 + bash now defaults to major version 5. 61 + </para> 62 + </listitem> 63 + <listitem> 64 + <para> 65 + Systemd was updated to version 249 (from 247). 66 + </para> 67 + </listitem> 68 + <listitem> 69 + <para> 60 70 Pantheon desktop has been updated to version 6. Due to changes 61 71 of screen locker, if locking doesn’t work for you, please try 62 72 <literal>gsettings set org.gnome.desktop.lockdown disable-lock-screen false</literal>.
+65 -53
nixos/doc/manual/release-notes/rl-2111.section.md
··· 20 20 This allows activation scripts to output what they would change if the activation was really run. 21 21 The users/modules activation script supports this and outputs some of is actions. 22 22 23 + - bash now defaults to major version 5. 24 + 25 + - Systemd was updated to version 249 (from 247). 26 + 23 27 - Pantheon desktop has been updated to version 6. Due to changes of screen locker, if locking doesn't work for you, please try `gsettings set org.gnome.desktop.lockdown disable-lock-screen false`. 24 28 25 29 - `kubernetes-helm` now defaults to 3.7.0, which introduced some breaking changes to the experimental OCI manifest format. See [HIP 6](https://github.com/helm/community/blob/main/hips/hip-0006.md) for more details. ··· 29 33 - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). 30 34 31 35 - [clipcat](https://github.com/xrelkd/clipcat/), an X11 clipboard manager written in Rust. Available at [services.clipcat](options.html#o 32 - pt-services.clipcat.enable). 36 + pt-services.clipcat.enable). 33 37 34 38 - [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP database updater from MaxMind. Available as [services.geoipupdate](options.html#opt-services.geoipupdate.enable). 35 39 ··· 67 71 Available as [isso](#opt-services.isso.enable) 68 72 69 73 - [navidrome](https://www.navidrome.org/), a personal music streaming server with 70 - subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable). 74 + subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable). 71 75 72 76 - [fluidd](https://docs.fluidd.xyz/), a Klipper web interface for managing 3d printers using moonraker. Available as [fluidd](#opt-services.fluidd.enable). 73 77 ··· 103 107 and advises all users to use `paperless-ng` instead. 104 108 105 109 Users can use the `services.paperless-ng` module as a replacement while noting the following incompatibilities: 106 - - `services.paperless.ocrLanguages` has no replacement. Users should migrate to [`services.paperless-ng.extraConfig`](options.html#opt-services.paperless-ng.extraConfig) instead: 107 - ```nix 108 - { 109 - services.paperless-ng.extraConfig = { 110 - # Provide languages as ISO 639-2 codes 111 - # separated by a plus (+) sign. 112 - # https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes 113 - PAPERLESS_OCR_LANGUAGE = "deu+eng+jpn"; # German & English & Japanse 114 - }; 115 - } 116 - ``` 117 110 118 - - If you previously specified `PAPERLESS_CONSUME_MAIL_*` settings in 119 - `services.paperless.extraConfig` you should remove those options now. You 120 - now *must* define those settings in the admin interface of paperless-ng. 111 + - `services.paperless.ocrLanguages` has no replacement. Users should migrate to [`services.paperless-ng.extraConfig`](options.html#opt-services.paperless-ng.extraConfig) instead: 121 112 122 - - Option `services.paperless.manage` no longer exists. 123 - Use the script at `${services.paperless-ng.dataDir}/paperless-ng-manage` instead. 124 - Note that this script only exists after the `paperless-ng` service has been 125 - started at least once. 113 + ```nix 114 + { 115 + services.paperless-ng.extraConfig = { 116 + # Provide languages as ISO 639-2 codes 117 + # separated by a plus (+) sign. 118 + # https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes 119 + PAPERLESS_OCR_LANGUAGE = "deu+eng+jpn"; # German & English & Japanse 120 + }; 121 + } 122 + ``` 126 123 127 - - After switching to the new system configuration you should run the Django 128 - management command to reindex your documents and optionally create a user, 129 - if you don't have one already. 124 + - If you previously specified `PAPERLESS_CONSUME_MAIL_*` settings in 125 + `services.paperless.extraConfig` you should remove those options now. You 126 + now _must_ define those settings in the admin interface of paperless-ng. 130 127 131 - To do so, enter the data directory (the value of 132 - `services.paperless-ng.dataDir`, `/var/lib/paperless` by default), switch 133 - to the paperless user and execute the management command like below: 134 - ``` 135 - $ cd /var/lib/paperless 136 - $ su paperless -s /bin/sh 137 - $ ./paperless-ng-manage document_index reindex 138 - # if not already done create a user account, paperless-ng requires a login 139 - $ ./paperless-ng-manage createsuperuser 140 - Username (leave blank to use 'paperless'): my-user-name 141 - Email address: me@example.com 142 - Password: ********** 143 - Password (again): ********** 144 - Superuser created successfully. 145 - ``` 128 + - Option `services.paperless.manage` no longer exists. 129 + Use the script at `${services.paperless-ng.dataDir}/paperless-ng-manage` instead. 130 + Note that this script only exists after the `paperless-ng` service has been 131 + started at least once. 132 + 133 + - After switching to the new system configuration you should run the Django 134 + management command to reindex your documents and optionally create a user, 135 + if you don't have one already. 136 + 137 + To do so, enter the data directory (the value of 138 + `services.paperless-ng.dataDir`, `/var/lib/paperless` by default), switch 139 + to the paperless user and execute the management command like below: 140 + 141 + ``` 142 + $ cd /var/lib/paperless 143 + $ su paperless -s /bin/sh 144 + $ ./paperless-ng-manage document_index reindex 145 + # if not already done create a user account, paperless-ng requires a login 146 + $ ./paperless-ng-manage createsuperuser 147 + Username (leave blank to use 'paperless'): my-user-name 148 + Email address: me@example.com 149 + Password: ********** 150 + Password (again): ********** 151 + Superuser created successfully. 152 + ``` 146 153 147 154 - The `staticjinja` package has been upgraded from 1.0.4 to 4.1.0 148 155 ··· 239 246 * The `bitwarden_rs` packages and modules were renamed to `vaultwarden` 240 247 [following upstream](https://github.com/dani-garcia/vaultwarden/discussions/1642). More specifically, 241 248 242 - * `pkgs.bitwarden_rs`, `pkgs.bitwarden_rs-sqlite`, `pkgs.bitwarden_rs-mysql` and 249 + - `pkgs.bitwarden_rs`, `pkgs.bitwarden_rs-sqlite`, `pkgs.bitwarden_rs-mysql` and 243 250 `pkgs.bitwarden_rs-postgresql` were renamed to `pkgs.vaultwarden`, `pkgs.vaultwarden-sqlite`, 244 251 `pkgs.vaultwarden-mysql` and `pkgs.vaultwarden-postgresql`, respectively. 245 - * Old names are preserved as aliases for backwards compatibility, but may be removed in the future. 246 - * The `bitwarden_rs` executable was also renamed to `vaultwarden` in all packages. 247 252 248 - * `pkgs.bitwarden_rs-vault` was renamed to `pkgs.vaultwarden-vault`. 249 - * `pkgs.bitwarden_rs-vault` is preserved as an alias for backwards compatibility, but may be removed in the future. 250 - * The static files were moved from `/usr/share/bitwarden_rs` to `/usr/share/vaultwarden`. 253 + - Old names are preserved as aliases for backwards compatibility, but may be removed in the future. 254 + - The `bitwarden_rs` executable was also renamed to `vaultwarden` in all packages. 251 255 252 - * The `services.bitwarden_rs` config module was renamed to `services.vaultwarden`. 253 - * `services.bitwarden_rs` is preserved as an alias for backwards compatibility, but may be removed in the future. 256 + - `pkgs.bitwarden_rs-vault` was renamed to `pkgs.vaultwarden-vault`. 257 + 258 + - `pkgs.bitwarden_rs-vault` is preserved as an alias for backwards compatibility, but may be removed in the future. 259 + - The static files were moved from `/usr/share/bitwarden_rs` to `/usr/share/vaultwarden`. 260 + 261 + - The `services.bitwarden_rs` config module was renamed to `services.vaultwarden`. 262 + 263 + - `services.bitwarden_rs` is preserved as an alias for backwards compatibility, but may be removed in the future. 254 264 255 - * `systemd.services.bitwarden_rs`, `systemd.services.backup-bitwarden_rs` and `systemd.timers.backup-bitwarden_rs` 265 + - `systemd.services.bitwarden_rs`, `systemd.services.backup-bitwarden_rs` and `systemd.timers.backup-bitwarden_rs` 256 266 were renamed to `systemd.services.vaultwarden`, `systemd.services.backup-vaultwarden` and 257 267 `systemd.timers.backup-vaultwarden`, respectively. 258 - * Old names are preserved as aliases for backwards compatibility, but may be removed in the future. 268 + 269 + - Old names are preserved as aliases for backwards compatibility, but may be removed in the future. 259 270 260 - * `users.users.bitwarden_rs` and `users.groups.bitwarden_rs` were renamed to `users.users.vaultwarden` and 271 + - `users.users.bitwarden_rs` and `users.groups.bitwarden_rs` were renamed to `users.users.vaultwarden` and 261 272 `users.groups.vaultwarden`, respectively. 262 273 263 - * The data directory remains located at `/var/lib/bitwarden_rs`, for backwards compatibility. 274 + - The data directory remains located at `/var/lib/bitwarden_rs`, for backwards compatibility. 264 275 265 276 - `yggdrasil` was upgraded to a new major release with breaking changes, see [upstream changelog](https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.4.0). 266 277 ··· 273 284 - `tt-rss` was upgraded to the commit on 2021-06-21, which has breaking changes. If you use `services.tt-rss.extraConfig` you should migrate to the `putenv`-style configuration. See [this Discourse post](https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337) in the tt-rss forums for more details. 274 285 275 286 - The following Visual Studio Code extensions were renamed to keep the naming convention uniform. 287 + 276 288 - `bbenoist.Nix` -> `bbenoist.nix` 277 289 - `CoenraadS.bracket-pair-colorizer` -> `coenraads.bracket-pair-colorizer` 278 290 - `golang.Go` -> `golang.go` ··· 292 304 - The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland. 293 305 294 306 - The `services.minio` module gained an additional option `consoleAddress`, that 295 - configures the address and port the web UI is listening, it defaults to `:9001`. 296 - To be able to access the web UI this port needs to be opened in the firewall. 307 + configures the address and port the web UI is listening, it defaults to `:9001`. 308 + To be able to access the web UI this port needs to be opened in the firewall. 297 309 298 310 - The `varnish` package was upgraded from 6.3.x to 6.5.x. `varnish60` for the last LTS release is also still available. 299 311 300 - - The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used. 312 + - The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used. 301 313 302 314 - The attribute `linuxPackages_latest_hardened` was dropped because the hardened patches 303 315 lag behind the upstream kernel which made version bumps harder. If you want to use
+8
nixos/modules/services/ttys/getty.nix
··· 131 131 restartIfChanged = false; 132 132 }; 133 133 134 + systemd.services."autovt@" = 135 + { serviceConfig.ExecStart = [ 136 + "" # override upstream default with an empty ExecStart 137 + (gettyCmd "--noclear %I $TERM") 138 + ]; 139 + restartIfChanged = false; 140 + }; 141 + 134 142 systemd.services."container-getty@" = 135 143 { serviceConfig.ExecStart = [ 136 144 "" # override upstream default with an empty ExecStart
-1
nixos/tests/herbstluftwm.nix
··· 3 3 4 4 meta = { 5 5 maintainers = with lib.maintainers; [ thibautmarty ]; 6 - timeout = 30; 7 6 }; 8 7 9 8 machine = { pkgs, lib, ... }: {
+1
nixos/tests/prometheus-exporters.nix
··· 280 280 }; 281 281 exporterTest = '' 282 282 wait_for_unit("prometheus-influxdb-exporter.service") 283 + wait_for_open_port(9122) 283 284 succeed( 284 285 "curl -XPOST http://localhost:9122/write --data-binary 'influxdb_exporter,distro=nixos,added_in=21.09 value=1'" 285 286 )
+18 -20
nixos/tests/systemd-confinement.nix
··· 44 44 { config.confinement.mode = "chroot-only"; 45 45 testScript = '' 46 46 with subtest("chroot-only confinement"): 47 - machine.succeed( 48 - 'test "$(chroot-exec ls -1 / | paste -sd,)" = bin,nix', 49 - 'test "$(chroot-exec id -u)" = 0', 50 - "chroot-exec chown 65534 /bin", 51 - ) 47 + paths = machine.succeed('chroot-exec ls -1 / | paste -sd,').strip() 48 + assert_eq(paths, "bin,nix,run") 49 + uid = machine.succeed('chroot-exec id -u').strip() 50 + assert_eq(uid, "0") 51 + machine.succeed("chroot-exec chown 65534 /bin") 52 52 ''; 53 53 } 54 54 { testScript = '' 55 55 with subtest("full confinement with APIVFS"): 56 - machine.fail( 57 - "chroot-exec ls -l /etc", 58 - "chroot-exec ls -l /run", 59 - "chroot-exec chown 65534 /bin", 60 - ) 61 - machine.succeed( 62 - 'test "$(chroot-exec id -u)" = 0', 63 - "chroot-exec chown 0 /bin", 64 - ) 56 + machine.fail("chroot-exec ls -l /etc") 57 + machine.fail("chroot-exec chown 65534 /bin") 58 + assert_eq(machine.succeed('chroot-exec id -u').strip(), "0") 59 + machine.succeed("chroot-exec chown 0 /bin") 65 60 ''; 66 61 } 67 62 { config.serviceConfig.BindReadOnlyPaths = [ "/etc" ]; 68 63 testScript = '' 69 64 with subtest("check existence of bind-mounted /etc"): 70 - machine.succeed('test -n "$(chroot-exec cat /etc/passwd)"') 65 + passwd = machine.succeed('chroot-exec cat /etc/passwd').strip() 66 + assert len(passwd) > 0, "/etc/passwd must not be empty" 71 67 ''; 72 68 } 73 69 { config.serviceConfig.User = "chroot-testuser"; ··· 75 71 testScript = '' 76 72 with subtest("check if User/Group really runs as non-root"): 77 73 machine.succeed("chroot-exec ls -l /dev") 78 - machine.succeed('test "$(chroot-exec id -u)" != 0') 74 + uid = machine.succeed('chroot-exec id -u').strip() 75 + assert uid != "0", "UID of chroot-testuser shouldn't be 0" 79 76 machine.fail("chroot-exec touch /bin/test") 80 77 ''; 81 78 } ··· 88 85 testScript = '' 89 86 with subtest("check if symlinks are properly bind-mounted"): 90 87 machine.fail("chroot-exec test -e /etc") 91 - machine.succeed( 92 - "chroot-exec cat ${symlink} >&2", 93 - 'test "$(chroot-exec cat ${symlink})" = "got me"', 94 - ) 88 + text = machine.succeed('chroot-exec cat ${symlink}').strip() 89 + assert_eq(text, "got me") 95 90 ''; 96 91 }) 97 92 { config.serviceConfig.User = "chroot-testuser"; ··· 158 153 }; 159 154 160 155 testScript = { nodes, ... }: '' 156 + def assert_eq(a, b): 157 + assert a == b, f"{a} != {b}" 158 + 161 159 machine.wait_for_unit("multi-user.target") 162 160 '' + nodes.machine.config.__testSteps; 163 161 }
+2 -2
pkgs/applications/graphics/ImageMagick/7.0.nix
··· 18 18 19 19 stdenv.mkDerivation rec { 20 20 pname = "imagemagick"; 21 - version = "7.1.0-4"; 21 + version = "7.1.0-6"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "ImageMagick"; 25 25 repo = "ImageMagick"; 26 26 rev = version; 27 - sha256 = "sha256-CvrSeoKaTigR+4egelwLRr2++CQ5OWUePwX9e1/G1GM="; 27 + sha256 = "sha256-rwaMAkbSBTdrJ+OVZfAOBIp1tmC7/TC34w5gBIe+J94="; 28 28 }; 29 29 30 30 outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
+1 -1
pkgs/applications/graphics/freecad/default.nix
··· 62 62 ninja 63 63 pkg-config 64 64 pyside2-tools 65 + gfortran 65 66 wrapQtAppsHook 66 67 ]; 67 68 ··· 70 71 boost 71 72 coin3d 72 73 eigen 73 - gfortran 74 74 gts 75 75 hdf5 76 76 libGLU
+2 -2
pkgs/applications/graphics/lightburn/default.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "lightburn"; 9 - version = "1.0.01"; 9 + version = "1.0.02"; 10 10 11 11 nativeBuildInputs = [ 12 12 p7zip ··· 16 16 17 17 src = fetchurl { 18 18 url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; 19 - sha256 = "sha256-UnTZcZjR8edHGflThkiu6OeWJU9x/bH/Ml/CRwWYgFU="; 19 + sha256 = "sha256-JaKThw6ubutpOCsO1pVAPVxhhUTKpfYRHjBSu02nlN4="; 20 20 }; 21 21 22 22 buildInputs = [
+1 -1
pkgs/applications/kde/fetch.sh
··· 1 - WGET_ARGS=( http://download.kde.org/stable/release-service/21.08.0/src -A '*.tar.xz' ) 1 + WGET_ARGS=( http://download.kde.org/stable/release-service/21.08.1/src -A '*.tar.xz' )
+915 -915
pkgs/applications/kde/srcs.nix
··· 4 4 5 5 { 6 6 akonadi = { 7 - version = "21.08.0"; 7 + version = "21.08.1"; 8 8 src = fetchurl { 9 - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-21.08.0.tar.xz"; 10 - sha256 = "0qjg8q11ir3dnhxgd068pniy4rwl8p2g0wwaf4cyzz4qw4kp8sbs"; 11 - name = "akonadi-21.08.0.tar.xz"; 9 + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-21.08.1.tar.xz"; 10 + sha256 = "02abs3mxwna30rgidlndj4jq0swy3id236ckw726vp3r8m9qimd6"; 11 + name = "akonadi-21.08.1.tar.xz"; 12 12 }; 13 13 }; 14 14 akonadi-calendar = { 15 - version = "21.08.0"; 15 + version = "21.08.1"; 16 16 src = fetchurl { 17 - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-calendar-21.08.0.tar.xz"; 18 - sha256 = "0f3psag09vc7k29z6p091qpb4b8464k6mjc5qf3mcnrfy2s6viw6"; 19 - name = "akonadi-calendar-21.08.0.tar.xz"; 17 + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-calendar-21.08.1.tar.xz"; 18 + sha256 = "1p8myayr6kfgp805wdpy39f9bjxw1fafv6kn35h1zsl1fgyc4812"; 19 + name = "akonadi-calendar-21.08.1.tar.xz"; 20 20 }; 21 21 }; 22 22 akonadi-calendar-tools = { 23 - version = "21.08.0"; 24 - src = fetchurl { 25 - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-calendar-tools-21.08.0.tar.xz"; 26 - sha256 = "1pzs9bdh7lm7kqyrg6qhjj70rkdycfy4ys35ibrgwjv7r6zdgvfx"; 27 - name = "akonadi-calendar-tools-21.08.0.tar.xz"; 28 - }; 29 - }; 30 - akonadiconsole = { 31 - version = "21.08.0"; 23 + version = "21.08.1"; 32 24 src = fetchurl { 33 - url = "${mirror}/stable/release-service/21.08.0/src/akonadiconsole-21.08.0.tar.xz"; 34 - sha256 = "0sq03jrv9i86qw7217s77hfz6105dc7s51fzdhxw15zzv07qd1hb"; 35 - name = "akonadiconsole-21.08.0.tar.xz"; 25 + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-calendar-tools-21.08.1.tar.xz"; 26 + sha256 = "0j8cc0x2bx64crgvprksnmng4yi7fk71s5pfyjrnw8d9xnj7vvvg"; 27 + name = "akonadi-calendar-tools-21.08.1.tar.xz"; 36 28 }; 37 29 }; 38 30 akonadi-contacts = { 39 - version = "21.08.0"; 31 + version = "21.08.1"; 40 32 src = fetchurl { 41 - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-contacts-21.08.0.tar.xz"; 42 - sha256 = "0ay0fsb5rrv88w4azlcvmrhsdf4hx6nw8ahz0ik54j8x7ciabyq1"; 43 - name = "akonadi-contacts-21.08.0.tar.xz"; 33 + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-contacts-21.08.1.tar.xz"; 34 + sha256 = "13sjy2jg4bbg7dm182apppmcpkhmiwhkpnkjhh13dhz8v7488vnc"; 35 + name = "akonadi-contacts-21.08.1.tar.xz"; 44 36 }; 45 37 }; 46 38 akonadi-import-wizard = { 47 - version = "21.08.0"; 39 + version = "21.08.1"; 48 40 src = fetchurl { 49 - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-import-wizard-21.08.0.tar.xz"; 50 - sha256 = "1pcnasgl6f8z4hwgp5nnk4c5hvw210f0b89zjw7v18il2s09vr58"; 51 - name = "akonadi-import-wizard-21.08.0.tar.xz"; 41 + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-import-wizard-21.08.1.tar.xz"; 42 + sha256 = "1v0nzaijy6nahjx4j1wsvi8s6s3zk79b8h01n3r6gwilbxklqnqs"; 43 + name = "akonadi-import-wizard-21.08.1.tar.xz"; 52 44 }; 53 45 }; 54 46 akonadi-mime = { 55 - version = "21.08.0"; 47 + version = "21.08.1"; 56 48 src = fetchurl { 57 - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-mime-21.08.0.tar.xz"; 58 - sha256 = "08c1gn28p3lna8kh33s7ckj37yk5fz26d5n9msrr5497xlf3zyik"; 59 - name = "akonadi-mime-21.08.0.tar.xz"; 49 + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-mime-21.08.1.tar.xz"; 50 + sha256 = "15lm1248diqhnv1qldcyyfi1v7w8h13jvwhp80py93hijq07iwz5"; 51 + name = "akonadi-mime-21.08.1.tar.xz"; 60 52 }; 61 53 }; 62 54 akonadi-notes = { 63 - version = "21.08.0"; 55 + version = "21.08.1"; 64 56 src = fetchurl { 65 - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-notes-21.08.0.tar.xz"; 66 - sha256 = "14d18h3jx761d3zh4m90fmw9fgn4yk22dvgif8ibm3xz8rwjc2v9"; 67 - name = "akonadi-notes-21.08.0.tar.xz"; 57 + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-notes-21.08.1.tar.xz"; 58 + sha256 = "1r43pvxpk3f183qaiydxg83xc1y5zss7xgxq5p1vnwgqyifibh3h"; 59 + name = "akonadi-notes-21.08.1.tar.xz"; 68 60 }; 69 61 }; 70 62 akonadi-search = { 71 - version = "21.08.0"; 63 + version = "21.08.1"; 64 + src = fetchurl { 65 + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-search-21.08.1.tar.xz"; 66 + sha256 = "1w5vps398kadl6p2jhsj18jqfn4lyysx09jzj6q9cvkvzmq4im6i"; 67 + name = "akonadi-search-21.08.1.tar.xz"; 68 + }; 69 + }; 70 + akonadiconsole = { 71 + version = "21.08.1"; 72 72 src = fetchurl { 73 - url = "${mirror}/stable/release-service/21.08.0/src/akonadi-search-21.08.0.tar.xz"; 74 - sha256 = "0sknzn0ks8az27a212mdfymrlybscl5irars3axb3f7r7lg4iw9s"; 75 - name = "akonadi-search-21.08.0.tar.xz"; 73 + url = "${mirror}/stable/release-service/21.08.1/src/akonadiconsole-21.08.1.tar.xz"; 74 + sha256 = "1dplpb6z3glps82bzlqhnx29k13m6b7q2wvdlcw9hfqrp2xgzyfk"; 75 + name = "akonadiconsole-21.08.1.tar.xz"; 76 76 }; 77 77 }; 78 78 akregator = { 79 - version = "21.08.0"; 79 + version = "21.08.1"; 80 80 src = fetchurl { 81 - url = "${mirror}/stable/release-service/21.08.0/src/akregator-21.08.0.tar.xz"; 82 - sha256 = "067dmvnssgcs5410xwnpr38lcxvqms4h70vxnqwzivj2yidymybd"; 83 - name = "akregator-21.08.0.tar.xz"; 81 + url = "${mirror}/stable/release-service/21.08.1/src/akregator-21.08.1.tar.xz"; 82 + sha256 = "03rv9m3f7vrn80jfdmnbzxsl226s82liyfam1cysxl2skkmvpimm"; 83 + name = "akregator-21.08.1.tar.xz"; 84 84 }; 85 85 }; 86 86 analitza = { 87 - version = "21.08.0"; 87 + version = "21.08.1"; 88 88 src = fetchurl { 89 - url = "${mirror}/stable/release-service/21.08.0/src/analitza-21.08.0.tar.xz"; 90 - sha256 = "1nrja7d5kpn1jywld737rx298ykvypb66mi1rxamscr59x2msq4l"; 91 - name = "analitza-21.08.0.tar.xz"; 89 + url = "${mirror}/stable/release-service/21.08.1/src/analitza-21.08.1.tar.xz"; 90 + sha256 = "0aagcj2dvm5aq24m6r5z79qsq2ra8xwzj7b1f64kcq8sabw7dbn4"; 91 + name = "analitza-21.08.1.tar.xz"; 92 92 }; 93 93 }; 94 94 ark = { 95 - version = "21.08.0"; 95 + version = "21.08.1"; 96 96 src = fetchurl { 97 - url = "${mirror}/stable/release-service/21.08.0/src/ark-21.08.0.tar.xz"; 98 - sha256 = "08pm60963fp77wklv3as2c4mg3qrhm7k8hdy7fqdq7l2y64syzfx"; 99 - name = "ark-21.08.0.tar.xz"; 97 + url = "${mirror}/stable/release-service/21.08.1/src/ark-21.08.1.tar.xz"; 98 + sha256 = "1ss33qizhg325k4hhf8339xg52iv4s32qjm048zhi2jaz54pdnv0"; 99 + name = "ark-21.08.1.tar.xz"; 100 100 }; 101 101 }; 102 102 artikulate = { 103 - version = "21.08.0"; 103 + version = "21.08.1"; 104 104 src = fetchurl { 105 - url = "${mirror}/stable/release-service/21.08.0/src/artikulate-21.08.0.tar.xz"; 106 - sha256 = "0w7f8yrfx57bg765iflpb3wjclncrpbfk0q0kych1pvynbxxam03"; 107 - name = "artikulate-21.08.0.tar.xz"; 105 + url = "${mirror}/stable/release-service/21.08.1/src/artikulate-21.08.1.tar.xz"; 106 + sha256 = "0x71m715iw1hv6xy36sd2gzd0cnsbn09wipp02nx2dc161lavnxk"; 107 + name = "artikulate-21.08.1.tar.xz"; 108 108 }; 109 109 }; 110 110 audiocd-kio = { 111 - version = "21.08.0"; 111 + version = "21.08.1"; 112 112 src = fetchurl { 113 - url = "${mirror}/stable/release-service/21.08.0/src/audiocd-kio-21.08.0.tar.xz"; 114 - sha256 = "12yp1k2z1sp785g5zzhq0v72qpc5gkw0cl7bbm9xn36jy4phi99s"; 115 - name = "audiocd-kio-21.08.0.tar.xz"; 113 + url = "${mirror}/stable/release-service/21.08.1/src/audiocd-kio-21.08.1.tar.xz"; 114 + sha256 = "1aqzgmpypzska5lgjwjpnbl6q2cbyiirph6h8ph5wnnb992lx8li"; 115 + name = "audiocd-kio-21.08.1.tar.xz"; 116 116 }; 117 117 }; 118 118 baloo-widgets = { 119 - version = "21.08.0"; 119 + version = "21.08.1"; 120 120 src = fetchurl { 121 - url = "${mirror}/stable/release-service/21.08.0/src/baloo-widgets-21.08.0.tar.xz"; 122 - sha256 = "0hf7lrr502xk5154k7889yxxqdnz6k6v70pkwz1s9qq0d58xrwcy"; 123 - name = "baloo-widgets-21.08.0.tar.xz"; 121 + url = "${mirror}/stable/release-service/21.08.1/src/baloo-widgets-21.08.1.tar.xz"; 122 + sha256 = "01f0hpgvlwxn3yms6yyi0ykryb78c9plp0q2z0ywk1p4lx4iywhd"; 123 + name = "baloo-widgets-21.08.1.tar.xz"; 124 124 }; 125 125 }; 126 126 blinken = { 127 - version = "21.08.0"; 127 + version = "21.08.1"; 128 128 src = fetchurl { 129 - url = "${mirror}/stable/release-service/21.08.0/src/blinken-21.08.0.tar.xz"; 130 - sha256 = "0i4qs4bbk3kpi0hg98mbrdrndj687gdnyxnx3riay0vs9myqsa25"; 131 - name = "blinken-21.08.0.tar.xz"; 129 + url = "${mirror}/stable/release-service/21.08.1/src/blinken-21.08.1.tar.xz"; 130 + sha256 = "1bfkiwg2cwn4dizwcjb0ynzvvdxndf5172a8z0ch9b2wxlaljh87"; 131 + name = "blinken-21.08.1.tar.xz"; 132 132 }; 133 133 }; 134 134 bomber = { 135 - version = "21.08.0"; 135 + version = "21.08.1"; 136 136 src = fetchurl { 137 - url = "${mirror}/stable/release-service/21.08.0/src/bomber-21.08.0.tar.xz"; 138 - sha256 = "1rkyxzdcjvzf6m6idjjx4xhqrj7j7cybnjmzyy9i81jnraql58gg"; 139 - name = "bomber-21.08.0.tar.xz"; 137 + url = "${mirror}/stable/release-service/21.08.1/src/bomber-21.08.1.tar.xz"; 138 + sha256 = "1ppsnnbwsf1y9pavnpxr64k845gx1yn5p1mqswpcqgp9zd58f338"; 139 + name = "bomber-21.08.1.tar.xz"; 140 140 }; 141 141 }; 142 142 bovo = { 143 - version = "21.08.0"; 143 + version = "21.08.1"; 144 144 src = fetchurl { 145 - url = "${mirror}/stable/release-service/21.08.0/src/bovo-21.08.0.tar.xz"; 146 - sha256 = "09gqf0cw23ia10sbqa4szlycihdjmiccvf024vgz8yyy8hi9n2hr"; 147 - name = "bovo-21.08.0.tar.xz"; 145 + url = "${mirror}/stable/release-service/21.08.1/src/bovo-21.08.1.tar.xz"; 146 + sha256 = "0qs96ds0clbvf7q487h9bq7l4haymdcyxzq8rlfd74qpki9cb9aa"; 147 + name = "bovo-21.08.1.tar.xz"; 148 148 }; 149 149 }; 150 150 calendarsupport = { 151 - version = "21.08.0"; 151 + version = "21.08.1"; 152 152 src = fetchurl { 153 - url = "${mirror}/stable/release-service/21.08.0/src/calendarsupport-21.08.0.tar.xz"; 154 - sha256 = "18dy6dhv0z8acvzr47q93rn027pm6dy5r49gagq975jkjw77wncp"; 155 - name = "calendarsupport-21.08.0.tar.xz"; 153 + url = "${mirror}/stable/release-service/21.08.1/src/calendarsupport-21.08.1.tar.xz"; 154 + sha256 = "0n9mbwdgyc4530g1rn9b393qq8pgpcclcpip9p72q8qc630jsvbw"; 155 + name = "calendarsupport-21.08.1.tar.xz"; 156 156 }; 157 157 }; 158 158 cantor = { 159 - version = "21.08.0"; 159 + version = "21.08.1"; 160 160 src = fetchurl { 161 - url = "${mirror}/stable/release-service/21.08.0/src/cantor-21.08.0.tar.xz"; 162 - sha256 = "0q7l3x5m0s3j9qlhjjvflzfi613638yzi38kcp1ldas1sw48jh7i"; 163 - name = "cantor-21.08.0.tar.xz"; 161 + url = "${mirror}/stable/release-service/21.08.1/src/cantor-21.08.1.tar.xz"; 162 + sha256 = "18gl6bw8mnn9sp4jws5b57k9w9scqg53ynw6yrabx2796k0hwfiw"; 163 + name = "cantor-21.08.1.tar.xz"; 164 164 }; 165 165 }; 166 166 cervisia = { 167 - version = "21.08.0"; 167 + version = "21.08.1"; 168 168 src = fetchurl { 169 - url = "${mirror}/stable/release-service/21.08.0/src/cervisia-21.08.0.tar.xz"; 170 - sha256 = "108wm6r0h2lz29z7g47m0vhg0rmsqrlwgx0is6ymbbaf7kdy8ynm"; 171 - name = "cervisia-21.08.0.tar.xz"; 169 + url = "${mirror}/stable/release-service/21.08.1/src/cervisia-21.08.1.tar.xz"; 170 + sha256 = "0dah0lgzpdzxyvccqk2k2qbl5x4dl53qp23d0rxb5cg1ba5h7n2l"; 171 + name = "cervisia-21.08.1.tar.xz"; 172 172 }; 173 173 }; 174 174 dolphin = { 175 - version = "21.08.0"; 175 + version = "21.08.1"; 176 176 src = fetchurl { 177 - url = "${mirror}/stable/release-service/21.08.0/src/dolphin-21.08.0.tar.xz"; 178 - sha256 = "18b751bmq1mlq8zw6wkk2jw8qqn8n2n84vb9ga4jl6bi2gjdqrjn"; 179 - name = "dolphin-21.08.0.tar.xz"; 177 + url = "${mirror}/stable/release-service/21.08.1/src/dolphin-21.08.1.tar.xz"; 178 + sha256 = "1vmk9iaylw427x203ccdjhlbah3dr5fz7l3lc113nczq54kcwpbf"; 179 + name = "dolphin-21.08.1.tar.xz"; 180 180 }; 181 181 }; 182 182 dolphin-plugins = { 183 - version = "21.08.0"; 183 + version = "21.08.1"; 184 184 src = fetchurl { 185 - url = "${mirror}/stable/release-service/21.08.0/src/dolphin-plugins-21.08.0.tar.xz"; 186 - sha256 = "1d10sbxpgz5fvw7ym8804qkqmrv1w4css5sn96xhd7kb7n23jbh8"; 187 - name = "dolphin-plugins-21.08.0.tar.xz"; 185 + url = "${mirror}/stable/release-service/21.08.1/src/dolphin-plugins-21.08.1.tar.xz"; 186 + sha256 = "0gnmr73ly0djngp3imdi4zm72icj3gilqcshb4ks3rq3lwk408rr"; 187 + name = "dolphin-plugins-21.08.1.tar.xz"; 188 188 }; 189 189 }; 190 190 dragon = { 191 - version = "21.08.0"; 191 + version = "21.08.1"; 192 192 src = fetchurl { 193 - url = "${mirror}/stable/release-service/21.08.0/src/dragon-21.08.0.tar.xz"; 194 - sha256 = "0d6kradbq010gmknzi4xf7x7b3cl2lmadhdngijmqw0k66g0gi6m"; 195 - name = "dragon-21.08.0.tar.xz"; 193 + url = "${mirror}/stable/release-service/21.08.1/src/dragon-21.08.1.tar.xz"; 194 + sha256 = "050jrizyip362fanrbx3fwp4n69sr7d4y2w6n70aqv8hhi90xqjy"; 195 + name = "dragon-21.08.1.tar.xz"; 196 196 }; 197 197 }; 198 198 elisa = { 199 - version = "21.08.0"; 199 + version = "21.08.1"; 200 200 src = fetchurl { 201 - url = "${mirror}/stable/release-service/21.08.0/src/elisa-21.08.0.tar.xz"; 202 - sha256 = "14zlwx97ia7hlzylc0anj57gd2b300hclpjwhzr512sis704cyym"; 203 - name = "elisa-21.08.0.tar.xz"; 201 + url = "${mirror}/stable/release-service/21.08.1/src/elisa-21.08.1.tar.xz"; 202 + sha256 = "12kr5aixw5gdmy2vj6id0wmznkwg6p1ysxcqayk8bwvv2qz2pygr"; 203 + name = "elisa-21.08.1.tar.xz"; 204 204 }; 205 205 }; 206 206 eventviews = { 207 - version = "21.08.0"; 207 + version = "21.08.1"; 208 208 src = fetchurl { 209 - url = "${mirror}/stable/release-service/21.08.0/src/eventviews-21.08.0.tar.xz"; 210 - sha256 = "06ryds5yc5rb3smdhyc1w94idg0apadfjrv65z7ikh85rw82h62s"; 211 - name = "eventviews-21.08.0.tar.xz"; 209 + url = "${mirror}/stable/release-service/21.08.1/src/eventviews-21.08.1.tar.xz"; 210 + sha256 = "04z5cb4vhxcwxp8dwv7w4400zmj090gr7dm4d4h4x39312d25rhh"; 211 + name = "eventviews-21.08.1.tar.xz"; 212 212 }; 213 213 }; 214 214 ffmpegthumbs = { 215 - version = "21.08.0"; 215 + version = "21.08.1"; 216 216 src = fetchurl { 217 - url = "${mirror}/stable/release-service/21.08.0/src/ffmpegthumbs-21.08.0.tar.xz"; 218 - sha256 = "0cbinfvfxibpigcv2pwa95yiyd0nll7qrhcb7gcaa21vsq6ggf5m"; 219 - name = "ffmpegthumbs-21.08.0.tar.xz"; 217 + url = "${mirror}/stable/release-service/21.08.1/src/ffmpegthumbs-21.08.1.tar.xz"; 218 + sha256 = "13v5y99fvj0p9f9hqafw652qzb7z267fjfsqykv7wb3pv274f11w"; 219 + name = "ffmpegthumbs-21.08.1.tar.xz"; 220 220 }; 221 221 }; 222 222 filelight = { 223 - version = "21.08.0"; 223 + version = "21.08.1"; 224 224 src = fetchurl { 225 - url = "${mirror}/stable/release-service/21.08.0/src/filelight-21.08.0.tar.xz"; 226 - sha256 = "1x287k36grk3hn7gl7n7sc89a0ibcciz93bym0znl241fd2ncl3q"; 227 - name = "filelight-21.08.0.tar.xz"; 225 + url = "${mirror}/stable/release-service/21.08.1/src/filelight-21.08.1.tar.xz"; 226 + sha256 = "0smvvh7g9p0vh4s3xd0pk6whszk8vmqv9ww1jp0y3dy6ai2cwixi"; 227 + name = "filelight-21.08.1.tar.xz"; 228 228 }; 229 229 }; 230 230 granatier = { 231 - version = "21.08.0"; 231 + version = "21.08.1"; 232 232 src = fetchurl { 233 - url = "${mirror}/stable/release-service/21.08.0/src/granatier-21.08.0.tar.xz"; 234 - sha256 = "119nfjcmi6fw47700cj4lxczgmc1dv3nxg2mjvzmp9gbr0cfmybb"; 235 - name = "granatier-21.08.0.tar.xz"; 233 + url = "${mirror}/stable/release-service/21.08.1/src/granatier-21.08.1.tar.xz"; 234 + sha256 = "1n7bvkh118530hi0aka9wwz7kycljwawb5d0wxzjb74kqp5rp0lv"; 235 + name = "granatier-21.08.1.tar.xz"; 236 236 }; 237 237 }; 238 238 grantlee-editor = { 239 - version = "21.08.0"; 239 + version = "21.08.1"; 240 240 src = fetchurl { 241 - url = "${mirror}/stable/release-service/21.08.0/src/grantlee-editor-21.08.0.tar.xz"; 242 - sha256 = "1jf3bzbg9k4xxhq1r22s5r31f5876gihwgipfdpmk7r7hckz2dzr"; 243 - name = "grantlee-editor-21.08.0.tar.xz"; 241 + url = "${mirror}/stable/release-service/21.08.1/src/grantlee-editor-21.08.1.tar.xz"; 242 + sha256 = "1nfqylrnkvhjiygah527i9q16987n99ry69nwd1000xvf7r1k2yd"; 243 + name = "grantlee-editor-21.08.1.tar.xz"; 244 244 }; 245 245 }; 246 246 grantleetheme = { 247 - version = "21.08.0"; 247 + version = "21.08.1"; 248 248 src = fetchurl { 249 - url = "${mirror}/stable/release-service/21.08.0/src/grantleetheme-21.08.0.tar.xz"; 250 - sha256 = "14sl4wnas4xcx0dpdp6bqi0fk6ylmm6k0cwiyhxp3n2mam1v9ia5"; 251 - name = "grantleetheme-21.08.0.tar.xz"; 249 + url = "${mirror}/stable/release-service/21.08.1/src/grantleetheme-21.08.1.tar.xz"; 250 + sha256 = "0zscb0wb85g1r0zcqb50ylg1r0640mjk985ifffnjzxlx4ayqglm"; 251 + name = "grantleetheme-21.08.1.tar.xz"; 252 252 }; 253 253 }; 254 254 gwenview = { 255 - version = "21.08.0"; 255 + version = "21.08.1"; 256 256 src = fetchurl { 257 - url = "${mirror}/stable/release-service/21.08.0/src/gwenview-21.08.0.tar.xz"; 258 - sha256 = "06bgq01zw5vybp78x543fv0j7yaz75wds0f7s1sbddrjyn8ifqwd"; 259 - name = "gwenview-21.08.0.tar.xz"; 257 + url = "${mirror}/stable/release-service/21.08.1/src/gwenview-21.08.1.tar.xz"; 258 + sha256 = "187br8271z00v02vllpxqwk8x6y38gg43xixczd8x4j0p6rgv8a0"; 259 + name = "gwenview-21.08.1.tar.xz"; 260 260 }; 261 261 }; 262 262 incidenceeditor = { 263 - version = "21.08.0"; 263 + version = "21.08.1"; 264 264 src = fetchurl { 265 - url = "${mirror}/stable/release-service/21.08.0/src/incidenceeditor-21.08.0.tar.xz"; 266 - sha256 = "0z1kbwmrwr430ayawcgc9vjnag11gjj3ydbgybs8x0y64cj5v7c0"; 267 - name = "incidenceeditor-21.08.0.tar.xz"; 265 + url = "${mirror}/stable/release-service/21.08.1/src/incidenceeditor-21.08.1.tar.xz"; 266 + sha256 = "1xyb106ck64qq4z083g0qx9n3rax5ma41jsfwl8am8w5q4szxw31"; 267 + name = "incidenceeditor-21.08.1.tar.xz"; 268 268 }; 269 269 }; 270 270 itinerary = { 271 - version = "21.08.0"; 271 + version = "21.08.1"; 272 272 src = fetchurl { 273 - url = "${mirror}/stable/release-service/21.08.0/src/itinerary-21.08.0.tar.xz"; 274 - sha256 = "1zcf6wz263an6lanl0q81f676zzbnznrrx8lsadbxacm7dvz47a8"; 275 - name = "itinerary-21.08.0.tar.xz"; 273 + url = "${mirror}/stable/release-service/21.08.1/src/itinerary-21.08.1.tar.xz"; 274 + sha256 = "018871y48yd2z2qsrnjhymb72nn4by2l8lrz38gcd9fq2dwlh5fs"; 275 + name = "itinerary-21.08.1.tar.xz"; 276 276 }; 277 277 }; 278 278 juk = { 279 - version = "21.08.0"; 279 + version = "21.08.1"; 280 280 src = fetchurl { 281 - url = "${mirror}/stable/release-service/21.08.0/src/juk-21.08.0.tar.xz"; 282 - sha256 = "13q9agy9sc7r3cpfc1ip0697jys5v665ih745l2kv6b7sm77w0f5"; 283 - name = "juk-21.08.0.tar.xz"; 281 + url = "${mirror}/stable/release-service/21.08.1/src/juk-21.08.1.tar.xz"; 282 + sha256 = "0q2q31r72d28hhabrnwglhcz6h3ay70i4fg7gyn658njvx8gl26b"; 283 + name = "juk-21.08.1.tar.xz"; 284 284 }; 285 285 }; 286 286 k3b = { 287 - version = "21.08.0"; 287 + version = "21.08.1"; 288 288 src = fetchurl { 289 - url = "${mirror}/stable/release-service/21.08.0/src/k3b-21.08.0.tar.xz"; 290 - sha256 = "0289g6dk03k7qab8wrj19kv4gz4b9d25ni9kii48ny5169whnk40"; 291 - name = "k3b-21.08.0.tar.xz"; 289 + url = "${mirror}/stable/release-service/21.08.1/src/k3b-21.08.1.tar.xz"; 290 + sha256 = "1gs4api78ngyb03sgknhc1cil6rx7rd1y66674lmi3sssyhi6bkz"; 291 + name = "k3b-21.08.1.tar.xz"; 292 292 }; 293 293 }; 294 294 kaccounts-integration = { 295 - version = "21.08.0"; 295 + version = "21.08.1"; 296 296 src = fetchurl { 297 - url = "${mirror}/stable/release-service/21.08.0/src/kaccounts-integration-21.08.0.tar.xz"; 298 - sha256 = "0kq3pi3lr4bwz0dv8nzdrf8q0dl9mqyj697x2dcmlhydg6vkcyp6"; 299 - name = "kaccounts-integration-21.08.0.tar.xz"; 297 + url = "${mirror}/stable/release-service/21.08.1/src/kaccounts-integration-21.08.1.tar.xz"; 298 + sha256 = "1860njydckpdz34y7g94pa4xz0229j1szj8ihvql05kgysdm11qp"; 299 + name = "kaccounts-integration-21.08.1.tar.xz"; 300 300 }; 301 301 }; 302 302 kaccounts-providers = { 303 - version = "21.08.0"; 303 + version = "21.08.1"; 304 304 src = fetchurl { 305 - url = "${mirror}/stable/release-service/21.08.0/src/kaccounts-providers-21.08.0.tar.xz"; 306 - sha256 = "0xflvms3y02z52yh9grl4304g8m302k7qw07mlcvfvsma44db1mg"; 307 - name = "kaccounts-providers-21.08.0.tar.xz"; 305 + url = "${mirror}/stable/release-service/21.08.1/src/kaccounts-providers-21.08.1.tar.xz"; 306 + sha256 = "1w5k7y8xakp1lf4ca3wip7af3f9avd04i6zixv7kq9w3fh1mndp0"; 307 + name = "kaccounts-providers-21.08.1.tar.xz"; 308 308 }; 309 309 }; 310 310 kaddressbook = { 311 - version = "21.08.0"; 311 + version = "21.08.1"; 312 312 src = fetchurl { 313 - url = "${mirror}/stable/release-service/21.08.0/src/kaddressbook-21.08.0.tar.xz"; 314 - sha256 = "1yhilvq14cx1g6wa21zccm9cfjm7nkfwg297b3iaympwnjb9bny2"; 315 - name = "kaddressbook-21.08.0.tar.xz"; 313 + url = "${mirror}/stable/release-service/21.08.1/src/kaddressbook-21.08.1.tar.xz"; 314 + sha256 = "05lrxban904szlqhri71qqfykyygsxwgsx9w406s213vwkakirxb"; 315 + name = "kaddressbook-21.08.1.tar.xz"; 316 316 }; 317 317 }; 318 318 kajongg = { 319 - version = "21.08.0"; 319 + version = "21.08.1"; 320 320 src = fetchurl { 321 - url = "${mirror}/stable/release-service/21.08.0/src/kajongg-21.08.0.tar.xz"; 322 - sha256 = "12l3ls1v4ldmmdmrky7d4ihymyr75jvm89zrz7mi44nkh5p1s7c2"; 323 - name = "kajongg-21.08.0.tar.xz"; 321 + url = "${mirror}/stable/release-service/21.08.1/src/kajongg-21.08.1.tar.xz"; 322 + sha256 = "1izm0n2nsvxh9zvws53q4hkpzjihjwwccspas7k10ryasgp4nwsb"; 323 + name = "kajongg-21.08.1.tar.xz"; 324 324 }; 325 325 }; 326 326 kalarm = { 327 - version = "21.08.0"; 327 + version = "21.08.1"; 328 328 src = fetchurl { 329 - url = "${mirror}/stable/release-service/21.08.0/src/kalarm-21.08.0.tar.xz"; 330 - sha256 = "1mmjj3dyza9xq8c5aqivhryvd1vj4z74zw8nmdfscwnzb72gn9xh"; 331 - name = "kalarm-21.08.0.tar.xz"; 329 + url = "${mirror}/stable/release-service/21.08.1/src/kalarm-21.08.1.tar.xz"; 330 + sha256 = "088461j6piwas0g4chpj579r3bhyncmyajsfh2hz4679ir5lf6yh"; 331 + name = "kalarm-21.08.1.tar.xz"; 332 332 }; 333 333 }; 334 334 kalarmcal = { 335 - version = "21.08.0"; 335 + version = "21.08.1"; 336 336 src = fetchurl { 337 - url = "${mirror}/stable/release-service/21.08.0/src/kalarmcal-21.08.0.tar.xz"; 338 - sha256 = "1v4aqgs2387jnjj5lf7jb03if1p2clxk433jrsyzi2zici7qcd07"; 339 - name = "kalarmcal-21.08.0.tar.xz"; 337 + url = "${mirror}/stable/release-service/21.08.1/src/kalarmcal-21.08.1.tar.xz"; 338 + sha256 = "1s0yrh0y54rjp4d6y8vcixxrlsdra1xr8j3lxswl2h866p87v7fa"; 339 + name = "kalarmcal-21.08.1.tar.xz"; 340 340 }; 341 341 }; 342 342 kalgebra = { 343 - version = "21.08.0"; 343 + version = "21.08.1"; 344 344 src = fetchurl { 345 - url = "${mirror}/stable/release-service/21.08.0/src/kalgebra-21.08.0.tar.xz"; 346 - sha256 = "0dl1yjh572mcnr71p2ivm2g5w785nq2frqskpydnng1bglrjcf4w"; 347 - name = "kalgebra-21.08.0.tar.xz"; 345 + url = "${mirror}/stable/release-service/21.08.1/src/kalgebra-21.08.1.tar.xz"; 346 + sha256 = "0a8hmzdslr92v9a8pjf7rnmpf040l9cizzlx8xrxqk2bdb7qls5w"; 347 + name = "kalgebra-21.08.1.tar.xz"; 348 348 }; 349 349 }; 350 350 kalzium = { 351 - version = "21.08.0"; 351 + version = "21.08.1"; 352 352 src = fetchurl { 353 - url = "${mirror}/stable/release-service/21.08.0/src/kalzium-21.08.0.tar.xz"; 354 - sha256 = "130xcqa5kmwg369s22bp9nvzdz3gb553n5awj5rg5gm1fs1xkwnr"; 355 - name = "kalzium-21.08.0.tar.xz"; 353 + url = "${mirror}/stable/release-service/21.08.1/src/kalzium-21.08.1.tar.xz"; 354 + sha256 = "0ijxyzryry1j9gfdmk56dlzyb4iz0v4vmjzjnqkv6sq2lm47lhyp"; 355 + name = "kalzium-21.08.1.tar.xz"; 356 356 }; 357 357 }; 358 358 kamera = { 359 - version = "21.08.0"; 359 + version = "21.08.1"; 360 360 src = fetchurl { 361 - url = "${mirror}/stable/release-service/21.08.0/src/kamera-21.08.0.tar.xz"; 362 - sha256 = "1zwwc1kaky7cnb4xmwh05w6n3yhqwz2blc1x7s427ismfxsjvsys"; 363 - name = "kamera-21.08.0.tar.xz"; 361 + url = "${mirror}/stable/release-service/21.08.1/src/kamera-21.08.1.tar.xz"; 362 + sha256 = "0cmppa8bc9iqbdk0pbnzrj1qqryqmrdgs7hliay3hsl7gjlz9zgy"; 363 + name = "kamera-21.08.1.tar.xz"; 364 364 }; 365 365 }; 366 366 kamoso = { 367 - version = "21.08.0"; 367 + version = "21.08.1"; 368 368 src = fetchurl { 369 - url = "${mirror}/stable/release-service/21.08.0/src/kamoso-21.08.0.tar.xz"; 370 - sha256 = "00l655hx15h1axxad4bk3v5smfv7zvg45w08hign6n30wb3jhz7f"; 371 - name = "kamoso-21.08.0.tar.xz"; 369 + url = "${mirror}/stable/release-service/21.08.1/src/kamoso-21.08.1.tar.xz"; 370 + sha256 = "15nqy97m913f0sdjs15bjivs7hvxghlhlw5579fsnfahg5iz5qp6"; 371 + name = "kamoso-21.08.1.tar.xz"; 372 372 }; 373 373 }; 374 374 kanagram = { 375 - version = "21.08.0"; 375 + version = "21.08.1"; 376 376 src = fetchurl { 377 - url = "${mirror}/stable/release-service/21.08.0/src/kanagram-21.08.0.tar.xz"; 378 - sha256 = "1ak7r1rsq1bxb9696a50dim5kicy4pi8rg199pwh0f7gy0b14wiz"; 379 - name = "kanagram-21.08.0.tar.xz"; 377 + url = "${mirror}/stable/release-service/21.08.1/src/kanagram-21.08.1.tar.xz"; 378 + sha256 = "1jqrmgyd2ijqb1sq17r7mijvcix6syys02kyasyilwgibbnlzjz1"; 379 + name = "kanagram-21.08.1.tar.xz"; 380 380 }; 381 381 }; 382 382 kapman = { 383 - version = "21.08.0"; 383 + version = "21.08.1"; 384 384 src = fetchurl { 385 - url = "${mirror}/stable/release-service/21.08.0/src/kapman-21.08.0.tar.xz"; 386 - sha256 = "11r4q66ii48g5mr9sa2c0ilas5441sdxlrd0053psksl3f0j8lv5"; 387 - name = "kapman-21.08.0.tar.xz"; 385 + url = "${mirror}/stable/release-service/21.08.1/src/kapman-21.08.1.tar.xz"; 386 + sha256 = "072376xqm4a8fwvslf9grsklvzb50d9f098z4qba1lh3y3ivp7wm"; 387 + name = "kapman-21.08.1.tar.xz"; 388 388 }; 389 389 }; 390 390 kapptemplate = { 391 - version = "21.08.0"; 391 + version = "21.08.1"; 392 392 src = fetchurl { 393 - url = "${mirror}/stable/release-service/21.08.0/src/kapptemplate-21.08.0.tar.xz"; 394 - sha256 = "09pi0s09jiqmmp0gv017m18w0y8y06gqcp60j6gawlcsl4kppykx"; 395 - name = "kapptemplate-21.08.0.tar.xz"; 393 + url = "${mirror}/stable/release-service/21.08.1/src/kapptemplate-21.08.1.tar.xz"; 394 + sha256 = "1crll3dr299qpigh2w9psvpi0r4jmb8y0b0facfcfcs6j9ldfbw5"; 395 + name = "kapptemplate-21.08.1.tar.xz"; 396 396 }; 397 397 }; 398 398 kate = { 399 - version = "21.08.0"; 399 + version = "21.08.1"; 400 400 src = fetchurl { 401 - url = "${mirror}/stable/release-service/21.08.0/src/kate-21.08.0.tar.xz"; 402 - sha256 = "1s37smn2pk3lglwm8xh0fmq81jd7j6w10pmxb32lm734igdjw9s9"; 403 - name = "kate-21.08.0.tar.xz"; 401 + url = "${mirror}/stable/release-service/21.08.1/src/kate-21.08.1.tar.xz"; 402 + sha256 = "0k9kf8x5gbj5vbnr6lfhizi8122p76xixw480a3zsqi57i4bxk0z"; 403 + name = "kate-21.08.1.tar.xz"; 404 404 }; 405 405 }; 406 406 katomic = { 407 - version = "21.08.0"; 407 + version = "21.08.1"; 408 408 src = fetchurl { 409 - url = "${mirror}/stable/release-service/21.08.0/src/katomic-21.08.0.tar.xz"; 410 - sha256 = "0z5w4zibczkdr8qv45l094lq1xh398rmhhdbs5k7pglj8pkywyww"; 411 - name = "katomic-21.08.0.tar.xz"; 409 + url = "${mirror}/stable/release-service/21.08.1/src/katomic-21.08.1.tar.xz"; 410 + sha256 = "1595swszpw2ia9dh5c6wgrz04qlcvw84l474imkms4gv1cz583pb"; 411 + name = "katomic-21.08.1.tar.xz"; 412 412 }; 413 413 }; 414 414 kbackup = { 415 - version = "21.08.0"; 415 + version = "21.08.1"; 416 416 src = fetchurl { 417 - url = "${mirror}/stable/release-service/21.08.0/src/kbackup-21.08.0.tar.xz"; 418 - sha256 = "1x8l0fw6p6ynsgp7fyzb1klmm2g78fyd06zn5b7jizm4wb7y47m0"; 419 - name = "kbackup-21.08.0.tar.xz"; 417 + url = "${mirror}/stable/release-service/21.08.1/src/kbackup-21.08.1.tar.xz"; 418 + sha256 = "04795m0r4icfpv6166ingb82mfai0g6q48f9qvcqn029z0f347ya"; 419 + name = "kbackup-21.08.1.tar.xz"; 420 420 }; 421 421 }; 422 422 kblackbox = { 423 - version = "21.08.0"; 423 + version = "21.08.1"; 424 424 src = fetchurl { 425 - url = "${mirror}/stable/release-service/21.08.0/src/kblackbox-21.08.0.tar.xz"; 426 - sha256 = "0qrhc8zp6pggk103p19kkijz206l99dkdw5whrqa5awl9vi2661y"; 427 - name = "kblackbox-21.08.0.tar.xz"; 425 + url = "${mirror}/stable/release-service/21.08.1/src/kblackbox-21.08.1.tar.xz"; 426 + sha256 = "019nd86wmm1m8yz0lsayx37mqyzhx1pa5kbddajf5032dscncymd"; 427 + name = "kblackbox-21.08.1.tar.xz"; 428 428 }; 429 429 }; 430 430 kblocks = { 431 - version = "21.08.0"; 431 + version = "21.08.1"; 432 432 src = fetchurl { 433 - url = "${mirror}/stable/release-service/21.08.0/src/kblocks-21.08.0.tar.xz"; 434 - sha256 = "1if3s2dgfd083ql5sgcijccxbdnab5gn6pqcdc8swwgpvvs98f08"; 435 - name = "kblocks-21.08.0.tar.xz"; 433 + url = "${mirror}/stable/release-service/21.08.1/src/kblocks-21.08.1.tar.xz"; 434 + sha256 = "1grgkikl7zcs58y86kaw6slq7wvqa51g85kvwrysniv6l3yzhvxj"; 435 + name = "kblocks-21.08.1.tar.xz"; 436 436 }; 437 437 }; 438 438 kbounce = { 439 - version = "21.08.0"; 439 + version = "21.08.1"; 440 440 src = fetchurl { 441 - url = "${mirror}/stable/release-service/21.08.0/src/kbounce-21.08.0.tar.xz"; 442 - sha256 = "0b8242kf0z9b6bi2k07rvyhyh2r5pqpykxn8gchrklg1a39i2748"; 443 - name = "kbounce-21.08.0.tar.xz"; 441 + url = "${mirror}/stable/release-service/21.08.1/src/kbounce-21.08.1.tar.xz"; 442 + sha256 = "18sd3yzz0mj9j666pnkm49ngfzh7aw125a5zyf1k947z6ayv5zix"; 443 + name = "kbounce-21.08.1.tar.xz"; 444 444 }; 445 445 }; 446 446 kbreakout = { 447 - version = "21.08.0"; 447 + version = "21.08.1"; 448 448 src = fetchurl { 449 - url = "${mirror}/stable/release-service/21.08.0/src/kbreakout-21.08.0.tar.xz"; 450 - sha256 = "1ps8jdyjv5l7iifps0h8v9mfssqrq2wzk9l6ic5l2lri4i941svn"; 451 - name = "kbreakout-21.08.0.tar.xz"; 449 + url = "${mirror}/stable/release-service/21.08.1/src/kbreakout-21.08.1.tar.xz"; 450 + sha256 = "0264w926ldfhdx22z1iqk41w5a9gnycff4vdjf0i6rzyws2qsb0g"; 451 + name = "kbreakout-21.08.1.tar.xz"; 452 452 }; 453 453 }; 454 454 kbruch = { 455 - version = "21.08.0"; 455 + version = "21.08.1"; 456 456 src = fetchurl { 457 - url = "${mirror}/stable/release-service/21.08.0/src/kbruch-21.08.0.tar.xz"; 458 - sha256 = "08mafsyr0d2qrpv213rssz9h9qk58miyvlmjbk9p4ryf81qhcbxs"; 459 - name = "kbruch-21.08.0.tar.xz"; 457 + url = "${mirror}/stable/release-service/21.08.1/src/kbruch-21.08.1.tar.xz"; 458 + sha256 = "1rbkwzca3m93p3z294cwkiyycg0w87r6j37v0zyiq802pwkkpm34"; 459 + name = "kbruch-21.08.1.tar.xz"; 460 460 }; 461 461 }; 462 462 kcachegrind = { 463 - version = "21.08.0"; 463 + version = "21.08.1"; 464 464 src = fetchurl { 465 - url = "${mirror}/stable/release-service/21.08.0/src/kcachegrind-21.08.0.tar.xz"; 466 - sha256 = "1br5f54ym1b2ra20lk2giqijir9q35al0vwm8m7fa7z9s9z002bx"; 467 - name = "kcachegrind-21.08.0.tar.xz"; 465 + url = "${mirror}/stable/release-service/21.08.1/src/kcachegrind-21.08.1.tar.xz"; 466 + sha256 = "09zgilcya7asj2si747snli6h0s7wzgjzkns9f53rwvq06xbp2zv"; 467 + name = "kcachegrind-21.08.1.tar.xz"; 468 468 }; 469 469 }; 470 470 kcalc = { 471 - version = "21.08.0"; 471 + version = "21.08.1"; 472 472 src = fetchurl { 473 - url = "${mirror}/stable/release-service/21.08.0/src/kcalc-21.08.0.tar.xz"; 474 - sha256 = "14f3p10sg41az5qiccdmdavqi62m9i7ijv27hibi6z162ly15nh3"; 475 - name = "kcalc-21.08.0.tar.xz"; 473 + url = "${mirror}/stable/release-service/21.08.1/src/kcalc-21.08.1.tar.xz"; 474 + sha256 = "0si3mp1xbk6gps5fhc9fv1vskx37pgwx72i2x1kcm7azif26nzsk"; 475 + name = "kcalc-21.08.1.tar.xz"; 476 476 }; 477 477 }; 478 478 kcalutils = { 479 - version = "21.08.0"; 479 + version = "21.08.1"; 480 480 src = fetchurl { 481 - url = "${mirror}/stable/release-service/21.08.0/src/kcalutils-21.08.0.tar.xz"; 482 - sha256 = "1yg8vdlcl79f42k2j100ikm8r1bhrrwmqdrzin7qnvsqyx8dhw1i"; 483 - name = "kcalutils-21.08.0.tar.xz"; 481 + url = "${mirror}/stable/release-service/21.08.1/src/kcalutils-21.08.1.tar.xz"; 482 + sha256 = "1xrggb8vv8lrjyhdb9yf2fzs36q766if78hlymgfndj1z37s0m6m"; 483 + name = "kcalutils-21.08.1.tar.xz"; 484 484 }; 485 485 }; 486 486 kcharselect = { 487 - version = "21.08.0"; 487 + version = "21.08.1"; 488 488 src = fetchurl { 489 - url = "${mirror}/stable/release-service/21.08.0/src/kcharselect-21.08.0.tar.xz"; 490 - sha256 = "16z657is57yrag7ydc2cxzsb438kl7bxdnbn68qq2x14n011fzah"; 491 - name = "kcharselect-21.08.0.tar.xz"; 489 + url = "${mirror}/stable/release-service/21.08.1/src/kcharselect-21.08.1.tar.xz"; 490 + sha256 = "0qbhmyczc13kmbls06732i91s8n6w396dfj1z50z28wrkyqls8zr"; 491 + name = "kcharselect-21.08.1.tar.xz"; 492 492 }; 493 493 }; 494 494 kcolorchooser = { 495 - version = "21.08.0"; 495 + version = "21.08.1"; 496 496 src = fetchurl { 497 - url = "${mirror}/stable/release-service/21.08.0/src/kcolorchooser-21.08.0.tar.xz"; 498 - sha256 = "1lpskfa6nfw6ymbw8rqqi6gr1f4grdsgmxh2s5w4r2n9i9limb17"; 499 - name = "kcolorchooser-21.08.0.tar.xz"; 497 + url = "${mirror}/stable/release-service/21.08.1/src/kcolorchooser-21.08.1.tar.xz"; 498 + sha256 = "13zdyksijxflvjb3zaszl6q7wzwz0pxsq8hyi5pb2gb7gryz65h7"; 499 + name = "kcolorchooser-21.08.1.tar.xz"; 500 500 }; 501 501 }; 502 502 kcron = { 503 - version = "21.08.0"; 503 + version = "21.08.1"; 504 504 src = fetchurl { 505 - url = "${mirror}/stable/release-service/21.08.0/src/kcron-21.08.0.tar.xz"; 506 - sha256 = "1972l12291mzrcdndr5385qh8sx2alsxjfqpsk9lj1gkcqh13yyk"; 507 - name = "kcron-21.08.0.tar.xz"; 505 + url = "${mirror}/stable/release-service/21.08.1/src/kcron-21.08.1.tar.xz"; 506 + sha256 = "0c9d3rlml2adk11bp541l1zpbgp3q6mfhb7bpq4alrwlrbd4fxan"; 507 + name = "kcron-21.08.1.tar.xz"; 508 508 }; 509 509 }; 510 - kdebugsettings = { 511 - version = "21.08.0"; 510 + kde-dev-scripts = { 511 + version = "21.08.1"; 512 512 src = fetchurl { 513 - url = "${mirror}/stable/release-service/21.08.0/src/kdebugsettings-21.08.0.tar.xz"; 514 - sha256 = "0a1wp3hnxvzpa6mhf0p6yj144sv3pvhl1dffck9avaz543zrxy36"; 515 - name = "kdebugsettings-21.08.0.tar.xz"; 513 + url = "${mirror}/stable/release-service/21.08.1/src/kde-dev-scripts-21.08.1.tar.xz"; 514 + sha256 = "1pv0qj7xpvxqgcrjbr9989cax0aan64cbipia4kmlg7kriz5wz6c"; 515 + name = "kde-dev-scripts-21.08.1.tar.xz"; 516 516 }; 517 517 }; 518 - kdeconnect-kde = { 519 - version = "21.08.0"; 518 + kde-dev-utils = { 519 + version = "21.08.1"; 520 520 src = fetchurl { 521 - url = "${mirror}/stable/release-service/21.08.0/src/kdeconnect-kde-21.08.0.tar.xz"; 522 - sha256 = "1qmic0016ybldsfagbqj3yrvfhja3zhygkq6pgnkb1zq3bfk22ls"; 523 - name = "kdeconnect-kde-21.08.0.tar.xz"; 521 + url = "${mirror}/stable/release-service/21.08.1/src/kde-dev-utils-21.08.1.tar.xz"; 522 + sha256 = "02ksa35xh8vw08pqik7q8v3wax1fcvx2inicm1b2z2c4gq5k766l"; 523 + name = "kde-dev-utils-21.08.1.tar.xz"; 524 524 }; 525 525 }; 526 - kde-dev-scripts = { 527 - version = "21.08.0"; 526 + kdebugsettings = { 527 + version = "21.08.1"; 528 528 src = fetchurl { 529 - url = "${mirror}/stable/release-service/21.08.0/src/kde-dev-scripts-21.08.0.tar.xz"; 530 - sha256 = "1v8h3fp8lv6d0qdwbwwwcz9ncj5r8b3l3dbc56r9x07i1pkxxmrr"; 531 - name = "kde-dev-scripts-21.08.0.tar.xz"; 529 + url = "${mirror}/stable/release-service/21.08.1/src/kdebugsettings-21.08.1.tar.xz"; 530 + sha256 = "1fmnmvyzlhczbsxdpnm3bi50pdh2659raizaqbal2yjxcp6rlb90"; 531 + name = "kdebugsettings-21.08.1.tar.xz"; 532 532 }; 533 533 }; 534 - kde-dev-utils = { 535 - version = "21.08.0"; 534 + kdeconnect-kde = { 535 + version = "21.08.1"; 536 536 src = fetchurl { 537 - url = "${mirror}/stable/release-service/21.08.0/src/kde-dev-utils-21.08.0.tar.xz"; 538 - sha256 = "17ccgwifx7sq3dzhicclaxa9xlnxc4qic37kf5f391y99d7kj9cm"; 539 - name = "kde-dev-utils-21.08.0.tar.xz"; 537 + url = "${mirror}/stable/release-service/21.08.1/src/kdeconnect-kde-21.08.1.tar.xz"; 538 + sha256 = "01nwzsryxg7kkxb6g4h0lwn6g5zx4k64vizqk4gsvkif8d5zfc33"; 539 + name = "kdeconnect-kde-21.08.1.tar.xz"; 540 540 }; 541 541 }; 542 542 kdeedu-data = { 543 - version = "21.08.0"; 543 + version = "21.08.1"; 544 544 src = fetchurl { 545 - url = "${mirror}/stable/release-service/21.08.0/src/kdeedu-data-21.08.0.tar.xz"; 546 - sha256 = "1szkqcn64z4qrfrbfwnlzp4prv84nl361dnr6m0nr72nk0421w4g"; 547 - name = "kdeedu-data-21.08.0.tar.xz"; 545 + url = "${mirror}/stable/release-service/21.08.1/src/kdeedu-data-21.08.1.tar.xz"; 546 + sha256 = "19hc9mykw8q0krcxmrjq4mhn5dljfrv9pzv38dm80w3yfflj8y65"; 547 + name = "kdeedu-data-21.08.1.tar.xz"; 548 548 }; 549 549 }; 550 550 kdegraphics-mobipocket = { 551 - version = "21.08.0"; 551 + version = "21.08.1"; 552 552 src = fetchurl { 553 - url = "${mirror}/stable/release-service/21.08.0/src/kdegraphics-mobipocket-21.08.0.tar.xz"; 554 - sha256 = "0lg92zz122b0ia3qyg7c00ymqlh9pvpja9fyjqa0rvqy1ampb848"; 555 - name = "kdegraphics-mobipocket-21.08.0.tar.xz"; 553 + url = "${mirror}/stable/release-service/21.08.1/src/kdegraphics-mobipocket-21.08.1.tar.xz"; 554 + sha256 = "06zpm5d58q10dalm2lm7v7lcjmainn3lmagra6a1f007yshm3i32"; 555 + name = "kdegraphics-mobipocket-21.08.1.tar.xz"; 556 556 }; 557 557 }; 558 558 kdegraphics-thumbnailers = { 559 - version = "21.08.0"; 559 + version = "21.08.1"; 560 560 src = fetchurl { 561 - url = "${mirror}/stable/release-service/21.08.0/src/kdegraphics-thumbnailers-21.08.0.tar.xz"; 562 - sha256 = "1asgh1zag5pv56zhbgjax6pba5vpywhxsd3lmpa2fd6yqvrnqflw"; 563 - name = "kdegraphics-thumbnailers-21.08.0.tar.xz"; 561 + url = "${mirror}/stable/release-service/21.08.1/src/kdegraphics-thumbnailers-21.08.1.tar.xz"; 562 + sha256 = "0hqdxsnv6xgvy2knnhq733hbfgzhr6f4fi63l80saysqvpjyrxly"; 563 + name = "kdegraphics-thumbnailers-21.08.1.tar.xz"; 564 564 }; 565 565 }; 566 566 kdenetwork-filesharing = { 567 - version = "21.08.0"; 567 + version = "21.08.1"; 568 568 src = fetchurl { 569 - url = "${mirror}/stable/release-service/21.08.0/src/kdenetwork-filesharing-21.08.0.tar.xz"; 570 - sha256 = "1pnn27cfkn209vp6mapfv8p2lbbyjrkha41qfza5cgbsmnbw8vag"; 571 - name = "kdenetwork-filesharing-21.08.0.tar.xz"; 569 + url = "${mirror}/stable/release-service/21.08.1/src/kdenetwork-filesharing-21.08.1.tar.xz"; 570 + sha256 = "1q5wisy6gz94lbf3dnmxp3rq0c5b1laajph8lnlm9dhfxxmrkacf"; 571 + name = "kdenetwork-filesharing-21.08.1.tar.xz"; 572 572 }; 573 573 }; 574 574 kdenlive = { 575 - version = "21.08.0"; 575 + version = "21.08.1"; 576 576 src = fetchurl { 577 - url = "${mirror}/stable/release-service/21.08.0/src/kdenlive-21.08.0.tar.xz"; 578 - sha256 = "08nfjslkm0xdfkq15nma9c6rajgi2d1qf6sb5wscnr5bvqkxyhg4"; 579 - name = "kdenlive-21.08.0.tar.xz"; 577 + url = "${mirror}/stable/release-service/21.08.1/src/kdenlive-21.08.1.tar.xz"; 578 + sha256 = "0gjv1fm07f1qckpmlvia58myg9si9z46nwxiz1lcca5mx5k7rpcz"; 579 + name = "kdenlive-21.08.1.tar.xz"; 580 580 }; 581 581 }; 582 582 kdepim-addons = { 583 - version = "21.08.0"; 583 + version = "21.08.1"; 584 584 src = fetchurl { 585 - url = "${mirror}/stable/release-service/21.08.0/src/kdepim-addons-21.08.0.tar.xz"; 586 - sha256 = "0fbf11zxn6zf6g9l1m3faiprbkppvi4ha1q8v6khxq92nkidq962"; 587 - name = "kdepim-addons-21.08.0.tar.xz"; 585 + url = "${mirror}/stable/release-service/21.08.1/src/kdepim-addons-21.08.1.tar.xz"; 586 + sha256 = "08vpjcqnjh99bbmwp3h64anp53zafifblqy2f7bqkvwifmlrqvz8"; 587 + name = "kdepim-addons-21.08.1.tar.xz"; 588 588 }; 589 589 }; 590 590 kdepim-runtime = { 591 - version = "21.08.0"; 591 + version = "21.08.1"; 592 592 src = fetchurl { 593 - url = "${mirror}/stable/release-service/21.08.0/src/kdepim-runtime-21.08.0.tar.xz"; 594 - sha256 = "1nzc8av8yai8pjbjwz0kx6jm9kl847ddx6v913xx4y58y9w2d3xs"; 595 - name = "kdepim-runtime-21.08.0.tar.xz"; 593 + url = "${mirror}/stable/release-service/21.08.1/src/kdepim-runtime-21.08.1.tar.xz"; 594 + sha256 = "0ai6v5sysh5pzwpvbhjzi1fvfp608abpndh9nhnm7b87hca73vm9"; 595 + name = "kdepim-runtime-21.08.1.tar.xz"; 596 596 }; 597 597 }; 598 598 kdesdk-kioslaves = { 599 - version = "21.08.0"; 599 + version = "21.08.1"; 600 600 src = fetchurl { 601 - url = "${mirror}/stable/release-service/21.08.0/src/kdesdk-kioslaves-21.08.0.tar.xz"; 602 - sha256 = "08vvkcyzlaq4l4v8rwlxxpdqdmxv5ylkrf10cbg8bjkgrwqyalrc"; 603 - name = "kdesdk-kioslaves-21.08.0.tar.xz"; 601 + url = "${mirror}/stable/release-service/21.08.1/src/kdesdk-kioslaves-21.08.1.tar.xz"; 602 + sha256 = "0cz2cmcgksfkgl2nh0nnyz38q3rp1dfwhnajgcif5q0ka528v33w"; 603 + name = "kdesdk-kioslaves-21.08.1.tar.xz"; 604 604 }; 605 605 }; 606 606 kdesdk-thumbnailers = { 607 - version = "21.08.0"; 607 + version = "21.08.1"; 608 608 src = fetchurl { 609 - url = "${mirror}/stable/release-service/21.08.0/src/kdesdk-thumbnailers-21.08.0.tar.xz"; 610 - sha256 = "0n5nmixnw92mkx8vwzyixgvnjk941q6p43i6j5h272j3w98p10lg"; 611 - name = "kdesdk-thumbnailers-21.08.0.tar.xz"; 609 + url = "${mirror}/stable/release-service/21.08.1/src/kdesdk-thumbnailers-21.08.1.tar.xz"; 610 + sha256 = "1cvh2p3vfzbqbr9cfa1bchgflmp9mi12qx1j6j1jdaqqwhz43kj6"; 611 + name = "kdesdk-thumbnailers-21.08.1.tar.xz"; 612 612 }; 613 613 }; 614 614 kdf = { 615 - version = "21.08.0"; 615 + version = "21.08.1"; 616 616 src = fetchurl { 617 - url = "${mirror}/stable/release-service/21.08.0/src/kdf-21.08.0.tar.xz"; 618 - sha256 = "0s3a4chj1hx3s4nw56ddcl8nvk1rannj14zzfq31r2yg3pahy1hm"; 619 - name = "kdf-21.08.0.tar.xz"; 617 + url = "${mirror}/stable/release-service/21.08.1/src/kdf-21.08.1.tar.xz"; 618 + sha256 = "1xmn7dhbnj9bhaw545ry0qwayxh3jhpgx9xa2fjcc0dhn8yx1spv"; 619 + name = "kdf-21.08.1.tar.xz"; 620 620 }; 621 621 }; 622 622 kdialog = { 623 - version = "21.08.0"; 623 + version = "21.08.1"; 624 624 src = fetchurl { 625 - url = "${mirror}/stable/release-service/21.08.0/src/kdialog-21.08.0.tar.xz"; 626 - sha256 = "1pki0hdwxrjlcfzyvhk2ag77050zg7wkhcpj7qzxr91l3ga3rbyl"; 627 - name = "kdialog-21.08.0.tar.xz"; 625 + url = "${mirror}/stable/release-service/21.08.1/src/kdialog-21.08.1.tar.xz"; 626 + sha256 = "1mxmj5cm5h1dhqkblcqdc7ba9x04sqj6gp0b12gii7jsz3g0pa94"; 627 + name = "kdialog-21.08.1.tar.xz"; 628 628 }; 629 629 }; 630 630 kdiamond = { 631 - version = "21.08.0"; 631 + version = "21.08.1"; 632 632 src = fetchurl { 633 - url = "${mirror}/stable/release-service/21.08.0/src/kdiamond-21.08.0.tar.xz"; 634 - sha256 = "054kjwscdw8ap2123lrrhpaw2mvd1ly1cwf22zjz41k4hq533kmm"; 635 - name = "kdiamond-21.08.0.tar.xz"; 633 + url = "${mirror}/stable/release-service/21.08.1/src/kdiamond-21.08.1.tar.xz"; 634 + sha256 = "0l8z71k0a300yp03mkpabi3a9xydky6x19sk7xhq727canrb3nwz"; 635 + name = "kdiamond-21.08.1.tar.xz"; 636 636 }; 637 637 }; 638 638 keditbookmarks = { 639 - version = "21.08.0"; 639 + version = "21.08.1"; 640 640 src = fetchurl { 641 - url = "${mirror}/stable/release-service/21.08.0/src/keditbookmarks-21.08.0.tar.xz"; 642 - sha256 = "1z0n0d0wgvr4v97lkvkx7lkj3d1ncp2vi7chvvq9ja0kxyd67r8f"; 643 - name = "keditbookmarks-21.08.0.tar.xz"; 641 + url = "${mirror}/stable/release-service/21.08.1/src/keditbookmarks-21.08.1.tar.xz"; 642 + sha256 = "0j9m5l3llb969ras4bvsswahqqpwrv1zscjpdscchk72vxi2ky4w"; 643 + name = "keditbookmarks-21.08.1.tar.xz"; 644 644 }; 645 645 }; 646 646 kfind = { 647 - version = "21.08.0"; 647 + version = "21.08.1"; 648 648 src = fetchurl { 649 - url = "${mirror}/stable/release-service/21.08.0/src/kfind-21.08.0.tar.xz"; 650 - sha256 = "0qa462fsfdzk1m8jasm5zcyhx2851r42gi5jkki35gnny84ic2lg"; 651 - name = "kfind-21.08.0.tar.xz"; 649 + url = "${mirror}/stable/release-service/21.08.1/src/kfind-21.08.1.tar.xz"; 650 + sha256 = "0d3milbrznwls197a5bjrdwarpdly4pyask7j97ia7nx0z91k35f"; 651 + name = "kfind-21.08.1.tar.xz"; 652 652 }; 653 653 }; 654 654 kfloppy = { 655 - version = "21.08.0"; 655 + version = "21.08.1"; 656 656 src = fetchurl { 657 - url = "${mirror}/stable/release-service/21.08.0/src/kfloppy-21.08.0.tar.xz"; 658 - sha256 = "03kgypngvalzzraf58g7l266naal0v7781lyh9ibi78frf6j7qw3"; 659 - name = "kfloppy-21.08.0.tar.xz"; 657 + url = "${mirror}/stable/release-service/21.08.1/src/kfloppy-21.08.1.tar.xz"; 658 + sha256 = "1nxkjaarvr7fq494hb4pk6nf9731f74zsxhfia3lzb2qf3rnxhvg"; 659 + name = "kfloppy-21.08.1.tar.xz"; 660 660 }; 661 661 }; 662 662 kfourinline = { 663 - version = "21.08.0"; 663 + version = "21.08.1"; 664 664 src = fetchurl { 665 - url = "${mirror}/stable/release-service/21.08.0/src/kfourinline-21.08.0.tar.xz"; 666 - sha256 = "1g663kkjhpfi0f6q23rmfqgwi976i46fs8qr4nqw55v7l09qrkwq"; 667 - name = "kfourinline-21.08.0.tar.xz"; 665 + url = "${mirror}/stable/release-service/21.08.1/src/kfourinline-21.08.1.tar.xz"; 666 + sha256 = "0niwvc1fxvxk5xi90n753y7gjhljrnm3jjzxgjxs9ca5y1c7jcac"; 667 + name = "kfourinline-21.08.1.tar.xz"; 668 668 }; 669 669 }; 670 670 kgeography = { 671 - version = "21.08.0"; 671 + version = "21.08.1"; 672 672 src = fetchurl { 673 - url = "${mirror}/stable/release-service/21.08.0/src/kgeography-21.08.0.tar.xz"; 674 - sha256 = "01y0phdfymn8k14riiy15f58b0148rl2jidxnbl9if1jpn90dkai"; 675 - name = "kgeography-21.08.0.tar.xz"; 673 + url = "${mirror}/stable/release-service/21.08.1/src/kgeography-21.08.1.tar.xz"; 674 + sha256 = "0wqblfs4h8pr0c3m9qv5xpz1sq1zxxbbgv42d0m12fhlbmhx0l64"; 675 + name = "kgeography-21.08.1.tar.xz"; 676 676 }; 677 677 }; 678 678 kget = { 679 - version = "21.08.0"; 679 + version = "21.08.1"; 680 680 src = fetchurl { 681 - url = "${mirror}/stable/release-service/21.08.0/src/kget-21.08.0.tar.xz"; 682 - sha256 = "0k406isgg3lgnbl4c6l9wqgwjiv0hp5pg07na94vm03j0qg015q5"; 683 - name = "kget-21.08.0.tar.xz"; 681 + url = "${mirror}/stable/release-service/21.08.1/src/kget-21.08.1.tar.xz"; 682 + sha256 = "06lng1sr1l5a7qcbld7xn97vlaxnq4f98sai2llmjkyna3awzi6r"; 683 + name = "kget-21.08.1.tar.xz"; 684 684 }; 685 685 }; 686 686 kgoldrunner = { 687 - version = "21.08.0"; 687 + version = "21.08.1"; 688 688 src = fetchurl { 689 - url = "${mirror}/stable/release-service/21.08.0/src/kgoldrunner-21.08.0.tar.xz"; 690 - sha256 = "1d2z76xv3v7sg9bad6gwc5p9dbb00ljkhd9jq8bn3lrqiya5vn1l"; 691 - name = "kgoldrunner-21.08.0.tar.xz"; 689 + url = "${mirror}/stable/release-service/21.08.1/src/kgoldrunner-21.08.1.tar.xz"; 690 + sha256 = "1dggs4fbfqc7q97j8fpi2v6q52165yikaps15mracn319c8mbx85"; 691 + name = "kgoldrunner-21.08.1.tar.xz"; 692 692 }; 693 693 }; 694 694 kgpg = { 695 - version = "21.08.0"; 695 + version = "21.08.1"; 696 696 src = fetchurl { 697 - url = "${mirror}/stable/release-service/21.08.0/src/kgpg-21.08.0.tar.xz"; 698 - sha256 = "0hkhnf1n72w4ccnh3mrvzg22nfv6vpjkh8i9a5496yrzkch862g8"; 699 - name = "kgpg-21.08.0.tar.xz"; 697 + url = "${mirror}/stable/release-service/21.08.1/src/kgpg-21.08.1.tar.xz"; 698 + sha256 = "0q4k7ahh1qr4fnkw4na5kyp4kq922a45hjgz9qzh7whn6zqrhsxs"; 699 + name = "kgpg-21.08.1.tar.xz"; 700 700 }; 701 701 }; 702 702 khangman = { 703 - version = "21.08.0"; 703 + version = "21.08.1"; 704 704 src = fetchurl { 705 - url = "${mirror}/stable/release-service/21.08.0/src/khangman-21.08.0.tar.xz"; 706 - sha256 = "03bazg4bd23q90pi8z5gab91j4md7ya9ahvyla5523r671pcfwhh"; 707 - name = "khangman-21.08.0.tar.xz"; 705 + url = "${mirror}/stable/release-service/21.08.1/src/khangman-21.08.1.tar.xz"; 706 + sha256 = "1jv7vbk4za17l73b10xx1ckv56qhsvlf2irlys917bk39jhxmwpp"; 707 + name = "khangman-21.08.1.tar.xz"; 708 708 }; 709 709 }; 710 710 khelpcenter = { 711 - version = "21.08.0"; 711 + version = "21.08.1"; 712 712 src = fetchurl { 713 - url = "${mirror}/stable/release-service/21.08.0/src/khelpcenter-21.08.0.tar.xz"; 714 - sha256 = "15if3awpx514prhsaznvw7acxy4zihgf36pxjgd1rzsg6f0gcj5i"; 715 - name = "khelpcenter-21.08.0.tar.xz"; 713 + url = "${mirror}/stable/release-service/21.08.1/src/khelpcenter-21.08.1.tar.xz"; 714 + sha256 = "09ayg8kb4b4v30xjm8ca5csw1axipn1336mq2sfqra5qwkj8d93y"; 715 + name = "khelpcenter-21.08.1.tar.xz"; 716 716 }; 717 717 }; 718 718 kidentitymanagement = { 719 - version = "21.08.0"; 719 + version = "21.08.1"; 720 720 src = fetchurl { 721 - url = "${mirror}/stable/release-service/21.08.0/src/kidentitymanagement-21.08.0.tar.xz"; 722 - sha256 = "1jqn973dccdynqinyi698wkm92nqvhyy8z6nihh82rcfzkj16xcf"; 723 - name = "kidentitymanagement-21.08.0.tar.xz"; 721 + url = "${mirror}/stable/release-service/21.08.1/src/kidentitymanagement-21.08.1.tar.xz"; 722 + sha256 = "0xhkz33w0z9jlxlqb06w5fiyj1qz2mjssrbba2kdm55q67lj1b76"; 723 + name = "kidentitymanagement-21.08.1.tar.xz"; 724 724 }; 725 725 }; 726 726 kig = { 727 - version = "21.08.0"; 727 + version = "21.08.1"; 728 728 src = fetchurl { 729 - url = "${mirror}/stable/release-service/21.08.0/src/kig-21.08.0.tar.xz"; 730 - sha256 = "1m2wx1cpv5821438hlzhpis88r8dspsrh8snr1a1sgnmpgpjjla9"; 731 - name = "kig-21.08.0.tar.xz"; 729 + url = "${mirror}/stable/release-service/21.08.1/src/kig-21.08.1.tar.xz"; 730 + sha256 = "0gvp07mnkpfamdq78bv2r1m84l4xp23qh2i6iscdhjdh05dzyl6s"; 731 + name = "kig-21.08.1.tar.xz"; 732 732 }; 733 733 }; 734 734 kigo = { 735 - version = "21.08.0"; 735 + version = "21.08.1"; 736 736 src = fetchurl { 737 - url = "${mirror}/stable/release-service/21.08.0/src/kigo-21.08.0.tar.xz"; 738 - sha256 = "1kym2bl0xh8mih13ykxw3g6xkl1lyh7vpyvyn2zprgnqjhs4699v"; 739 - name = "kigo-21.08.0.tar.xz"; 737 + url = "${mirror}/stable/release-service/21.08.1/src/kigo-21.08.1.tar.xz"; 738 + sha256 = "1y7fh9acng4a135bz7skg7hgmyisaxgwli4ddv7y5h3r1rlhfd47"; 739 + name = "kigo-21.08.1.tar.xz"; 740 740 }; 741 741 }; 742 742 killbots = { 743 - version = "21.08.0"; 743 + version = "21.08.1"; 744 744 src = fetchurl { 745 - url = "${mirror}/stable/release-service/21.08.0/src/killbots-21.08.0.tar.xz"; 746 - sha256 = "0agqd8ww6l5i1absv6wxzraavdjlwvdp831xk18vr7gfdqq5rqzw"; 747 - name = "killbots-21.08.0.tar.xz"; 745 + url = "${mirror}/stable/release-service/21.08.1/src/killbots-21.08.1.tar.xz"; 746 + sha256 = "02rh60ww43r3zqv3v7zs42j7nl8b5373mykbql80amxnbj5965mn"; 747 + name = "killbots-21.08.1.tar.xz"; 748 748 }; 749 749 }; 750 750 kimagemapeditor = { 751 - version = "21.08.0"; 751 + version = "21.08.1"; 752 752 src = fetchurl { 753 - url = "${mirror}/stable/release-service/21.08.0/src/kimagemapeditor-21.08.0.tar.xz"; 754 - sha256 = "0lpzf2wcn6ifbh3jin7z55bryb2gzq1yki2yl6v5fgabq0kg0pb9"; 755 - name = "kimagemapeditor-21.08.0.tar.xz"; 753 + url = "${mirror}/stable/release-service/21.08.1/src/kimagemapeditor-21.08.1.tar.xz"; 754 + sha256 = "1mrf0k923gwy4cfh7g5yv0nnm4kx0j0yk9sz051sbvvbm4hbxqjg"; 755 + name = "kimagemapeditor-21.08.1.tar.xz"; 756 756 }; 757 757 }; 758 758 kimap = { 759 - version = "21.08.0"; 759 + version = "21.08.1"; 760 760 src = fetchurl { 761 - url = "${mirror}/stable/release-service/21.08.0/src/kimap-21.08.0.tar.xz"; 762 - sha256 = "0qyixdxy0d56a9r8gw2asm4230bcmwmj88wlhcgzd6n5q198xh49"; 763 - name = "kimap-21.08.0.tar.xz"; 761 + url = "${mirror}/stable/release-service/21.08.1/src/kimap-21.08.1.tar.xz"; 762 + sha256 = "19b8awcbrn61dwqli10v883i8s18sjz8w335c2sxlhzqgdijgxhl"; 763 + name = "kimap-21.08.1.tar.xz"; 764 764 }; 765 765 }; 766 766 kio-extras = { 767 - version = "21.08.0"; 767 + version = "21.08.1"; 768 768 src = fetchurl { 769 - url = "${mirror}/stable/release-service/21.08.0/src/kio-extras-21.08.0.tar.xz"; 770 - sha256 = "0va8ankd2hp1c5c0fdmhnx6p8rhar6xicdalck6z8gw8q94dg4xx"; 771 - name = "kio-extras-21.08.0.tar.xz"; 769 + url = "${mirror}/stable/release-service/21.08.1/src/kio-extras-21.08.1.tar.xz"; 770 + sha256 = "0wlgd0cc56gzicgi16nx4592i6f6594d1mvz7d0266xrwmm8n688"; 771 + name = "kio-extras-21.08.1.tar.xz"; 772 772 }; 773 773 }; 774 774 kio-gdrive = { 775 - version = "21.08.0"; 775 + version = "21.08.1"; 776 776 src = fetchurl { 777 - url = "${mirror}/stable/release-service/21.08.0/src/kio-gdrive-21.08.0.tar.xz"; 778 - sha256 = "1akjmd9l4ydvrjh4r2rxrhfzngvbv487wmdgq2fvy9y926vzvvlz"; 779 - name = "kio-gdrive-21.08.0.tar.xz"; 777 + url = "${mirror}/stable/release-service/21.08.1/src/kio-gdrive-21.08.1.tar.xz"; 778 + sha256 = "1vqm8b819hg1yfjlz1x3yis9qkbclahp7l00cpqbxnra0ph9b1vw"; 779 + name = "kio-gdrive-21.08.1.tar.xz"; 780 780 }; 781 781 }; 782 782 kipi-plugins = { 783 - version = "21.08.0"; 783 + version = "21.08.1"; 784 784 src = fetchurl { 785 - url = "${mirror}/stable/release-service/21.08.0/src/kipi-plugins-21.08.0.tar.xz"; 786 - sha256 = "0xfn0sx9xxl2fasj89iyyhqn6b7czkmrqxssmahi67dfnazqdnvg"; 787 - name = "kipi-plugins-21.08.0.tar.xz"; 785 + url = "${mirror}/stable/release-service/21.08.1/src/kipi-plugins-21.08.1.tar.xz"; 786 + sha256 = "1w6sw3wn0nj15jv6qp0yg7psg1m87b3izgn303z74vzkhqw04pid"; 787 + name = "kipi-plugins-21.08.1.tar.xz"; 788 788 }; 789 789 }; 790 790 kirigami-gallery = { 791 - version = "21.08.0"; 791 + version = "21.08.1"; 792 792 src = fetchurl { 793 - url = "${mirror}/stable/release-service/21.08.0/src/kirigami-gallery-21.08.0.tar.xz"; 794 - sha256 = "1q64blarbm82pwpch9r16my3zidvifmbzx2hj1wm6nan57k56xs8"; 795 - name = "kirigami-gallery-21.08.0.tar.xz"; 793 + url = "${mirror}/stable/release-service/21.08.1/src/kirigami-gallery-21.08.1.tar.xz"; 794 + sha256 = "0db1a5czq0xg0dhhmphds5vrz2lq771zwmps7gq6ahpfj01vyavd"; 795 + name = "kirigami-gallery-21.08.1.tar.xz"; 796 796 }; 797 797 }; 798 798 kiriki = { 799 - version = "21.08.0"; 799 + version = "21.08.1"; 800 800 src = fetchurl { 801 - url = "${mirror}/stable/release-service/21.08.0/src/kiriki-21.08.0.tar.xz"; 802 - sha256 = "0cvhc14syhzkgf7k04m1wpb9l8lrph2lk0mb47xyj2qlw4vyn31a"; 803 - name = "kiriki-21.08.0.tar.xz"; 801 + url = "${mirror}/stable/release-service/21.08.1/src/kiriki-21.08.1.tar.xz"; 802 + sha256 = "0x7iq3y2jc4wykgcyrgm8gmrkvlhs8gsxdl0495n1x1invsnmj00"; 803 + name = "kiriki-21.08.1.tar.xz"; 804 804 }; 805 805 }; 806 806 kiten = { 807 - version = "21.08.0"; 807 + version = "21.08.1"; 808 808 src = fetchurl { 809 - url = "${mirror}/stable/release-service/21.08.0/src/kiten-21.08.0.tar.xz"; 810 - sha256 = "1n961yhiiw6vsfqnfb9k1w8rdfdcrzawimvk4z6990bli6caj432"; 811 - name = "kiten-21.08.0.tar.xz"; 809 + url = "${mirror}/stable/release-service/21.08.1/src/kiten-21.08.1.tar.xz"; 810 + sha256 = "1skyfw5bshy6z8xvhs5q9f3c8nwqbm4mc74jcs6yhzc3i4mp82n3"; 811 + name = "kiten-21.08.1.tar.xz"; 812 812 }; 813 813 }; 814 814 kitinerary = { 815 - version = "21.08.0"; 815 + version = "21.08.1"; 816 816 src = fetchurl { 817 - url = "${mirror}/stable/release-service/21.08.0/src/kitinerary-21.08.0.tar.xz"; 818 - sha256 = "0hd28l6a2p3q6rrdn80l46fznswwy645krfcfpyasaf917710kkm"; 819 - name = "kitinerary-21.08.0.tar.xz"; 817 + url = "${mirror}/stable/release-service/21.08.1/src/kitinerary-21.08.1.tar.xz"; 818 + sha256 = "0r7mrcs7gh9ffscksvkh5v78dr2y1nh26p8r8ginafachg32p0mi"; 819 + name = "kitinerary-21.08.1.tar.xz"; 820 820 }; 821 821 }; 822 822 kjumpingcube = { 823 - version = "21.08.0"; 823 + version = "21.08.1"; 824 824 src = fetchurl { 825 - url = "${mirror}/stable/release-service/21.08.0/src/kjumpingcube-21.08.0.tar.xz"; 826 - sha256 = "0wvfn1a2wa6bwpsgk3b4i6jfza106f4j0mpqvqcck2bdyjpcqrc6"; 827 - name = "kjumpingcube-21.08.0.tar.xz"; 825 + url = "${mirror}/stable/release-service/21.08.1/src/kjumpingcube-21.08.1.tar.xz"; 826 + sha256 = "1kh3jqp3m96lal6salcrqhgzg1pbacx20xn41c1jy272ch57r2jj"; 827 + name = "kjumpingcube-21.08.1.tar.xz"; 828 828 }; 829 829 }; 830 830 kldap = { 831 - version = "21.08.0"; 831 + version = "21.08.1"; 832 832 src = fetchurl { 833 - url = "${mirror}/stable/release-service/21.08.0/src/kldap-21.08.0.tar.xz"; 834 - sha256 = "0ng64lrcp0av31i2rp0jpag4kvikfmmxap4z1wzb21br3wr6zfcr"; 835 - name = "kldap-21.08.0.tar.xz"; 833 + url = "${mirror}/stable/release-service/21.08.1/src/kldap-21.08.1.tar.xz"; 834 + sha256 = "1m92kd6mrz3dxap6rzw0r85wij030a60n10hkgkjkxb8npgvl14g"; 835 + name = "kldap-21.08.1.tar.xz"; 836 836 }; 837 837 }; 838 838 kleopatra = { 839 - version = "21.08.0"; 839 + version = "21.08.1"; 840 840 src = fetchurl { 841 - url = "${mirror}/stable/release-service/21.08.0/src/kleopatra-21.08.0.tar.xz"; 842 - sha256 = "0l83x3cpfi9b1pbf00fbbynk5g9ffryasmapxdr1qqsavk2wlybr"; 843 - name = "kleopatra-21.08.0.tar.xz"; 841 + url = "${mirror}/stable/release-service/21.08.1/src/kleopatra-21.08.1.tar.xz"; 842 + sha256 = "1j1jd8ivcw2r2nlzzhr24kxcvfp5q1206gpkchd5mvsl6q34fmzx"; 843 + name = "kleopatra-21.08.1.tar.xz"; 844 844 }; 845 845 }; 846 846 klettres = { 847 - version = "21.08.0"; 847 + version = "21.08.1"; 848 848 src = fetchurl { 849 - url = "${mirror}/stable/release-service/21.08.0/src/klettres-21.08.0.tar.xz"; 850 - sha256 = "16fc71s9nksd47xhphqw4zdw8inb47m5zn5m6xpmvvf98bs42ia1"; 851 - name = "klettres-21.08.0.tar.xz"; 849 + url = "${mirror}/stable/release-service/21.08.1/src/klettres-21.08.1.tar.xz"; 850 + sha256 = "0scgccwsma1hc1zp52h4rqddwizsqzwsh6gql5lf4qxhr8ihgj4m"; 851 + name = "klettres-21.08.1.tar.xz"; 852 852 }; 853 853 }; 854 854 klickety = { 855 - version = "21.08.0"; 855 + version = "21.08.1"; 856 856 src = fetchurl { 857 - url = "${mirror}/stable/release-service/21.08.0/src/klickety-21.08.0.tar.xz"; 858 - sha256 = "172ajlmnw6hwg8lr7kdiixd43iv2ldg5bwnh1jaddrpn29zfdj9g"; 859 - name = "klickety-21.08.0.tar.xz"; 857 + url = "${mirror}/stable/release-service/21.08.1/src/klickety-21.08.1.tar.xz"; 858 + sha256 = "0r8dr4blwv1l6b8585qw7q258qr9pgk97pmrfmpssb90yxni2c1c"; 859 + name = "klickety-21.08.1.tar.xz"; 860 860 }; 861 861 }; 862 862 klines = { 863 - version = "21.08.0"; 863 + version = "21.08.1"; 864 864 src = fetchurl { 865 - url = "${mirror}/stable/release-service/21.08.0/src/klines-21.08.0.tar.xz"; 866 - sha256 = "0f4281cynn1zacfpq5i6n5vwps9d1k7i6mqpzwx8jrxmwka39r1y"; 867 - name = "klines-21.08.0.tar.xz"; 865 + url = "${mirror}/stable/release-service/21.08.1/src/klines-21.08.1.tar.xz"; 866 + sha256 = "1iyk91spsnfrkbjyf6jng6rgximcav2zf2xqkq1q2vvyhwwpchn6"; 867 + name = "klines-21.08.1.tar.xz"; 868 868 }; 869 869 }; 870 870 kmag = { 871 - version = "21.08.0"; 871 + version = "21.08.1"; 872 872 src = fetchurl { 873 - url = "${mirror}/stable/release-service/21.08.0/src/kmag-21.08.0.tar.xz"; 874 - sha256 = "148frh2qq1yxixcpr0s8kvcviz8qh7vjvyp2w0v30m9lr01asm0s"; 875 - name = "kmag-21.08.0.tar.xz"; 873 + url = "${mirror}/stable/release-service/21.08.1/src/kmag-21.08.1.tar.xz"; 874 + sha256 = "1hdjcya1jv6adz0d9hp1sq7y8f6fvzpw30fchmjkdm9y2kf8il6c"; 875 + name = "kmag-21.08.1.tar.xz"; 876 876 }; 877 877 }; 878 878 kmahjongg = { 879 - version = "21.08.0"; 879 + version = "21.08.1"; 880 880 src = fetchurl { 881 - url = "${mirror}/stable/release-service/21.08.0/src/kmahjongg-21.08.0.tar.xz"; 882 - sha256 = "04mr9i0dwy1rypr22wlv3lcg73zz1yy373pb1vv914b3spps9pip"; 883 - name = "kmahjongg-21.08.0.tar.xz"; 881 + url = "${mirror}/stable/release-service/21.08.1/src/kmahjongg-21.08.1.tar.xz"; 882 + sha256 = "1wrzyiv07cffn5xiachqa8k9spcsi3iwvdj6prgbgdndbffw2gim"; 883 + name = "kmahjongg-21.08.1.tar.xz"; 884 884 }; 885 885 }; 886 886 kmail = { 887 - version = "21.08.0"; 887 + version = "21.08.1"; 888 888 src = fetchurl { 889 - url = "${mirror}/stable/release-service/21.08.0/src/kmail-21.08.0.tar.xz"; 890 - sha256 = "1jnlgl5hdw4dx36wd5642x484dka1094d9xq0wn7iqpzlyh8d519"; 891 - name = "kmail-21.08.0.tar.xz"; 889 + url = "${mirror}/stable/release-service/21.08.1/src/kmail-21.08.1.tar.xz"; 890 + sha256 = "08q7c8l2nfrvw5xgc2dzcmidcpsjfya3jjnssziy3hpznmf8jpjr"; 891 + name = "kmail-21.08.1.tar.xz"; 892 892 }; 893 893 }; 894 894 kmail-account-wizard = { 895 - version = "21.08.0"; 895 + version = "21.08.1"; 896 896 src = fetchurl { 897 - url = "${mirror}/stable/release-service/21.08.0/src/kmail-account-wizard-21.08.0.tar.xz"; 898 - sha256 = "14sxx25xijp9r53001kywbbaidsni1sslk4mi1pi71rwi4mvmm2w"; 899 - name = "kmail-account-wizard-21.08.0.tar.xz"; 897 + url = "${mirror}/stable/release-service/21.08.1/src/kmail-account-wizard-21.08.1.tar.xz"; 898 + sha256 = "1xqm4737p5l5cwqlnn7xladz4yna7aghl84hlbvzrfcc72v5xkal"; 899 + name = "kmail-account-wizard-21.08.1.tar.xz"; 900 900 }; 901 901 }; 902 902 kmailtransport = { 903 - version = "21.08.0"; 903 + version = "21.08.1"; 904 904 src = fetchurl { 905 - url = "${mirror}/stable/release-service/21.08.0/src/kmailtransport-21.08.0.tar.xz"; 906 - sha256 = "1xijhf37djscjm86r3m1f64w97q24plpv06h55mqq4pgxkm6v0a9"; 907 - name = "kmailtransport-21.08.0.tar.xz"; 905 + url = "${mirror}/stable/release-service/21.08.1/src/kmailtransport-21.08.1.tar.xz"; 906 + sha256 = "0zd03s4848n3g1w8fm0q3kq5sy91zhjw3hc2w6ncv6cgbb9s50dv"; 907 + name = "kmailtransport-21.08.1.tar.xz"; 908 908 }; 909 909 }; 910 910 kmbox = { 911 - version = "21.08.0"; 911 + version = "21.08.1"; 912 912 src = fetchurl { 913 - url = "${mirror}/stable/release-service/21.08.0/src/kmbox-21.08.0.tar.xz"; 914 - sha256 = "1xa4g2cj5chmmhsw6larbmwr0k0n07mj7953w1qm5wi1jfr2ivca"; 915 - name = "kmbox-21.08.0.tar.xz"; 913 + url = "${mirror}/stable/release-service/21.08.1/src/kmbox-21.08.1.tar.xz"; 914 + sha256 = "027x76lrjssrhqpr651fyqqkdv6jmiad901cssv7w54r2dpzs6w3"; 915 + name = "kmbox-21.08.1.tar.xz"; 916 916 }; 917 917 }; 918 918 kmime = { 919 - version = "21.08.0"; 919 + version = "21.08.1"; 920 920 src = fetchurl { 921 - url = "${mirror}/stable/release-service/21.08.0/src/kmime-21.08.0.tar.xz"; 922 - sha256 = "19g9l5bl6gm4rx133nlsv6p4kpa1pifk24rqx7f2rv5j7by8jmxh"; 923 - name = "kmime-21.08.0.tar.xz"; 921 + url = "${mirror}/stable/release-service/21.08.1/src/kmime-21.08.1.tar.xz"; 922 + sha256 = "0prsmiv0g6icclhv7mkha66pddmdqz2mi69njz0xwz6m3ax068jw"; 923 + name = "kmime-21.08.1.tar.xz"; 924 924 }; 925 925 }; 926 926 kmines = { 927 - version = "21.08.0"; 927 + version = "21.08.1"; 928 928 src = fetchurl { 929 - url = "${mirror}/stable/release-service/21.08.0/src/kmines-21.08.0.tar.xz"; 930 - sha256 = "1v4hl4kqwgrdkjj1lsa5z6bvlq8xhldp2pwldzvg05c1r7lbvnw1"; 931 - name = "kmines-21.08.0.tar.xz"; 929 + url = "${mirror}/stable/release-service/21.08.1/src/kmines-21.08.1.tar.xz"; 930 + sha256 = "0nx07cghq20rja8rncrayx87v357s036whdfyzc6qkhdmlmkh6qj"; 931 + name = "kmines-21.08.1.tar.xz"; 932 932 }; 933 933 }; 934 934 kmix = { 935 - version = "21.08.0"; 935 + version = "21.08.1"; 936 936 src = fetchurl { 937 - url = "${mirror}/stable/release-service/21.08.0/src/kmix-21.08.0.tar.xz"; 938 - sha256 = "1bdp2vasbw2qrsajqlpd5w1403n291w43dfms46fgw8vw5wpi5qq"; 939 - name = "kmix-21.08.0.tar.xz"; 937 + url = "${mirror}/stable/release-service/21.08.1/src/kmix-21.08.1.tar.xz"; 938 + sha256 = "0jc0b1j32gg7az0z7m1cvfdjrwss4q91hm1cfhrk5fq12620vivf"; 939 + name = "kmix-21.08.1.tar.xz"; 940 940 }; 941 941 }; 942 942 kmousetool = { 943 - version = "21.08.0"; 943 + version = "21.08.1"; 944 944 src = fetchurl { 945 - url = "${mirror}/stable/release-service/21.08.0/src/kmousetool-21.08.0.tar.xz"; 946 - sha256 = "1rz44gwjikckpjms4v4hsakll2dy0imrsgdvk2zsr9nr00lgbn0v"; 947 - name = "kmousetool-21.08.0.tar.xz"; 945 + url = "${mirror}/stable/release-service/21.08.1/src/kmousetool-21.08.1.tar.xz"; 946 + sha256 = "04a5zrxg48svrvdf8gf3qc7cj7cayzhw0q4l1v8nzs2ykc330xq1"; 947 + name = "kmousetool-21.08.1.tar.xz"; 948 948 }; 949 949 }; 950 950 kmouth = { 951 - version = "21.08.0"; 951 + version = "21.08.1"; 952 952 src = fetchurl { 953 - url = "${mirror}/stable/release-service/21.08.0/src/kmouth-21.08.0.tar.xz"; 954 - sha256 = "0i8bg49y4x9bwacmq0hk8az88r2q54bgnzxbd1rscd5nkqs21fr1"; 955 - name = "kmouth-21.08.0.tar.xz"; 953 + url = "${mirror}/stable/release-service/21.08.1/src/kmouth-21.08.1.tar.xz"; 954 + sha256 = "1rmqppmjjcrc7xp63csdgp440f003nia6hcnixxlya8pwn90bpwr"; 955 + name = "kmouth-21.08.1.tar.xz"; 956 956 }; 957 957 }; 958 958 kmplot = { 959 - version = "21.08.0"; 959 + version = "21.08.1"; 960 960 src = fetchurl { 961 - url = "${mirror}/stable/release-service/21.08.0/src/kmplot-21.08.0.tar.xz"; 962 - sha256 = "1szskpbql3s10b64na55rnys2gz05gssvydbsiqxkwyj4igs91yv"; 963 - name = "kmplot-21.08.0.tar.xz"; 961 + url = "${mirror}/stable/release-service/21.08.1/src/kmplot-21.08.1.tar.xz"; 962 + sha256 = "0mkcrdg0v98hdy5lgkyfv4x019w4sm7yiyfpryhx1wiqcpibxwl1"; 963 + name = "kmplot-21.08.1.tar.xz"; 964 964 }; 965 965 }; 966 966 knavalbattle = { 967 - version = "21.08.0"; 967 + version = "21.08.1"; 968 968 src = fetchurl { 969 - url = "${mirror}/stable/release-service/21.08.0/src/knavalbattle-21.08.0.tar.xz"; 970 - sha256 = "1f8byp909306ksvbdjs662k7ahyf5sjg3gsv3qay0d36kzlp8274"; 971 - name = "knavalbattle-21.08.0.tar.xz"; 969 + url = "${mirror}/stable/release-service/21.08.1/src/knavalbattle-21.08.1.tar.xz"; 970 + sha256 = "1lvq223jspc5y0z6qaf648m85a58yp88b0jm8510p77ymxhyvgm7"; 971 + name = "knavalbattle-21.08.1.tar.xz"; 972 972 }; 973 973 }; 974 974 knetwalk = { 975 - version = "21.08.0"; 975 + version = "21.08.1"; 976 976 src = fetchurl { 977 - url = "${mirror}/stable/release-service/21.08.0/src/knetwalk-21.08.0.tar.xz"; 978 - sha256 = "0djdshqq35mpbdqn10acaxn3irwagh3q6zvc6sfsc2cs7nihaff2"; 979 - name = "knetwalk-21.08.0.tar.xz"; 977 + url = "${mirror}/stable/release-service/21.08.1/src/knetwalk-21.08.1.tar.xz"; 978 + sha256 = "1akv78yaym474b57d9qxqp3vivs405m1zm6x0plf2g1adp93myz2"; 979 + name = "knetwalk-21.08.1.tar.xz"; 980 980 }; 981 981 }; 982 982 knights = { 983 - version = "21.08.0"; 983 + version = "21.08.1"; 984 984 src = fetchurl { 985 - url = "${mirror}/stable/release-service/21.08.0/src/knights-21.08.0.tar.xz"; 986 - sha256 = "1hq9vm67cgdjqmy41hk2hf6x0z4gqmrzyz8sfd1ja5j03yisjv4h"; 987 - name = "knights-21.08.0.tar.xz"; 985 + url = "${mirror}/stable/release-service/21.08.1/src/knights-21.08.1.tar.xz"; 986 + sha256 = "1m00nryw69k4dyb0vvnjz3fwasf67ghkq78l7k8ck9vvzrihmwd1"; 987 + name = "knights-21.08.1.tar.xz"; 988 988 }; 989 989 }; 990 990 knotes = { 991 - version = "21.08.0"; 991 + version = "21.08.1"; 992 992 src = fetchurl { 993 - url = "${mirror}/stable/release-service/21.08.0/src/knotes-21.08.0.tar.xz"; 994 - sha256 = "0p2jvvm2i66aib0ajlr2jynsyf7gzqhn18rxpp4mg95lqzsmvdlf"; 995 - name = "knotes-21.08.0.tar.xz"; 993 + url = "${mirror}/stable/release-service/21.08.1/src/knotes-21.08.1.tar.xz"; 994 + sha256 = "1av537f02zsz72mqkzlcrv977kf96nrdwsj4fx7kmdbhf5x9rvgv"; 995 + name = "knotes-21.08.1.tar.xz"; 996 996 }; 997 997 }; 998 998 kolf = { 999 - version = "21.08.0"; 999 + version = "21.08.1"; 1000 1000 src = fetchurl { 1001 - url = "${mirror}/stable/release-service/21.08.0/src/kolf-21.08.0.tar.xz"; 1002 - sha256 = "1p2sgfkrlcm125y461kdf5rf5i6x89z3i3kad375agl6wnlnkvr7"; 1003 - name = "kolf-21.08.0.tar.xz"; 1001 + url = "${mirror}/stable/release-service/21.08.1/src/kolf-21.08.1.tar.xz"; 1002 + sha256 = "15wk2c2pzpg39hv6s1b80mf5l7gkbxlprahjq6wh6f6a5hm3wkxb"; 1003 + name = "kolf-21.08.1.tar.xz"; 1004 1004 }; 1005 1005 }; 1006 1006 kollision = { 1007 - version = "21.08.0"; 1007 + version = "21.08.1"; 1008 1008 src = fetchurl { 1009 - url = "${mirror}/stable/release-service/21.08.0/src/kollision-21.08.0.tar.xz"; 1010 - sha256 = "1vs298nigl6rnp14xrlsp50gmca77bah149k94mxqq86f0gfin7s"; 1011 - name = "kollision-21.08.0.tar.xz"; 1009 + url = "${mirror}/stable/release-service/21.08.1/src/kollision-21.08.1.tar.xz"; 1010 + sha256 = "15ddxccj29094lxrihchc17x2a2xnjk790dqhfja9d235vkg3lpb"; 1011 + name = "kollision-21.08.1.tar.xz"; 1012 1012 }; 1013 1013 }; 1014 1014 kolourpaint = { 1015 - version = "21.08.0"; 1015 + version = "21.08.1"; 1016 1016 src = fetchurl { 1017 - url = "${mirror}/stable/release-service/21.08.0/src/kolourpaint-21.08.0.tar.xz"; 1018 - sha256 = "0n6fid327m864sp8sa7ms0l559fhxj7ikp5yn6pfm86xl6ks8bfz"; 1019 - name = "kolourpaint-21.08.0.tar.xz"; 1017 + url = "${mirror}/stable/release-service/21.08.1/src/kolourpaint-21.08.1.tar.xz"; 1018 + sha256 = "0vjssni7c8dx1617gsnkp8dip92agys8n1ydzdly6jpwhvlr382a"; 1019 + name = "kolourpaint-21.08.1.tar.xz"; 1020 1020 }; 1021 1021 }; 1022 1022 kompare = { 1023 - version = "21.08.0"; 1023 + version = "21.08.1"; 1024 1024 src = fetchurl { 1025 - url = "${mirror}/stable/release-service/21.08.0/src/kompare-21.08.0.tar.xz"; 1026 - sha256 = "1m079gqqzfsawixsq0spi7lyg0ad9vm3mhddzbmnbg2mn250nbkb"; 1027 - name = "kompare-21.08.0.tar.xz"; 1025 + url = "${mirror}/stable/release-service/21.08.1/src/kompare-21.08.1.tar.xz"; 1026 + sha256 = "0sigh2c91ff7r6yclx18lcwqbwh4gbj55n5fjpd1fw9rb7xf9j3n"; 1027 + name = "kompare-21.08.1.tar.xz"; 1028 1028 }; 1029 1029 }; 1030 1030 konqueror = { 1031 - version = "21.08.0"; 1031 + version = "21.08.1"; 1032 1032 src = fetchurl { 1033 - url = "${mirror}/stable/release-service/21.08.0/src/konqueror-21.08.0.tar.xz"; 1034 - sha256 = "0jlnw7j6p1svx3af95drdfrczqvikz4krq3gmmq3r62gp5bk3yyf"; 1035 - name = "konqueror-21.08.0.tar.xz"; 1033 + url = "${mirror}/stable/release-service/21.08.1/src/konqueror-21.08.1.tar.xz"; 1034 + sha256 = "155dc8nd3kgr25wpjisnp9z2jr1f31vcnm8ywa98p4i59kaaxh7h"; 1035 + name = "konqueror-21.08.1.tar.xz"; 1036 1036 }; 1037 1037 }; 1038 1038 konquest = { 1039 - version = "21.08.0"; 1039 + version = "21.08.1"; 1040 1040 src = fetchurl { 1041 - url = "${mirror}/stable/release-service/21.08.0/src/konquest-21.08.0.tar.xz"; 1042 - sha256 = "0l128pr04qq6jdja6p0bbzc6y1233gd2h3wvbwh7hml4vxl8fsbh"; 1043 - name = "konquest-21.08.0.tar.xz"; 1041 + url = "${mirror}/stable/release-service/21.08.1/src/konquest-21.08.1.tar.xz"; 1042 + sha256 = "0i0pm5zq2ipm1ipsam19c771v16bxlhilidny336rzwfa1vik0zl"; 1043 + name = "konquest-21.08.1.tar.xz"; 1044 1044 }; 1045 1045 }; 1046 1046 konsole = { 1047 - version = "21.08.0"; 1047 + version = "21.08.1"; 1048 1048 src = fetchurl { 1049 - url = "${mirror}/stable/release-service/21.08.0/src/konsole-21.08.0.tar.xz"; 1050 - sha256 = "1gxy98wg2qfylqslg3ga3prk54knrik1rhzs7lsmmr73vym1dpav"; 1051 - name = "konsole-21.08.0.tar.xz"; 1049 + url = "${mirror}/stable/release-service/21.08.1/src/konsole-21.08.1.tar.xz"; 1050 + sha256 = "0v74yrblwakbmy0p4x5j9lhmqyavgsffahr51bh5r5qcgx0cafjv"; 1051 + name = "konsole-21.08.1.tar.xz"; 1052 1052 }; 1053 1053 }; 1054 1054 kontact = { 1055 - version = "21.08.0"; 1055 + version = "21.08.1"; 1056 1056 src = fetchurl { 1057 - url = "${mirror}/stable/release-service/21.08.0/src/kontact-21.08.0.tar.xz"; 1058 - sha256 = "1bdvji09nimgpdlz6nk7dbr22agnsrpra7r8jz81a0cjqspcmmsi"; 1059 - name = "kontact-21.08.0.tar.xz"; 1057 + url = "${mirror}/stable/release-service/21.08.1/src/kontact-21.08.1.tar.xz"; 1058 + sha256 = "1aqyrkmc7hnzja1spm75ybrb9c3yg37rklcgdr7myyyhjxmvnrzg"; 1059 + name = "kontact-21.08.1.tar.xz"; 1060 1060 }; 1061 1061 }; 1062 1062 kontactinterface = { 1063 - version = "21.08.0"; 1063 + version = "21.08.1"; 1064 1064 src = fetchurl { 1065 - url = "${mirror}/stable/release-service/21.08.0/src/kontactinterface-21.08.0.tar.xz"; 1066 - sha256 = "1gl99624yhafwc1nw5if0a2k2v25s3rl4ak35c8af8mba54niy5z"; 1067 - name = "kontactinterface-21.08.0.tar.xz"; 1065 + url = "${mirror}/stable/release-service/21.08.1/src/kontactinterface-21.08.1.tar.xz"; 1066 + sha256 = "1l251rw80c329sgrv25r8cn242v0kl7pvcfv9xkakql7dw707xs9"; 1067 + name = "kontactinterface-21.08.1.tar.xz"; 1068 1068 }; 1069 1069 }; 1070 1070 kontrast = { 1071 - version = "21.08.0"; 1071 + version = "21.08.1"; 1072 1072 src = fetchurl { 1073 - url = "${mirror}/stable/release-service/21.08.0/src/kontrast-21.08.0.tar.xz"; 1074 - sha256 = "000bmbgp43znmqxxb33ik11lri1x44jcdyzd8cxlh8frwv96hd9x"; 1075 - name = "kontrast-21.08.0.tar.xz"; 1073 + url = "${mirror}/stable/release-service/21.08.1/src/kontrast-21.08.1.tar.xz"; 1074 + sha256 = "05nw7z05maxpcr37andv60fn9s8kprz474bkza980ah05xzvkkvb"; 1075 + name = "kontrast-21.08.1.tar.xz"; 1076 1076 }; 1077 1077 }; 1078 1078 konversation = { 1079 - version = "21.08.0"; 1079 + version = "21.08.1"; 1080 1080 src = fetchurl { 1081 - url = "${mirror}/stable/release-service/21.08.0/src/konversation-21.08.0.tar.xz"; 1082 - sha256 = "162rdh9cz417b6zc5217gp53vwsny3i7r0s14cpvrmfl141isrg8"; 1083 - name = "konversation-21.08.0.tar.xz"; 1081 + url = "${mirror}/stable/release-service/21.08.1/src/konversation-21.08.1.tar.xz"; 1082 + sha256 = "0v3nvyjc13jav8x9krg9sd9p533j7ndan0fqb5p0virwk1dznvfy"; 1083 + name = "konversation-21.08.1.tar.xz"; 1084 1084 }; 1085 1085 }; 1086 1086 kopeninghours = { 1087 - version = "21.08.0"; 1087 + version = "21.08.1"; 1088 1088 src = fetchurl { 1089 - url = "${mirror}/stable/release-service/21.08.0/src/kopeninghours-21.08.0.tar.xz"; 1090 - sha256 = "1abyq50pa8qzsvgawbas4mn64g3p8jz7cbz5fb6mzy8546sm11yv"; 1091 - name = "kopeninghours-21.08.0.tar.xz"; 1089 + url = "${mirror}/stable/release-service/21.08.1/src/kopeninghours-21.08.1.tar.xz"; 1090 + sha256 = "09yskjfkr190vkp8xgj2hicfyg1mx9mqm7pgn4133qfn08xh52vd"; 1091 + name = "kopeninghours-21.08.1.tar.xz"; 1092 1092 }; 1093 1093 }; 1094 1094 kopete = { 1095 - version = "21.08.0"; 1095 + version = "21.08.1"; 1096 1096 src = fetchurl { 1097 - url = "${mirror}/stable/release-service/21.08.0/src/kopete-21.08.0.tar.xz"; 1098 - sha256 = "11zngca7wyfzbv0bw1f3qw1gvi5234m2ybkh5sznhrd3w1jadqgl"; 1099 - name = "kopete-21.08.0.tar.xz"; 1097 + url = "${mirror}/stable/release-service/21.08.1/src/kopete-21.08.1.tar.xz"; 1098 + sha256 = "131nic6w1bzc0l94b8jkzac2dckaz64y2fgplyiqjidicm0cyrd1"; 1099 + name = "kopete-21.08.1.tar.xz"; 1100 1100 }; 1101 1101 }; 1102 1102 korganizer = { 1103 - version = "21.08.0"; 1103 + version = "21.08.1"; 1104 1104 src = fetchurl { 1105 - url = "${mirror}/stable/release-service/21.08.0/src/korganizer-21.08.0.tar.xz"; 1106 - sha256 = "1d5zilr1qsgfwvzc61pmbn8w8gv4a6i5i1slbdaps6wkr4bb0z7m"; 1107 - name = "korganizer-21.08.0.tar.xz"; 1105 + url = "${mirror}/stable/release-service/21.08.1/src/korganizer-21.08.1.tar.xz"; 1106 + sha256 = "0x05i3c0nj46bnnd7msz1rpghbr2p6sywfsa15d6l1j72i2ay0vr"; 1107 + name = "korganizer-21.08.1.tar.xz"; 1108 1108 }; 1109 1109 }; 1110 1110 kosmindoormap = { 1111 - version = "21.08.0"; 1111 + version = "21.08.1"; 1112 1112 src = fetchurl { 1113 - url = "${mirror}/stable/release-service/21.08.0/src/kosmindoormap-21.08.0.tar.xz"; 1114 - sha256 = "1lbywi76mwvljxp7n6gyhgfl4772cdfa5sphxhbf1klyvhryl797"; 1115 - name = "kosmindoormap-21.08.0.tar.xz"; 1113 + url = "${mirror}/stable/release-service/21.08.1/src/kosmindoormap-21.08.1.tar.xz"; 1114 + sha256 = "1v31cik859b994xka37z0l86nd0crykbsnafyxpmqdzf942ixixb"; 1115 + name = "kosmindoormap-21.08.1.tar.xz"; 1116 1116 }; 1117 1117 }; 1118 1118 kpat = { 1119 - version = "21.08.0"; 1119 + version = "21.08.1"; 1120 1120 src = fetchurl { 1121 - url = "${mirror}/stable/release-service/21.08.0/src/kpat-21.08.0.tar.xz"; 1122 - sha256 = "1wpsxz2fwjl92yl4a0npksdbhd9b3gfvh9giyr2p0gwfxrwwdq3z"; 1123 - name = "kpat-21.08.0.tar.xz"; 1121 + url = "${mirror}/stable/release-service/21.08.1/src/kpat-21.08.1.tar.xz"; 1122 + sha256 = "1dxihma5mad2kbg7wzfbnaq3gmgwav70rqrj5fpji42pvlqx4vyn"; 1123 + name = "kpat-21.08.1.tar.xz"; 1124 1124 }; 1125 1125 }; 1126 1126 kpimtextedit = { 1127 - version = "21.08.0"; 1127 + version = "21.08.1"; 1128 1128 src = fetchurl { 1129 - url = "${mirror}/stable/release-service/21.08.0/src/kpimtextedit-21.08.0.tar.xz"; 1130 - sha256 = "1s20s5njmrbn5sa4vx74aivrphnypzd133j6n58xqbjza7zm0sgj"; 1131 - name = "kpimtextedit-21.08.0.tar.xz"; 1129 + url = "${mirror}/stable/release-service/21.08.1/src/kpimtextedit-21.08.1.tar.xz"; 1130 + sha256 = "1zaavf0gpaibk22fz8ij0fqrlp18lj07hgdg6ynhdmhamw59sfr5"; 1131 + name = "kpimtextedit-21.08.1.tar.xz"; 1132 1132 }; 1133 1133 }; 1134 1134 kpkpass = { 1135 - version = "21.08.0"; 1135 + version = "21.08.1"; 1136 1136 src = fetchurl { 1137 - url = "${mirror}/stable/release-service/21.08.0/src/kpkpass-21.08.0.tar.xz"; 1138 - sha256 = "058kk3rfklfmw949wix0rv10q8094xq30vxyrglll96pxk2rj22h"; 1139 - name = "kpkpass-21.08.0.tar.xz"; 1137 + url = "${mirror}/stable/release-service/21.08.1/src/kpkpass-21.08.1.tar.xz"; 1138 + sha256 = "0z8dk548awy37iq8zz41x2wm2i9bhpfa2g0ghlwvhj7sy97ap1vk"; 1139 + name = "kpkpass-21.08.1.tar.xz"; 1140 1140 }; 1141 1141 }; 1142 1142 kpmcore = { 1143 - version = "21.08.0"; 1143 + version = "21.08.1"; 1144 1144 src = fetchurl { 1145 - url = "${mirror}/stable/release-service/21.08.0/src/kpmcore-21.08.0.tar.xz"; 1146 - sha256 = "0l9aqm07203r2q74g6pnzhgwqhccr38qn89zb80p683bqi3chdd1"; 1147 - name = "kpmcore-21.08.0.tar.xz"; 1145 + url = "${mirror}/stable/release-service/21.08.1/src/kpmcore-21.08.1.tar.xz"; 1146 + sha256 = "1aw21x70kgm1dmhqr384k6rbsd1fx70zd94i0slq5zyf37zx6b9l"; 1147 + name = "kpmcore-21.08.1.tar.xz"; 1148 1148 }; 1149 1149 }; 1150 1150 kpublictransport = { 1151 - version = "21.08.0"; 1151 + version = "21.08.1"; 1152 1152 src = fetchurl { 1153 - url = "${mirror}/stable/release-service/21.08.0/src/kpublictransport-21.08.0.tar.xz"; 1154 - sha256 = "1bfyr509z27gz59ykar0png1gghbna6minl987hxyiys76pchrd2"; 1155 - name = "kpublictransport-21.08.0.tar.xz"; 1153 + url = "${mirror}/stable/release-service/21.08.1/src/kpublictransport-21.08.1.tar.xz"; 1154 + sha256 = "1dbbsdrzhqaiz6d4hlyy1f50m6hi0arafxrxr65gh9h4zs2ym4qs"; 1155 + name = "kpublictransport-21.08.1.tar.xz"; 1156 1156 }; 1157 1157 }; 1158 1158 kqtquickcharts = { 1159 - version = "21.08.0"; 1159 + version = "21.08.1"; 1160 1160 src = fetchurl { 1161 - url = "${mirror}/stable/release-service/21.08.0/src/kqtquickcharts-21.08.0.tar.xz"; 1162 - sha256 = "1x4bxqpnmyq6cvg7j6dbk0y7nbhjkrrldw9spxa72lx914bpd6np"; 1163 - name = "kqtquickcharts-21.08.0.tar.xz"; 1161 + url = "${mirror}/stable/release-service/21.08.1/src/kqtquickcharts-21.08.1.tar.xz"; 1162 + sha256 = "0ghmxzy3jqzy3zdpp5zhjv3mcq6micnnk1jhnlq03v4z981rrs6h"; 1163 + name = "kqtquickcharts-21.08.1.tar.xz"; 1164 1164 }; 1165 1165 }; 1166 1166 krdc = { 1167 - version = "21.08.0"; 1167 + version = "21.08.1"; 1168 1168 src = fetchurl { 1169 - url = "${mirror}/stable/release-service/21.08.0/src/krdc-21.08.0.tar.xz"; 1170 - sha256 = "0ja1x3i91wiw0v8qfd6fig56bqhpbfg2hhhl1bh8bqxm77q3qq9h"; 1171 - name = "krdc-21.08.0.tar.xz"; 1169 + url = "${mirror}/stable/release-service/21.08.1/src/krdc-21.08.1.tar.xz"; 1170 + sha256 = "038m7wgpg33sqqqq7iy4rvficsi7x2012rimxb1gn2azg5kcwk6v"; 1171 + name = "krdc-21.08.1.tar.xz"; 1172 1172 }; 1173 1173 }; 1174 1174 kreversi = { 1175 - version = "21.08.0"; 1175 + version = "21.08.1"; 1176 1176 src = fetchurl { 1177 - url = "${mirror}/stable/release-service/21.08.0/src/kreversi-21.08.0.tar.xz"; 1178 - sha256 = "1122ybggnmkhb0lx934a2dka24gbfif0dmcg5qgzsbhvmc3am0cp"; 1179 - name = "kreversi-21.08.0.tar.xz"; 1177 + url = "${mirror}/stable/release-service/21.08.1/src/kreversi-21.08.1.tar.xz"; 1178 + sha256 = "1gh7zhqzyh2m34v3gyb902c6cvw33rbib5g8p3dwsmm5v2bfgggj"; 1179 + name = "kreversi-21.08.1.tar.xz"; 1180 1180 }; 1181 1181 }; 1182 1182 krfb = { 1183 - version = "21.08.0"; 1183 + version = "21.08.1"; 1184 1184 src = fetchurl { 1185 - url = "${mirror}/stable/release-service/21.08.0/src/krfb-21.08.0.tar.xz"; 1186 - sha256 = "14l5h04g3k51jsphzl4yq4kd8d2s3wfh7dq4i099gw6r04divipb"; 1187 - name = "krfb-21.08.0.tar.xz"; 1185 + url = "${mirror}/stable/release-service/21.08.1/src/krfb-21.08.1.tar.xz"; 1186 + sha256 = "0l28l9wmfxf6vihxr86pwxj027fkz0k0pwkif8had0s4swc9jfnx"; 1187 + name = "krfb-21.08.1.tar.xz"; 1188 1188 }; 1189 1189 }; 1190 1190 kross-interpreters = { 1191 - version = "21.08.0"; 1191 + version = "21.08.1"; 1192 1192 src = fetchurl { 1193 - url = "${mirror}/stable/release-service/21.08.0/src/kross-interpreters-21.08.0.tar.xz"; 1194 - sha256 = "1vnfd96sjb20jifh5pvnd752ycq3m8p8kl7rmwv5s9lvmdiw14s2"; 1195 - name = "kross-interpreters-21.08.0.tar.xz"; 1193 + url = "${mirror}/stable/release-service/21.08.1/src/kross-interpreters-21.08.1.tar.xz"; 1194 + sha256 = "1fznrng6mz9s8ynzr48p05n6akkmzn3fifbgpxs98nhzlz2ay574"; 1195 + name = "kross-interpreters-21.08.1.tar.xz"; 1196 1196 }; 1197 1197 }; 1198 1198 kruler = { 1199 - version = "21.08.0"; 1199 + version = "21.08.1"; 1200 1200 src = fetchurl { 1201 - url = "${mirror}/stable/release-service/21.08.0/src/kruler-21.08.0.tar.xz"; 1202 - sha256 = "1bz7b3m46mlibf2gai6is68119w8gphal7idz4wi3rlwl2lfbmm4"; 1203 - name = "kruler-21.08.0.tar.xz"; 1201 + url = "${mirror}/stable/release-service/21.08.1/src/kruler-21.08.1.tar.xz"; 1202 + sha256 = "0l78hk7zjwjxba094gjvajh32v4avdc80h5r0rv94k2r3gckfjv4"; 1203 + name = "kruler-21.08.1.tar.xz"; 1204 1204 }; 1205 1205 }; 1206 1206 kshisen = { 1207 - version = "21.08.0"; 1207 + version = "21.08.1"; 1208 1208 src = fetchurl { 1209 - url = "${mirror}/stable/release-service/21.08.0/src/kshisen-21.08.0.tar.xz"; 1210 - sha256 = "1m9fhd2hk9pi5297hj1a36m1sl8c959a3mx1fc36va7yi0m8vxly"; 1211 - name = "kshisen-21.08.0.tar.xz"; 1209 + url = "${mirror}/stable/release-service/21.08.1/src/kshisen-21.08.1.tar.xz"; 1210 + sha256 = "107y828nkdzza5hi68pxxk5gp017dy2yxdmmhmg6ylppk5gfp6dp"; 1211 + name = "kshisen-21.08.1.tar.xz"; 1212 1212 }; 1213 1213 }; 1214 1214 ksirk = { 1215 - version = "21.08.0"; 1215 + version = "21.08.1"; 1216 1216 src = fetchurl { 1217 - url = "${mirror}/stable/release-service/21.08.0/src/ksirk-21.08.0.tar.xz"; 1218 - sha256 = "0vqg4gz67p00p3rrrv7mw2aiy9lcahkzrhz69xki96vfzcbpxw4r"; 1219 - name = "ksirk-21.08.0.tar.xz"; 1217 + url = "${mirror}/stable/release-service/21.08.1/src/ksirk-21.08.1.tar.xz"; 1218 + sha256 = "0l6bfpima9whgfdkbghhfh36p6kjs8j26gz5zc7r8fcswv66ya21"; 1219 + name = "ksirk-21.08.1.tar.xz"; 1220 1220 }; 1221 1221 }; 1222 1222 ksmtp = { 1223 - version = "21.08.0"; 1223 + version = "21.08.1"; 1224 1224 src = fetchurl { 1225 - url = "${mirror}/stable/release-service/21.08.0/src/ksmtp-21.08.0.tar.xz"; 1226 - sha256 = "1imm692nkgxa5bhhxqvd4mc6n8ajigjbmm6crpsciwi1gm84fx0b"; 1227 - name = "ksmtp-21.08.0.tar.xz"; 1225 + url = "${mirror}/stable/release-service/21.08.1/src/ksmtp-21.08.1.tar.xz"; 1226 + sha256 = "0pl167gjhpmdvhsjm6hcygxwjs8v1z4xfc7x0c69bac8rdrzrlb6"; 1227 + name = "ksmtp-21.08.1.tar.xz"; 1228 1228 }; 1229 1229 }; 1230 1230 ksnakeduel = { 1231 - version = "21.08.0"; 1231 + version = "21.08.1"; 1232 1232 src = fetchurl { 1233 - url = "${mirror}/stable/release-service/21.08.0/src/ksnakeduel-21.08.0.tar.xz"; 1234 - sha256 = "14hp1vqw9bk3lavv02y9xxmpgv1g9cvz113900j924c5xsjkp4mi"; 1235 - name = "ksnakeduel-21.08.0.tar.xz"; 1233 + url = "${mirror}/stable/release-service/21.08.1/src/ksnakeduel-21.08.1.tar.xz"; 1234 + sha256 = "1jk4mdxg2b1aa1686rimhjqh91ijaf8n7fahvswwbl473zfjf748"; 1235 + name = "ksnakeduel-21.08.1.tar.xz"; 1236 1236 }; 1237 1237 }; 1238 1238 kspaceduel = { 1239 - version = "21.08.0"; 1239 + version = "21.08.1"; 1240 1240 src = fetchurl { 1241 - url = "${mirror}/stable/release-service/21.08.0/src/kspaceduel-21.08.0.tar.xz"; 1242 - sha256 = "1aa2cx06x5kq3ni5ikgjvar0rmz4csi231hvhgjhsnj18ilk0bxh"; 1243 - name = "kspaceduel-21.08.0.tar.xz"; 1241 + url = "${mirror}/stable/release-service/21.08.1/src/kspaceduel-21.08.1.tar.xz"; 1242 + sha256 = "0q2mpidkhgjz3nm88j3m8wdb06y3m8ixr0540q0s9i9d997jdkch"; 1243 + name = "kspaceduel-21.08.1.tar.xz"; 1244 1244 }; 1245 1245 }; 1246 1246 ksquares = { 1247 - version = "21.08.0"; 1247 + version = "21.08.1"; 1248 1248 src = fetchurl { 1249 - url = "${mirror}/stable/release-service/21.08.0/src/ksquares-21.08.0.tar.xz"; 1250 - sha256 = "1715l0j79n6nrjgg0fib17yv8rhjbnivmcgs8fg4iw49c3k5s7nc"; 1251 - name = "ksquares-21.08.0.tar.xz"; 1249 + url = "${mirror}/stable/release-service/21.08.1/src/ksquares-21.08.1.tar.xz"; 1250 + sha256 = "0z7h5vig5zablvdlv7lanmsjjbqq931pqjyynm75mygrrbavgcfq"; 1251 + name = "ksquares-21.08.1.tar.xz"; 1252 1252 }; 1253 1253 }; 1254 1254 ksudoku = { 1255 - version = "21.08.0"; 1255 + version = "21.08.1"; 1256 1256 src = fetchurl { 1257 - url = "${mirror}/stable/release-service/21.08.0/src/ksudoku-21.08.0.tar.xz"; 1258 - sha256 = "1p878yglczah0fdmmmcys46x07r2d78fx5f54z1yd8vhaf8bxmxj"; 1259 - name = "ksudoku-21.08.0.tar.xz"; 1257 + url = "${mirror}/stable/release-service/21.08.1/src/ksudoku-21.08.1.tar.xz"; 1258 + sha256 = "0aax14xwg42wr8g563nbpn7m55gs4k50kwk0zn79pf62i78g10lp"; 1259 + name = "ksudoku-21.08.1.tar.xz"; 1260 1260 }; 1261 1261 }; 1262 1262 ksystemlog = { 1263 - version = "21.08.0"; 1263 + version = "21.08.1"; 1264 1264 src = fetchurl { 1265 - url = "${mirror}/stable/release-service/21.08.0/src/ksystemlog-21.08.0.tar.xz"; 1266 - sha256 = "18jlwmk9aynhcnkgflky20b6mphzaxxvcicmpv58sp4q92fgwgab"; 1267 - name = "ksystemlog-21.08.0.tar.xz"; 1265 + url = "${mirror}/stable/release-service/21.08.1/src/ksystemlog-21.08.1.tar.xz"; 1266 + sha256 = "1vv0wbb3npbq8r0mq8y5lc36qx1hxdjxygfcnw2h9hm4dwl8mc5v"; 1267 + name = "ksystemlog-21.08.1.tar.xz"; 1268 1268 }; 1269 1269 }; 1270 1270 kteatime = { 1271 - version = "21.08.0"; 1271 + version = "21.08.1"; 1272 1272 src = fetchurl { 1273 - url = "${mirror}/stable/release-service/21.08.0/src/kteatime-21.08.0.tar.xz"; 1274 - sha256 = "0imm902b19g2miyhwliryjyiyygsdsilk2b3biyvjlqp037sfrr4"; 1275 - name = "kteatime-21.08.0.tar.xz"; 1273 + url = "${mirror}/stable/release-service/21.08.1/src/kteatime-21.08.1.tar.xz"; 1274 + sha256 = "0gjnvcvrnb3049ln64chnjgr7xm722ighjscxxhqz61i872dgb72"; 1275 + name = "kteatime-21.08.1.tar.xz"; 1276 1276 }; 1277 1277 }; 1278 1278 ktimer = { 1279 - version = "21.08.0"; 1279 + version = "21.08.1"; 1280 1280 src = fetchurl { 1281 - url = "${mirror}/stable/release-service/21.08.0/src/ktimer-21.08.0.tar.xz"; 1282 - sha256 = "05pka16za7dbpbhsss0mcm2h6rxzd7sp7wlly2ds9azdkwqzdjkh"; 1283 - name = "ktimer-21.08.0.tar.xz"; 1281 + url = "${mirror}/stable/release-service/21.08.1/src/ktimer-21.08.1.tar.xz"; 1282 + sha256 = "1l79yrg6g78gf8av1h6yr4mxyd1n63g4r38qp4csvpnjpx7y8ijd"; 1283 + name = "ktimer-21.08.1.tar.xz"; 1284 1284 }; 1285 1285 }; 1286 1286 ktnef = { 1287 - version = "21.08.0"; 1287 + version = "21.08.1"; 1288 1288 src = fetchurl { 1289 - url = "${mirror}/stable/release-service/21.08.0/src/ktnef-21.08.0.tar.xz"; 1290 - sha256 = "0zp03pbry6qkcanbjj5qscja9i97f7gsssmn40swnfbd45ja2z6l"; 1291 - name = "ktnef-21.08.0.tar.xz"; 1289 + url = "${mirror}/stable/release-service/21.08.1/src/ktnef-21.08.1.tar.xz"; 1290 + sha256 = "08wk4ssasqqixwnp59smv64c8m4jf89vpcwc3zvz4h92sfk0pk33"; 1291 + name = "ktnef-21.08.1.tar.xz"; 1292 1292 }; 1293 1293 }; 1294 1294 ktorrent = { 1295 - version = "21.08.0"; 1295 + version = "21.08.1"; 1296 1296 src = fetchurl { 1297 - url = "${mirror}/stable/release-service/21.08.0/src/ktorrent-21.08.0.tar.xz"; 1298 - sha256 = "1wqf6vvl1wyw8b6xzl91pry1mzjj9lpflnp4rinr9jsxfrf88c4x"; 1299 - name = "ktorrent-21.08.0.tar.xz"; 1297 + url = "${mirror}/stable/release-service/21.08.1/src/ktorrent-21.08.1.tar.xz"; 1298 + sha256 = "1r7w43ns4zy94y82dbghrjgqv1sbdj01rni0iijirzjjikr5av9m"; 1299 + name = "ktorrent-21.08.1.tar.xz"; 1300 1300 }; 1301 1301 }; 1302 1302 ktouch = { 1303 - version = "21.08.0"; 1303 + version = "21.08.1"; 1304 1304 src = fetchurl { 1305 - url = "${mirror}/stable/release-service/21.08.0/src/ktouch-21.08.0.tar.xz"; 1306 - sha256 = "0zwf5q5h9qacygp9gzyj0s2y2sd3j2y5sm2rc6z3bn4jcv03bjxf"; 1307 - name = "ktouch-21.08.0.tar.xz"; 1305 + url = "${mirror}/stable/release-service/21.08.1/src/ktouch-21.08.1.tar.xz"; 1306 + sha256 = "00pyrp00dqbanb2w0cxmxh8aahih714q85prjij6iy5sv0917zr7"; 1307 + name = "ktouch-21.08.1.tar.xz"; 1308 1308 }; 1309 1309 }; 1310 1310 ktp-accounts-kcm = { 1311 - version = "21.08.0"; 1311 + version = "21.08.1"; 1312 1312 src = fetchurl { 1313 - url = "${mirror}/stable/release-service/21.08.0/src/ktp-accounts-kcm-21.08.0.tar.xz"; 1314 - sha256 = "0qs3izsffkjyafxxq7mrhcw487zrl9vvdv75gdahc8bq6hni60q9"; 1315 - name = "ktp-accounts-kcm-21.08.0.tar.xz"; 1313 + url = "${mirror}/stable/release-service/21.08.1/src/ktp-accounts-kcm-21.08.1.tar.xz"; 1314 + sha256 = "0pn8g5w4p2synwfskw9m805nj2wk9g7yff423243qc3fxl572sv8"; 1315 + name = "ktp-accounts-kcm-21.08.1.tar.xz"; 1316 1316 }; 1317 1317 }; 1318 1318 ktp-approver = { 1319 - version = "21.08.0"; 1319 + version = "21.08.1"; 1320 1320 src = fetchurl { 1321 - url = "${mirror}/stable/release-service/21.08.0/src/ktp-approver-21.08.0.tar.xz"; 1322 - sha256 = "177hz0fwpqxg65cw5d51hzqsb5ipp3vm513zdc6ac1bxjb6pd725"; 1323 - name = "ktp-approver-21.08.0.tar.xz"; 1321 + url = "${mirror}/stable/release-service/21.08.1/src/ktp-approver-21.08.1.tar.xz"; 1322 + sha256 = "1q2rsg9520ra7ap3ipvv0sdyc2mzbzap2ygzkwbm80fpspl6b973"; 1323 + name = "ktp-approver-21.08.1.tar.xz"; 1324 1324 }; 1325 1325 }; 1326 1326 ktp-auth-handler = { 1327 - version = "21.08.0"; 1327 + version = "21.08.1"; 1328 1328 src = fetchurl { 1329 - url = "${mirror}/stable/release-service/21.08.0/src/ktp-auth-handler-21.08.0.tar.xz"; 1330 - sha256 = "1wg4vcix56ws1mq7611h1kqcxk8dfb5fw57m9wn2q0ikzs9ymav7"; 1331 - name = "ktp-auth-handler-21.08.0.tar.xz"; 1329 + url = "${mirror}/stable/release-service/21.08.1/src/ktp-auth-handler-21.08.1.tar.xz"; 1330 + sha256 = "0yzh2sqsyic3d979mj3m8d9m42y37w3h2s7gsyifw08gf5sna48p"; 1331 + name = "ktp-auth-handler-21.08.1.tar.xz"; 1332 1332 }; 1333 1333 }; 1334 1334 ktp-call-ui = { 1335 - version = "21.08.0"; 1335 + version = "21.08.1"; 1336 1336 src = fetchurl { 1337 - url = "${mirror}/stable/release-service/21.08.0/src/ktp-call-ui-21.08.0.tar.xz"; 1338 - sha256 = "1mgbhkd9ph411h95xyajx6cqsjjf1m52frxw88agv5q6cymx2iz1"; 1339 - name = "ktp-call-ui-21.08.0.tar.xz"; 1337 + url = "${mirror}/stable/release-service/21.08.1/src/ktp-call-ui-21.08.1.tar.xz"; 1338 + sha256 = "0m8x3mfhy5rnv9wp15zrl5fiwdkm66pc8szkncqnjxw2nv721s3m"; 1339 + name = "ktp-call-ui-21.08.1.tar.xz"; 1340 1340 }; 1341 1341 }; 1342 1342 ktp-common-internals = { 1343 - version = "21.08.0"; 1343 + version = "21.08.1"; 1344 1344 src = fetchurl { 1345 - url = "${mirror}/stable/release-service/21.08.0/src/ktp-common-internals-21.08.0.tar.xz"; 1346 - sha256 = "16ivfv65q06gxf01zzswy77f8aqdnjm7jycz812xa07h5xqxj4az"; 1347 - name = "ktp-common-internals-21.08.0.tar.xz"; 1345 + url = "${mirror}/stable/release-service/21.08.1/src/ktp-common-internals-21.08.1.tar.xz"; 1346 + sha256 = "12jcfr3cvyhzn62jnlnfmp39wyxa06bih4qz8gxzv56nl434qzv0"; 1347 + name = "ktp-common-internals-21.08.1.tar.xz"; 1348 1348 }; 1349 1349 }; 1350 1350 ktp-contact-list = { 1351 - version = "21.08.0"; 1351 + version = "21.08.1"; 1352 1352 src = fetchurl { 1353 - url = "${mirror}/stable/release-service/21.08.0/src/ktp-contact-list-21.08.0.tar.xz"; 1354 - sha256 = "1pwql0g5bz5h59wc4nay85c74vic3yk0vc7wx8z6namjcw5sl6n8"; 1355 - name = "ktp-contact-list-21.08.0.tar.xz"; 1353 + url = "${mirror}/stable/release-service/21.08.1/src/ktp-contact-list-21.08.1.tar.xz"; 1354 + sha256 = "1d4d0bvi9c813c3gyws3gc8zca1az2f3ych2r1cgpdhhbqjrf3wl"; 1355 + name = "ktp-contact-list-21.08.1.tar.xz"; 1356 1356 }; 1357 1357 }; 1358 1358 ktp-contact-runner = { 1359 - version = "21.08.0"; 1359 + version = "21.08.1"; 1360 1360 src = fetchurl { 1361 - url = "${mirror}/stable/release-service/21.08.0/src/ktp-contact-runner-21.08.0.tar.xz"; 1362 - sha256 = "1wv21ybzk0nvabjrbnvc6yg4mfdxw368x5zxhrffirv58lyqclxs"; 1363 - name = "ktp-contact-runner-21.08.0.tar.xz"; 1361 + url = "${mirror}/stable/release-service/21.08.1/src/ktp-contact-runner-21.08.1.tar.xz"; 1362 + sha256 = "0l2qimrpfnpmhvspgv62y8a7hsbw4abz92n1xry040qmkfqzv2l7"; 1363 + name = "ktp-contact-runner-21.08.1.tar.xz"; 1364 1364 }; 1365 1365 }; 1366 1366 ktp-desktop-applets = { 1367 - version = "21.08.0"; 1367 + version = "21.08.1"; 1368 1368 src = fetchurl { 1369 - url = "${mirror}/stable/release-service/21.08.0/src/ktp-desktop-applets-21.08.0.tar.xz"; 1370 - sha256 = "1wzjxd4xndpcixlhv636m9gis1clqhf9cksapxgk6sn31mamqxia"; 1371 - name = "ktp-desktop-applets-21.08.0.tar.xz"; 1369 + url = "${mirror}/stable/release-service/21.08.1/src/ktp-desktop-applets-21.08.1.tar.xz"; 1370 + sha256 = "03si91agdjascs6ri0g5zrhicjzx24p6kh2ni1d96k5sc7alwxnl"; 1371 + name = "ktp-desktop-applets-21.08.1.tar.xz"; 1372 1372 }; 1373 1373 }; 1374 1374 ktp-filetransfer-handler = { 1375 - version = "21.08.0"; 1375 + version = "21.08.1"; 1376 1376 src = fetchurl { 1377 - url = "${mirror}/stable/release-service/21.08.0/src/ktp-filetransfer-handler-21.08.0.tar.xz"; 1378 - sha256 = "0zvfhwa70jiiv9xf405263h9mr2zap1fpplgyfrz5r2lsidga5r8"; 1379 - name = "ktp-filetransfer-handler-21.08.0.tar.xz"; 1377 + url = "${mirror}/stable/release-service/21.08.1/src/ktp-filetransfer-handler-21.08.1.tar.xz"; 1378 + sha256 = "08dklgklc31fvcdi3917lh77gr58y75f1di0xhjf6jq8vxplqjd8"; 1379 + name = "ktp-filetransfer-handler-21.08.1.tar.xz"; 1380 1380 }; 1381 1381 }; 1382 1382 ktp-kded-module = { 1383 - version = "21.08.0"; 1383 + version = "21.08.1"; 1384 1384 src = fetchurl { 1385 - url = "${mirror}/stable/release-service/21.08.0/src/ktp-kded-module-21.08.0.tar.xz"; 1386 - sha256 = "17k94bwmv547xks6206x89h014r4gxkd2gj3wry3xm3g1z27w7bn"; 1387 - name = "ktp-kded-module-21.08.0.tar.xz"; 1385 + url = "${mirror}/stable/release-service/21.08.1/src/ktp-kded-module-21.08.1.tar.xz"; 1386 + sha256 = "1135hh82ivvbpks9k39baisrq053570yq2x851j4vb2qrxg000yg"; 1387 + name = "ktp-kded-module-21.08.1.tar.xz"; 1388 1388 }; 1389 1389 }; 1390 1390 ktp-send-file = { 1391 - version = "21.08.0"; 1391 + version = "21.08.1"; 1392 1392 src = fetchurl { 1393 - url = "${mirror}/stable/release-service/21.08.0/src/ktp-send-file-21.08.0.tar.xz"; 1394 - sha256 = "0hk85ydzhlqfinj3ggy5kxvs242kkwbvlh5jz0hh3bi88rdw13px"; 1395 - name = "ktp-send-file-21.08.0.tar.xz"; 1393 + url = "${mirror}/stable/release-service/21.08.1/src/ktp-send-file-21.08.1.tar.xz"; 1394 + sha256 = "1fnn5m9spa0x8nw1rx94x85hy06qwkb1fl5l498rmhyzikhxmhqp"; 1395 + name = "ktp-send-file-21.08.1.tar.xz"; 1396 1396 }; 1397 1397 }; 1398 1398 ktp-text-ui = { 1399 - version = "21.08.0"; 1399 + version = "21.08.1"; 1400 1400 src = fetchurl { 1401 - url = "${mirror}/stable/release-service/21.08.0/src/ktp-text-ui-21.08.0.tar.xz"; 1402 - sha256 = "0zv736zrz5mkvbzgbkm9hq8sp6qnqkg58nyd76xfqq54svgcpi71"; 1403 - name = "ktp-text-ui-21.08.0.tar.xz"; 1401 + url = "${mirror}/stable/release-service/21.08.1/src/ktp-text-ui-21.08.1.tar.xz"; 1402 + sha256 = "0cfnf688jz5953x7jxjrdlfs96rxjcfzvasrc881y1aprav1dmjq"; 1403 + name = "ktp-text-ui-21.08.1.tar.xz"; 1404 1404 }; 1405 1405 }; 1406 1406 ktuberling = { 1407 - version = "21.08.0"; 1407 + version = "21.08.1"; 1408 1408 src = fetchurl { 1409 - url = "${mirror}/stable/release-service/21.08.0/src/ktuberling-21.08.0.tar.xz"; 1410 - sha256 = "15sjqskzni5jhvr77b794mia3v00rmzgxvzqaqbwkhy6ax1gihda"; 1411 - name = "ktuberling-21.08.0.tar.xz"; 1409 + url = "${mirror}/stable/release-service/21.08.1/src/ktuberling-21.08.1.tar.xz"; 1410 + sha256 = "1f3a74nfh4fhxibcfxgjdj6phy185iz6y9nfg3pag3jvqsn8nx49"; 1411 + name = "ktuberling-21.08.1.tar.xz"; 1412 1412 }; 1413 1413 }; 1414 1414 kturtle = { 1415 - version = "21.08.0"; 1415 + version = "21.08.1"; 1416 1416 src = fetchurl { 1417 - url = "${mirror}/stable/release-service/21.08.0/src/kturtle-21.08.0.tar.xz"; 1418 - sha256 = "07japzwhfhb5gbm8ac4acvq4k2xqhlz6sl11qjb9j9scmz77y66f"; 1419 - name = "kturtle-21.08.0.tar.xz"; 1417 + url = "${mirror}/stable/release-service/21.08.1/src/kturtle-21.08.1.tar.xz"; 1418 + sha256 = "15ng6k6xfaj37dvycm29pj2pk73yfr66pp0wgj719c0kq7c9avdp"; 1419 + name = "kturtle-21.08.1.tar.xz"; 1420 1420 }; 1421 1421 }; 1422 1422 kubrick = { 1423 - version = "21.08.0"; 1423 + version = "21.08.1"; 1424 1424 src = fetchurl { 1425 - url = "${mirror}/stable/release-service/21.08.0/src/kubrick-21.08.0.tar.xz"; 1426 - sha256 = "0lk4qfg0fzfhs796csqvniinlyljd4iz9x1l884b1pz2savrfq05"; 1427 - name = "kubrick-21.08.0.tar.xz"; 1425 + url = "${mirror}/stable/release-service/21.08.1/src/kubrick-21.08.1.tar.xz"; 1426 + sha256 = "03i0b24mmq3jqf7812a9sjr8lr82mq9mrq75z2a9h62jinvxvigj"; 1427 + name = "kubrick-21.08.1.tar.xz"; 1428 1428 }; 1429 1429 }; 1430 1430 kwalletmanager = { 1431 - version = "21.08.0"; 1431 + version = "21.08.1"; 1432 1432 src = fetchurl { 1433 - url = "${mirror}/stable/release-service/21.08.0/src/kwalletmanager-21.08.0.tar.xz"; 1434 - sha256 = "0qwrlm0ay04gn9k752pixykiz2dvqaxybfgahahlqf2j2l5w18kh"; 1435 - name = "kwalletmanager-21.08.0.tar.xz"; 1433 + url = "${mirror}/stable/release-service/21.08.1/src/kwalletmanager-21.08.1.tar.xz"; 1434 + sha256 = "1a4aiajq04rlm566jwqwjq2b6sfamnabfrjfa80pld3qcmq0l1mz"; 1435 + name = "kwalletmanager-21.08.1.tar.xz"; 1436 1436 }; 1437 1437 }; 1438 1438 kwave = { 1439 - version = "21.08.0"; 1439 + version = "21.08.1"; 1440 1440 src = fetchurl { 1441 - url = "${mirror}/stable/release-service/21.08.0/src/kwave-21.08.0.tar.xz"; 1442 - sha256 = "0pi7ycxnl5dacw5qmig1v3xy69a6c0x3hdk4bpw19avx9asgfjq7"; 1443 - name = "kwave-21.08.0.tar.xz"; 1441 + url = "${mirror}/stable/release-service/21.08.1/src/kwave-21.08.1.tar.xz"; 1442 + sha256 = "1dl7kn67hp9y39xlnq989kg743295a23kbpjpvbjashgdqy3hqwl"; 1443 + name = "kwave-21.08.1.tar.xz"; 1444 1444 }; 1445 1445 }; 1446 1446 kwordquiz = { 1447 - version = "21.08.0"; 1447 + version = "21.08.1"; 1448 1448 src = fetchurl { 1449 - url = "${mirror}/stable/release-service/21.08.0/src/kwordquiz-21.08.0.tar.xz"; 1450 - sha256 = "1ms8scxg14s4s35xcgacryfwyadvfyzsv1alkipv87x75qsbjzjm"; 1451 - name = "kwordquiz-21.08.0.tar.xz"; 1449 + url = "${mirror}/stable/release-service/21.08.1/src/kwordquiz-21.08.1.tar.xz"; 1450 + sha256 = "1mzdmgls07bb6k2x6qb1xzp04jpfifdrka2k6kzwy9bq071gs7q5"; 1451 + name = "kwordquiz-21.08.1.tar.xz"; 1452 1452 }; 1453 1453 }; 1454 1454 libgravatar = { 1455 - version = "21.08.0"; 1455 + version = "21.08.1"; 1456 1456 src = fetchurl { 1457 - url = "${mirror}/stable/release-service/21.08.0/src/libgravatar-21.08.0.tar.xz"; 1458 - sha256 = "10nqv5f3hanhljld8rpkxaqvr892sj1v2vfx43i52xhg6pbxdd5n"; 1459 - name = "libgravatar-21.08.0.tar.xz"; 1457 + url = "${mirror}/stable/release-service/21.08.1/src/libgravatar-21.08.1.tar.xz"; 1458 + sha256 = "08xl8nb0bn6zf9sh7sn4v7aa86ffqb16hixci4ymixyxy5c4gwbv"; 1459 + name = "libgravatar-21.08.1.tar.xz"; 1460 1460 }; 1461 1461 }; 1462 1462 libkcddb = { 1463 - version = "21.08.0"; 1463 + version = "21.08.1"; 1464 1464 src = fetchurl { 1465 - url = "${mirror}/stable/release-service/21.08.0/src/libkcddb-21.08.0.tar.xz"; 1466 - sha256 = "006z9m4lwgk0ick5blx00mndw5m04l6ayb9nmd7fswd4ql3qqcpv"; 1467 - name = "libkcddb-21.08.0.tar.xz"; 1465 + url = "${mirror}/stable/release-service/21.08.1/src/libkcddb-21.08.1.tar.xz"; 1466 + sha256 = "08841rssxcg9vi490qih8jxnalnbjd2wqsgcq22gkm1ahfj5dizq"; 1467 + name = "libkcddb-21.08.1.tar.xz"; 1468 1468 }; 1469 1469 }; 1470 1470 libkcompactdisc = { 1471 - version = "21.08.0"; 1471 + version = "21.08.1"; 1472 1472 src = fetchurl { 1473 - url = "${mirror}/stable/release-service/21.08.0/src/libkcompactdisc-21.08.0.tar.xz"; 1474 - sha256 = "0fgcr6gr4di5spw9dm6yz90s16jv2zmdpgpvhxbscirn7mf1b4is"; 1475 - name = "libkcompactdisc-21.08.0.tar.xz"; 1473 + url = "${mirror}/stable/release-service/21.08.1/src/libkcompactdisc-21.08.1.tar.xz"; 1474 + sha256 = "1q838md6kqvjmc61sy943lqgv5isll2px1s0izyvvxkf747hcpin"; 1475 + name = "libkcompactdisc-21.08.1.tar.xz"; 1476 1476 }; 1477 1477 }; 1478 1478 libkdcraw = { 1479 - version = "21.08.0"; 1479 + version = "21.08.1"; 1480 1480 src = fetchurl { 1481 - url = "${mirror}/stable/release-service/21.08.0/src/libkdcraw-21.08.0.tar.xz"; 1482 - sha256 = "176wp24ij2kciggjnffcamgk4y6h59cwabwwxvli32i3l3ll8wlc"; 1483 - name = "libkdcraw-21.08.0.tar.xz"; 1481 + url = "${mirror}/stable/release-service/21.08.1/src/libkdcraw-21.08.1.tar.xz"; 1482 + sha256 = "17ijpgljhrm851mdnd1znjpa7hidmv1d5d05q68r6lp1aclcgmwm"; 1483 + name = "libkdcraw-21.08.1.tar.xz"; 1484 1484 }; 1485 1485 }; 1486 1486 libkdegames = { 1487 - version = "21.08.0"; 1487 + version = "21.08.1"; 1488 1488 src = fetchurl { 1489 - url = "${mirror}/stable/release-service/21.08.0/src/libkdegames-21.08.0.tar.xz"; 1490 - sha256 = "0nbimjv8sanwn3is9d357ic8zy0dpdr3g3qsipzapzlchpigjm9b"; 1491 - name = "libkdegames-21.08.0.tar.xz"; 1489 + url = "${mirror}/stable/release-service/21.08.1/src/libkdegames-21.08.1.tar.xz"; 1490 + sha256 = "0vfx3ksy6z5h4hjx0dl3fr3phfz3q590h86ksbp5q20lyylmdpji"; 1491 + name = "libkdegames-21.08.1.tar.xz"; 1492 1492 }; 1493 1493 }; 1494 1494 libkdepim = { 1495 - version = "21.08.0"; 1495 + version = "21.08.1"; 1496 1496 src = fetchurl { 1497 - url = "${mirror}/stable/release-service/21.08.0/src/libkdepim-21.08.0.tar.xz"; 1498 - sha256 = "1gxyzq7lgswfrkxsfqf5y4vwx2ji3wz7vyzkg5gpygr1an6c2sp3"; 1499 - name = "libkdepim-21.08.0.tar.xz"; 1497 + url = "${mirror}/stable/release-service/21.08.1/src/libkdepim-21.08.1.tar.xz"; 1498 + sha256 = "10zb97zf1jidh9q6dkn8cjs9f4gqz2xn6yqylsbq0bjlycv991fh"; 1499 + name = "libkdepim-21.08.1.tar.xz"; 1500 1500 }; 1501 1501 }; 1502 1502 libkeduvocdocument = { 1503 - version = "21.08.0"; 1503 + version = "21.08.1"; 1504 1504 src = fetchurl { 1505 - url = "${mirror}/stable/release-service/21.08.0/src/libkeduvocdocument-21.08.0.tar.xz"; 1506 - sha256 = "1nm07fdaas7jn3yfds7k22n6xl9c8wdi6bjrf8blbycj6fflciwd"; 1507 - name = "libkeduvocdocument-21.08.0.tar.xz"; 1505 + url = "${mirror}/stable/release-service/21.08.1/src/libkeduvocdocument-21.08.1.tar.xz"; 1506 + sha256 = "0wnyx7h284g6wssnfdfz4m0hcb0rc6fnlryav8vnjcyzz7p5ni6l"; 1507 + name = "libkeduvocdocument-21.08.1.tar.xz"; 1508 1508 }; 1509 1509 }; 1510 1510 libkexiv2 = { 1511 - version = "21.08.0"; 1511 + version = "21.08.1"; 1512 1512 src = fetchurl { 1513 - url = "${mirror}/stable/release-service/21.08.0/src/libkexiv2-21.08.0.tar.xz"; 1514 - sha256 = "0mb5qj4n2fcwak36an4yslffvlhj6f2qfv5vdl2cid8c34ikvqll"; 1515 - name = "libkexiv2-21.08.0.tar.xz"; 1513 + url = "${mirror}/stable/release-service/21.08.1/src/libkexiv2-21.08.1.tar.xz"; 1514 + sha256 = "0wnpkzivb5f5z3d1dn5952cx07q8nw421xrs21r57cmbsss344xa"; 1515 + name = "libkexiv2-21.08.1.tar.xz"; 1516 1516 }; 1517 1517 }; 1518 1518 libkgapi = { 1519 - version = "21.08.0"; 1519 + version = "21.08.1"; 1520 1520 src = fetchurl { 1521 - url = "${mirror}/stable/release-service/21.08.0/src/libkgapi-21.08.0.tar.xz"; 1522 - sha256 = "0f2yk75a0gr7hah32fmn35lk0illviswfhlh0nw6ignfx56q7f3r"; 1523 - name = "libkgapi-21.08.0.tar.xz"; 1521 + url = "${mirror}/stable/release-service/21.08.1/src/libkgapi-21.08.1.tar.xz"; 1522 + sha256 = "14wzl40j5baw20628dqcpkg8vi6jsq5f9gw0sc1my8qhw91mj3vy"; 1523 + name = "libkgapi-21.08.1.tar.xz"; 1524 1524 }; 1525 1525 }; 1526 1526 libkipi = { 1527 - version = "21.08.0"; 1527 + version = "21.08.1"; 1528 1528 src = fetchurl { 1529 - url = "${mirror}/stable/release-service/21.08.0/src/libkipi-21.08.0.tar.xz"; 1530 - sha256 = "0831x76w413azciabm6l83nrwpiivq5pjqxcl3yzhs2hq1i1wd06"; 1531 - name = "libkipi-21.08.0.tar.xz"; 1529 + url = "${mirror}/stable/release-service/21.08.1/src/libkipi-21.08.1.tar.xz"; 1530 + sha256 = "13579gqxyj8dwmrmxylnw6mf56vr73vlbbv07rpi661kfrbjk2ms"; 1531 + name = "libkipi-21.08.1.tar.xz"; 1532 1532 }; 1533 1533 }; 1534 1534 libkleo = { 1535 - version = "21.08.0"; 1535 + version = "21.08.1"; 1536 1536 src = fetchurl { 1537 - url = "${mirror}/stable/release-service/21.08.0/src/libkleo-21.08.0.tar.xz"; 1538 - sha256 = "14i65vh0c39z0d65kgqn2apcfi5x3vxrxp2ybc4ccc4sxh033akp"; 1539 - name = "libkleo-21.08.0.tar.xz"; 1537 + url = "${mirror}/stable/release-service/21.08.1/src/libkleo-21.08.1.tar.xz"; 1538 + sha256 = "1n1nacr1q0nw2jq8px6b3cmda6ff9mygggfrl3xh6qz042bg77xz"; 1539 + name = "libkleo-21.08.1.tar.xz"; 1540 1540 }; 1541 1541 }; 1542 1542 libkmahjongg = { 1543 - version = "21.08.0"; 1543 + version = "21.08.1"; 1544 1544 src = fetchurl { 1545 - url = "${mirror}/stable/release-service/21.08.0/src/libkmahjongg-21.08.0.tar.xz"; 1546 - sha256 = "18syxfszfvq1h0l5fbgy599ak2pgp4mj4i949kyv4v6qdwwv9mhi"; 1547 - name = "libkmahjongg-21.08.0.tar.xz"; 1545 + url = "${mirror}/stable/release-service/21.08.1/src/libkmahjongg-21.08.1.tar.xz"; 1546 + sha256 = "0ry6wz0i9dccjn5w2qy2nin0rhbg30vlbcr4zrlx8bxsw0la2k94"; 1547 + name = "libkmahjongg-21.08.1.tar.xz"; 1548 1548 }; 1549 1549 }; 1550 1550 libkomparediff2 = { 1551 - version = "21.08.0"; 1551 + version = "21.08.1"; 1552 1552 src = fetchurl { 1553 - url = "${mirror}/stable/release-service/21.08.0/src/libkomparediff2-21.08.0.tar.xz"; 1554 - sha256 = "0b5yhhvnipbwzn2sylh45ispslrw3w68y9xnrxrjwb0ydmq5zqyb"; 1555 - name = "libkomparediff2-21.08.0.tar.xz"; 1553 + url = "${mirror}/stable/release-service/21.08.1/src/libkomparediff2-21.08.1.tar.xz"; 1554 + sha256 = "0n6xxam33k8j6c9wqdf0lhfpk6nyf9brhvdkivdamp0idhi3rcpx"; 1555 + name = "libkomparediff2-21.08.1.tar.xz"; 1556 1556 }; 1557 1557 }; 1558 1558 libksane = { 1559 - version = "21.08.0"; 1559 + version = "21.08.1"; 1560 1560 src = fetchurl { 1561 - url = "${mirror}/stable/release-service/21.08.0/src/libksane-21.08.0.tar.xz"; 1562 - sha256 = "0i2vr95hi776rqljjjh14d3p5zhcbnjx0b3n94x7m4jq5k2wqpqs"; 1563 - name = "libksane-21.08.0.tar.xz"; 1561 + url = "${mirror}/stable/release-service/21.08.1/src/libksane-21.08.1.tar.xz"; 1562 + sha256 = "1x4wsdfczqnasr6ps8677m0ix1fqqd2316f6k2k3awn9qfgsqy3x"; 1563 + name = "libksane-21.08.1.tar.xz"; 1564 1564 }; 1565 1565 }; 1566 1566 libksieve = { 1567 - version = "21.08.0"; 1567 + version = "21.08.1"; 1568 1568 src = fetchurl { 1569 - url = "${mirror}/stable/release-service/21.08.0/src/libksieve-21.08.0.tar.xz"; 1570 - sha256 = "0r35153l0kgmw5gvspvqlna6ramggz7p055rbpz60xz9hxfkz3d7"; 1571 - name = "libksieve-21.08.0.tar.xz"; 1569 + url = "${mirror}/stable/release-service/21.08.1/src/libksieve-21.08.1.tar.xz"; 1570 + sha256 = "1569xcjz575f8007z91zs9xn5wjklzkiy6l0cl7yzpzn880wc03p"; 1571 + name = "libksieve-21.08.1.tar.xz"; 1572 1572 }; 1573 1573 }; 1574 1574 libktorrent = { 1575 - version = "21.08.0"; 1575 + version = "21.08.1"; 1576 1576 src = fetchurl { 1577 - url = "${mirror}/stable/release-service/21.08.0/src/libktorrent-21.08.0.tar.xz"; 1578 - sha256 = "12x7h0wrxdcpyd4mblbv64swxlcc8vc5k4nlzmag4nzdmgrb7c3x"; 1579 - name = "libktorrent-21.08.0.tar.xz"; 1577 + url = "${mirror}/stable/release-service/21.08.1/src/libktorrent-21.08.1.tar.xz"; 1578 + sha256 = "0y5881v0g49rr8dspzaq4l1c62rchgfq4mjx64sn0ng2jjpnhv1x"; 1579 + name = "libktorrent-21.08.1.tar.xz"; 1580 1580 }; 1581 1581 }; 1582 1582 lokalize = { 1583 - version = "21.08.0"; 1583 + version = "21.08.1"; 1584 1584 src = fetchurl { 1585 - url = "${mirror}/stable/release-service/21.08.0/src/lokalize-21.08.0.tar.xz"; 1586 - sha256 = "0mwyvfam5ybrhd67vq6dgw74106l7p0q16xvddxa9gi0sdxb9883"; 1587 - name = "lokalize-21.08.0.tar.xz"; 1585 + url = "${mirror}/stable/release-service/21.08.1/src/lokalize-21.08.1.tar.xz"; 1586 + sha256 = "0ih7a1rkwn9jpgk3qld8anavr0g4wlf8figwikhvbc2dw79lxs7k"; 1587 + name = "lokalize-21.08.1.tar.xz"; 1588 1588 }; 1589 1589 }; 1590 1590 lskat = { 1591 - version = "21.08.0"; 1591 + version = "21.08.1"; 1592 1592 src = fetchurl { 1593 - url = "${mirror}/stable/release-service/21.08.0/src/lskat-21.08.0.tar.xz"; 1594 - sha256 = "14ii7pcq6p0k1626x63nc49pvjb4lvc4d5sdsi47rp0ll0f03sa8"; 1595 - name = "lskat-21.08.0.tar.xz"; 1593 + url = "${mirror}/stable/release-service/21.08.1/src/lskat-21.08.1.tar.xz"; 1594 + sha256 = "1d89yqfsc703pnvxljcsn33wpsv64s4nr2wlmlbl609m9x8b9g9b"; 1595 + name = "lskat-21.08.1.tar.xz"; 1596 1596 }; 1597 1597 }; 1598 1598 mailcommon = { 1599 - version = "21.08.0"; 1599 + version = "21.08.1"; 1600 1600 src = fetchurl { 1601 - url = "${mirror}/stable/release-service/21.08.0/src/mailcommon-21.08.0.tar.xz"; 1602 - sha256 = "0braayvcpbyvmcxx82ic7fhmzfwf6dyanvikwcmb0p9y7bkr1vk1"; 1603 - name = "mailcommon-21.08.0.tar.xz"; 1601 + url = "${mirror}/stable/release-service/21.08.1/src/mailcommon-21.08.1.tar.xz"; 1602 + sha256 = "1r0qyqasah4z8vx836fhvv1f4zm20az9qrw8122l3a986lazh1zw"; 1603 + name = "mailcommon-21.08.1.tar.xz"; 1604 1604 }; 1605 1605 }; 1606 1606 mailimporter = { 1607 - version = "21.08.0"; 1607 + version = "21.08.1"; 1608 1608 src = fetchurl { 1609 - url = "${mirror}/stable/release-service/21.08.0/src/mailimporter-21.08.0.tar.xz"; 1610 - sha256 = "139akl53hfq3kc91qnca5f6i5vimr8djbxnw94xibpiwj22xq7rz"; 1611 - name = "mailimporter-21.08.0.tar.xz"; 1609 + url = "${mirror}/stable/release-service/21.08.1/src/mailimporter-21.08.1.tar.xz"; 1610 + sha256 = "05kiizbdnsl15ry2zb5sg94lcdwq9w4lnznd6zcq8n09s0zpz8nf"; 1611 + name = "mailimporter-21.08.1.tar.xz"; 1612 1612 }; 1613 1613 }; 1614 1614 marble = { 1615 - version = "21.08.0"; 1615 + version = "21.08.1"; 1616 1616 src = fetchurl { 1617 - url = "${mirror}/stable/release-service/21.08.0/src/marble-21.08.0.tar.xz"; 1618 - sha256 = "17sn26grpph8iw2kw498krvryyxy0qp6ala55bvh6a2hyn3562zl"; 1619 - name = "marble-21.08.0.tar.xz"; 1617 + url = "${mirror}/stable/release-service/21.08.1/src/marble-21.08.1.tar.xz"; 1618 + sha256 = "01hf3wwz9zflkpgx1pbkxbnl1vs2yyafrwmldnil66nkxsxx7izw"; 1619 + name = "marble-21.08.1.tar.xz"; 1620 1620 }; 1621 1621 }; 1622 1622 markdownpart = { 1623 - version = "21.08.0"; 1623 + version = "21.08.1"; 1624 1624 src = fetchurl { 1625 - url = "${mirror}/stable/release-service/21.08.0/src/markdownpart-21.08.0.tar.xz"; 1626 - sha256 = "138pi82653mwxn18s541b95i1zj5nij08cm7zykpm7kpkr2ri167"; 1627 - name = "markdownpart-21.08.0.tar.xz"; 1625 + url = "${mirror}/stable/release-service/21.08.1/src/markdownpart-21.08.1.tar.xz"; 1626 + sha256 = "0xgs2kxnbrn70mrzza2d4f7xpx9ks3dbl3yj1y1kds7bnidsf3f9"; 1627 + name = "markdownpart-21.08.1.tar.xz"; 1628 1628 }; 1629 1629 }; 1630 1630 mbox-importer = { 1631 - version = "21.08.0"; 1631 + version = "21.08.1"; 1632 1632 src = fetchurl { 1633 - url = "${mirror}/stable/release-service/21.08.0/src/mbox-importer-21.08.0.tar.xz"; 1634 - sha256 = "0whpz4vv27cibvb4q98dxkdrn3jpiywvbqdn5adzfmjvw9sdb4ym"; 1635 - name = "mbox-importer-21.08.0.tar.xz"; 1633 + url = "${mirror}/stable/release-service/21.08.1/src/mbox-importer-21.08.1.tar.xz"; 1634 + sha256 = "06mgz10ma8r0vi7ln9zxz2kipdp9rd0zw0sgm69h43rq9zyjnjkk"; 1635 + name = "mbox-importer-21.08.1.tar.xz"; 1636 1636 }; 1637 1637 }; 1638 1638 messagelib = { 1639 - version = "21.08.0"; 1639 + version = "21.08.1"; 1640 1640 src = fetchurl { 1641 - url = "${mirror}/stable/release-service/21.08.0/src/messagelib-21.08.0.tar.xz"; 1642 - sha256 = "1l5af4bwgcgj2askfsvx11bzqsp4bl5jc84fnswxpzidrir4x8ig"; 1643 - name = "messagelib-21.08.0.tar.xz"; 1641 + url = "${mirror}/stable/release-service/21.08.1/src/messagelib-21.08.1.tar.xz"; 1642 + sha256 = "1r3lqacixy5vy36jgy6glz08gp8k4559h1bdqyh7svmmflhs927i"; 1643 + name = "messagelib-21.08.1.tar.xz"; 1644 1644 }; 1645 1645 }; 1646 1646 minuet = { 1647 - version = "21.08.0"; 1647 + version = "21.08.1"; 1648 1648 src = fetchurl { 1649 - url = "${mirror}/stable/release-service/21.08.0/src/minuet-21.08.0.tar.xz"; 1650 - sha256 = "06dk90qb2lvl01bc6d9wmjqm3xv4hqi092ljn1dh6h2711c7czca"; 1651 - name = "minuet-21.08.0.tar.xz"; 1649 + url = "${mirror}/stable/release-service/21.08.1/src/minuet-21.08.1.tar.xz"; 1650 + sha256 = "0law0ram3xdf5ayc7j8as1xwj83k37mf7w6qkkp3hy3kj2r2dahx"; 1651 + name = "minuet-21.08.1.tar.xz"; 1652 1652 }; 1653 1653 }; 1654 1654 okular = { 1655 - version = "21.08.0"; 1655 + version = "21.08.1"; 1656 1656 src = fetchurl { 1657 - url = "${mirror}/stable/release-service/21.08.0/src/okular-21.08.0.tar.xz"; 1658 - sha256 = "0sbaq7cqzardmdvbl8y7jqb8pi605kg8jq2daizrp2m73w8p7vfx"; 1659 - name = "okular-21.08.0.tar.xz"; 1657 + url = "${mirror}/stable/release-service/21.08.1/src/okular-21.08.1.tar.xz"; 1658 + sha256 = "1vk1mn40i80b5vkxq47i1qf2i734n5nfa1wgx3748jwc1fws631p"; 1659 + name = "okular-21.08.1.tar.xz"; 1660 1660 }; 1661 1661 }; 1662 1662 palapeli = { 1663 - version = "21.08.0"; 1663 + version = "21.08.1"; 1664 1664 src = fetchurl { 1665 - url = "${mirror}/stable/release-service/21.08.0/src/palapeli-21.08.0.tar.xz"; 1666 - sha256 = "11mgsyk3mg9ic76grr1x0m8qihzrs8da40qxbx2v0syy5dgn7ssw"; 1667 - name = "palapeli-21.08.0.tar.xz"; 1665 + url = "${mirror}/stable/release-service/21.08.1/src/palapeli-21.08.1.tar.xz"; 1666 + sha256 = "09mswv446s6vqlllhz727qpd7mdszdkgivfn9sazgmydmmmzrw53"; 1667 + name = "palapeli-21.08.1.tar.xz"; 1668 1668 }; 1669 1669 }; 1670 1670 parley = { 1671 - version = "21.08.0"; 1671 + version = "21.08.1"; 1672 1672 src = fetchurl { 1673 - url = "${mirror}/stable/release-service/21.08.0/src/parley-21.08.0.tar.xz"; 1674 - sha256 = "1qn9pqvha52ha80lpqcvsi34yssvgnnyhl50is9wgk7qfnj02g9b"; 1675 - name = "parley-21.08.0.tar.xz"; 1673 + url = "${mirror}/stable/release-service/21.08.1/src/parley-21.08.1.tar.xz"; 1674 + sha256 = "02v9gfjdryf48m5iinsc9qg2qfmj1s96xga5b3ndd63g66b6gp9b"; 1675 + name = "parley-21.08.1.tar.xz"; 1676 1676 }; 1677 1677 }; 1678 1678 partitionmanager = { 1679 - version = "21.08.0"; 1679 + version = "21.08.1"; 1680 1680 src = fetchurl { 1681 - url = "${mirror}/stable/release-service/21.08.0/src/partitionmanager-21.08.0.tar.xz"; 1682 - sha256 = "1r5vis8dnpyl8jvv3r22jmlfwsscnqvfdkvpabkrfw6l7l33p3cj"; 1683 - name = "partitionmanager-21.08.0.tar.xz"; 1681 + url = "${mirror}/stable/release-service/21.08.1/src/partitionmanager-21.08.1.tar.xz"; 1682 + sha256 = "16vc0g08rs6dz87zv4b1ygs198c6mbjwcp2j4994z6cf16bxfgz8"; 1683 + name = "partitionmanager-21.08.1.tar.xz"; 1684 1684 }; 1685 1685 }; 1686 1686 picmi = { 1687 - version = "21.08.0"; 1687 + version = "21.08.1"; 1688 1688 src = fetchurl { 1689 - url = "${mirror}/stable/release-service/21.08.0/src/picmi-21.08.0.tar.xz"; 1690 - sha256 = "02jwsibpclp1a3nrzlkkq4qzm3y595cdf2pfd5933z8q3lk0zj85"; 1691 - name = "picmi-21.08.0.tar.xz"; 1689 + url = "${mirror}/stable/release-service/21.08.1/src/picmi-21.08.1.tar.xz"; 1690 + sha256 = "1yshwfl8baw0cw8hnvzkb3y72r0bycyr19rwwns9sjc3fk9gnk6a"; 1691 + name = "picmi-21.08.1.tar.xz"; 1692 1692 }; 1693 1693 }; 1694 - pimcommon = { 1695 - version = "21.08.0"; 1694 + pim-data-exporter = { 1695 + version = "21.08.1"; 1696 1696 src = fetchurl { 1697 - url = "${mirror}/stable/release-service/21.08.0/src/pimcommon-21.08.0.tar.xz"; 1698 - sha256 = "12ffffv149ggpycdpk3sxh152y67dnm460d5d7sdfx8ip78xl0lv"; 1699 - name = "pimcommon-21.08.0.tar.xz"; 1697 + url = "${mirror}/stable/release-service/21.08.1/src/pim-data-exporter-21.08.1.tar.xz"; 1698 + sha256 = "1vx7h7900wq8icx7q4khkx9g5gm6j5c8dl38q08pwda4vl0pmxmd"; 1699 + name = "pim-data-exporter-21.08.1.tar.xz"; 1700 1700 }; 1701 1701 }; 1702 - pim-data-exporter = { 1703 - version = "21.08.0"; 1702 + pim-sieve-editor = { 1703 + version = "21.08.1"; 1704 1704 src = fetchurl { 1705 - url = "${mirror}/stable/release-service/21.08.0/src/pim-data-exporter-21.08.0.tar.xz"; 1706 - sha256 = "0zdcldazg5dsi3npl63hsz8v99h8k0pvnfh9rnhf0lg0mpcl8psn"; 1707 - name = "pim-data-exporter-21.08.0.tar.xz"; 1705 + url = "${mirror}/stable/release-service/21.08.1/src/pim-sieve-editor-21.08.1.tar.xz"; 1706 + sha256 = "0ph62khl2k2gpfjf05p9sklihib0hbxgl3n1bv59l58awj9brs0r"; 1707 + name = "pim-sieve-editor-21.08.1.tar.xz"; 1708 1708 }; 1709 1709 }; 1710 - pim-sieve-editor = { 1711 - version = "21.08.0"; 1710 + pimcommon = { 1711 + version = "21.08.1"; 1712 1712 src = fetchurl { 1713 - url = "${mirror}/stable/release-service/21.08.0/src/pim-sieve-editor-21.08.0.tar.xz"; 1714 - sha256 = "008a8wq7n68fgh63gaz64q4qsxlk11zlg9v4mmln8238zgvwif1q"; 1715 - name = "pim-sieve-editor-21.08.0.tar.xz"; 1713 + url = "${mirror}/stable/release-service/21.08.1/src/pimcommon-21.08.1.tar.xz"; 1714 + sha256 = "1379lhvin2vkikd3fzanhwfjszb4cc9f3h9bxf3md3h4gx1i6hb6"; 1715 + name = "pimcommon-21.08.1.tar.xz"; 1716 1716 }; 1717 1717 }; 1718 1718 poxml = { 1719 - version = "21.08.0"; 1719 + version = "21.08.1"; 1720 1720 src = fetchurl { 1721 - url = "${mirror}/stable/release-service/21.08.0/src/poxml-21.08.0.tar.xz"; 1722 - sha256 = "0wb3nq09ki2nkcpl6nfl483cm919hx6qxd39g6d76ksa7q2q46m9"; 1723 - name = "poxml-21.08.0.tar.xz"; 1721 + url = "${mirror}/stable/release-service/21.08.1/src/poxml-21.08.1.tar.xz"; 1722 + sha256 = "10wwrbmhwbjk71m4ya1shb7mviil33fciykrzyqvvdnvx668aawm"; 1723 + name = "poxml-21.08.1.tar.xz"; 1724 1724 }; 1725 1725 }; 1726 1726 print-manager = { 1727 - version = "21.08.0"; 1727 + version = "21.08.1"; 1728 1728 src = fetchurl { 1729 - url = "${mirror}/stable/release-service/21.08.0/src/print-manager-21.08.0.tar.xz"; 1730 - sha256 = "01pcrjfp40a9h466jsm3ymjqzavrzxvn74gcrvxasi68wwq8aqrf"; 1731 - name = "print-manager-21.08.0.tar.xz"; 1729 + url = "${mirror}/stable/release-service/21.08.1/src/print-manager-21.08.1.tar.xz"; 1730 + sha256 = "1hzykjnymr0knh67h6s5214bjp5lk1klm6znh8q2asf49c6x2zgw"; 1731 + name = "print-manager-21.08.1.tar.xz"; 1732 1732 }; 1733 1733 }; 1734 1734 rocs = { 1735 - version = "21.08.0"; 1735 + version = "21.08.1"; 1736 1736 src = fetchurl { 1737 - url = "${mirror}/stable/release-service/21.08.0/src/rocs-21.08.0.tar.xz"; 1738 - sha256 = "1jqiaxxdbv1cc75awl5gfq1kv76qmgiw872s4g5bny27ki8dlk7w"; 1739 - name = "rocs-21.08.0.tar.xz"; 1737 + url = "${mirror}/stable/release-service/21.08.1/src/rocs-21.08.1.tar.xz"; 1738 + sha256 = "1b527n0csk43sxafynqijiwf0bzj89viznpxnk2ayb9lik4q3djm"; 1739 + name = "rocs-21.08.1.tar.xz"; 1740 1740 }; 1741 1741 }; 1742 1742 signon-kwallet-extension = { 1743 - version = "21.08.0"; 1743 + version = "21.08.1"; 1744 1744 src = fetchurl { 1745 - url = "${mirror}/stable/release-service/21.08.0/src/signon-kwallet-extension-21.08.0.tar.xz"; 1746 - sha256 = "0wig4p13qjpmn3imjiz4l14haad8qkr4qccv1kdgkkijy2dr66dy"; 1747 - name = "signon-kwallet-extension-21.08.0.tar.xz"; 1745 + url = "${mirror}/stable/release-service/21.08.1/src/signon-kwallet-extension-21.08.1.tar.xz"; 1746 + sha256 = "1x1q1vmqm9nq7sjhxc495x612jh39scxba0nbr8a4rval144268m"; 1747 + name = "signon-kwallet-extension-21.08.1.tar.xz"; 1748 1748 }; 1749 1749 }; 1750 1750 skanlite = { 1751 - version = "21.08.0"; 1751 + version = "21.08.1"; 1752 1752 src = fetchurl { 1753 - url = "${mirror}/stable/release-service/21.08.0/src/skanlite-21.08.0.tar.xz"; 1754 - sha256 = "1kkxxcaibxfvsaf9548vxspz6iyfhdl9xmmcdxrp85w9ymcr3mi5"; 1755 - name = "skanlite-21.08.0.tar.xz"; 1753 + url = "${mirror}/stable/release-service/21.08.1/src/skanlite-21.08.1.tar.xz"; 1754 + sha256 = "17lnazx1h4lk78037gvzscnm3p2yl6dhc4970bdq982ahwp63gg8"; 1755 + name = "skanlite-21.08.1.tar.xz"; 1756 1756 }; 1757 1757 }; 1758 1758 spectacle = { 1759 - version = "21.08.0"; 1759 + version = "21.08.1"; 1760 1760 src = fetchurl { 1761 - url = "${mirror}/stable/release-service/21.08.0/src/spectacle-21.08.0.tar.xz"; 1762 - sha256 = "18rhb92m102hdkirdcigbd5ixma3s86022af1h133h3fy33xciwc"; 1763 - name = "spectacle-21.08.0.tar.xz"; 1761 + url = "${mirror}/stable/release-service/21.08.1/src/spectacle-21.08.1.tar.xz"; 1762 + sha256 = "0bs93gylw90wj3b9kw71xhqy60smggh38s5g4jcras1n6iqmb06x"; 1763 + name = "spectacle-21.08.1.tar.xz"; 1764 1764 }; 1765 1765 }; 1766 1766 step = { 1767 - version = "21.08.0"; 1767 + version = "21.08.1"; 1768 1768 src = fetchurl { 1769 - url = "${mirror}/stable/release-service/21.08.0/src/step-21.08.0.tar.xz"; 1770 - sha256 = "0dayfkfh68ldg3ivh2nki78w07rscqphq04xazvqss8j296xjzgz"; 1771 - name = "step-21.08.0.tar.xz"; 1769 + url = "${mirror}/stable/release-service/21.08.1/src/step-21.08.1.tar.xz"; 1770 + sha256 = "0rg69j8r479vzyrajbdjgh5l2506w8f2dnlh1di545gzjk2ww448"; 1771 + name = "step-21.08.1.tar.xz"; 1772 1772 }; 1773 1773 }; 1774 1774 svgpart = { 1775 - version = "21.08.0"; 1775 + version = "21.08.1"; 1776 1776 src = fetchurl { 1777 - url = "${mirror}/stable/release-service/21.08.0/src/svgpart-21.08.0.tar.xz"; 1778 - sha256 = "00pigyf0bicgclbb1imz2w1ksp10zzdf385kdx9zphh2h438kagf"; 1779 - name = "svgpart-21.08.0.tar.xz"; 1777 + url = "${mirror}/stable/release-service/21.08.1/src/svgpart-21.08.1.tar.xz"; 1778 + sha256 = "1silp6k0l9xb363h8whiv4dry6gf1mj4w53mksl1i2slhqn9q96v"; 1779 + name = "svgpart-21.08.1.tar.xz"; 1780 1780 }; 1781 1781 }; 1782 1782 sweeper = { 1783 - version = "21.08.0"; 1783 + version = "21.08.1"; 1784 1784 src = fetchurl { 1785 - url = "${mirror}/stable/release-service/21.08.0/src/sweeper-21.08.0.tar.xz"; 1786 - sha256 = "1g6s7nvcxs93i8mwplwd6a42jjid73n4rywwar9z2y1293afzaci"; 1787 - name = "sweeper-21.08.0.tar.xz"; 1785 + url = "${mirror}/stable/release-service/21.08.1/src/sweeper-21.08.1.tar.xz"; 1786 + sha256 = "0p25bkczxmx93igicyiasvjd4v9rc3sg7gm7b9ddgzz8rrnr0d9p"; 1787 + name = "sweeper-21.08.1.tar.xz"; 1788 1788 }; 1789 1789 }; 1790 1790 umbrello = { 1791 - version = "21.08.0"; 1791 + version = "21.08.1"; 1792 1792 src = fetchurl { 1793 - url = "${mirror}/stable/release-service/21.08.0/src/umbrello-21.08.0.tar.xz"; 1794 - sha256 = "0nly325zb51n5l2hbc6m199vhqx3jsscbvp4bqhgplklwhd6c1c0"; 1795 - name = "umbrello-21.08.0.tar.xz"; 1793 + url = "${mirror}/stable/release-service/21.08.1/src/umbrello-21.08.1.tar.xz"; 1794 + sha256 = "0x4f3hiydyprhzd56i8lijwfhzca041bmbbxp7x1dckv3shdangc"; 1795 + name = "umbrello-21.08.1.tar.xz"; 1796 1796 }; 1797 1797 }; 1798 1798 yakuake = { 1799 - version = "21.08.0"; 1799 + version = "21.08.1"; 1800 1800 src = fetchurl { 1801 - url = "${mirror}/stable/release-service/21.08.0/src/yakuake-21.08.0.tar.xz"; 1802 - sha256 = "0gm2djqjf807h657br1hz9ds5w09lszyi8iy2n3my4h78cs9lw72"; 1803 - name = "yakuake-21.08.0.tar.xz"; 1801 + url = "${mirror}/stable/release-service/21.08.1/src/yakuake-21.08.1.tar.xz"; 1802 + sha256 = "1x41jrkvlff8x5qcd12lcrv6zqzw7jqw02ikpmqv1v4gw7lz94w9"; 1803 + name = "yakuake-21.08.1.tar.xz"; 1804 1804 }; 1805 1805 }; 1806 1806 zeroconf-ioslave = { 1807 - version = "21.08.0"; 1807 + version = "21.08.1"; 1808 1808 src = fetchurl { 1809 - url = "${mirror}/stable/release-service/21.08.0/src/zeroconf-ioslave-21.08.0.tar.xz"; 1810 - sha256 = "13nxmghb8h0p5qp69w095xwgdl6b7kv8c1zs1n63l0m028wa37bg"; 1811 - name = "zeroconf-ioslave-21.08.0.tar.xz"; 1809 + url = "${mirror}/stable/release-service/21.08.1/src/zeroconf-ioslave-21.08.1.tar.xz"; 1810 + sha256 = "113sp3lqzyxx7icww4sznc23kxarmxz0158kzl6nazxj4m6cnm4r"; 1811 + name = "zeroconf-ioslave-21.08.1.tar.xz"; 1812 1812 }; 1813 1813 }; 1814 1814 }
+15 -6
pkgs/applications/misc/bottles/default.nix
··· 3 3 , desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy 4 4 , python3Packages, gettext 5 5 , appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3 6 - , steam-run-native 6 + , steam-run, xdg-utils, pciutils, cabextract, wineWowPackages 7 7 }: 8 8 9 9 python3Packages.buildPythonApplication rec { 10 10 pname = "bottles"; 11 - version = "2021.7.14-treviso"; 11 + version = "2021.7.28-treviso-2"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "bottlesdevs"; 15 15 repo = pname; 16 16 rev = version; 17 - sha256 = "0xhfk1ll8vacgrr0kkhynq4bryjhfjs29j824bark5mj9b6lkbix"; 17 + sha256 = "0kvwcajm9izvkwfg7ir7bks39bpc665idwa8mc8d536ajyjriysn"; 18 18 }; 19 19 20 20 postPatch = '' ··· 52 52 dbus-python 53 53 gst-python 54 54 liblarch 55 - ] ++ [ steam-run-native ]; 55 + patool 56 + ] ++ [ 57 + steam-run 58 + xdg-utils 59 + pciutils 60 + cabextract 61 + wineWowPackages.minimal 62 + ]; 56 63 57 64 format = "other"; 58 65 strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943 ··· 62 69 substituteInPlace build-aux/meson/postinstall.py \ 63 70 --replace "'update-desktop-database'" "'${desktop-file-utils}/bin/update-desktop-database'" 64 71 substituteInPlace src/runner.py \ 65 - --replace " {runner}" " ${steam-run-native}/bin/steam-run {runner}" \ 66 - --replace " {dxvk_setup}" " ${steam-run-native}/bin/steam-run {dxvk_setup}" 72 + --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ 73 + --replace " {dxvk_setup}" " ${steam-run}/bin/steam-run {dxvk_setup}" 74 + substituteInPlace src/runner_utilities.py \ 75 + --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ 67 76 ''; 68 77 69 78 preFixup = ''
+8 -2
pkgs/applications/science/chemistry/openmolcas/default.nix
··· 27 27 ./openblasPath.patch 28 28 ]; 29 29 30 - nativeBuildInputs = [ perl cmake texlive.combined.scheme-minimal makeWrapper ]; 31 - buildInputs = [ 30 + nativeBuildInputs = [ 31 + perl 32 32 gfortran 33 + cmake 34 + texlive.combined.scheme-minimal 35 + makeWrapper 36 + ]; 37 + 38 + buildInputs = [ 33 39 openblas 34 40 hdf5-cpp 35 41 python
+3 -1
pkgs/applications/science/chemistry/quantum-espresso/default.nix
··· 28 28 patchShebangs configure 29 29 ''; 30 30 31 - buildInputs = [ fftw blas lapack gfortran ] 31 + nativeBuildInputs = [ gfortran ]; 32 + 33 + buildInputs = [ fftw blas lapack ] 32 34 ++ (lib.optionals useMpi [ mpi ]); 33 35 34 36 configureFlags = if useMpi then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ];
+3 -1
pkgs/applications/science/chemistry/siesta/default.nix
··· 17 17 inherit mpi; 18 18 }; 19 19 20 - buildInputs = [ blas lapack gfortran ] 20 + nativeBuildInputs = [ gfortran ]; 21 + 22 + buildInputs = [ blas lapack ] 21 23 ++ lib.optionals useMpi [ mpi scalapack ]; 22 24 23 25 enableParallelBuilding = true;
+5 -1
pkgs/applications/science/math/jags/default.nix
··· 6 6 url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; 7 7 sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica"; 8 8 }; 9 - buildInputs = [gfortran blas lapack]; 9 + 10 + nativeBuildInputs = [ gfortran ]; 11 + 12 + buildInputs = [ blas lapack ]; 13 + 10 14 configureFlags = [ "--with-blas=-lblas" "--with-lapack=-llapack" ]; 11 15 12 16 meta = with lib; {
+6 -5
pkgs/applications/science/math/scilab/default.nix
··· 19 19 sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc"; 20 20 }; 21 21 22 - buildInputs = [gfortran ncurses] 23 - ++ lib.optionals withGtk [gtk2] 24 - ++ lib.optionals withOCaml [ocaml] 25 - ++ lib.optional withX xlibsWrapper 26 - ; 22 + nativeBuildInputs = [ gfortran ]; 23 + 24 + buildInputs = [ ncurses ] 25 + ++ lib.optionals withGtk [ gtk2 ] 26 + ++ lib.optionals withOCaml [ ocaml ] 27 + ++ lib.optional withX xlibsWrapper; 27 28 28 29 29 30 /*
+3 -1
pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
··· 11 11 sha256 = "1r76zvln3bwycxlmqday0sqzv5j260y7mdh66as2aqny6jzd5ld7"; 12 12 }; 13 13 14 - buildInputs = [ mpi gfortran ]; 14 + nativeBuildInputs = [ gfortran ]; 15 + 16 + buildInputs = [ mpi ]; 15 17 16 18 configurePhase = '' 17 19 cd source
+2 -2
pkgs/applications/science/physics/elmerfem/default.nix
··· 13 13 14 14 hardeningDisable = [ "format" ]; 15 15 16 - nativeBuildInputs = [ cmake pkg-config git ]; 17 - buildInputs = [ gfortran mpi blas liblapack qt4 qwt6_qt4 ]; 16 + nativeBuildInputs = [ cmake gfortran pkg-config git ]; 17 + buildInputs = [ mpi blas liblapack qt4 qwt6_qt4 ]; 18 18 19 19 preConfigure = '' 20 20 patchShebangs ./
+4 -1
pkgs/applications/science/physics/sherpa/default.nix
··· 13 13 sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C 14 14 ''; 15 15 16 - buildInputs = [ gfortran sqlite lhapdf rivet ]; 16 + 17 + nativeBuildInputs = [ gfortran ]; 18 + 19 + buildInputs = [ sqlite lhapdf rivet ]; 17 20 18 21 enableParallelBuilding = true; 19 22
+4
pkgs/applications/version-management/git-and-tools/git/default.nix
··· 65 65 # Fix references to gettext introduced by ./git-sh-i18n.patch 66 66 substituteInPlace git-sh-i18n.sh \ 67 67 --subst-var-by gettext ${gettext} 68 + 69 + # ensure we are using the correct shell when executing the test scripts 70 + patchShebangs t/*.sh 68 71 ''; 69 72 70 73 nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ] ··· 318 321 319 322 # Flaky tests: 320 323 disable_test t5319-multi-pack-index 324 + disable_test t6421-merge-partial-clone 321 325 322 326 ${lib.optionalString (!perlSupport) '' 323 327 # request-pull is a Bash script that invokes Perl, so it is not available
+2 -2
pkgs/build-support/alternatives/blas/default.nix
··· 82 82 patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libblas${canonicalExtension} 83 83 '' else if stdenv.hostPlatform.isDarwin then '' 84 84 install_name_tool \ 85 - -id libblas${canonicalExtension} \ 85 + -id $out/lib/libblas${canonicalExtension} \ 86 86 -add_rpath ${lib.getLib blasProvider}/lib \ 87 87 $out/lib/libblas${canonicalExtension} 88 88 '' else "") + '' ··· 114 114 patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libcblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libcblas${canonicalExtension} 115 115 '' else if stdenv.hostPlatform.isDarwin then '' 116 116 install_name_tool \ 117 - -id libcblas${canonicalExtension} \ 117 + -id $out/lib/libcblas${canonicalExtension} \ 118 118 -add_rpath ${lib.getLib blasProvider}/lib \ 119 119 $out/lib/libcblas${canonicalExtension} 120 120 '' else "") + ''
+2 -2
pkgs/build-support/setup-hooks/compress-man-pages.sh
··· 9 9 echo "gzipping man pages under $dir/share/man/" 10 10 11 11 # Compress all uncompressed manpages. Don't follow symlinks, etc. 12 - find "$dir"/share/man/ -type f -a '!' -regex '.*\.\(bz2\|gz\)$' -print0 \ 12 + find "$dir"/share/man/ -type f -a '!' -regex '.*\.\(bz2\|gz\|xz\)$' -print0 \ 13 13 | while IFS= read -r -d $'\0' f 14 14 do 15 15 if gzip -c -n "$f" > "$f".gz; then ··· 20 20 done 21 21 22 22 # Point symlinks to compressed manpages. 23 - find "$dir"/share/man/ -type l -a '!' -regex '.*\.\(bz2\|gz\)$' -print0 \ 23 + find "$dir"/share/man/ -type l -a '!' -regex '.*\.\(bz2\|gz\|xz\)$' -print0 \ 24 24 | sort -z \ 25 25 | while IFS= read -r -d $'\0' f 26 26 do
+1 -1
pkgs/build-support/setup-hooks/move-docs.sh
··· 6 6 7 7 _moveToShare() { 8 8 forceShare=${forceShare:=man doc info} 9 - if [ -z "$forceShare" -o -z "$out" ]; then return; fi 9 + if [[ -z "$out" ]]; then return; fi 10 10 11 11 for d in $forceShare; do 12 12 if [ -d "$out/$d" ]; then
+2
pkgs/data/misc/shared-mime-info/default.nix
··· 16 16 pname = "shared-mime-info"; 17 17 version = "2.1"; 18 18 19 + outputs = [ "out" "dev" ]; 20 + 19 21 src = fetchFromGitLab { 20 22 domain = "gitlab.freedesktop.org"; 21 23 owner = "xdg";
+1 -1
pkgs/desktops/plasma-5/fetch.sh
··· 1 - WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.4/ -A '*.tar.xz' ) 1 + WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.5/ -A '*.tar.xz' )
+12
pkgs/desktops/plasma-5/kwin/default.nix
··· 40 40 ./0002-xwayland.patch 41 41 ./0003-plugins-qpa-allow-using-nixos-wrapper.patch 42 42 ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch 43 + # Fix build against libglvnd 1.3.4+ 44 + # Remove with release 5.22.90 45 + (fetchpatch { 46 + url = "https://invent.kde.org/plasma/kwin/-/commit/839710201c389b7f4ed248cb3818e755a37ce977.patch"; 47 + sha256 = "09rldhy0sbmqdfpyjzwm20cwnmrmj0w2751vyi5xlr414g0rzyc1"; 48 + }) 49 + # Fixup previous patch for i686 50 + # Remove with release 5.22.90 51 + (fetchpatch { 52 + url = "https://invent.kde.org/plasma/kwin/-/commit/38e24ecd6416a975db0989c21b70d6a4cc242f35.patch"; 53 + sha256 = "0zsjmzswcnvfd2jm1c8i9aijpbap1141mjv6y4j282bplyqlp966"; 54 + }) 43 55 ]; 44 56 CXXFLAGS = [ 45 57 ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
+214 -214
pkgs/desktops/plasma-5/srcs.nix
··· 4 4 5 5 { 6 6 bluedevil = { 7 - version = "5.22.4"; 7 + version = "5.22.5"; 8 8 src = fetchurl { 9 - url = "${mirror}/stable/plasma/5.22.4/bluedevil-5.22.4.tar.xz"; 10 - sha256 = "10bqk46ygnf72aqxxaxlx4khv1gwj46la1czsjmlszvkcqxrpwa0"; 11 - name = "bluedevil-5.22.4.tar.xz"; 9 + url = "${mirror}/stable/plasma/5.22.5/bluedevil-5.22.5.tar.xz"; 10 + sha256 = "01fc5zk3qh3kx8z3dpikaaidi6vg21s75kmpd9w65rj5akg98452"; 11 + name = "bluedevil-5.22.5.tar.xz"; 12 12 }; 13 13 }; 14 14 breeze = { 15 - version = "5.22.4"; 15 + version = "5.22.5"; 16 16 src = fetchurl { 17 - url = "${mirror}/stable/plasma/5.22.4/breeze-5.22.4.tar.xz"; 18 - sha256 = "1b4zrwpaayd6mlwsnwg416ryba32zpg8w2dlh56qbmg6jxzjnybx"; 19 - name = "breeze-5.22.4.tar.xz"; 17 + url = "${mirror}/stable/plasma/5.22.5/breeze-5.22.5.tar.xz"; 18 + sha256 = "09ll0bddsbbhz7ihqcn0wbd2llbjrblgk90gp556kpy09jh4rz73"; 19 + name = "breeze-5.22.5.tar.xz"; 20 20 }; 21 21 }; 22 22 breeze-grub = { 23 - version = "5.22.4"; 23 + version = "5.22.5"; 24 24 src = fetchurl { 25 - url = "${mirror}/stable/plasma/5.22.4/breeze-grub-5.22.4.tar.xz"; 26 - sha256 = "19zlhq3k80id676sxlf8nhk0a11rkrwmbd256aggdwhz1fivxc1c"; 27 - name = "breeze-grub-5.22.4.tar.xz"; 25 + url = "${mirror}/stable/plasma/5.22.5/breeze-grub-5.22.5.tar.xz"; 26 + sha256 = "1p08pmhkac3s5pccryy5s33594kr0v8z6j1hg94l419nzaqqya1v"; 27 + name = "breeze-grub-5.22.5.tar.xz"; 28 28 }; 29 29 }; 30 30 breeze-gtk = { 31 - version = "5.22.4"; 31 + version = "5.22.5"; 32 32 src = fetchurl { 33 - url = "${mirror}/stable/plasma/5.22.4/breeze-gtk-5.22.4.tar.xz"; 34 - sha256 = "1p47vsr2xj00p1r2jhyns2wzchjlhymzzyv2xqy9xd4l8pkv8scb"; 35 - name = "breeze-gtk-5.22.4.tar.xz"; 33 + url = "${mirror}/stable/plasma/5.22.5/breeze-gtk-5.22.5.tar.xz"; 34 + sha256 = "0lifs97wad9cg5hp1vdd5ag9fkcbqj3h2bkg6x5jd4f41j0x2fy2"; 35 + name = "breeze-gtk-5.22.5.tar.xz"; 36 36 }; 37 37 }; 38 38 breeze-plymouth = { 39 - version = "5.22.4"; 39 + version = "5.22.5"; 40 40 src = fetchurl { 41 - url = "${mirror}/stable/plasma/5.22.4/breeze-plymouth-5.22.4.tar.xz"; 42 - sha256 = "0b9sjn8lfhgyc2sz1r9rnknkas79526qmwi5j3wbxb0va2rcap9z"; 43 - name = "breeze-plymouth-5.22.4.tar.xz"; 41 + url = "${mirror}/stable/plasma/5.22.5/breeze-plymouth-5.22.5.tar.xz"; 42 + sha256 = "1735ii7is873yz6rhcsrj81crvmdxj4a368k22rkj8nm374s44g1"; 43 + name = "breeze-plymouth-5.22.5.tar.xz"; 44 44 }; 45 45 }; 46 46 discover = { 47 - version = "5.22.4"; 47 + version = "5.22.5"; 48 48 src = fetchurl { 49 - url = "${mirror}/stable/plasma/5.22.4/discover-5.22.4.tar.xz"; 50 - sha256 = "0ij7b1fyv9rgiw6ywgxzj35c9bd3937w3njzqmkzi2l9zlnrzwvg"; 51 - name = "discover-5.22.4.tar.xz"; 49 + url = "${mirror}/stable/plasma/5.22.5/discover-5.22.5.tar.xz"; 50 + sha256 = "1c22910ainm4819xzkri8j2x8lng0g6zgmh1k770jsgjyg49x069"; 51 + name = "discover-5.22.5.tar.xz"; 52 52 }; 53 53 }; 54 54 drkonqi = { 55 - version = "5.22.4"; 55 + version = "5.22.5"; 56 56 src = fetchurl { 57 - url = "${mirror}/stable/plasma/5.22.4/drkonqi-5.22.4.tar.xz"; 58 - sha256 = "1dy5v50icnlwa4pl5z30q5abv2sbznlrpgiy28hh1mf64hx6hl3w"; 59 - name = "drkonqi-5.22.4.tar.xz"; 57 + url = "${mirror}/stable/plasma/5.22.5/drkonqi-5.22.5.tar.xz"; 58 + sha256 = "1f23p35wzsk0wx2kz0r7x616in6kizzdvl9j37v2a94hh8z3f7my"; 59 + name = "drkonqi-5.22.5.tar.xz"; 60 60 }; 61 61 }; 62 62 kactivitymanagerd = { 63 - version = "5.22.4"; 63 + version = "5.22.5"; 64 64 src = fetchurl { 65 - url = "${mirror}/stable/plasma/5.22.4/kactivitymanagerd-5.22.4.tar.xz"; 66 - sha256 = "1km0mlqyrvflq45gwffrbwvkrqirb44qn1rp37iif4d82pmx11yv"; 67 - name = "kactivitymanagerd-5.22.4.tar.xz"; 65 + url = "${mirror}/stable/plasma/5.22.5/kactivitymanagerd-5.22.5.tar.xz"; 66 + sha256 = "069a862myj9b0303qc6j8iv3mdja8qhzx5ax52206pjrglvn9ar2"; 67 + name = "kactivitymanagerd-5.22.5.tar.xz"; 68 68 }; 69 69 }; 70 70 kde-cli-tools = { 71 - version = "5.22.4"; 71 + version = "5.22.5"; 72 72 src = fetchurl { 73 - url = "${mirror}/stable/plasma/5.22.4/kde-cli-tools-5.22.4.tar.xz"; 74 - sha256 = "1kh8pba9q61qjjpc945nvx42mm63vrj5bny4iv60jgcfxxwy7qj4"; 75 - name = "kde-cli-tools-5.22.4.tar.xz"; 73 + url = "${mirror}/stable/plasma/5.22.5/kde-cli-tools-5.22.5.tar.xz"; 74 + sha256 = "1jj5vywai9di05wzr81dzvrcsb5h6l300llw3ma49f0jl4z3gjwh"; 75 + name = "kde-cli-tools-5.22.5.tar.xz"; 76 76 }; 77 77 }; 78 - kdecoration = { 79 - version = "5.22.4"; 78 + kde-gtk-config = { 79 + version = "5.22.5"; 80 80 src = fetchurl { 81 - url = "${mirror}/stable/plasma/5.22.4/kdecoration-5.22.4.tar.xz"; 82 - sha256 = "0cc0lskm359lbg93bxny84cf1qnk0h53f64bxy3dvbyn5gmvzsch"; 83 - name = "kdecoration-5.22.4.tar.xz"; 81 + url = "${mirror}/stable/plasma/5.22.5/kde-gtk-config-5.22.5.tar.xz"; 82 + sha256 = "0v0yjy6diwby3y71kkipx8h0wxfc49nwr2r3g2j8cf9ybqnwmy6s"; 83 + name = "kde-gtk-config-5.22.5.tar.xz"; 84 84 }; 85 85 }; 86 - kde-gtk-config = { 87 - version = "5.22.4"; 86 + kdecoration = { 87 + version = "5.22.5"; 88 88 src = fetchurl { 89 - url = "${mirror}/stable/plasma/5.22.4/kde-gtk-config-5.22.4.tar.xz"; 90 - sha256 = "0d56brzpk5yi7cdyvpqg3jlk5n3l2dvk98npw34fd4i3gw357px8"; 91 - name = "kde-gtk-config-5.22.4.tar.xz"; 89 + url = "${mirror}/stable/plasma/5.22.5/kdecoration-5.22.5.tar.xz"; 90 + sha256 = "1vqv44ls79x2d71ldkkkzpk4mzpv110y270wf1gbkmxaxwp20xxm"; 91 + name = "kdecoration-5.22.5.tar.xz"; 92 92 }; 93 93 }; 94 94 kdeplasma-addons = { 95 - version = "5.22.4"; 95 + version = "5.22.5"; 96 96 src = fetchurl { 97 - url = "${mirror}/stable/plasma/5.22.4/kdeplasma-addons-5.22.4.tar.xz"; 98 - sha256 = "1flf4mq0zcjh7fnv155hklliidfvflh20d1s84rj8q2ka7phcwk0"; 99 - name = "kdeplasma-addons-5.22.4.tar.xz"; 97 + url = "${mirror}/stable/plasma/5.22.5/kdeplasma-addons-5.22.5.tar.xz"; 98 + sha256 = "00ricjqxcafhji8b33zqynrlh56z3nr516v5jghp8cz2wclvnh32"; 99 + name = "kdeplasma-addons-5.22.5.tar.xz"; 100 100 }; 101 101 }; 102 102 kgamma5 = { 103 - version = "5.22.4"; 103 + version = "5.22.5"; 104 104 src = fetchurl { 105 - url = "${mirror}/stable/plasma/5.22.4/kgamma5-5.22.4.tar.xz"; 106 - sha256 = "0fgx9i031iqrp7w7v7px1vha079cjcdv9w5ah4k1m53g8abriddl"; 107 - name = "kgamma5-5.22.4.tar.xz"; 105 + url = "${mirror}/stable/plasma/5.22.5/kgamma5-5.22.5.tar.xz"; 106 + sha256 = "0m2h4wwkg3dnkvq31z8mvn4q1r7hwi1q2d7csy350ycrv9x7f402"; 107 + name = "kgamma5-5.22.5.tar.xz"; 108 108 }; 109 109 }; 110 110 khotkeys = { 111 - version = "5.22.4"; 111 + version = "5.22.5"; 112 112 src = fetchurl { 113 - url = "${mirror}/stable/plasma/5.22.4/khotkeys-5.22.4.tar.xz"; 114 - sha256 = "1lm1xrbrpym7nhvnzljdgr5nsas8z3i0hgda53j5k6svzk5r3qg8"; 115 - name = "khotkeys-5.22.4.tar.xz"; 113 + url = "${mirror}/stable/plasma/5.22.5/khotkeys-5.22.5.tar.xz"; 114 + sha256 = "1l0p9q7bmljism188mzssryyd31b1x0alivnpsk0jhhjr9hwbqb4"; 115 + name = "khotkeys-5.22.5.tar.xz"; 116 116 }; 117 117 }; 118 118 kinfocenter = { 119 - version = "5.22.4"; 119 + version = "5.22.5"; 120 120 src = fetchurl { 121 - url = "${mirror}/stable/plasma/5.22.4/kinfocenter-5.22.4.tar.xz"; 122 - sha256 = "14vfz5j3fxhfb1fip00fgg9k6dc9ffjf0ss8ij1cx7bga14nmzvw"; 123 - name = "kinfocenter-5.22.4.tar.xz"; 121 + url = "${mirror}/stable/plasma/5.22.5/kinfocenter-5.22.5.tar.xz"; 122 + sha256 = "1pxr4pihy6asflpij5r4payxnbagzkli3qm5zh4zgap4bhq447lm"; 123 + name = "kinfocenter-5.22.5.tar.xz"; 124 124 }; 125 125 }; 126 126 kmenuedit = { 127 - version = "5.22.4"; 127 + version = "5.22.5"; 128 128 src = fetchurl { 129 - url = "${mirror}/stable/plasma/5.22.4/kmenuedit-5.22.4.tar.xz"; 130 - sha256 = "186j8ky5z3l0mmxx327xzahhsyf7wlds1rsmzzmlxficpg43n90b"; 131 - name = "kmenuedit-5.22.4.tar.xz"; 129 + url = "${mirror}/stable/plasma/5.22.5/kmenuedit-5.22.5.tar.xz"; 130 + sha256 = "1in8q0hd8wgcnwmx0cpv2w5l2w75xhv5j38mc5py322h9gkg1mqs"; 131 + name = "kmenuedit-5.22.5.tar.xz"; 132 132 }; 133 133 }; 134 134 kscreen = { 135 - version = "5.22.4"; 135 + version = "5.22.5"; 136 136 src = fetchurl { 137 - url = "${mirror}/stable/plasma/5.22.4/kscreen-5.22.4.tar.xz"; 138 - sha256 = "0hkn7ap55x4rzm6x3qdinjar9qhnb742zgzmvswy1kn3a8mxby17"; 139 - name = "kscreen-5.22.4.tar.xz"; 137 + url = "${mirror}/stable/plasma/5.22.5/kscreen-5.22.5.tar.xz"; 138 + sha256 = "0q0ykp10nwfzzxjrcra11k4b81di4r37jbhis4b9wn9j0pqv3ykb"; 139 + name = "kscreen-5.22.5.tar.xz"; 140 140 }; 141 141 }; 142 142 kscreenlocker = { 143 - version = "5.22.4"; 143 + version = "5.22.5"; 144 144 src = fetchurl { 145 - url = "${mirror}/stable/plasma/5.22.4/kscreenlocker-5.22.4.tar.xz"; 146 - sha256 = "0i7c6a378h7366h7nl5051mwrx7cadzfaryfnhpskhlgy3l7119j"; 147 - name = "kscreenlocker-5.22.4.tar.xz"; 145 + url = "${mirror}/stable/plasma/5.22.5/kscreenlocker-5.22.5.tar.xz"; 146 + sha256 = "107icbr0cdcpbzi5npgx3fw2m2wp1z91k1iw26n595dp3n2czv98"; 147 + name = "kscreenlocker-5.22.5.tar.xz"; 148 148 }; 149 149 }; 150 150 ksshaskpass = { 151 - version = "5.22.4"; 151 + version = "5.22.5"; 152 152 src = fetchurl { 153 - url = "${mirror}/stable/plasma/5.22.4/ksshaskpass-5.22.4.tar.xz"; 154 - sha256 = "01f2rz1xqb1jy83427f7rmsb3a7ivkgf2qmm04kwjv29zplg796f"; 155 - name = "ksshaskpass-5.22.4.tar.xz"; 153 + url = "${mirror}/stable/plasma/5.22.5/ksshaskpass-5.22.5.tar.xz"; 154 + sha256 = "0ig2cx80ba57k9mq7bcnmriymjln7kvr81mgm5rsdi4asal2zpgp"; 155 + name = "ksshaskpass-5.22.5.tar.xz"; 156 156 }; 157 157 }; 158 158 ksystemstats = { 159 - version = "5.22.4"; 159 + version = "5.22.5"; 160 160 src = fetchurl { 161 - url = "${mirror}/stable/plasma/5.22.4/ksystemstats-5.22.4.tar.xz"; 162 - sha256 = "1daz3890v7qbkcsb9m535mfnijdq3rbasxwqs0ixhn2m400yivvg"; 163 - name = "ksystemstats-5.22.4.tar.xz"; 161 + url = "${mirror}/stable/plasma/5.22.5/ksystemstats-5.22.5.tar.xz"; 162 + sha256 = "1cb5hbwnj6j9ziin6bflcz9b8jyvjqbqqhqbzvgs8dyji2xz0gb8"; 163 + name = "ksystemstats-5.22.5.tar.xz"; 164 164 }; 165 165 }; 166 166 kwallet-pam = { 167 - version = "5.22.4"; 167 + version = "5.22.5"; 168 168 src = fetchurl { 169 - url = "${mirror}/stable/plasma/5.22.4/kwallet-pam-5.22.4.tar.xz"; 170 - sha256 = "1ljrrgjvkvs3fsiijgaxj82hzp1fhsiy39r4amwp21v411c80jwq"; 171 - name = "kwallet-pam-5.22.4.tar.xz"; 169 + url = "${mirror}/stable/plasma/5.22.5/kwallet-pam-5.22.5.tar.xz"; 170 + sha256 = "03rj2kgda1as547jjvvigkb4pblh1w9jv8hsrjrs5vwfir0ag8nq"; 171 + name = "kwallet-pam-5.22.5.tar.xz"; 172 172 }; 173 173 }; 174 174 kwayland-integration = { 175 - version = "5.22.4"; 175 + version = "5.22.5"; 176 176 src = fetchurl { 177 - url = "${mirror}/stable/plasma/5.22.4/kwayland-integration-5.22.4.tar.xz"; 178 - sha256 = "17nl033vl8i9a92bjbgwwwrkf03lg4726lwdbj3y8xajdp8ql1nb"; 179 - name = "kwayland-integration-5.22.4.tar.xz"; 177 + url = "${mirror}/stable/plasma/5.22.5/kwayland-integration-5.22.5.tar.xz"; 178 + sha256 = "0kgv6klb32y7ckflsi5xbs8ajn7zg461621fqhmgn1x54w931g2c"; 179 + name = "kwayland-integration-5.22.5.tar.xz"; 180 180 }; 181 181 }; 182 182 kwayland-server = { 183 - version = "5.22.4"; 183 + version = "5.22.5"; 184 184 src = fetchurl { 185 - url = "${mirror}/stable/plasma/5.22.4/kwayland-server-5.22.4.tar.xz"; 186 - sha256 = "0z3ni5ar2bwpc75ssb3qmkbff85a489sxr7vzqhxa40n48bp85ns"; 187 - name = "kwayland-server-5.22.4.tar.xz"; 185 + url = "${mirror}/stable/plasma/5.22.5/kwayland-server-5.22.5.tar.xz"; 186 + sha256 = "17gkbcam9dpqbw618rvb5ia8inp0yvpyr3bxd0fn4fdj57bbsr6x"; 187 + name = "kwayland-server-5.22.5.tar.xz"; 188 188 }; 189 189 }; 190 190 kwin = { 191 - version = "5.22.4"; 191 + version = "5.22.5"; 192 192 src = fetchurl { 193 - url = "${mirror}/stable/plasma/5.22.4/kwin-5.22.4.tar.xz"; 194 - sha256 = "1x5338aib7kn1lgpb06b8s06bfj2ybfgyr6k0q91zlc53x61qamh"; 195 - name = "kwin-5.22.4.tar.xz"; 193 + url = "${mirror}/stable/plasma/5.22.5/kwin-5.22.5.tar.xz"; 194 + sha256 = "18zmzhmjr6q5vsfd7lr0ym5ga7l2x8xcxqizmpfnb7hv3kaax38j"; 195 + name = "kwin-5.22.5.tar.xz"; 196 196 }; 197 197 }; 198 198 kwrited = { 199 - version = "5.22.4"; 199 + version = "5.22.5"; 200 200 src = fetchurl { 201 - url = "${mirror}/stable/plasma/5.22.4/kwrited-5.22.4.tar.xz"; 202 - sha256 = "1rbkbqf5v8wqd2aldpg396ki8a9fsw82jmzmdhsirq33r5yznn4i"; 203 - name = "kwrited-5.22.4.tar.xz"; 201 + url = "${mirror}/stable/plasma/5.22.5/kwrited-5.22.5.tar.xz"; 202 + sha256 = "02cffj88hqs5rfvrkkmk9z23qsdnqhavm98hksx1v5ajjh4rbgb3"; 203 + name = "kwrited-5.22.5.tar.xz"; 204 204 }; 205 205 }; 206 206 layer-shell-qt = { 207 - version = "5.22.4"; 207 + version = "5.22.5"; 208 208 src = fetchurl { 209 - url = "${mirror}/stable/plasma/5.22.4/layer-shell-qt-5.22.4.tar.xz"; 210 - sha256 = "11iqk4bla0y0w2frmvzxi4a3jxj3cj2m8y473z3nfb0z8i5yca0m"; 211 - name = "layer-shell-qt-5.22.4.tar.xz"; 209 + url = "${mirror}/stable/plasma/5.22.5/layer-shell-qt-5.22.5.tar.xz"; 210 + sha256 = "0i9gsckqk9608drxvym6ghcwxqilcf6ilcxq48sbrnpswid71k7z"; 211 + name = "layer-shell-qt-5.22.5.tar.xz"; 212 212 }; 213 213 }; 214 214 libkscreen = { 215 - version = "5.22.4"; 215 + version = "5.22.5"; 216 216 src = fetchurl { 217 - url = "${mirror}/stable/plasma/5.22.4/libkscreen-5.22.4.tar.xz"; 218 - sha256 = "0z2mzha22f2yl7l0ijy4pqpab6n1ivib3grnd583znff02wvj4d2"; 219 - name = "libkscreen-5.22.4.tar.xz"; 217 + url = "${mirror}/stable/plasma/5.22.5/libkscreen-5.22.5.tar.xz"; 218 + sha256 = "1qqnra28r698kbps6ywk22ncac4sm3f9d9wrwmicp963mkmwlksv"; 219 + name = "libkscreen-5.22.5.tar.xz"; 220 220 }; 221 221 }; 222 222 libksysguard = { 223 - version = "5.22.4"; 223 + version = "5.22.5"; 224 224 src = fetchurl { 225 - url = "${mirror}/stable/plasma/5.22.4/libksysguard-5.22.4.tar.xz"; 226 - sha256 = "14h66gs7z6gf7wrpdhpd1461431q2plv7kvfsh02fj52l1dzpcc0"; 227 - name = "libksysguard-5.22.4.tar.xz"; 225 + url = "${mirror}/stable/plasma/5.22.5/libksysguard-5.22.5.tar.xz"; 226 + sha256 = "1hkjsjfl4hsxbk998hpq4f38rahqfx6nmznbh0dqrymadfbsn8m5"; 227 + name = "libksysguard-5.22.5.tar.xz"; 228 228 }; 229 229 }; 230 230 milou = { 231 - version = "5.22.4"; 231 + version = "5.22.5"; 232 232 src = fetchurl { 233 - url = "${mirror}/stable/plasma/5.22.4/milou-5.22.4.tar.xz"; 234 - sha256 = "11fa9bj3yzriaydfk8q9kc626yv0s0sal5ws13pcd6ksbhslz83s"; 235 - name = "milou-5.22.4.tar.xz"; 233 + url = "${mirror}/stable/plasma/5.22.5/milou-5.22.5.tar.xz"; 234 + sha256 = "1d1zg1fbhl6cbxfhgrp9njvpcn052psn96cfyw314255v532phpp"; 235 + name = "milou-5.22.5.tar.xz"; 236 236 }; 237 237 }; 238 238 oxygen = { 239 - version = "5.22.4"; 239 + version = "5.22.5"; 240 240 src = fetchurl { 241 - url = "${mirror}/stable/plasma/5.22.4/oxygen-5.22.4.tar.xz"; 242 - sha256 = "1p5hklryi02xw0byy5zcaxx5zw81vd6vq3s1h8dyhj07vspimpzw"; 243 - name = "oxygen-5.22.4.tar.xz"; 241 + url = "${mirror}/stable/plasma/5.22.5/oxygen-5.22.5.tar.xz"; 242 + sha256 = "0fy4dr8kjyh96w482qbf47vkbnb2qqwwp8d0jlf0xc20w6fb4fqc"; 243 + name = "oxygen-5.22.5.tar.xz"; 244 244 }; 245 245 }; 246 246 plasma-browser-integration = { 247 - version = "5.22.4"; 247 + version = "5.22.5"; 248 248 src = fetchurl { 249 - url = "${mirror}/stable/plasma/5.22.4/plasma-browser-integration-5.22.4.tar.xz"; 250 - sha256 = "023qbp77ga0jblhhx3437v9jjxx5va7q58abmnpv2nls1xwyq8hb"; 251 - name = "plasma-browser-integration-5.22.4.tar.xz"; 249 + url = "${mirror}/stable/plasma/5.22.5/plasma-browser-integration-5.22.5.tar.xz"; 250 + sha256 = "1zkz4qd9nk2kw8zx0mj0p5q4yclmfgz5ihfmgqb2iw4j0d2ckw8f"; 251 + name = "plasma-browser-integration-5.22.5.tar.xz"; 252 252 }; 253 253 }; 254 254 plasma-desktop = { 255 - version = "5.22.4"; 255 + version = "5.22.5"; 256 256 src = fetchurl { 257 - url = "${mirror}/stable/plasma/5.22.4/plasma-desktop-5.22.4.tar.xz"; 258 - sha256 = "0c225lckhsmhig7xsnv5yfajys3w67g6xj4w1hvz1x3hqs79z3kj"; 259 - name = "plasma-desktop-5.22.4.tar.xz"; 257 + url = "${mirror}/stable/plasma/5.22.5/plasma-desktop-5.22.5.tar.xz"; 258 + sha256 = "1kmcmpfjgmiazalczjchyrvgy365s1gqdnyv3xav4g4irb62llxl"; 259 + name = "plasma-desktop-5.22.5.tar.xz"; 260 260 }; 261 261 }; 262 262 plasma-disks = { 263 - version = "5.22.4"; 263 + version = "5.22.5"; 264 264 src = fetchurl { 265 - url = "${mirror}/stable/plasma/5.22.4/plasma-disks-5.22.4.tar.xz"; 266 - sha256 = "02brm36akqfhjz9fzyzfinjnb954glrrlwpyhiq1sx073v2ibyap"; 267 - name = "plasma-disks-5.22.4.tar.xz"; 265 + url = "${mirror}/stable/plasma/5.22.5/plasma-disks-5.22.5.tar.xz"; 266 + sha256 = "14ml1vxdp6brms8yqg5x96bad2r9n81cki91fsq6qk0aq098dqbh"; 267 + name = "plasma-disks-5.22.5.tar.xz"; 268 268 }; 269 269 }; 270 270 plasma-firewall = { 271 - version = "5.22.4"; 271 + version = "5.22.5"; 272 272 src = fetchurl { 273 - url = "${mirror}/stable/plasma/5.22.4/plasma-firewall-5.22.4.tar.xz"; 274 - sha256 = "1c1mzpd45hd4sb6qsylqgq2x4fay1nskkgmcc1vswmnapcm9gp91"; 275 - name = "plasma-firewall-5.22.4.tar.xz"; 273 + url = "${mirror}/stable/plasma/5.22.5/plasma-firewall-5.22.5.tar.xz"; 274 + sha256 = "19ii5ha3m9jmfrdg59z9nfx8frmp4f2gc3a7c0krsnajhyrm0npg"; 275 + name = "plasma-firewall-5.22.5.tar.xz"; 276 276 }; 277 277 }; 278 278 plasma-integration = { 279 - version = "5.22.4"; 279 + version = "5.22.5"; 280 280 src = fetchurl { 281 - url = "${mirror}/stable/plasma/5.22.4/plasma-integration-5.22.4.tar.xz"; 282 - sha256 = "0rslli0jsyyhm6prac3xgilwf58gjxqhsijgvr25sipg6200r2z0"; 283 - name = "plasma-integration-5.22.4.tar.xz"; 281 + url = "${mirror}/stable/plasma/5.22.5/plasma-integration-5.22.5.tar.xz"; 282 + sha256 = "0w7jnsyz876k6kzppd6lx0i58ywbfhaycsnq3nn2s10im7ql7ir8"; 283 + name = "plasma-integration-5.22.5.tar.xz"; 284 284 }; 285 285 }; 286 286 plasma-nano = { 287 - version = "5.22.4"; 287 + version = "5.22.5"; 288 288 src = fetchurl { 289 - url = "${mirror}/stable/plasma/5.22.4/plasma-nano-5.22.4.tar.xz"; 290 - sha256 = "1ag57nphgkj3f17s42d81npk0z2n27623szbiz1hpgp7f6994l90"; 291 - name = "plasma-nano-5.22.4.tar.xz"; 289 + url = "${mirror}/stable/plasma/5.22.5/plasma-nano-5.22.5.tar.xz"; 290 + sha256 = "0i8r8mxf00c0rfnybxy2nzl2hn2r7vqfzwlbmkykd6b1z333xfjh"; 291 + name = "plasma-nano-5.22.5.tar.xz"; 292 292 }; 293 293 }; 294 294 plasma-nm = { 295 - version = "5.22.4"; 295 + version = "5.22.5"; 296 296 src = fetchurl { 297 - url = "${mirror}/stable/plasma/5.22.4/plasma-nm-5.22.4.tar.xz"; 298 - sha256 = "1cvfawsqzk3yzjwnz6gc6l7p3pz9brbh0n6km23i1bis08rks168"; 299 - name = "plasma-nm-5.22.4.tar.xz"; 297 + url = "${mirror}/stable/plasma/5.22.5/plasma-nm-5.22.5.tar.xz"; 298 + sha256 = "0jgwp41l4h16qyif2bwnsdfd190ykpddv7gi3zrcmc57fnhrzavz"; 299 + name = "plasma-nm-5.22.5.tar.xz"; 300 300 }; 301 301 }; 302 302 plasma-pa = { 303 - version = "5.22.4"; 303 + version = "5.22.5"; 304 304 src = fetchurl { 305 - url = "${mirror}/stable/plasma/5.22.4/plasma-pa-5.22.4.tar.xz"; 306 - sha256 = "1p000y08p89wvv73glv9ic0gdbdhc9fpzvphx72y420g5hhmnnwa"; 307 - name = "plasma-pa-5.22.4.tar.xz"; 305 + url = "${mirror}/stable/plasma/5.22.5/plasma-pa-5.22.5.tar.xz"; 306 + sha256 = "1axm564si8g9j9f9ndvq39x7s6awiwiiyqnvs1wf76miyyjfdba0"; 307 + name = "plasma-pa-5.22.5.tar.xz"; 308 308 }; 309 309 }; 310 310 plasma-phone-components = { 311 - version = "5.22.4"; 311 + version = "5.22.5"; 312 312 src = fetchurl { 313 - url = "${mirror}/stable/plasma/5.22.4/plasma-phone-components-5.22.4.tar.xz"; 314 - sha256 = "0mkr7amxvr325y7f98y1368iv4gs6j2x6bkpi20rp8c2vifkvg5b"; 315 - name = "plasma-phone-components-5.22.4.tar.xz"; 313 + url = "${mirror}/stable/plasma/5.22.5/plasma-phone-components-5.22.5.tar.xz"; 314 + sha256 = "1m2swgkydjrpxsnj87fs8zkyavba6zrfrzvimbhxf15c3199yrj0"; 315 + name = "plasma-phone-components-5.22.5.tar.xz"; 316 316 }; 317 317 }; 318 318 plasma-sdk = { 319 - version = "5.22.4"; 319 + version = "5.22.5"; 320 320 src = fetchurl { 321 - url = "${mirror}/stable/plasma/5.22.4/plasma-sdk-5.22.4.tar.xz"; 322 - sha256 = "0nrh3zbff25wr59hbsvrygjix56as8rd95smr5075qwdyamcqnhf"; 323 - name = "plasma-sdk-5.22.4.tar.xz"; 321 + url = "${mirror}/stable/plasma/5.22.5/plasma-sdk-5.22.5.tar.xz"; 322 + sha256 = "0gvmvdlqjm2kvkb7bw3bhryql4d9mp0max89l9y25kzqadd6byad"; 323 + name = "plasma-sdk-5.22.5.tar.xz"; 324 324 }; 325 325 }; 326 326 plasma-systemmonitor = { 327 - version = "5.22.4"; 327 + version = "5.22.5"; 328 328 src = fetchurl { 329 - url = "${mirror}/stable/plasma/5.22.4/plasma-systemmonitor-5.22.4.tar.xz"; 330 - sha256 = "1gl6kjk6b8xwcfrk6xf41jf1lh3zxr5b6qvdv7z6i8wb3pll63cb"; 331 - name = "plasma-systemmonitor-5.22.4.tar.xz"; 329 + url = "${mirror}/stable/plasma/5.22.5/plasma-systemmonitor-5.22.5.tar.xz"; 330 + sha256 = "18s72vdcx4jrjs1hfr7mq8zjng2pmba2x23k11jdk8hxl7msm7nx"; 331 + name = "plasma-systemmonitor-5.22.5.tar.xz"; 332 332 }; 333 333 }; 334 334 plasma-tests = { 335 - version = "5.22.4"; 335 + version = "5.22.5"; 336 336 src = fetchurl { 337 - url = "${mirror}/stable/plasma/5.22.4/plasma-tests-5.22.4.tar.xz"; 338 - sha256 = "1wf33c0izm9yyjcysiimcpiwmsa64b4ypklga2rbg7kkk7q0nq82"; 339 - name = "plasma-tests-5.22.4.tar.xz"; 337 + url = "${mirror}/stable/plasma/5.22.5/plasma-tests-5.22.5.tar.xz"; 338 + sha256 = "1wmwm9mmdy98qrmr0r8h99j0cpmib2vyv66jk99wf43bwddy2hxi"; 339 + name = "plasma-tests-5.22.5.tar.xz"; 340 340 }; 341 341 }; 342 342 plasma-thunderbolt = { 343 - version = "5.22.4"; 343 + version = "5.22.5"; 344 344 src = fetchurl { 345 - url = "${mirror}/stable/plasma/5.22.4/plasma-thunderbolt-5.22.4.tar.xz"; 346 - sha256 = "1c5ihvam5hfk7xiy3m707jjhpv2rxgl7d2f6m0d764zynm6zax79"; 347 - name = "plasma-thunderbolt-5.22.4.tar.xz"; 345 + url = "${mirror}/stable/plasma/5.22.5/plasma-thunderbolt-5.22.5.tar.xz"; 346 + sha256 = "13rjn21sdga5yx9983zx26jdb260lg5815ilfjnkdfp7g6ckjlmc"; 347 + name = "plasma-thunderbolt-5.22.5.tar.xz"; 348 348 }; 349 349 }; 350 350 plasma-vault = { 351 - version = "5.22.4"; 351 + version = "5.22.5"; 352 352 src = fetchurl { 353 - url = "${mirror}/stable/plasma/5.22.4/plasma-vault-5.22.4.tar.xz"; 354 - sha256 = "1p6bl8as8rx36nzwx2rymqmx4rg7dg0bfrxr0flx9jqp1adclf39"; 355 - name = "plasma-vault-5.22.4.tar.xz"; 353 + url = "${mirror}/stable/plasma/5.22.5/plasma-vault-5.22.5.tar.xz"; 354 + sha256 = "1ap9kp9agnqljlszzkd14sivpfz9ihjlhq67lhg2sg570s8ng4a0"; 355 + name = "plasma-vault-5.22.5.tar.xz"; 356 356 }; 357 357 }; 358 358 plasma-workspace = { 359 - version = "5.22.4"; 359 + version = "5.22.5"; 360 360 src = fetchurl { 361 - url = "${mirror}/stable/plasma/5.22.4/plasma-workspace-5.22.4.tar.xz"; 362 - sha256 = "1fi0c66f2cgqcbshbaxzch75r28l5w4l3flggccil5c73lavf5mg"; 363 - name = "plasma-workspace-5.22.4.tar.xz"; 361 + url = "${mirror}/stable/plasma/5.22.5/plasma-workspace-5.22.5.tar.xz"; 362 + sha256 = "01inn7jawqn5brcmbglqs3szfzkq637qzf39kya8siq3lgg14bpj"; 363 + name = "plasma-workspace-5.22.5.tar.xz"; 364 364 }; 365 365 }; 366 366 plasma-workspace-wallpapers = { 367 - version = "5.22.4"; 367 + version = "5.22.5"; 368 368 src = fetchurl { 369 - url = "${mirror}/stable/plasma/5.22.4/plasma-workspace-wallpapers-5.22.4.tar.xz"; 370 - sha256 = "0abz3qic8m7dcbd0m1ci8qspfds3fdsqhgv8m6ks2jkcm7z4vnnr"; 371 - name = "plasma-workspace-wallpapers-5.22.4.tar.xz"; 369 + url = "${mirror}/stable/plasma/5.22.5/plasma-workspace-wallpapers-5.22.5.tar.xz"; 370 + sha256 = "1h582vqw14zyngfyjppg6lgs17d1nmc7gcr8kw1zzbc0ynbl68dy"; 371 + name = "plasma-workspace-wallpapers-5.22.5.tar.xz"; 372 372 }; 373 373 }; 374 374 plymouth-kcm = { 375 - version = "5.22.4"; 375 + version = "5.22.5"; 376 376 src = fetchurl { 377 - url = "${mirror}/stable/plasma/5.22.4/plymouth-kcm-5.22.4.tar.xz"; 378 - sha256 = "0vh39lidm0dqah14y7nkzqpanlkxpmylf7wc40giavady3d2i1y1"; 379 - name = "plymouth-kcm-5.22.4.tar.xz"; 377 + url = "${mirror}/stable/plasma/5.22.5/plymouth-kcm-5.22.5.tar.xz"; 378 + sha256 = "1rn8c0z6ycagmxm72gs9cm6pwv1fy8zg5881brglpxy8x63prb9g"; 379 + name = "plymouth-kcm-5.22.5.tar.xz"; 380 380 }; 381 381 }; 382 382 polkit-kde-agent = { 383 - version = "1-5.22.4"; 383 + version = "1-5.22.5"; 384 384 src = fetchurl { 385 - url = "${mirror}/stable/plasma/5.22.4/polkit-kde-agent-1-5.22.4.tar.xz"; 386 - sha256 = "0pxrrn4qs96a5p9cp890vdq2g79ah72p655643ciqdb14936p0z2"; 387 - name = "polkit-kde-agent-1-5.22.4.tar.xz"; 385 + url = "${mirror}/stable/plasma/5.22.5/polkit-kde-agent-1-5.22.5.tar.xz"; 386 + sha256 = "1a1b4baszlx01x4n66wikgw8z7wwnycz5rqzjr8r6q1b9dafmqv0"; 387 + name = "polkit-kde-agent-1-5.22.5.tar.xz"; 388 388 }; 389 389 }; 390 390 powerdevil = { 391 - version = "5.22.4"; 391 + version = "5.22.5"; 392 392 src = fetchurl { 393 - url = "${mirror}/stable/plasma/5.22.4/powerdevil-5.22.4.tar.xz"; 394 - sha256 = "17427sv6yh16hmgl94lyb4d7gds0r4hvx8vbbqhzysih2x81xl6m"; 395 - name = "powerdevil-5.22.4.tar.xz"; 393 + url = "${mirror}/stable/plasma/5.22.5/powerdevil-5.22.5.tar.xz"; 394 + sha256 = "17qw7w9h60illpzd1zlymdipx0mpwfhn12d9k0f165qcabk02wsr"; 395 + name = "powerdevil-5.22.5.tar.xz"; 396 396 }; 397 397 }; 398 398 qqc2-breeze-style = { 399 - version = "5.22.4"; 399 + version = "5.22.5"; 400 400 src = fetchurl { 401 - url = "${mirror}/stable/plasma/5.22.4/qqc2-breeze-style-5.22.4.tar.xz"; 402 - sha256 = "15h9rjc4ry3kw18aw18r8y8av4cn2wckab8gyyi7zx7s54n6zpvc"; 403 - name = "qqc2-breeze-style-5.22.4.tar.xz"; 401 + url = "${mirror}/stable/plasma/5.22.5/qqc2-breeze-style-5.22.5.tar.xz"; 402 + sha256 = "0qi8b11f45lnyy09w3b65h0s7qj7d40b7ppwy8mapr92m0zqrkpf"; 403 + name = "qqc2-breeze-style-5.22.5.tar.xz"; 404 404 }; 405 405 }; 406 406 sddm-kcm = { 407 - version = "5.22.4"; 407 + version = "5.22.5"; 408 408 src = fetchurl { 409 - url = "${mirror}/stable/plasma/5.22.4/sddm-kcm-5.22.4.tar.xz"; 410 - sha256 = "08j0qd288a5msagpyaqwrw0w6wymxsgqq3rlk8kv3n6qvrsm7174"; 411 - name = "sddm-kcm-5.22.4.tar.xz"; 409 + url = "${mirror}/stable/plasma/5.22.5/sddm-kcm-5.22.5.tar.xz"; 410 + sha256 = "163p426bd9zfval5zz2hmq3na0px3pz016shzzgna3rqwh7s8sa6"; 411 + name = "sddm-kcm-5.22.5.tar.xz"; 412 412 }; 413 413 }; 414 414 systemsettings = { 415 - version = "5.22.4"; 415 + version = "5.22.5"; 416 416 src = fetchurl { 417 - url = "${mirror}/stable/plasma/5.22.4/systemsettings-5.22.4.tar.xz"; 418 - sha256 = "1ap2h1sa6hdakhf6lzy4bhaq5pxc8g7p32iz04894hd7dbb2iv8h"; 419 - name = "systemsettings-5.22.4.tar.xz"; 417 + url = "${mirror}/stable/plasma/5.22.5/systemsettings-5.22.5.tar.xz"; 418 + sha256 = "1fvmp6nhmn71hxrf0nfg9m8ifp36kvk5k550hiazgz63l7x7hyfc"; 419 + name = "systemsettings-5.22.5.tar.xz"; 420 420 }; 421 421 }; 422 422 xdg-desktop-portal-kde = { 423 - version = "5.22.4"; 423 + version = "5.22.5"; 424 424 src = fetchurl { 425 - url = "${mirror}/stable/plasma/5.22.4/xdg-desktop-portal-kde-5.22.4.tar.xz"; 426 - sha256 = "1xmlw66bw60cl530hjjab8g4krv6di4wpimjaz0a9mv3dnq9xz7m"; 427 - name = "xdg-desktop-portal-kde-5.22.4.tar.xz"; 425 + url = "${mirror}/stable/plasma/5.22.5/xdg-desktop-portal-kde-5.22.5.tar.xz"; 426 + sha256 = "00d6dh9jh15y0ndcrm86wzhmpv81s9pm0x0pbiywdia606yp27c6"; 427 + name = "xdg-desktop-portal-kde-5.22.5.tar.xz"; 428 428 }; 429 429 }; 430 430 }
+3 -1
pkgs/development/compilers/graalvm/default.nix
··· 370 370 ./009_remove_signedness_verifier.patch ./010_mx_substratevm.py 371 371 ]; 372 372 373 + nativeBuildInputs = [ gfortran ]; 374 + 373 375 buildInputs = [ mx zlib.dev mercurial jvmci8 git llvm clang 374 376 python27withPackages icu ruby bzip2 which 375 - readline bzip2 xz pcre curl ed gfortran 377 + readline bzip2 xz pcre curl ed 376 378 ] ++ lib.optional stdenv.isDarwin [ 377 379 CoreFoundation gcc.cc.lib libiconv perl openssl 378 380 ];
-60
pkgs/development/compilers/rust/1_54.nix
··· 1 - # New rust versions should first go to staging. 2 - # Things to check after updating: 3 - # 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: 4 - # i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github 5 - # This testing can be also done by other volunteers as part of the pull 6 - # request review, in case platforms cannot be covered. 7 - # 2. The LLVM version used for building should match with rust upstream. 8 - # Check the version number in the src/llvm-project git submodule in: 9 - # https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules 10 - # 3. Firefox and Thunderbird should still build on x86_64-linux. 11 - 12 - { stdenv, lib 13 - , buildPackages 14 - , newScope, callPackage 15 - , CoreFoundation, Security 16 - , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost 17 - , makeRustPlatform 18 - , llvmPackages_11 19 - , llvmPackages_12, llvm_12 20 - } @ args: 21 - 22 - import ./default.nix { 23 - rustcVersion = "1.54.0"; 24 - rustcSha256 = "0xk9dhfff16caambmwij67zgshd8v9djw6ha0fnnanlv7rii31dc"; 25 - 26 - llvmSharedForBuild = pkgsBuildBuild.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; 27 - llvmSharedForHost = pkgsBuildHost.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; 28 - llvmSharedForTarget = pkgsBuildTarget.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; 29 - 30 - llvmBootstrapForDarwin = llvmPackages_11; 31 - 32 - # For use at runtime 33 - llvmShared = llvm_12.override { enableSharedLibraries = true; }; 34 - 35 - # Note: the version MUST be one version prior to the version we're 36 - # building 37 - bootstrapVersion = "1.53.0"; 38 - 39 - # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` 40 - bootstrapHashes = { 41 - i686-unknown-linux-gnu = "4ebeeba05448b9484bb2845dba2ff4c0e2b7208fa8b08bef2b2ca3b171d0db99"; 42 - x86_64-unknown-linux-gnu = "5e9e556d2ccce27aa8f01a528f1348bf8cdd34496c35ec2abf131660b9792fed"; 43 - x86_64-unknown-linux-musl = "908b6163b62660f289bcd1eda1a0eb6d849b4b29da12546d24a033e5718e93ff"; 44 - arm-unknown-linux-gnueabihf = "6ae3108f4a0b0478c76f5dbaf1827c9e4a983fa78a9f973b24d501e693cfdcab"; 45 - armv7-unknown-linux-gnueabihf = "886e78f7c5bd92e16322ca3af70d1899c064837343cdfeb9a216b76edfd18157"; 46 - aarch64-unknown-linux-gnu = "cba81d5c3d16deee04098ea18af8636bc7415315a44c9e44734fd669aa778040"; 47 - aarch64-unknown-linux-musl = "a0065a6313bf370f2844af6f3b47fe292360e9cca3da31b5f6cb32db311ba686"; 48 - x86_64-apple-darwin = "940a4488f907b871f9fb1be309086509e4a48efb19303f8b5fe115c6f12abf43"; 49 - aarch64-apple-darwin = "c519da905514c05240a8fe39e459de2c4ef5943535e3655502e8fb756070aee1"; 50 - powerpc64le-unknown-linux-gnu = "9f6c17427d1023b10694e4ba60d6d9deec0aeb07d051f99763789ed18e07e2e6"; 51 - riscv64gc-unknown-linux-gnu = "6ae23ac00269df72b0790f10f2d9a98d03acf542c6090f4d30a87365fafd14ed"; 52 - }; 53 - 54 - selectRustPackage = pkgs: pkgs.rust_1_54; 55 - 56 - rustcPatches = [ 57 - ]; 58 - } 59 - 60 - (builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_12" "llvm_12"])
+60
pkgs/development/compilers/rust/1_55.nix
··· 1 + # New rust versions should first go to staging. 2 + # Things to check after updating: 3 + # 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: 4 + # i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github 5 + # This testing can be also done by other volunteers as part of the pull 6 + # request review, in case platforms cannot be covered. 7 + # 2. The LLVM version used for building should match with rust upstream. 8 + # Check the version number in the src/llvm-project git submodule in: 9 + # https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules 10 + # 3. Firefox and Thunderbird should still build on x86_64-linux. 11 + 12 + { stdenv, lib 13 + , buildPackages 14 + , newScope, callPackage 15 + , CoreFoundation, Security 16 + , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost 17 + , makeRustPlatform 18 + , llvmPackages_11 19 + , llvmPackages_12, llvm_12 20 + } @ args: 21 + 22 + import ./default.nix { 23 + rustcVersion = "1.55.0"; 24 + rustcSha256 = "07l28f7grdmi65naq71pbmvdd61hwcpi40ry7kp7dy7m233rldxj"; 25 + 26 + llvmSharedForBuild = pkgsBuildBuild.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; 27 + llvmSharedForHost = pkgsBuildHost.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; 28 + llvmSharedForTarget = pkgsBuildTarget.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; 29 + 30 + llvmBootstrapForDarwin = llvmPackages_11; 31 + 32 + # For use at runtime 33 + llvmShared = llvm_12.override { enableSharedLibraries = true; }; 34 + 35 + # Note: the version MUST be one version prior to the version we're 36 + # building 37 + bootstrapVersion = "1.54.0"; 38 + 39 + # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` 40 + bootstrapHashes = { 41 + i686-unknown-linux-gnu = "1cd06090463711d50d98374ef52c1a84b9f4e3e35febaaef4890fb10536ceb3a"; 42 + x86_64-unknown-linux-gnu = "350354495b1d4b6dd2ec7cf96aa9bc61d031951cf667a31e8cf401dc508639e6"; 43 + x86_64-unknown-linux-musl = "3571db0018fcd32f3b579a32b2301826dbd1cce44b373aed8e8a31c2a6f52fe8"; 44 + arm-unknown-linux-gnueabihf = "77f4e4c2195f75466c6de0b1d8fd7fb8cef3d12666e3aae777dcfd0d71d080ca"; 45 + armv7-unknown-linux-gnueabihf = "dd01ccb6a53d5e895a6755a78c213ae601a347366688941d5c543b5af5835d6d"; 46 + aarch64-unknown-linux-gnu = "33a50c5366a57aaab43c1c19e4a49ab7d8ffcd99a72925c315fb1f9389139e6f"; 47 + aarch64-unknown-linux-musl = "49d94116a357ea13f5a3231de2472f59210028c3cf81f158b8a367c3155ac544"; 48 + x86_64-apple-darwin = "5eb27a4f5f7a4699bc70cf1848e340ddd74e151488bfcb26853fd584958e3d33"; 49 + aarch64-apple-darwin = "801b3b15b992b0321261de8b8ea2728e9a74822c6cb99bf978b34e217c7825ba"; 50 + powerpc64le-unknown-linux-gnu = "67cadf7ac5bd2e3d5fb4baede69846059f17c4e099f771329b266d08b875ed71"; 51 + riscv64gc-unknown-linux-gnu = "6113a6cce3500033d0dc0d170b54c5f22562ef3025fd58d804c822a2499c74d7"; 52 + }; 53 + 54 + selectRustPackage = pkgs: pkgs.rust_1_55; 55 + 56 + rustcPatches = [ 57 + ]; 58 + } 59 + 60 + (builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_12" "llvm_12"])
+14 -2
pkgs/development/compilers/rust/cargo.nix
··· 1 - { lib, stdenv, file, curl, pkg-config, python3, openssl, cmake, zlib 1 + { lib, stdenv, pkgsHostHost 2 + , file, curl, pkg-config, python3, openssl, cmake, zlib 2 3 , installShellFiles, makeWrapper, cacert, rustPlatform, rustc 3 4 , CoreFoundation, Security 4 5 }: ··· 16 17 # changes hash of vendor directory otherwise 17 18 dontUpdateAutotoolsGnuConfigScripts = true; 18 19 19 - nativeBuildInputs = [ pkg-config cmake installShellFiles makeWrapper ]; 20 + nativeBuildInputs = [ 21 + pkg-config cmake installShellFiles makeWrapper 22 + (lib.getDev pkgsHostHost.curl) 23 + ]; 20 24 buildInputs = [ cacert file curl python3 openssl zlib ] 21 25 ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; 22 26 ··· 53 57 54 58 # Disable check phase as there are failures (4 tests fail) 55 59 doCheck = false; 60 + 61 + doInstallCheck = !stdenv.hostPlatform.isStatic && 62 + stdenv.hostPlatform.parsed.kernel.execFormat == lib.systems.parse.execFormats.elf; 63 + installCheckPhase = '' 64 + runHook preInstallCheck 65 + readelf -a $out/bin/.cargo-wrapped | grep -F 'Shared library: [libcurl.so' 66 + runHook postInstallCheck 67 + ''; 56 68 57 69 meta = with lib; { 58 70 homepage = "https://crates.io";
+6 -6
pkgs/development/compilers/vala/default.nix
··· 116 116 }; 117 117 118 118 vala_0_48 = generic { 119 - version = "0.48.18"; 120 - sha256 = "1pbz4nyrrf9wp8rp953sczx545s4g0h5mars9ynkn788dzs2h3wy"; 119 + version = "0.48.19"; 120 + sha256 = "sha256-gLdlijfZhE/NG0Mdr8WATeYWpYGW5PHxGeWyrraLSgE="; 121 121 }; 122 122 123 123 vala_0_50 = generic { 124 - version = "0.50.9"; 125 - sha256 = "0w5ngs90rq7vy21nqfq8drqyb33kxm17j161qvakwpsbjsidv1mn"; 124 + version = "0.50.10"; 125 + sha256 = "sha256-vnIf8/AYHqttM+zKzygfZvMI+qHl5VTwj99nFZpFlRU="; 126 126 }; 127 127 128 128 vala_0_52 = generic { 129 - version = "0.52.4"; 130 - sha256 = "0cfz3xshc9azxx4fn25x9gadnph6jvf1r2wzd7p5krk0a4755ppc"; 129 + version = "0.52.5"; 130 + sha256 = "sha256-hKG7MSs+Xcrkt7JcRVmNN14stpIzzvtZoV0jUMdr3ZE="; 131 131 }; 132 132 133 133 vala = vala_0_52;
+14
pkgs/development/interpreters/python/cpython/default.nix
··· 416 416 # This allows build Python to import host Python's sysconfigdata 417 417 mkdir -p "$out/${sitePackages}" 418 418 ln -s "$out/lib/${libPrefix}/"_sysconfigdata*.py "$out/${sitePackages}/" 419 + 420 + # debug info can't be separated from a static library and would otherwise be 421 + # left in place by a separateDebugInfo build. force its removal here to save 422 + # space in output. 423 + $STRIP -S $out/lib/${libPrefix}/config-*/libpython*.a || true 419 424 '' + optionalString stripConfig '' 420 425 rm -R $out/bin/python*-config $out/lib/python*/config-* 421 426 '' + optionalString stripIdlelib '' ··· 445 450 find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - 446 451 find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - 447 452 find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - 453 + '' + '' 454 + # *strip* shebang from libpython gdb script - it should be dual-syntax and 455 + # interpretable by whatever python the gdb in question is using, which may 456 + # not even match the major version of this python. doing this after the 457 + # bytecode compilations for the same reason - we don't want bytecode generated. 458 + mkdir -p $out/share/gdb 459 + sed '/^#!/d' Tools/gdb/libpython.py > $out/share/gdb/libpython.py 448 460 ''; 449 461 450 462 preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' ··· 469 481 # These typically end up in shebangs. 470 482 pythonForBuild buildPackages.bash 471 483 ]; 484 + 485 + separateDebugInfo = true; 472 486 473 487 inherit passthru; 474 488
+12 -6
pkgs/development/interpreters/python/tests.nix
··· 94 94 95 95 # Integration tests involving the package set. 96 96 # All PyPy package builds are broken at the moment 97 - integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec { 98 - # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages 99 - nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { 100 - interpreter = python; 101 - }; 102 - }; 97 + integrationTests = lib.optionalAttrs (!python.isPyPy) ( 98 + lib.optionalAttrs (python.isPy3k && !stdenv.isDarwin) { # darwin has no split-debug 99 + cpython-gdb = callPackage ./tests/test_cpython_gdb { 100 + interpreter = python; 101 + }; 102 + } // lib.optionalAttrs (python.pythonAtLeast "3.7") rec { 103 + # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages 104 + nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { 105 + interpreter = python; 106 + }; 107 + } 108 + ); 103 109 104 110 # Tests to ensure overriding works as expected. 105 111 overrideTests = let
+22
pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix
··· 1 + { interpreter, lib, gdb, writeText, runCommand }: 2 + 3 + let 4 + crashme-py = writeText "crashme.py" '' 5 + import ctypes 6 + 7 + def sentinel_foo_bar(): 8 + ctypes.memset(0, 1, 1) 9 + 10 + sentinel_foo_bar() 11 + ''; 12 + in runCommand "python-gdb" {} '' 13 + # test that gdb is able to recover the python stack frame of this segfault 14 + ${gdb}/bin/gdb -batch -ex 'set debug-file-directory ${interpreter.debug}/lib/debug' \ 15 + -ex 'source ${interpreter}/share/gdb/libpython.py' \ 16 + -ex r \ 17 + -ex py-bt \ 18 + --args ${interpreter}/bin/python ${crashme-py} | grep 'in sentinel_foo_bar' > /dev/null 19 + 20 + # success. 21 + touch $out 22 + ''
+2 -2
pkgs/development/interpreters/rakudo/zef.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "zef"; 5 - version = "0.11.10"; 5 + version = "0.11.11"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "ugexe"; 9 9 repo = "zef"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-snnvREM2RLssmE55Ea0Imcw12pmyD6+/11ZXmmUY36U="; 11 + sha256 = "sha256-IOConYPH+t84INXaHw8OVp0mLNucSDS2RT2AlZOUoEs="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ makeWrapper ];
+2
pkgs/development/interpreters/tcl/8.5.nix
··· 4 4 release = "8.5"; 5 5 version = "${release}.18"; 6 6 7 + # Note: when updating, the hash in pkgs/development/libraries/tk/8.5.nix must also be updated! 8 + 7 9 src = fetchurl { 8 10 url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; 9 11 sha256 = "1jfkqp2fr0xh6xvaqx134hkfa5kh7agaqbxm6lhjbpvvc1xfaaq3";
+2
pkgs/development/interpreters/tcl/8.6.nix
··· 4 4 release = "8.6"; 5 5 version = "${release}.11"; 6 6 7 + # Note: when updating, the hash in pkgs/development/libraries/tk/8.6.nix must also be updated! 8 + 7 9 src = fetchurl { 8 10 url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; 9 11 sha256 = "0n4211j80mxr6ql0xx52rig8r885rcbminfpjdb2qrw6hmk8c14c";
+3 -3
pkgs/development/interpreters/tcl/generic.nix
··· 1 - { lib, stdenv, callPackage, makeSetupHook, makeWrapper 1 + { lib, stdenv, callPackage, makeSetupHook 2 2 3 3 # Version specific stuff 4 4 , release, version, src ··· 51 51 inherit release version; 52 52 libPrefix = "tcl${release}"; 53 53 libdir = "lib/${libPrefix}"; 54 - tclPackageHook = callPackage ({}: makeSetupHook { 54 + tclPackageHook = callPackage ({ buildPackages }: makeSetupHook { 55 55 name = "tcl-package-hook"; 56 - deps = [ makeWrapper ]; 56 + deps = [ buildPackages.makeWrapper ]; 57 57 } ./tcl-package-hook.sh) {}; 58 58 }; 59 59 };
+2 -2
pkgs/development/interpreters/tcl/mk-tcl-derivation.nix
··· 39 39 "addTclConfigureFlags" "checkPhase" "checkInputs" "doCheck" 40 40 ]) // { 41 41 42 - buildInputs = buildInputs ++ [ makeWrapper tcl.tclPackageHook ]; 43 - nativeBuildInputs = nativeBuildInputs ++ [ tcl ]; 42 + buildInputs = buildInputs ++ [ tcl.tclPackageHook ]; 43 + nativeBuildInputs = nativeBuildInputs ++ [ makeWrapper tcl ]; 44 44 propagatedBuildInputs = propagatedBuildInputs ++ [ tcl ]; 45 45 46 46 TCLSH = "${getBin tcl}/bin/tclsh";
+7
pkgs/development/libraries/audio/libbs2b/default.nix
··· 12 12 nativeBuildInputs = [ pkg-config ]; 13 13 buildInputs = [ libsndfile ]; 14 14 15 + configureFlags = [ 16 + # Required for cross-compilation. 17 + # Prevents linking error with 'undefined reference to rpl_malloc'. 18 + # I think it's safe to assume that most libcs will properly handle 19 + # realloc(NULL, size) and treat it like malloc(size). 20 + "ac_cv_func_malloc_0_nonnull=yes" 21 + ]; 15 22 hardeningDisable = [ "format" ]; 16 23 17 24 meta = {
+2 -2
pkgs/development/libraries/c-blosc/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "c-blosc"; 5 - version = "1.20.1"; 5 + version = "1.21.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "Blosc"; 9 9 repo = "c-blosc"; 10 10 rev = "v${version}"; 11 - sha256 = "0a3yrig78plzjbazfqcfrzqhnw17xd0dcayvp4z4kp415kgs2a3s"; 11 + sha256 = "sha256-B8SFOc1oGgU5AGAbkqe5oz045H08TnymNAbzz2oOKoo="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ cmake ];
+1
pkgs/development/libraries/cairo/default.nix
··· 59 59 60 60 outputs = [ "out" "dev" "devdoc" ]; 61 61 outputBin = "dev"; # very small 62 + separateDebugInfo = true; 62 63 63 64 nativeBuildInputs = [ 64 65 pkg-config
+2 -2
pkgs/development/libraries/dav1d/default.nix
··· 10 10 11 11 stdenv.mkDerivation rec { 12 12 pname = "dav1d"; 13 - version = "0.9.1"; 13 + version = "0.9.2"; 14 14 15 15 src = fetchFromGitLab { 16 16 domain = "code.videolan.org"; 17 17 owner = "videolan"; 18 18 repo = pname; 19 19 rev = version; 20 - sha256 = "15ngaqyjbwkj0rd9mvxaqf3i9vzsnlrqgr50cnxxjqnpf7xdmslj"; 20 + sha256 = "0bkps488h9s15ylvkm4fmfywgrpbw570glawpnv6khpq9n223dzl"; 21 21 }; 22 22 23 23 nativeBuildInputs = [ meson ninja nasm pkg-config ];
+1 -2
pkgs/development/libraries/eccodes/default.nix
··· 26 26 substituteInPlace cmake/FindOpenJPEG.cmake --replace openjpeg-2.1 ${openjpeg.incDir} 27 27 ''; 28 28 29 - nativeBuildInputs = [ cmake perl ]; 29 + nativeBuildInputs = [ cmake gfortran perl ]; 30 30 31 31 buildInputs = [ 32 32 netcdf 33 33 openjpeg 34 34 libpng 35 - gfortran 36 35 ]; 37 36 38 37 propagatedBuildInputs = lib.optionals enablePython [
+10
pkgs/development/libraries/ffmpeg/4.nix
··· 23 23 url = "https://github.com/FFmpeg/FFmpeg/commit/7150f9575671f898382c370acae35f9087a30ba1.patch"; 24 24 sha256 = "0gwkc7v1wsh4j0am2nnskhsca1b5aqzhcfd41sd9mh2swsdyf27i"; 25 25 }) 26 + (fetchpatch { 27 + name = "CVE-2021-38171.patch"; 28 + url = "https://github.com/FFmpeg/FFmpeg/commit/9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6.patch"; 29 + sha256 = "0b8hsb45izw7w1vb2b94k9f6kvn2shxrap5ip1krdxg6hs7an0x8"; 30 + }) 31 + (fetchpatch { 32 + name = "CVE-2021-38291.patch"; 33 + url = "https://github.com/FFmpeg/FFmpeg/commit/e01d306c647b5827102260b885faa223b646d2d1.patch"; 34 + sha256 = "0p2p8gcnb5j469xa3czfssm09w3jk08kz8rnl8wi2l9aj9l08my9"; 35 + }) 26 36 # Fix incorrect segment length in HLS child playlist with fmp4 segment format 27 37 # FIXME remove in version 4.5 28 38 # https://trac.ffmpeg.org/ticket/9193
+2 -2
pkgs/development/libraries/glib/default.nix
··· 45 45 46 46 stdenv.mkDerivation rec { 47 47 pname = "glib"; 48 - version = "2.68.3"; 48 + version = "2.68.4"; 49 49 50 50 src = fetchurl { 51 51 url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 52 - sha256 = "0f1iprj7v0b5wn9njj39dkl25g6filfs7i4ybk20jq821k1a7qg7"; 52 + sha256 = "sha256-Yv0GHQinVJJhfmJac+LAXiWfgxrLuOH4ucgfI/eZOjs="; 53 53 }; 54 54 55 55 patches = optionals stdenv.isDarwin [
pkgs/development/libraries/glibc/2.33-master.patch.gz

This is a binary file and will not be displayed.

+2 -2
pkgs/development/libraries/glibc/common.nix
··· 42 42 43 43 let 44 44 version = "2.33"; 45 - patchSuffix = "-49"; 45 + patchSuffix = "-50"; 46 46 sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; 47 47 in 48 48 ··· 61 61 [ 62 62 /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. 63 63 $ git fetch --all -p && git checkout origin/release/2.33/master && git describe 64 - glibc-2.33-49-g22d37364ae 64 + glibc-2.33-50-gc6cadbf83a 65 65 $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz 66 66 67 67 To compare the archive contents zdiff can be used.
+2 -2
pkgs/development/libraries/globalarrays/default.nix
··· 13 13 sha256 = "0bky91ncz6vy0011ps9prsnq9f4a5s5xwr23kkmi39xzg0417mnd"; 14 14 }; 15 15 16 - nativeBuildInputs = [ autoreconfHook ]; 17 - buildInputs = [ mpi blas gfortran openssh ]; 16 + nativeBuildInputs = [ autoreconfHook gfortran ]; 17 + buildInputs = [ mpi blas openssh ]; 18 18 19 19 preConfigure = '' 20 20 configureFlagsArray+=( "--enable-i8" \
+3 -3
pkgs/development/libraries/harfbuzz/default.nix
··· 32 32 in 33 33 34 34 stdenv.mkDerivation { 35 - name = "harfbuzz${optionalString withIcu "-icu"}-${version}"; 35 + pname = "harfbuzz${optionalString withIcu "-icu"}"; 36 + inherit version; 36 37 37 38 src = fetchFromGitHub { 38 39 owner = "harfbuzz"; ··· 42 43 }; 43 44 44 45 postPatch = '' 45 - patchShebangs src/*.py 46 - patchShebangs test 46 + patchShebangs src/*.py test 47 47 '' + lib.optionalString stdenv.isDarwin '' 48 48 # ApplicationServices.framework headers have cast-align warnings. 49 49 substituteInPlace src/hb.hh \
+2 -2
pkgs/development/libraries/imlib2/default.nix
··· 12 12 in 13 13 stdenv.mkDerivation rec { 14 14 pname = "imlib2"; 15 - version = "1.7.2"; 15 + version = "1.7.3"; 16 16 17 17 src = fetchurl { 18 18 url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; 19 - sha256 = "sha256-Ul1OMYknRxveRSB4bcJVC1mriFM4SNstdcYPW05YIaE="; 19 + sha256 = "sha256-FY0LjCC8ESIa+ed6ZKEW/KcFGwPN6ixPMdMfRpOC+Zc="; 20 20 }; 21 21 22 22 buildInputs = [
+1 -1
pkgs/development/libraries/kde-frameworks/fetch.sh
··· 1 - WGET_ARGS=( https://download.kde.org/stable/frameworks/5.84/ -A '*.tar.xz' ) 1 + WGET_ARGS=( https://download.kde.org/stable/frameworks/5.85/ -A '*.tar.xz' )
+2 -2
pkgs/development/libraries/kde-frameworks/kio/default.nix
··· 1 1 { 2 2 mkDerivation, fetchpatch, 3 - extra-cmake-modules, kdoctools, qttools, 3 + util-linux, extra-cmake-modules, kdoctools, qttools, 4 4 karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, 5 5 kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, 6 6 kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, ··· 11 11 name = "kio"; 12 12 nativeBuildInputs = [ extra-cmake-modules kdoctools ]; 13 13 buildInputs = [ 14 - karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications 14 + util-linux karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications 15 15 ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras 16 16 kcrash 17 17 ];
+332 -332
pkgs/development/libraries/kde-frameworks/srcs.nix
··· 4 4 5 5 { 6 6 attica = { 7 - version = "5.84.0"; 7 + version = "5.85.0"; 8 8 src = fetchurl { 9 - url = "${mirror}/stable/frameworks/5.84/attica-5.84.0.tar.xz"; 10 - sha256 = "1q5imda1p26rw3lzz7p6wlg63d2kjl6yx93pxryy129xwyxszf5d"; 11 - name = "attica-5.84.0.tar.xz"; 9 + url = "${mirror}/stable/frameworks/5.85/attica-5.85.0.tar.xz"; 10 + sha256 = "1rwb2jz2chvxa7hdxn5ms1f93ykpk26kmnngwcixqr7gwlcv8prl"; 11 + name = "attica-5.85.0.tar.xz"; 12 12 }; 13 13 }; 14 14 baloo = { 15 - version = "5.84.0"; 15 + version = "5.85.0"; 16 16 src = fetchurl { 17 - url = "${mirror}/stable/frameworks/5.84/baloo-5.84.0.tar.xz"; 18 - sha256 = "15ldfq9qryw2xna6kr316fqldrfd2r09qj9ig8i2x391x18dzhg4"; 19 - name = "baloo-5.84.0.tar.xz"; 17 + url = "${mirror}/stable/frameworks/5.85/baloo-5.85.0.tar.xz"; 18 + sha256 = "0kcilv41assarhp54i99scpg08m11fjznw4d1lx5rdy7fyd4bd41"; 19 + name = "baloo-5.85.0.tar.xz"; 20 20 }; 21 21 }; 22 22 bluez-qt = { 23 - version = "5.84.0"; 23 + version = "5.85.0"; 24 24 src = fetchurl { 25 - url = "${mirror}/stable/frameworks/5.84/bluez-qt-5.84.0.tar.xz"; 26 - sha256 = "0pg6zj0b7j9v339g1q5a9dm1l0a7n1c388n26x6k2s1q785vk6lh"; 27 - name = "bluez-qt-5.84.0.tar.xz"; 25 + url = "${mirror}/stable/frameworks/5.85/bluez-qt-5.85.0.tar.xz"; 26 + sha256 = "18h0swvmimfxr9ygg0fs9gg0bm4a016n55hkvqx6n3y505b2lnx8"; 27 + name = "bluez-qt-5.85.0.tar.xz"; 28 28 }; 29 29 }; 30 30 breeze-icons = { 31 - version = "5.84.0"; 31 + version = "5.85.0"; 32 32 src = fetchurl { 33 - url = "${mirror}/stable/frameworks/5.84/breeze-icons-5.84.0.tar.xz"; 34 - sha256 = "1320c84pr39541lb4zk33brxx593dbvvnij5x8as4rp99mcjd6h4"; 35 - name = "breeze-icons-5.84.0.tar.xz"; 33 + url = "${mirror}/stable/frameworks/5.85/breeze-icons-5.85.0.tar.xz"; 34 + sha256 = "0g97md30f76x38skqf7xpxxrcpydx4z5adrknq0bcnpqg3baw1s4"; 35 + name = "breeze-icons-5.85.0.tar.xz"; 36 36 }; 37 37 }; 38 38 extra-cmake-modules = { 39 - version = "5.84.0"; 39 + version = "5.85.0"; 40 40 src = fetchurl { 41 - url = "${mirror}/stable/frameworks/5.84/extra-cmake-modules-5.84.0.tar.xz"; 42 - sha256 = "0h8w5ahjpbb524qgabzbgd4x2j8qnfv1d1cq8vzq5hbpw7r5w25v"; 43 - name = "extra-cmake-modules-5.84.0.tar.xz"; 41 + url = "${mirror}/stable/frameworks/5.85/extra-cmake-modules-5.85.0.tar.xz"; 42 + sha256 = "0d36dg727d0ilq0ag4mv3vhp065p60nnl61014jm1p0kn71hjhks"; 43 + name = "extra-cmake-modules-5.85.0.tar.xz"; 44 44 }; 45 45 }; 46 46 frameworkintegration = { 47 - version = "5.84.0"; 47 + version = "5.85.0"; 48 48 src = fetchurl { 49 - url = "${mirror}/stable/frameworks/5.84/frameworkintegration-5.84.0.tar.xz"; 50 - sha256 = "0jzrsw5fkbgk8xpdjfjprqm1vpa61x32zikyj370shcg3qsaiyir"; 51 - name = "frameworkintegration-5.84.0.tar.xz"; 49 + url = "${mirror}/stable/frameworks/5.85/frameworkintegration-5.85.0.tar.xz"; 50 + sha256 = "1j3p1hy5fhy1b83mcy2n25a8rzwv8n79c2jwfxhyd2hw1yvrkmzr"; 51 + name = "frameworkintegration-5.85.0.tar.xz"; 52 52 }; 53 53 }; 54 54 kactivities = { 55 - version = "5.84.0"; 55 + version = "5.85.0"; 56 56 src = fetchurl { 57 - url = "${mirror}/stable/frameworks/5.84/kactivities-5.84.0.tar.xz"; 58 - sha256 = "0lihxr9jvmg2h7k36djdfvsz5slxzzgxpxmv9745ynvc92fr1c46"; 59 - name = "kactivities-5.84.0.tar.xz"; 57 + url = "${mirror}/stable/frameworks/5.85/kactivities-5.85.0.tar.xz"; 58 + sha256 = "0c40ripx3k8rccaj699ill4kmdnh1vl9gsxvzvff0y312ya1v2gm"; 59 + name = "kactivities-5.85.0.tar.xz"; 60 60 }; 61 61 }; 62 62 kactivities-stats = { 63 - version = "5.84.0"; 63 + version = "5.85.0"; 64 64 src = fetchurl { 65 - url = "${mirror}/stable/frameworks/5.84/kactivities-stats-5.84.0.tar.xz"; 66 - sha256 = "1mb80jzccvha6rnd9q0xych1k4p0nfdyh7s9ryafv9fqqhzr5fh4"; 67 - name = "kactivities-stats-5.84.0.tar.xz"; 65 + url = "${mirror}/stable/frameworks/5.85/kactivities-stats-5.85.0.tar.xz"; 66 + sha256 = "08y5wqalsd3xwczb87n2n5l0rky8lydhyb66xvh2dzl5fmw7k5z1"; 67 + name = "kactivities-stats-5.85.0.tar.xz"; 68 68 }; 69 69 }; 70 70 kapidox = { 71 - version = "5.84.0"; 71 + version = "5.85.0"; 72 72 src = fetchurl { 73 - url = "${mirror}/stable/frameworks/5.84/kapidox-5.84.0.tar.xz"; 74 - sha256 = "0h8isigbgc02df3kb875p7yzy04i41lss2r5awlh5b1np89l5g51"; 75 - name = "kapidox-5.84.0.tar.xz"; 73 + url = "${mirror}/stable/frameworks/5.85/kapidox-5.85.0.tar.xz"; 74 + sha256 = "1cmx16gy2s6j2vvs0nn62vczjf6pc8s7dvdz47lrnpmc7p8yzddm"; 75 + name = "kapidox-5.85.0.tar.xz"; 76 76 }; 77 77 }; 78 78 karchive = { 79 - version = "5.84.0"; 79 + version = "5.85.0"; 80 80 src = fetchurl { 81 - url = "${mirror}/stable/frameworks/5.84/karchive-5.84.0.tar.xz"; 82 - sha256 = "1xjykx94xn0p1926my4f82dn9bsv2b2mv1l4pjpzzfwyn26df34s"; 83 - name = "karchive-5.84.0.tar.xz"; 81 + url = "${mirror}/stable/frameworks/5.85/karchive-5.85.0.tar.xz"; 82 + sha256 = "0bvbmd3phjyk11ylggmzl0kihmg7w623alplwp3j4mj8jn8nw6cc"; 83 + name = "karchive-5.85.0.tar.xz"; 84 84 }; 85 85 }; 86 86 kauth = { 87 - version = "5.84.0"; 87 + version = "5.85.0"; 88 88 src = fetchurl { 89 - url = "${mirror}/stable/frameworks/5.84/kauth-5.84.0.tar.xz"; 90 - sha256 = "1jwynarchwbgdnfzpp3r8ggr8mz2gwgwiv9j2kxmh0m607sqzj04"; 91 - name = "kauth-5.84.0.tar.xz"; 89 + url = "${mirror}/stable/frameworks/5.85/kauth-5.85.0.tar.xz"; 90 + sha256 = "1ib1i4mpxdkddn0kd6prx0j8vc55ai6nlx71lakr2cdafp296fhs"; 91 + name = "kauth-5.85.0.tar.xz"; 92 92 }; 93 93 }; 94 94 kbookmarks = { 95 - version = "5.84.0"; 95 + version = "5.85.0"; 96 96 src = fetchurl { 97 - url = "${mirror}/stable/frameworks/5.84/kbookmarks-5.84.0.tar.xz"; 98 - sha256 = "1k3mamhd55j3hvkw7h0gfizy5hg37d57h26xz9hbxrw1lb1p9gyc"; 99 - name = "kbookmarks-5.84.0.tar.xz"; 97 + url = "${mirror}/stable/frameworks/5.85/kbookmarks-5.85.0.tar.xz"; 98 + sha256 = "0jraagmjch0pda15k9ywpidl474x4wq60zzffi2n3vmy8y9hs4rn"; 99 + name = "kbookmarks-5.85.0.tar.xz"; 100 100 }; 101 101 }; 102 102 kcalendarcore = { 103 - version = "5.84.0"; 103 + version = "5.85.0"; 104 104 src = fetchurl { 105 - url = "${mirror}/stable/frameworks/5.84/kcalendarcore-5.84.0.tar.xz"; 106 - sha256 = "06asygdsk4bnn29cc8khpzy68fiyrqwajl55fixmja7kvzsnq4cb"; 107 - name = "kcalendarcore-5.84.0.tar.xz"; 105 + url = "${mirror}/stable/frameworks/5.85/kcalendarcore-5.85.0.tar.xz"; 106 + sha256 = "04nrfwd4g5v4lnmlcq0rdmx8xfn9wbzp92izsy7zwwxcmpwivysq"; 107 + name = "kcalendarcore-5.85.0.tar.xz"; 108 108 }; 109 109 }; 110 110 kcmutils = { 111 - version = "5.84.0"; 111 + version = "5.85.0"; 112 112 src = fetchurl { 113 - url = "${mirror}/stable/frameworks/5.84/kcmutils-5.84.0.tar.xz"; 114 - sha256 = "1ackicsg2xnjl8gid9v4a72vvqhn7536s0w1g50hss142hp0b9zf"; 115 - name = "kcmutils-5.84.0.tar.xz"; 113 + url = "${mirror}/stable/frameworks/5.85/kcmutils-5.85.0.tar.xz"; 114 + sha256 = "14yfkrqv77r6hm390ib8g7gcjcw3dlnlqs9bd3y0mg123wps7s10"; 115 + name = "kcmutils-5.85.0.tar.xz"; 116 116 }; 117 117 }; 118 118 kcodecs = { 119 - version = "5.84.0"; 119 + version = "5.85.0"; 120 120 src = fetchurl { 121 - url = "${mirror}/stable/frameworks/5.84/kcodecs-5.84.0.tar.xz"; 122 - sha256 = "0fjjz40kchw38p74zvgrcfsgclg54w6b8bl6ly72qmj5n0ip2gr3"; 123 - name = "kcodecs-5.84.0.tar.xz"; 121 + url = "${mirror}/stable/frameworks/5.85/kcodecs-5.85.0.tar.xz"; 122 + sha256 = "1zgpi177j0j3jzi3n0kjyddy0d7b9vp7kxv6c2jsqx9ppps0l1k5"; 123 + name = "kcodecs-5.85.0.tar.xz"; 124 124 }; 125 125 }; 126 126 kcompletion = { 127 - version = "5.84.0"; 127 + version = "5.85.0"; 128 128 src = fetchurl { 129 - url = "${mirror}/stable/frameworks/5.84/kcompletion-5.84.0.tar.xz"; 130 - sha256 = "1kbj1f3c3qpfxn4jyldhzlmgxfxn0af5rbs0irzwd9wqgk9i94vs"; 131 - name = "kcompletion-5.84.0.tar.xz"; 129 + url = "${mirror}/stable/frameworks/5.85/kcompletion-5.85.0.tar.xz"; 130 + sha256 = "1vy41mavbm8avr9jfspys4mpzc4i5rkg5gpl9hcbjrkldb9ymfj1"; 131 + name = "kcompletion-5.85.0.tar.xz"; 132 132 }; 133 133 }; 134 134 kconfig = { 135 - version = "5.84.0"; 135 + version = "5.85.0"; 136 136 src = fetchurl { 137 - url = "${mirror}/stable/frameworks/5.84/kconfig-5.84.0.tar.xz"; 138 - sha256 = "0wshg4hx4d6m1r17mc7l9ivhx6mw0h1qx8fd46hmydmbjp030jma"; 139 - name = "kconfig-5.84.0.tar.xz"; 137 + url = "${mirror}/stable/frameworks/5.85/kconfig-5.85.0.tar.xz"; 138 + sha256 = "0qmrv8ixlg7qrb7fyyvk7a0a7avvpflc05rj46zzip6kjhl4imds"; 139 + name = "kconfig-5.85.0.tar.xz"; 140 140 }; 141 141 }; 142 142 kconfigwidgets = { 143 - version = "5.84.0"; 143 + version = "5.85.0"; 144 144 src = fetchurl { 145 - url = "${mirror}/stable/frameworks/5.84/kconfigwidgets-5.84.0.tar.xz"; 146 - sha256 = "17hyf495wlm5jqc0qxxymy1kcjybbihg8093kf59hvvpcci5xsin"; 147 - name = "kconfigwidgets-5.84.0.tar.xz"; 145 + url = "${mirror}/stable/frameworks/5.85/kconfigwidgets-5.85.0.tar.xz"; 146 + sha256 = "0hx8f1dcd38wsrifh4j3a5m05xahdqrhsysasbdwxhr5s29d7vvr"; 147 + name = "kconfigwidgets-5.85.0.tar.xz"; 148 148 }; 149 149 }; 150 150 kcontacts = { 151 - version = "5.84.0"; 151 + version = "5.85.0"; 152 152 src = fetchurl { 153 - url = "${mirror}/stable/frameworks/5.84/kcontacts-5.84.0.tar.xz"; 154 - sha256 = "0gvskvfwfmrs884fkfl0gvmnic4hhymffs7jhq6yaixbsjl2mznl"; 155 - name = "kcontacts-5.84.0.tar.xz"; 153 + url = "${mirror}/stable/frameworks/5.85/kcontacts-5.85.0.tar.xz"; 154 + sha256 = "07j2h8fd62j7jbcm5fyv27vy120687k1cmp2rw06sf3xl480nk8k"; 155 + name = "kcontacts-5.85.0.tar.xz"; 156 156 }; 157 157 }; 158 158 kcoreaddons = { 159 - version = "5.84.0"; 159 + version = "5.85.0"; 160 160 src = fetchurl { 161 - url = "${mirror}/stable/frameworks/5.84/kcoreaddons-5.84.0.tar.xz"; 162 - sha256 = "1c0z2cn02jqanisq5rr6iry1hx9p5ffm59353mknyyg5xyk3qkbm"; 163 - name = "kcoreaddons-5.84.0.tar.xz"; 161 + url = "${mirror}/stable/frameworks/5.85/kcoreaddons-5.85.0.tar.xz"; 162 + sha256 = "052l8kvv7k3m43r6arckg4fls0y913gklc8jx09y56g1m51mgbwh"; 163 + name = "kcoreaddons-5.85.0.tar.xz"; 164 164 }; 165 165 }; 166 166 kcrash = { 167 - version = "5.84.0"; 167 + version = "5.85.0"; 168 168 src = fetchurl { 169 - url = "${mirror}/stable/frameworks/5.84/kcrash-5.84.0.tar.xz"; 170 - sha256 = "0asr7llkdbr6wzq31vnmga7haxddz1b6xqp3smw7hvgzs0f8vrv5"; 171 - name = "kcrash-5.84.0.tar.xz"; 169 + url = "${mirror}/stable/frameworks/5.85/kcrash-5.85.0.tar.xz"; 170 + sha256 = "14hknkl4md0qzh44f1zqraljzvlbwzc95mci713a9mhk9rb0957f"; 171 + name = "kcrash-5.85.0.tar.xz"; 172 172 }; 173 173 }; 174 174 kdav = { 175 - version = "5.84.0"; 175 + version = "5.85.0"; 176 176 src = fetchurl { 177 - url = "${mirror}/stable/frameworks/5.84/kdav-5.84.0.tar.xz"; 178 - sha256 = "09wly717cp86b3gahj79nfplx71f78zyb5mhpw9xm0dkdf1qf56q"; 179 - name = "kdav-5.84.0.tar.xz"; 177 + url = "${mirror}/stable/frameworks/5.85/kdav-5.85.0.tar.xz"; 178 + sha256 = "11wwdv19d0fy7b1bzgqaciv4hg99a8pi6g2ymjn3g0l3ps05a0sl"; 179 + name = "kdav-5.85.0.tar.xz"; 180 180 }; 181 181 }; 182 182 kdbusaddons = { 183 - version = "5.84.0"; 183 + version = "5.85.0"; 184 184 src = fetchurl { 185 - url = "${mirror}/stable/frameworks/5.84/kdbusaddons-5.84.0.tar.xz"; 186 - sha256 = "0a4v2g86lss1wq359mssg142dp1qccn17yrdhbgy55qi6id6pvl5"; 187 - name = "kdbusaddons-5.84.0.tar.xz"; 185 + url = "${mirror}/stable/frameworks/5.85/kdbusaddons-5.85.0.tar.xz"; 186 + sha256 = "0f8k2kynbspi86gcvpzn209m1bm6vc65flqlnh8prbkd3gg283d6"; 187 + name = "kdbusaddons-5.85.0.tar.xz"; 188 188 }; 189 189 }; 190 190 kdeclarative = { 191 - version = "5.84.0"; 191 + version = "5.85.0"; 192 192 src = fetchurl { 193 - url = "${mirror}/stable/frameworks/5.84/kdeclarative-5.84.0.tar.xz"; 194 - sha256 = "0ygp3jwz0fjixiq7bkjchsxzvg6fn50qw7si9nil5hkkg6lwxir6"; 195 - name = "kdeclarative-5.84.0.tar.xz"; 193 + url = "${mirror}/stable/frameworks/5.85/kdeclarative-5.85.0.tar.xz"; 194 + sha256 = "1qdbvfx0i09hn9236hnb73fzym529wjsgqmfwzhh5a6dnqdh1rjd"; 195 + name = "kdeclarative-5.85.0.tar.xz"; 196 196 }; 197 197 }; 198 198 kded = { 199 - version = "5.84.0"; 199 + version = "5.85.0"; 200 200 src = fetchurl { 201 - url = "${mirror}/stable/frameworks/5.84/kded-5.84.0.tar.xz"; 202 - sha256 = "0c6klrchbxy57f7hjvsk640bg6s8gp1ilrzvzg7f8m825yg1b5jc"; 203 - name = "kded-5.84.0.tar.xz"; 201 + url = "${mirror}/stable/frameworks/5.85/kded-5.85.0.tar.xz"; 202 + sha256 = "1yar9zcrrs0c0hakg8sfisnp32284ljj1axhgmx8hkwfj591jdiw"; 203 + name = "kded-5.85.0.tar.xz"; 204 204 }; 205 205 }; 206 206 kdelibs4support = { 207 - version = "5.84.0"; 207 + version = "5.85.0"; 208 208 src = fetchurl { 209 - url = "${mirror}/stable/frameworks/5.84/portingAids/kdelibs4support-5.84.0.tar.xz"; 210 - sha256 = "1qkiqv0fq8q6i18mi7gm58qhnqra8xkslzjprap6zjq49g9lcgrp"; 211 - name = "kdelibs4support-5.84.0.tar.xz"; 209 + url = "${mirror}/stable/frameworks/5.85/portingAids/kdelibs4support-5.85.0.tar.xz"; 210 + sha256 = "1c4zd60s7l1qv719nl28j7gh3lpr1cwqq5vcibb9a6di04k27mm0"; 211 + name = "kdelibs4support-5.85.0.tar.xz"; 212 212 }; 213 213 }; 214 214 kdesignerplugin = { 215 - version = "5.84.0"; 215 + version = "5.85.0"; 216 216 src = fetchurl { 217 - url = "${mirror}/stable/frameworks/5.84/portingAids/kdesignerplugin-5.84.0.tar.xz"; 218 - sha256 = "0k51pjkh4dfc8bkw0pbsa260fifvcm0wrbpckvd1xd32b0r1n2ax"; 219 - name = "kdesignerplugin-5.84.0.tar.xz"; 217 + url = "${mirror}/stable/frameworks/5.85/portingAids/kdesignerplugin-5.85.0.tar.xz"; 218 + sha256 = "0pchfvmy7r2mkd412nbzk2pkji2dx5lispwcnk759ffm4wlnxncf"; 219 + name = "kdesignerplugin-5.85.0.tar.xz"; 220 220 }; 221 221 }; 222 222 kdesu = { 223 - version = "5.84.0"; 223 + version = "5.85.0"; 224 224 src = fetchurl { 225 - url = "${mirror}/stable/frameworks/5.84/kdesu-5.84.0.tar.xz"; 226 - sha256 = "0b3ljqj86crccyqzlqg0fkjryi654pi5q84c11zywmws72bjjx9d"; 227 - name = "kdesu-5.84.0.tar.xz"; 225 + url = "${mirror}/stable/frameworks/5.85/kdesu-5.85.0.tar.xz"; 226 + sha256 = "1xqzkyd9flglr3aqabkh54yl7a5a429d24mpqphakc3djmdv5d08"; 227 + name = "kdesu-5.85.0.tar.xz"; 228 228 }; 229 229 }; 230 230 kdewebkit = { 231 - version = "5.84.0"; 231 + version = "5.85.0"; 232 232 src = fetchurl { 233 - url = "${mirror}/stable/frameworks/5.84/portingAids/kdewebkit-5.84.0.tar.xz"; 234 - sha256 = "0rhjdqr5g4gphszz70nhvv9wgr0g048pnc36w4w2jpzyy75nwjq2"; 235 - name = "kdewebkit-5.84.0.tar.xz"; 233 + url = "${mirror}/stable/frameworks/5.85/portingAids/kdewebkit-5.85.0.tar.xz"; 234 + sha256 = "14w254wfp35sldadff1y62yl6f1kshlfk4vlhlan626vyidypc43"; 235 + name = "kdewebkit-5.85.0.tar.xz"; 236 236 }; 237 237 }; 238 238 kdnssd = { 239 - version = "5.84.0"; 239 + version = "5.85.0"; 240 240 src = fetchurl { 241 - url = "${mirror}/stable/frameworks/5.84/kdnssd-5.84.0.tar.xz"; 242 - sha256 = "1ayscd05m20i4nldidxdx83xsa66ybsyrf3f8sm3h99hgwb1yxm9"; 243 - name = "kdnssd-5.84.0.tar.xz"; 241 + url = "${mirror}/stable/frameworks/5.85/kdnssd-5.85.0.tar.xz"; 242 + sha256 = "0i1qv6qjsdlb08mwiqs3s6v2hwfr77i65hgc0qj9pbhzvm5v6x8m"; 243 + name = "kdnssd-5.85.0.tar.xz"; 244 244 }; 245 245 }; 246 246 kdoctools = { 247 - version = "5.84.0"; 247 + version = "5.85.0"; 248 248 src = fetchurl { 249 - url = "${mirror}/stable/frameworks/5.84/kdoctools-5.84.0.tar.xz"; 250 - sha256 = "1x0dimayl1pj6r4cjwsvzvyc5j79308bcdi27bn0lq1769wm7rlp"; 251 - name = "kdoctools-5.84.0.tar.xz"; 249 + url = "${mirror}/stable/frameworks/5.85/kdoctools-5.85.0.tar.xz"; 250 + sha256 = "01bxzp65ffwr14yrrbw8p15lkwhisv15drwkgcwg48f289f51if1"; 251 + name = "kdoctools-5.85.0.tar.xz"; 252 252 }; 253 253 }; 254 254 kemoticons = { 255 - version = "5.84.0"; 255 + version = "5.85.0"; 256 256 src = fetchurl { 257 - url = "${mirror}/stable/frameworks/5.84/kemoticons-5.84.0.tar.xz"; 258 - sha256 = "0h8ilgwd5y8mbmvr89qkq81km216gs2lx7ln4rijamv2380gwcq7"; 259 - name = "kemoticons-5.84.0.tar.xz"; 257 + url = "${mirror}/stable/frameworks/5.85/kemoticons-5.85.0.tar.xz"; 258 + sha256 = "0zihi00fql8q4jp08n71agmjrpr5177yw24w0vf0lmjhgmxwkrsw"; 259 + name = "kemoticons-5.85.0.tar.xz"; 260 260 }; 261 261 }; 262 262 kfilemetadata = { 263 - version = "5.84.0"; 263 + version = "5.85.0"; 264 264 src = fetchurl { 265 - url = "${mirror}/stable/frameworks/5.84/kfilemetadata-5.84.0.tar.xz"; 266 - sha256 = "19a6lsnh7vxjgvy780bgispgxycj2838gyak6ivd9lxzn6d9jw6i"; 267 - name = "kfilemetadata-5.84.0.tar.xz"; 265 + url = "${mirror}/stable/frameworks/5.85/kfilemetadata-5.85.0.tar.xz"; 266 + sha256 = "07i52zi4jmqhm2sazw2jx7g7s3mp8c7kr32z3ikifsc5wfzy8kix"; 267 + name = "kfilemetadata-5.85.0.tar.xz"; 268 268 }; 269 269 }; 270 270 kglobalaccel = { 271 - version = "5.84.0"; 271 + version = "5.85.0"; 272 272 src = fetchurl { 273 - url = "${mirror}/stable/frameworks/5.84/kglobalaccel-5.84.0.tar.xz"; 274 - sha256 = "0v3j4zx6p45lwd7jpbc9y43l5fh247dm6g21w5r56cq6asapx3k5"; 275 - name = "kglobalaccel-5.84.0.tar.xz"; 273 + url = "${mirror}/stable/frameworks/5.85/kglobalaccel-5.85.0.tar.xz"; 274 + sha256 = "0f5ly344a06aaj3rcsa45xzg9xx0s2qsgk5r0h2kphkj8n2gpp70"; 275 + name = "kglobalaccel-5.85.0.tar.xz"; 276 276 }; 277 277 }; 278 278 kguiaddons = { 279 - version = "5.84.0"; 279 + version = "5.85.0"; 280 280 src = fetchurl { 281 - url = "${mirror}/stable/frameworks/5.84/kguiaddons-5.84.0.tar.xz"; 282 - sha256 = "0p98xzml58fv2cv8x382bmcrbk39q89mrxy52hkqy759g4ffj919"; 283 - name = "kguiaddons-5.84.0.tar.xz"; 281 + url = "${mirror}/stable/frameworks/5.85/kguiaddons-5.85.0.tar.xz"; 282 + sha256 = "1d1724k67chiv4sxbaifnwzwcss3kry3ms9frpxifi2nsn0x9nhc"; 283 + name = "kguiaddons-5.85.0.tar.xz"; 284 284 }; 285 285 }; 286 286 kholidays = { 287 - version = "5.84.0"; 287 + version = "5.85.0"; 288 288 src = fetchurl { 289 - url = "${mirror}/stable/frameworks/5.84/kholidays-5.84.0.tar.xz"; 290 - sha256 = "0fzcdlvai0p3l58wbs8ia7vmd9ll2akzzab12ask8kkaz7iwaqqs"; 291 - name = "kholidays-5.84.0.tar.xz"; 289 + url = "${mirror}/stable/frameworks/5.85/kholidays-5.85.0.tar.xz"; 290 + sha256 = "0nrxn8sjzp1lg3va7703d5hxmda33d0f91rgq2s99mxi77a82yi2"; 291 + name = "kholidays-5.85.0.tar.xz"; 292 292 }; 293 293 }; 294 294 khtml = { 295 - version = "5.84.0"; 295 + version = "5.85.0"; 296 296 src = fetchurl { 297 - url = "${mirror}/stable/frameworks/5.84/portingAids/khtml-5.84.0.tar.xz"; 298 - sha256 = "13j2plfgx4zx99i3s70424v8b7qj2xf6gndp7hhmdka0vjhm5bv9"; 299 - name = "khtml-5.84.0.tar.xz"; 297 + url = "${mirror}/stable/frameworks/5.85/portingAids/khtml-5.85.0.tar.xz"; 298 + sha256 = "0ma9sk51pszxqmvzlrfdsnh2f8fm09wd0kaywsrkvbh2q2f6kg8g"; 299 + name = "khtml-5.85.0.tar.xz"; 300 300 }; 301 301 }; 302 302 ki18n = { 303 - version = "5.84.0"; 303 + version = "5.85.0"; 304 304 src = fetchurl { 305 - url = "${mirror}/stable/frameworks/5.84/ki18n-5.84.0.tar.xz"; 306 - sha256 = "1530jxpbfky3mhr1dv3pr7lrvi96q4ai8fn85h5gnjp7s7h1wgv0"; 307 - name = "ki18n-5.84.0.tar.xz"; 305 + url = "${mirror}/stable/frameworks/5.85/ki18n-5.85.0.tar.xz"; 306 + sha256 = "1h1jcdyc3cphkn56qfn5j6jbbb6wp5z0vp8kxzm1wd023sj83dqn"; 307 + name = "ki18n-5.85.0.tar.xz"; 308 308 }; 309 309 }; 310 310 kiconthemes = { 311 - version = "5.84.0"; 311 + version = "5.85.0"; 312 312 src = fetchurl { 313 - url = "${mirror}/stable/frameworks/5.84/kiconthemes-5.84.0.tar.xz"; 314 - sha256 = "0r90cdxs6x9bnqb6qb7p2szavqw2lfk9khhxhzgp2z9121smxpgn"; 315 - name = "kiconthemes-5.84.0.tar.xz"; 313 + url = "${mirror}/stable/frameworks/5.85/kiconthemes-5.85.0.tar.xz"; 314 + sha256 = "0k6ni351b051k8rfncpddf5zplqmg71wf9a5h8k6ix787h1r5dcp"; 315 + name = "kiconthemes-5.85.0.tar.xz"; 316 316 }; 317 317 }; 318 318 kidletime = { 319 - version = "5.84.0"; 319 + version = "5.85.0"; 320 320 src = fetchurl { 321 - url = "${mirror}/stable/frameworks/5.84/kidletime-5.84.0.tar.xz"; 322 - sha256 = "0akkzj05399f72klr8qf5q0w9v8x1jw2961m3h4hcg1zfsmb6pv4"; 323 - name = "kidletime-5.84.0.tar.xz"; 321 + url = "${mirror}/stable/frameworks/5.85/kidletime-5.85.0.tar.xz"; 322 + sha256 = "1nclrxipjzasqi8g84lvpsr5rwfs9xfqgj377wfphm4qbml09x2z"; 323 + name = "kidletime-5.85.0.tar.xz"; 324 324 }; 325 325 }; 326 326 kimageformats = { 327 - version = "5.84.0"; 327 + version = "5.85.0"; 328 328 src = fetchurl { 329 - url = "${mirror}/stable/frameworks/5.84/kimageformats-5.84.0.tar.xz"; 330 - sha256 = "1xzddqc6wj188dhwcw1haa2a28r2d8c4aqhmgymwdwhs7k4ibpds"; 331 - name = "kimageformats-5.84.0.tar.xz"; 329 + url = "${mirror}/stable/frameworks/5.85/kimageformats-5.85.0.tar.xz"; 330 + sha256 = "1687sh19ph1v1bg4xrdrf0gs2nna0ds8gcqc8x7ydgdc2301m9jh"; 331 + name = "kimageformats-5.85.0.tar.xz"; 332 332 }; 333 333 }; 334 334 kinit = { 335 - version = "5.84.0"; 335 + version = "5.85.0"; 336 336 src = fetchurl { 337 - url = "${mirror}/stable/frameworks/5.84/kinit-5.84.0.tar.xz"; 338 - sha256 = "0a5i2rvamw95y9bqscdg6fk1fjsib7rcis9fbk504qk4n7jdp9gw"; 339 - name = "kinit-5.84.0.tar.xz"; 337 + url = "${mirror}/stable/frameworks/5.85/kinit-5.85.0.tar.xz"; 338 + sha256 = "03m6ik7l54q1w615111rqs0m7az7snh6x418s90xnzm81g0dzpwj"; 339 + name = "kinit-5.85.0.tar.xz"; 340 340 }; 341 341 }; 342 342 kio = { 343 - version = "5.84.0"; 343 + version = "5.85.0"; 344 344 src = fetchurl { 345 - url = "${mirror}/stable/frameworks/5.84/kio-5.84.0.tar.xz"; 346 - sha256 = "1lz07745w3549n7lc174p4rz5w12mm4q08y5xn2a95xg5xrjpgln"; 347 - name = "kio-5.84.0.tar.xz"; 345 + url = "${mirror}/stable/frameworks/5.85/kio-5.85.0.tar.xz"; 346 + sha256 = "1xhrmpz9xbwipxqvj7l6d1n471isb3jggrvgcx5hqlz659yqmmg4"; 347 + name = "kio-5.85.0.tar.xz"; 348 348 }; 349 349 }; 350 350 kirigami2 = { 351 - version = "5.84.0"; 351 + version = "5.85.0"; 352 352 src = fetchurl { 353 - url = "${mirror}/stable/frameworks/5.84/kirigami2-5.84.0.tar.xz"; 354 - sha256 = "05hpw2ba7g5kzg6z0slngrfz45kih8w1zmahbjhss9i7blj9x32r"; 355 - name = "kirigami2-5.84.0.tar.xz"; 353 + url = "${mirror}/stable/frameworks/5.85/kirigami2-5.85.0.tar.xz"; 354 + sha256 = "0axdsxzmr735ci19srmgkgpm4x7h23vk37hhakfc6n30ry0j7lik"; 355 + name = "kirigami2-5.85.0.tar.xz"; 356 356 }; 357 357 }; 358 358 kitemmodels = { 359 - version = "5.84.0"; 359 + version = "5.85.0"; 360 360 src = fetchurl { 361 - url = "${mirror}/stable/frameworks/5.84/kitemmodels-5.84.0.tar.xz"; 362 - sha256 = "1v19vc155jh421z8djhrigc83ajz9qvb6qz9cpscdzrcimhaarns"; 363 - name = "kitemmodels-5.84.0.tar.xz"; 361 + url = "${mirror}/stable/frameworks/5.85/kitemmodels-5.85.0.tar.xz"; 362 + sha256 = "0c55lw6r78x41v6fgycr68inviaxlxa6bj8zm8fdia631mhx273s"; 363 + name = "kitemmodels-5.85.0.tar.xz"; 364 364 }; 365 365 }; 366 366 kitemviews = { 367 - version = "5.84.0"; 367 + version = "5.85.0"; 368 368 src = fetchurl { 369 - url = "${mirror}/stable/frameworks/5.84/kitemviews-5.84.0.tar.xz"; 370 - sha256 = "14rammhm5zp8h37a794z3pmgkpnb606izqy1zlk8lwvnw6aj0kwb"; 371 - name = "kitemviews-5.84.0.tar.xz"; 369 + url = "${mirror}/stable/frameworks/5.85/kitemviews-5.85.0.tar.xz"; 370 + sha256 = "1fr8ivpvpaxykrgnjjsf8nhnhs60i4xhlkanvhrkkgjabxk0sbl0"; 371 + name = "kitemviews-5.85.0.tar.xz"; 372 372 }; 373 373 }; 374 374 kjobwidgets = { 375 - version = "5.84.0"; 375 + version = "5.85.0"; 376 376 src = fetchurl { 377 - url = "${mirror}/stable/frameworks/5.84/kjobwidgets-5.84.0.tar.xz"; 378 - sha256 = "0gcdd07ma7wg6rqygfhmq2nc3cq78zcxbd7mx0fgirdns5fbp8p5"; 379 - name = "kjobwidgets-5.84.0.tar.xz"; 377 + url = "${mirror}/stable/frameworks/5.85/kjobwidgets-5.85.0.tar.xz"; 378 + sha256 = "05gpp2bvirbxs5yk0ysi5gh72axwv253yc2sqmzdsjylq4fjy8rl"; 379 + name = "kjobwidgets-5.85.0.tar.xz"; 380 380 }; 381 381 }; 382 382 kjs = { 383 - version = "5.84.0"; 383 + version = "5.85.0"; 384 384 src = fetchurl { 385 - url = "${mirror}/stable/frameworks/5.84/portingAids/kjs-5.84.0.tar.xz"; 386 - sha256 = "0qi1xk6pq7nyzkh6jlp4l1v1b5gq9hryq2a81hgfl7q9xgrx00qy"; 387 - name = "kjs-5.84.0.tar.xz"; 385 + url = "${mirror}/stable/frameworks/5.85/portingAids/kjs-5.85.0.tar.xz"; 386 + sha256 = "0inliv97x63174n3mn5jqyy8d440863g3m5pn69cq1i2mr5zyswb"; 387 + name = "kjs-5.85.0.tar.xz"; 388 388 }; 389 389 }; 390 390 kjsembed = { 391 - version = "5.84.0"; 391 + version = "5.85.0"; 392 392 src = fetchurl { 393 - url = "${mirror}/stable/frameworks/5.84/portingAids/kjsembed-5.84.0.tar.xz"; 394 - sha256 = "1av326byza162ds5vn54nmpd9ndr7yb0cpl8hxmwzfbym1favhvb"; 395 - name = "kjsembed-5.84.0.tar.xz"; 393 + url = "${mirror}/stable/frameworks/5.85/portingAids/kjsembed-5.85.0.tar.xz"; 394 + sha256 = "1j8prfg7hpk0g7manilds27ivrcgxr3hidjzy0yzn13ckvv3ccj1"; 395 + name = "kjsembed-5.85.0.tar.xz"; 396 396 }; 397 397 }; 398 398 kmediaplayer = { 399 - version = "5.84.0"; 399 + version = "5.85.0"; 400 400 src = fetchurl { 401 - url = "${mirror}/stable/frameworks/5.84/portingAids/kmediaplayer-5.84.0.tar.xz"; 402 - sha256 = "1zzx7d9wcc1qh9zg83c2ihid0c2f5p23gpc475ql056ny71fdvv3"; 403 - name = "kmediaplayer-5.84.0.tar.xz"; 401 + url = "${mirror}/stable/frameworks/5.85/portingAids/kmediaplayer-5.85.0.tar.xz"; 402 + sha256 = "1bmj24d3si937svh8zdi7xs0y4j1ibyj8z8q1y4k2vp8fa9fack6"; 403 + name = "kmediaplayer-5.85.0.tar.xz"; 404 404 }; 405 405 }; 406 406 knewstuff = { 407 - version = "5.84.0"; 407 + version = "5.85.0"; 408 408 src = fetchurl { 409 - url = "${mirror}/stable/frameworks/5.84/knewstuff-5.84.0.tar.xz"; 410 - sha256 = "1y1b7704xlf7kmw7c41b3ngsmi5304mvdgphcqsinav6bq48ka5f"; 411 - name = "knewstuff-5.84.0.tar.xz"; 409 + url = "${mirror}/stable/frameworks/5.85/knewstuff-5.85.0.tar.xz"; 410 + sha256 = "1j90ysfw1qygaiigizbjik1k7zkl6wkin0r7r9q8r3dibvbqziph"; 411 + name = "knewstuff-5.85.0.tar.xz"; 412 412 }; 413 413 }; 414 414 knotifications = { 415 - version = "5.84.0"; 415 + version = "5.85.0"; 416 416 src = fetchurl { 417 - url = "${mirror}/stable/frameworks/5.84/knotifications-5.84.0.tar.xz"; 418 - sha256 = "02az98aqk8alq1cqrxym5idnlzvl6i4jvgnv34q6g4x7j5h4v75h"; 419 - name = "knotifications-5.84.0.tar.xz"; 417 + url = "${mirror}/stable/frameworks/5.85/knotifications-5.85.0.tar.xz"; 418 + sha256 = "0qr695sn2di24cal0x6yj4x1a8qk6jny68r4d4xdcy5i1i4yyni5"; 419 + name = "knotifications-5.85.0.tar.xz"; 420 420 }; 421 421 }; 422 422 knotifyconfig = { 423 - version = "5.84.0"; 423 + version = "5.85.0"; 424 424 src = fetchurl { 425 - url = "${mirror}/stable/frameworks/5.84/knotifyconfig-5.84.0.tar.xz"; 426 - sha256 = "1x7jp2c2a1bawl3nl46zfnp8d5al1z19za58g76wn40jy9ksnpy2"; 427 - name = "knotifyconfig-5.84.0.tar.xz"; 425 + url = "${mirror}/stable/frameworks/5.85/knotifyconfig-5.85.0.tar.xz"; 426 + sha256 = "1aphmi7r4zmzrfk8635a66dnkd6zg2i17nrm0hfqhqhcfn217mfv"; 427 + name = "knotifyconfig-5.85.0.tar.xz"; 428 428 }; 429 429 }; 430 430 kpackage = { 431 - version = "5.84.0"; 431 + version = "5.85.0"; 432 432 src = fetchurl { 433 - url = "${mirror}/stable/frameworks/5.84/kpackage-5.84.0.tar.xz"; 434 - sha256 = "166cc85y49xqk4r8k6003rlwphxxx2rmik24d7yhmq8p1qig4qb7"; 435 - name = "kpackage-5.84.0.tar.xz"; 433 + url = "${mirror}/stable/frameworks/5.85/kpackage-5.85.0.tar.xz"; 434 + sha256 = "14rwq5ckns06h0n8h4q2r7ilfr1myxcan1md1zz4cg4vb87ckimj"; 435 + name = "kpackage-5.85.0.tar.xz"; 436 436 }; 437 437 }; 438 438 kparts = { 439 - version = "5.84.0"; 439 + version = "5.85.0"; 440 440 src = fetchurl { 441 - url = "${mirror}/stable/frameworks/5.84/kparts-5.84.0.tar.xz"; 442 - sha256 = "1fbmywx1fvv9hnznpiy8cp27dfn2ysskymyppqi1hsw01gqs7vfy"; 443 - name = "kparts-5.84.0.tar.xz"; 441 + url = "${mirror}/stable/frameworks/5.85/kparts-5.85.0.tar.xz"; 442 + sha256 = "07px14xdh7p2kb9kvsma16xifsc65mhpm6xmnz15i5pdmrz1wxc1"; 443 + name = "kparts-5.85.0.tar.xz"; 444 444 }; 445 445 }; 446 446 kpeople = { 447 - version = "5.84.0"; 447 + version = "5.85.0"; 448 448 src = fetchurl { 449 - url = "${mirror}/stable/frameworks/5.84/kpeople-5.84.0.tar.xz"; 450 - sha256 = "0llggx56xb3y10j0avm4vdmjfl4pwqbvpb5w7kk1gb43nxpz7h3p"; 451 - name = "kpeople-5.84.0.tar.xz"; 449 + url = "${mirror}/stable/frameworks/5.85/kpeople-5.85.0.tar.xz"; 450 + sha256 = "03ynnbjj939b3cmczlz9piilkgh45fbyal71pab0qfpxr66m9fk5"; 451 + name = "kpeople-5.85.0.tar.xz"; 452 452 }; 453 453 }; 454 454 kplotting = { 455 - version = "5.84.0"; 455 + version = "5.85.0"; 456 456 src = fetchurl { 457 - url = "${mirror}/stable/frameworks/5.84/kplotting-5.84.0.tar.xz"; 458 - sha256 = "007cvy57ck2frnr5dvs80k3n7lv1q2xw1zadmw13wwdqqsl0kzag"; 459 - name = "kplotting-5.84.0.tar.xz"; 457 + url = "${mirror}/stable/frameworks/5.85/kplotting-5.85.0.tar.xz"; 458 + sha256 = "0jhkc12fiz50iavz9msj6w29lhqrm6chl1521sx55km9cb3wmzda"; 459 + name = "kplotting-5.85.0.tar.xz"; 460 460 }; 461 461 }; 462 462 kpty = { 463 - version = "5.84.0"; 463 + version = "5.85.0"; 464 464 src = fetchurl { 465 - url = "${mirror}/stable/frameworks/5.84/kpty-5.84.0.tar.xz"; 466 - sha256 = "04q6qz62vwywzaxxmsq0g28k036ljrcyvn5hywdns58zi5d7nab2"; 467 - name = "kpty-5.84.0.tar.xz"; 465 + url = "${mirror}/stable/frameworks/5.85/kpty-5.85.0.tar.xz"; 466 + sha256 = "1zmzzlzv1pnx0d7w6v8yiccw1q2g94pfjzh4sm2k1fickgrfrir8"; 467 + name = "kpty-5.85.0.tar.xz"; 468 468 }; 469 469 }; 470 470 kquickcharts = { 471 - version = "5.84.0"; 471 + version = "5.85.0"; 472 472 src = fetchurl { 473 - url = "${mirror}/stable/frameworks/5.84/kquickcharts-5.84.0.tar.xz"; 474 - sha256 = "01q1ncvk8dc9jkm9x6q7wkcnj1z1377824gj7m83pzgy3g51vcdg"; 475 - name = "kquickcharts-5.84.0.tar.xz"; 473 + url = "${mirror}/stable/frameworks/5.85/kquickcharts-5.85.0.tar.xz"; 474 + sha256 = "1hnbr3qkjy48pq8hkvl7lcfd8cywkkr77n8qf296rjmrv23jw4xf"; 475 + name = "kquickcharts-5.85.0.tar.xz"; 476 476 }; 477 477 }; 478 478 kross = { 479 - version = "5.84.0"; 479 + version = "5.85.0"; 480 480 src = fetchurl { 481 - url = "${mirror}/stable/frameworks/5.84/portingAids/kross-5.84.0.tar.xz"; 482 - sha256 = "0fz4q2m16f4zy6pajcrmhm5a9fjrfjfqyns1lm6aimdsrvkwpc93"; 483 - name = "kross-5.84.0.tar.xz"; 481 + url = "${mirror}/stable/frameworks/5.85/portingAids/kross-5.85.0.tar.xz"; 482 + sha256 = "07gnh98avv5zzybh4262jqkjy8kg0cplryv356kvsbarl4ksy4kr"; 483 + name = "kross-5.85.0.tar.xz"; 484 484 }; 485 485 }; 486 486 krunner = { 487 - version = "5.84.0"; 487 + version = "5.85.0"; 488 488 src = fetchurl { 489 - url = "${mirror}/stable/frameworks/5.84/krunner-5.84.0.tar.xz"; 490 - sha256 = "15ai1x9v5hm5vj7qhh7c4ajiiaf56h3yy3qnb4kamkv146g09a1p"; 491 - name = "krunner-5.84.0.tar.xz"; 489 + url = "${mirror}/stable/frameworks/5.85/krunner-5.85.0.tar.xz"; 490 + sha256 = "1pz466pjrqd3dj2wdqsqxcpmim0ig8i7gvnw96mxlh262cv15h4d"; 491 + name = "krunner-5.85.0.tar.xz"; 492 492 }; 493 493 }; 494 494 kservice = { 495 - version = "5.84.0"; 495 + version = "5.85.0"; 496 496 src = fetchurl { 497 - url = "${mirror}/stable/frameworks/5.84/kservice-5.84.0.tar.xz"; 498 - sha256 = "1lbx51wpsc7qdp480yl08wsp6lb1lww5ix5hpxxmv0x7galcgsf2"; 499 - name = "kservice-5.84.0.tar.xz"; 497 + url = "${mirror}/stable/frameworks/5.85/kservice-5.85.0.tar.xz"; 498 + sha256 = "008b56jibgvpg6qqh7wqbg39fyca62w6nj7c9qxsgj1bd91vglg2"; 499 + name = "kservice-5.85.0.tar.xz"; 500 500 }; 501 501 }; 502 502 ktexteditor = { 503 - version = "5.84.0"; 503 + version = "5.85.0"; 504 504 src = fetchurl { 505 - url = "${mirror}/stable/frameworks/5.84/ktexteditor-5.84.0.tar.xz"; 506 - sha256 = "0znpls5ap33yjcjw1ayl6zja8qnqx5glk2bvig5aajriqbpw8irk"; 507 - name = "ktexteditor-5.84.0.tar.xz"; 505 + url = "${mirror}/stable/frameworks/5.85/ktexteditor-5.85.0.tar.xz"; 506 + sha256 = "1j6xkz8w7mb47ypgcf00m7hl1ayli8r5a3l4fk5xzsz1k0g72l6m"; 507 + name = "ktexteditor-5.85.0.tar.xz"; 508 508 }; 509 509 }; 510 510 ktextwidgets = { 511 - version = "5.84.0"; 511 + version = "5.85.0"; 512 512 src = fetchurl { 513 - url = "${mirror}/stable/frameworks/5.84/ktextwidgets-5.84.0.tar.xz"; 514 - sha256 = "069qk1frsfa9iqgchpvkq4sgh973fc2fy1hjymc2zv3mahz23qfl"; 515 - name = "ktextwidgets-5.84.0.tar.xz"; 513 + url = "${mirror}/stable/frameworks/5.85/ktextwidgets-5.85.0.tar.xz"; 514 + sha256 = "128jjcay0s2qi0zs32zxwlmh2xq4kzasc0zhy3l9gfv898yaq6zy"; 515 + name = "ktextwidgets-5.85.0.tar.xz"; 516 516 }; 517 517 }; 518 518 kunitconversion = { 519 - version = "5.84.0"; 519 + version = "5.85.0"; 520 520 src = fetchurl { 521 - url = "${mirror}/stable/frameworks/5.84/kunitconversion-5.84.0.tar.xz"; 522 - sha256 = "0a8jc3vw4ydsfff1qis9323vcd7nhigwyjxqa57qzvswrk7wmlxf"; 523 - name = "kunitconversion-5.84.0.tar.xz"; 521 + url = "${mirror}/stable/frameworks/5.85/kunitconversion-5.85.0.tar.xz"; 522 + sha256 = "0rcnmdqnm7h8ffxacza2v7y7zicly0yvz07g4857jxpk7h4z62hy"; 523 + name = "kunitconversion-5.85.0.tar.xz"; 524 524 }; 525 525 }; 526 526 kwallet = { 527 - version = "5.84.0"; 527 + version = "5.85.0"; 528 528 src = fetchurl { 529 - url = "${mirror}/stable/frameworks/5.84/kwallet-5.84.0.tar.xz"; 530 - sha256 = "1m08q820zl9wrc04i0inb7n0r35p0lzcv3hiwvzxmgdcm9zm2n3c"; 531 - name = "kwallet-5.84.0.tar.xz"; 529 + url = "${mirror}/stable/frameworks/5.85/kwallet-5.85.0.tar.xz"; 530 + sha256 = "053ddi83a5d1i61r8y6jimd5pafmilja25w5pl09g3fqkp3id677"; 531 + name = "kwallet-5.85.0.tar.xz"; 532 532 }; 533 533 }; 534 534 kwayland = { 535 - version = "5.84.0"; 535 + version = "5.85.0"; 536 536 src = fetchurl { 537 - url = "${mirror}/stable/frameworks/5.84/kwayland-5.84.0.tar.xz"; 538 - sha256 = "1lpmbqkfbjq3445lj42zqc90wk437kzyjlpzji0wh4p9nqa4a27s"; 539 - name = "kwayland-5.84.0.tar.xz"; 537 + url = "${mirror}/stable/frameworks/5.85/kwayland-5.85.0.tar.xz"; 538 + sha256 = "0sfzpqb3v79jrhc49f4v3akc9wrv1976nb7xs9nd6ips237v86v2"; 539 + name = "kwayland-5.85.0.tar.xz"; 540 540 }; 541 541 }; 542 542 kwidgetsaddons = { 543 - version = "5.84.0"; 543 + version = "5.85.0"; 544 544 src = fetchurl { 545 - url = "${mirror}/stable/frameworks/5.84/kwidgetsaddons-5.84.0.tar.xz"; 546 - sha256 = "1xffbmi3a3qp781aay964b30l9y170imxaa05r3xpj77saq673kp"; 547 - name = "kwidgetsaddons-5.84.0.tar.xz"; 545 + url = "${mirror}/stable/frameworks/5.85/kwidgetsaddons-5.85.0.tar.xz"; 546 + sha256 = "14042vc9jl48fclsfmsincwqj2s6mfm3lbq4yg5vlj931kznyr31"; 547 + name = "kwidgetsaddons-5.85.0.tar.xz"; 548 548 }; 549 549 }; 550 550 kwindowsystem = { 551 - version = "5.84.0"; 551 + version = "5.85.0"; 552 552 src = fetchurl { 553 - url = "${mirror}/stable/frameworks/5.84/kwindowsystem-5.84.0.tar.xz"; 554 - sha256 = "19fa8j4paq245rwvnmnz2mnwgh8y6c26wbw25v8kgd7a33ryg0fg"; 555 - name = "kwindowsystem-5.84.0.tar.xz"; 553 + url = "${mirror}/stable/frameworks/5.85/kwindowsystem-5.85.0.tar.xz"; 554 + sha256 = "07k6d6sgxlfwkjg0r9lgvlkd7j53b986qfv283c313ahy5c3gd3d"; 555 + name = "kwindowsystem-5.85.0.tar.xz"; 556 556 }; 557 557 }; 558 558 kxmlgui = { 559 - version = "5.84.0"; 559 + version = "5.85.0"; 560 560 src = fetchurl { 561 - url = "${mirror}/stable/frameworks/5.84/kxmlgui-5.84.0.tar.xz"; 562 - sha256 = "1ddfvjwww2270zx4f86w0xmd45pyir95llhc4x2ixicx94jvsg1c"; 563 - name = "kxmlgui-5.84.0.tar.xz"; 561 + url = "${mirror}/stable/frameworks/5.85/kxmlgui-5.85.0.tar.xz"; 562 + sha256 = "1ciwrm16a5cgmkkm8cv72cyr45q418gsrxc3qrjq3iic9ycf6fi5"; 563 + name = "kxmlgui-5.85.0.tar.xz"; 564 564 }; 565 565 }; 566 566 kxmlrpcclient = { 567 - version = "5.84.0"; 567 + version = "5.85.0"; 568 568 src = fetchurl { 569 - url = "${mirror}/stable/frameworks/5.84/portingAids/kxmlrpcclient-5.84.0.tar.xz"; 570 - sha256 = "10jddyak99wd4x3vm9d6xzh45pl1lhhfw9isrdkgzcixip2s4p6i"; 571 - name = "kxmlrpcclient-5.84.0.tar.xz"; 569 + url = "${mirror}/stable/frameworks/5.85/portingAids/kxmlrpcclient-5.85.0.tar.xz"; 570 + sha256 = "117cvdf7iy1139sx0vk906whmkm3ffw0wivqdjdcfwxsdxi6s6d1"; 571 + name = "kxmlrpcclient-5.85.0.tar.xz"; 572 572 }; 573 573 }; 574 574 modemmanager-qt = { 575 - version = "5.84.0"; 575 + version = "5.85.0"; 576 576 src = fetchurl { 577 - url = "${mirror}/stable/frameworks/5.84/modemmanager-qt-5.84.0.tar.xz"; 578 - sha256 = "1k0dbgq3zbg1rhy775vbxwqssbdin4wm7rw4fkcdra4z9hf39xin"; 579 - name = "modemmanager-qt-5.84.0.tar.xz"; 577 + url = "${mirror}/stable/frameworks/5.85/modemmanager-qt-5.85.0.tar.xz"; 578 + sha256 = "1jb27266dc6ry2y3w9bf1sf20xxw2rkb6ac8z9p46r0myhj2zn2j"; 579 + name = "modemmanager-qt-5.85.0.tar.xz"; 580 580 }; 581 581 }; 582 582 networkmanager-qt = { 583 - version = "5.84.0"; 583 + version = "5.85.0"; 584 584 src = fetchurl { 585 - url = "${mirror}/stable/frameworks/5.84/networkmanager-qt-5.84.0.tar.xz"; 586 - sha256 = "1qd58p2hj1rnzjvd6sskmry7gq7gp9fvp115ihc8dkaq8xvwah77"; 587 - name = "networkmanager-qt-5.84.0.tar.xz"; 585 + url = "${mirror}/stable/frameworks/5.85/networkmanager-qt-5.85.0.tar.xz"; 586 + sha256 = "1lg17ibk9mn4jsxh6dl0yzyhy26xifymvrf5saggl28vkkhvnh6r"; 587 + name = "networkmanager-qt-5.85.0.tar.xz"; 588 588 }; 589 589 }; 590 590 oxygen-icons5 = { 591 - version = "5.84.0"; 591 + version = "5.85.0"; 592 592 src = fetchurl { 593 - url = "${mirror}/stable/frameworks/5.84/oxygen-icons5-5.84.0.tar.xz"; 594 - sha256 = "06h1c2lvvs41lcibgv5iz31g7j1x7fdyi7lnh21hkgd7747vk42l"; 595 - name = "oxygen-icons5-5.84.0.tar.xz"; 593 + url = "${mirror}/stable/frameworks/5.85/oxygen-icons5-5.85.0.tar.xz"; 594 + sha256 = "0if136n5mkvxhiyvlmwmj3q9y1g1gr9qz4qqdcsn6wy9jippq46g"; 595 + name = "oxygen-icons5-5.85.0.tar.xz"; 596 596 }; 597 597 }; 598 598 plasma-framework = { 599 - version = "5.84.0"; 599 + version = "5.85.0"; 600 600 src = fetchurl { 601 - url = "${mirror}/stable/frameworks/5.84/plasma-framework-5.84.0.tar.xz"; 602 - sha256 = "0chmmb04m1bq4d1w67bw3ppc2iycw7wzsdpams6c4y9f59iwrd8r"; 603 - name = "plasma-framework-5.84.0.tar.xz"; 601 + url = "${mirror}/stable/frameworks/5.85/plasma-framework-5.85.0.tar.xz"; 602 + sha256 = "1zzqmm7s39bcay3b4f6qzhd5pw3q6p9fas94i88afhqsxjbkm6w7"; 603 + name = "plasma-framework-5.85.0.tar.xz"; 604 604 }; 605 605 }; 606 606 prison = { 607 - version = "5.84.0"; 607 + version = "5.85.0"; 608 608 src = fetchurl { 609 - url = "${mirror}/stable/frameworks/5.84/prison-5.84.0.tar.xz"; 610 - sha256 = "17bd40fqp88j5dwxixrhf1d4xwri574l4593rdhzg8qgi9jm2ypj"; 611 - name = "prison-5.84.0.tar.xz"; 609 + url = "${mirror}/stable/frameworks/5.85/prison-5.85.0.tar.xz"; 610 + sha256 = "1c6dq4ql3n6s9xwvs6ix8n3fsv96aqdvd0qwc1n4sap9xlg3752n"; 611 + name = "prison-5.85.0.tar.xz"; 612 612 }; 613 613 }; 614 614 purpose = { 615 - version = "5.84.0"; 615 + version = "5.85.0"; 616 616 src = fetchurl { 617 - url = "${mirror}/stable/frameworks/5.84/purpose-5.84.0.tar.xz"; 618 - sha256 = "01rh85fc4c4gl0lxw2rbcrh001akggnz7aahkc2spsgd64m7vfv7"; 619 - name = "purpose-5.84.0.tar.xz"; 617 + url = "${mirror}/stable/frameworks/5.85/purpose-5.85.0.tar.xz"; 618 + sha256 = "13r47g81qfqdvd0s70r9dwlcdg8c6m5xrnpvypjs6cd51907m0f5"; 619 + name = "purpose-5.85.0.tar.xz"; 620 620 }; 621 621 }; 622 622 qqc2-desktop-style = { 623 - version = "5.84.0"; 623 + version = "5.85.0"; 624 624 src = fetchurl { 625 - url = "${mirror}/stable/frameworks/5.84/qqc2-desktop-style-5.84.0.tar.xz"; 626 - sha256 = "0vz68nh6iy92whjlkgf1jmmlhr5261rgsy1r7k3bfd91a41qh2qw"; 627 - name = "qqc2-desktop-style-5.84.0.tar.xz"; 625 + url = "${mirror}/stable/frameworks/5.85/qqc2-desktop-style-5.85.0.tar.xz"; 626 + sha256 = "1hkcy3dzaqfkxnmj9k278q0dijiwhjmzw98xxj9fh8mjygwkj1dp"; 627 + name = "qqc2-desktop-style-5.85.0.tar.xz"; 628 628 }; 629 629 }; 630 630 solid = { 631 - version = "5.84.0"; 631 + version = "5.85.0"; 632 632 src = fetchurl { 633 - url = "${mirror}/stable/frameworks/5.84/solid-5.84.0.tar.xz"; 634 - sha256 = "0lrims7zfr5xr5y25v63d08m6cm27z6mxbdg9j06xsrqf93vyz4s"; 635 - name = "solid-5.84.0.tar.xz"; 633 + url = "${mirror}/stable/frameworks/5.85/solid-5.85.0.tar.xz"; 634 + sha256 = "0gcddgrz07j9dgf4fg9hc810zr8f3az9b0qvxax9ys9x5kg1dr57"; 635 + name = "solid-5.85.0.tar.xz"; 636 636 }; 637 637 }; 638 638 sonnet = { 639 - version = "5.84.0"; 639 + version = "5.85.0"; 640 640 src = fetchurl { 641 - url = "${mirror}/stable/frameworks/5.84/sonnet-5.84.0.tar.xz"; 642 - sha256 = "0xnbi1rbb2awl5bvyjxjvzq5a8n9xpmiqvlzcgprmqgmsygzlnnq"; 643 - name = "sonnet-5.84.0.tar.xz"; 641 + url = "${mirror}/stable/frameworks/5.85/sonnet-5.85.0.tar.xz"; 642 + sha256 = "1cg2f09c0blk7ymlq7j3a1bci78kv1n0xq3ys4kxgf53khwhdqpw"; 643 + name = "sonnet-5.85.0.tar.xz"; 644 644 }; 645 645 }; 646 646 syndication = { 647 - version = "5.84.0"; 647 + version = "5.85.0"; 648 648 src = fetchurl { 649 - url = "${mirror}/stable/frameworks/5.84/syndication-5.84.0.tar.xz"; 650 - sha256 = "0m245vp5dkw88rz9kgym4ka729p688wspm8mv6zzsfffggvfkwrc"; 651 - name = "syndication-5.84.0.tar.xz"; 649 + url = "${mirror}/stable/frameworks/5.85/syndication-5.85.0.tar.xz"; 650 + sha256 = "05hvzxzlvdzc2sxapjvqhdycdvn6bnq0hs45c88pb13ncxxljdxh"; 651 + name = "syndication-5.85.0.tar.xz"; 652 652 }; 653 653 }; 654 654 syntax-highlighting = { 655 - version = "5.84.0"; 655 + version = "5.85.0"; 656 656 src = fetchurl { 657 - url = "${mirror}/stable/frameworks/5.84/syntax-highlighting-5.84.0.tar.xz"; 658 - sha256 = "1mb4di9k2rxf6f7n53z94q5awmwzfd516kv757ifd323w9xkmyxa"; 659 - name = "syntax-highlighting-5.84.0.tar.xz"; 657 + url = "${mirror}/stable/frameworks/5.85/syntax-highlighting-5.85.0.tar.xz"; 658 + sha256 = "1qn9n2sv9n22j7bhq4n93i985v244kkg0vi5c33s9zppb4xgd34a"; 659 + name = "syntax-highlighting-5.85.0.tar.xz"; 660 660 }; 661 661 }; 662 662 threadweaver = { 663 - version = "5.84.0"; 663 + version = "5.85.0"; 664 664 src = fetchurl { 665 - url = "${mirror}/stable/frameworks/5.84/threadweaver-5.84.0.tar.xz"; 666 - sha256 = "0hmxkqwxjvk6m3h3l12bw01xgwqxzja5cismqrwcc3yxf8fyd572"; 667 - name = "threadweaver-5.84.0.tar.xz"; 665 + url = "${mirror}/stable/frameworks/5.85/threadweaver-5.85.0.tar.xz"; 666 + sha256 = "0md5bnkn5bh2jqzj7m444bmn5c7davyhwlffi0pg22r01m44l6s3"; 667 + name = "threadweaver-5.85.0.tar.xz"; 668 668 }; 669 669 }; 670 670 }
+2 -2
pkgs/development/libraries/libarchive/default.nix
··· 12 12 13 13 stdenv.mkDerivation rec { 14 14 pname = "libarchive"; 15 - version = "3.5.1"; 15 + version = "3.5.2"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "libarchive"; 19 19 repo = "libarchive"; 20 20 rev = "v${version}"; 21 - sha256 = "sha256-RFPhe4PCq8OLwa6c7ir+5u9jBsUxS5M/fcZYAG9W6R0="; 21 + sha256 = "sha256-H00UJ+ON1kBc19BgWBBKmO8f23oAg2mk7o9hhDhn50Q="; 22 22 }; 23 23 24 24 outputs = [ "out" "lib" "dev" ];
+3 -17
pkgs/development/libraries/libexif/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }: 1 + { lib, stdenv, fetchFromGitHub, autoreconfHook, gettext }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "libexif"; 5 - version = "0.6.22"; 5 + version = "0.6.23"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = pname; 9 9 repo = pname; 10 10 rev = "${pname}-${builtins.replaceStrings ["."] ["_"] version}-release"; 11 - sha256 = "0mzndakdi816zcs13z7yzp7hj031p2dcyfq2p391r63d9z21jmy1"; 11 + sha256 = "sha256-Os0yI/IPoe9MuhXgNdDaIg6uohclA2bjeu9t3tbUoNA="; 12 12 }; 13 - 14 - patches = [ 15 - (fetchpatch { 16 - name = "CVE-2020-0198.patch"; 17 - url = "https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c.patch"; 18 - sha256 = "1040278g5dbq3vvlyk8cmzb7flpi9bfsp99268hw69i6ilwbdf2k"; 19 - }) 20 - (fetchpatch { 21 - name = "CVE-2020-0452.patch"; 22 - url = "https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06.patch"; 23 - excludes = [ "NEWS" ]; 24 - sha256 = "0k4z1gbbkli6wwyy9qm2qvn0h00qda6wqym61nmmbys7yc2zryj6"; 25 - }) 26 - ]; 27 13 28 14 nativeBuildInputs = [ autoreconfHook gettext ]; 29 15
+2 -2
pkgs/development/libraries/libgcrypt/default.nix
··· 4 4 5 5 stdenv.mkDerivation rec { 6 6 pname = "libgcrypt"; 7 - version = "1.9.3"; 7 + version = "1.9.4"; 8 8 9 9 src = fetchurl { 10 10 url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; 11 - sha256 = "sha256-l+vk+U4vfjW3UhlM4VoPPGYyTg/2ryZlm7+1/y7DKP0="; 11 + sha256 = "1xxabjv45zlxyryiwhmbfblsx41kl267wsb78bny6m14ly1rr17a"; 12 12 }; 13 13 14 14 outputs = [ "out" "dev" "info" ];
+2 -2
pkgs/development/libraries/libglvnd/default.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "libglvnd"; 8 - version = "1.3.3"; 8 + version = "1.3.4"; 9 9 10 10 src = fetchFromGitLab { 11 11 domain = "gitlab.freedesktop.org"; 12 12 owner = "glvnd"; 13 13 repo = "libglvnd"; 14 14 rev = "v${version}"; 15 - sha256 = "0gjk6m3gkdm12bmih2jflp0v5s1ibkixk7mrzrk0cj884m3hy1z6"; 15 + sha256 = "0phvgg2h3pcz3x39gaymwb37bnw1s26clq9wsj0zx398zmp3dwpk"; 16 16 }; 17 17 18 18 nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ];
+2 -2
pkgs/development/libraries/libhandy/default.nix
··· 27 27 28 28 stdenv.mkDerivation rec { 29 29 pname = "libhandy"; 30 - version = "1.2.3"; 30 + version = "1.4.0"; 31 31 32 32 outputs = [ 33 33 "out" ··· 40 40 41 41 src = fetchurl { 42 42 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 43 - sha256 = "sha256-kuxKWB7BtB3Qek6PqvXVKuN8q7fh+n+UTWyvvllrbWE="; 43 + sha256 = "sha256-JnbVH6H6QP3udJfT52P++hiwM4v/zS7jLn9+YzyIVEY="; 44 44 }; 45 45 46 46 nativeBuildInputs = [
+5 -12
pkgs/development/libraries/libogg/default.nix
··· 1 - { lib, stdenv, fetchurl, fetchpatch }: 1 + { lib, stdenv, fetchurl }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "libogg-1.3.4"; 4 + pname = "libogg"; 5 + version = "1.3.5"; 5 6 6 7 src = fetchurl { 7 - url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz"; 8 - sha256 = "1zlk33vxvxr0l9lhkbhkdwvylw96d2n0fnd3d8dl031hph9bqqy1"; 8 + url = "http://downloads.xiph.org/releases/ogg/${pname}-${version}.tar.xz"; 9 + sha256 = "01b7050bghdvbxvw0gzv588fn4a27zh42ljpwzm4vrf8dziipnf4"; 9 10 }; 10 11 11 12 outputs = [ "out" "dev" "doc" ]; 12 - 13 - patches = lib.optionals stdenv.isDarwin [ 14 - # Fix unsigned typedefs on darwin. Remove with the next release https://github.com/xiph/ogg/pull/64 15 - (fetchpatch { 16 - url = "https://github.com/xiph/ogg/commit/c8fca6b4a02d695b1ceea39b330d4406001c03ed.patch"; 17 - sha256 = "1s72g37y87x0a74zjji9vx2hyk86kr4f2l3m4y2fipvlf9348b3f"; 18 - }) 19 - ]; 20 13 21 14 meta = with lib; { 22 15 description = "Media container library to manipulate Ogg files";
+3 -3
pkgs/development/libraries/libssh/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "libssh"; 5 - version = "0.8.9"; 5 + version = "0.9.6"; 6 6 7 7 src = fetchurl { 8 - url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz"; 9 - sha256 = "09b8w9m5qiap8wbvz4613nglsynpk8hn0q9b929ny2y4l2fy2nc5"; 8 + url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 9 + sha256 = "sha256-hrz4hb2bgEZv4OBUU8WLh332GvqLqUeljDVtfw+rgps="; 10 10 }; 11 11 12 12 postPatch = ''
-210
pkgs/development/libraries/libssh2/CVE-2019-17498.patch
··· 1 - From b9aa7c2495694d0527e4e7fd560a3f0f18556c72 Mon Sep 17 00:00:00 2001 2 - From: Will Cosgrove <will@panic.com> 3 - Date: Thu, 29 Aug 2019 15:14:19 -0700 4 - Subject: [PATCH 1/5] packet.c: improve parsing of packets 5 - 6 - file: packet.c 7 - 8 - notes: 9 - Use _libssh2_get_string API in SSH_MSG_DEBUG, additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST 10 - --- 11 - src/packet.c | 30 +++++++++++++++--------------- 12 - 1 file changed, 15 insertions(+), 15 deletions(-) 13 - 14 - diff --git a/src/packet.c b/src/packet.c 15 - index 38ab62944..ac69768cd 100644 16 - --- a/src/packet.c 17 - +++ b/src/packet.c 18 - @@ -537,26 +537,26 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, 19 - case SSH_MSG_DEBUG: 20 - if(datalen >= 2) { 21 - int always_display = data[1]; 22 - - 23 - + 24 - if(datalen >= 6) { 25 - - message_len = _libssh2_ntohu32(data + 2); 26 - - 27 - - if(message_len <= (datalen - 10)) { 28 - - /* 6 = packet_type(1) + display(1) + message_len(4) */ 29 - - message = (char *) data + 6; 30 - - language_len = _libssh2_ntohu32(data + 6 + 31 - - message_len); 32 - - 33 - - if(language_len <= (datalen - 10 - message_len)) 34 - - language = (char *) data + 10 + message_len; 35 - - } 36 - + struct string_buf buf; 37 - + buf.data = (unsigned char *)data; 38 - + buf.dataptr = buf.data; 39 - + buf.len = datalen; 40 - + buf.dataptr += 2; /* advance past type & always display */ 41 - + 42 - + _libssh2_get_string(&buf, &message, &message_len); 43 - + _libssh2_get_string(&buf, &language, &language_len); 44 - } 45 - 46 - if(session->ssh_msg_debug) { 47 - - LIBSSH2_DEBUG(session, always_display, message, 48 - - message_len, language, language_len); 49 - + LIBSSH2_DEBUG(session, always_display, 50 - + (const char *)message, 51 - + message_len, (const char *)language, 52 - + language_len); 53 - } 54 - } 55 - + 56 - /* 57 - * _libssh2_debug will actually truncate this for us so 58 - * that it's not an inordinate about of data 59 - @@ -579,7 +579,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, 60 - uint32_t len = 0; 61 - unsigned char want_reply = 0; 62 - len = _libssh2_ntohu32(data + 1); 63 - - if(datalen >= (6 + len)) { 64 - + if((len <= (UINT_MAX - 6) && (datalen >= (6 + len))) { 65 - want_reply = data[5 + len]; 66 - _libssh2_debug(session, 67 - LIBSSH2_TRACE_CONN, 68 - 69 - From 8b3cf0b17c1b84a138bed9423a9e0743452b4de9 Mon Sep 17 00:00:00 2001 70 - From: Will Cosgrove <will@panic.com> 71 - Date: Thu, 29 Aug 2019 15:15:33 -0700 72 - Subject: [PATCH 2/5] stray whitespace 73 - 74 - --- 75 - src/packet.c | 2 +- 76 - 1 file changed, 1 insertion(+), 1 deletion(-) 77 - 78 - diff --git a/src/packet.c b/src/packet.c 79 - index ac69768cd..8908b2c5a 100644 80 - --- a/src/packet.c 81 - +++ b/src/packet.c 82 - @@ -537,7 +537,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, 83 - case SSH_MSG_DEBUG: 84 - if(datalen >= 2) { 85 - int always_display = data[1]; 86 - - 87 - + 88 - if(datalen >= 6) { 89 - struct string_buf buf; 90 - buf.data = (unsigned char *)data; 91 - 92 - From 1c6fa92b77e34d089493fe6d3e2c6c8775858b94 Mon Sep 17 00:00:00 2001 93 - From: Will Cosgrove <will@panic.com> 94 - Date: Thu, 29 Aug 2019 15:24:22 -0700 95 - Subject: [PATCH 3/5] fixed type issue, updated SSH_MSG_DISCONNECT 96 - 97 - SSH_MSG_DISCONNECT now also uses _libssh2_get API. 98 - --- 99 - src/packet.c | 40 +++++++++++++++------------------------- 100 - 1 file changed, 15 insertions(+), 25 deletions(-) 101 - 102 - diff --git a/src/packet.c b/src/packet.c 103 - index 8908b2c5a..97f0cdd4b 100644 104 - --- a/src/packet.c 105 - +++ b/src/packet.c 106 - @@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, 107 - size_t datalen, int macstate) 108 - { 109 - int rc = 0; 110 - - char *message = NULL; 111 - - char *language = NULL; 112 - + unsigned char *message = NULL; 113 - + unsigned char *language = NULL; 114 - size_t message_len = 0; 115 - size_t language_len = 0; 116 - LIBSSH2_CHANNEL *channelp = NULL; 117 - @@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, 118 - 119 - case SSH_MSG_DISCONNECT: 120 - if(datalen >= 5) { 121 - - size_t reason = _libssh2_ntohu32(data + 1); 122 - + uint32_t reason = 0; 123 - + struct string_buf buf; 124 - + buf.data = (unsigned char *)data; 125 - + buf.dataptr = buf.data; 126 - + buf.len = datalen; 127 - + buf.dataptr++; /* advance past type */ 128 - 129 - - if(datalen >= 9) { 130 - - message_len = _libssh2_ntohu32(data + 5); 131 - + _libssh2_get_u32(&buf, &reason); 132 - + _libssh2_get_string(&buf, &message, &message_len); 133 - + _libssh2_get_string(&buf, &language, &language_len); 134 - 135 - - if(message_len < datalen-13) { 136 - - /* 9 = packet_type(1) + reason(4) + message_len(4) */ 137 - - message = (char *) data + 9; 138 - - 139 - - language_len = 140 - - _libssh2_ntohu32(data + 9 + message_len); 141 - - language = (char *) data + 9 + message_len + 4; 142 - - 143 - - if(language_len > (datalen-13-message_len)) { 144 - - /* bad input, clear info */ 145 - - language = message = NULL; 146 - - language_len = message_len = 0; 147 - - } 148 - - } 149 - - else 150 - - /* bad size, clear it */ 151 - - message_len = 0; 152 - - } 153 - if(session->ssh_msg_disconnect) { 154 - - LIBSSH2_DISCONNECT(session, reason, message, 155 - - message_len, language, language_len); 156 - + LIBSSH2_DISCONNECT(session, reason, (const char *)message, 157 - + message_len, (const char *)language, 158 - + language_len); 159 - } 160 - + 161 - _libssh2_debug(session, LIBSSH2_TRACE_TRANS, 162 - "Disconnect(%d): %s(%s)", reason, 163 - message, language); 164 - 165 - From 77616117cc9dbbdd0fe1157098435bff73a83a0f Mon Sep 17 00:00:00 2001 166 - From: Will Cosgrove <will@panic.com> 167 - Date: Thu, 29 Aug 2019 15:26:32 -0700 168 - Subject: [PATCH 4/5] fixed stray ( 169 - 170 - bad paste 171 - --- 172 - src/packet.c | 2 +- 173 - 1 file changed, 1 insertion(+), 1 deletion(-) 174 - 175 - diff --git a/src/packet.c b/src/packet.c 176 - index 97f0cdd4b..bd4c39e46 100644 177 - --- a/src/packet.c 178 - +++ b/src/packet.c 179 - @@ -569,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, 180 - uint32_t len = 0; 181 - unsigned char want_reply = 0; 182 - len = _libssh2_ntohu32(data + 1); 183 - - if((len <= (UINT_MAX - 6) && (datalen >= (6 + len))) { 184 - + if(len <= (UINT_MAX - 6) && datalen >= (6 + len)) { 185 - want_reply = data[5 + len]; 186 - _libssh2_debug(session, 187 - LIBSSH2_TRACE_CONN, 188 - 189 - From 436c45dc143cadc8c59afac6c4255be332856581 Mon Sep 17 00:00:00 2001 190 - From: Will Cosgrove <will@panic.com> 191 - Date: Thu, 29 Aug 2019 15:29:00 -0700 192 - Subject: [PATCH 5/5] added additional parentheses for clarity 193 - 194 - --- 195 - src/packet.c | 2 +- 196 - 1 file changed, 1 insertion(+), 1 deletion(-) 197 - 198 - diff --git a/src/packet.c b/src/packet.c 199 - index bd4c39e46..2e01bfc5d 100644 200 - --- a/src/packet.c 201 - +++ b/src/packet.c 202 - @@ -569,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, 203 - uint32_t len = 0; 204 - unsigned char want_reply = 0; 205 - len = _libssh2_ntohu32(data + 1); 206 - - if(len <= (UINT_MAX - 6) && datalen >= (6 + len)) { 207 - + if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) { 208 - want_reply = data[5 + len]; 209 - _libssh2_debug(session, 210 - LIBSSH2_TRACE_CONN,
+4 -9
pkgs/development/libraries/libssh2/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "libssh2"; 5 - version = "1.9.0"; 5 + version = "1.10.0"; 6 6 7 7 src = fetchurl { 8 - url = "${meta.homepage}/download/${pname}-${version}.tar.gz"; 9 - sha256 = "1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym"; 8 + url = "https://www.libssh2.org/download/libssh2-${version}.tar.gz"; 9 + sha256 = "sha256-LWTpDz3tOUuR06LndMogOkF59prr7gMAPlpvpiHkHVE="; 10 10 }; 11 11 12 12 outputs = [ "out" "dev" "devdoc" ]; ··· 14 14 buildInputs = [ openssl zlib ] 15 15 ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; 16 16 17 - patches = [ 18 - # Not able to use fetchpatch here: infinite recursion 19 - ./CVE-2019-17498.patch 20 - ]; 21 - 22 17 meta = with lib; { 23 18 description = "A client-side C library implementing the SSH2 protocol"; 24 19 homepage = "https://www.libssh2.org"; 25 20 platforms = platforms.all; 26 21 license = licenses.bsd3; 27 - maintainers = [ ]; 22 + maintainers = with maintainers; [ SuperSandro2000 ]; 28 23 }; 29 24 }
+3 -3
pkgs/development/libraries/libva/default.nix
··· 6 6 }: 7 7 8 8 stdenv.mkDerivation rec { 9 - name = "libva-${lib.optionalString minimal "minimal-"}${version}"; 9 + pname = "libva" + lib.optionalString minimal "minimal"; 10 10 version = "2.12.0"; 11 11 12 12 src = fetchFromGitHub { ··· 25 25 # TODO: share libs between minimal and !minimal - perhaps just symlink them 26 26 27 27 mesonFlags = [ 28 - # Add FHS paths for non-NixOS applications: 29 - "-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" 28 + # Add FHS and Debian paths for non-NixOS applications 29 + "-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/i386-linux-gnu/dri" 30 30 ]; 31 31 32 32 meta = with lib; {
+27 -6
pkgs/development/libraries/libwacom/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen, python3 }: 1 + { stdenv 2 + , lib 3 + , fetchFromGitHub 4 + , meson 5 + , ninja 6 + , glib 7 + , pkg-config 8 + , udev 9 + , libgudev 10 + , python3 11 + }: 2 12 3 13 stdenv.mkDerivation rec { 4 14 pname = "libwacom"; 5 - version = "1.11"; 15 + version = "1.12"; 6 16 7 17 outputs = [ "out" "dev" ]; 8 18 ··· 10 20 owner = "linuxwacom"; 11 21 repo = "libwacom"; 12 22 rev = "libwacom-${version}"; 13 - sha256 = "sha256-HDBWycdZf/pUL7ZzCuF55tfby3GW0WW6Vq3htPWT1v4="; 23 + sha256 = "sha256-pCO0lB0liveIEZIxY3IJcqlmWy4rYhSBtRPssfzHEow="; 14 24 }; 15 25 16 - nativeBuildInputs = [ pkg-config meson ninja doxygen python3 ]; 26 + nativeBuildInputs = [ 27 + pkg-config 28 + meson 29 + ninja 30 + python3 31 + ]; 17 32 18 - mesonFlags = [ "-Dtests=disabled" ]; 33 + buildInputs = [ 34 + glib 35 + udev 36 + libgudev 37 + ]; 19 38 20 - buildInputs = [ glib udev libgudev ]; 39 + mesonFlags = [ 40 + "-Dtests=disabled" 41 + ]; 21 42 22 43 meta = with lib; { 23 44 platforms = platforms.linux;
+1 -2
pkgs/development/libraries/libxc/default.nix
··· 11 11 sha256 = "07iljmv737kx24kd33x9ndf5l854mwslg9x2psqm12k07jmq9wjw"; 12 12 }; 13 13 14 - buildInputs = [ gfortran ]; 15 - nativeBuildInputs = [ perl cmake ]; 14 + nativeBuildInputs = [ perl cmake gfortran ]; 16 15 17 16 preConfigure = '' 18 17 patchShebangs ./
+2 -2
pkgs/development/libraries/libxkbcommon/default.nix
··· 21 21 22 22 stdenv.mkDerivation rec { 23 23 pname = "libxkbcommon"; 24 - version = "1.3.0"; 24 + version = "1.3.1"; 25 25 26 26 src = fetchurl { 27 27 url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; 28 - sha256 = "0ysynzzgzd9jdrh1321r4bgw8wd5zljrlyn5y1a31g39xacf02bv"; 28 + sha256 = "0d4jzq0zv1xmng0z0q5lb4rz03ikgxdwi68k3r70ac16gb911ixk"; 29 29 }; 30 30 31 31 outputs = [ "out" "dev" "doc" ];
+2 -2
pkgs/development/libraries/mesa/default.nix
··· 31 31 let 32 32 # Release calendar: https://www.mesa3d.org/release-calendar.html 33 33 # Release frequency: https://www.mesa3d.org/releasing.html#schedule 34 - version = "21.2.1"; 34 + version = "21.2.2"; 35 35 branch = versions.major version; 36 36 37 37 self = stdenv.mkDerivation { ··· 45 45 "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" 46 46 "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" 47 47 ]; 48 - sha256 = "11qpq16xbxymcgiy0wk787dk4yw2pv8fzgj8d92ng6s11dqycr9c"; 48 + sha256 = "1i75k6gh76f49vy6kksbsikf593jmgk6slqwbs1fs5s2jyzz3an4"; 49 49 }; 50 50 51 51 # TODO:
+2 -1
pkgs/development/libraries/mpich/default.nix
··· 26 26 27 27 enableParallelBuilding = true; 28 28 29 - buildInputs = [ perl gfortran openssh hwloc ] 29 + nativeBuildInputs = [ gfortran ]; 30 + buildInputs = [ perl openssh hwloc ] 30 31 ++ lib.optional (!stdenv.isDarwin) ch4backend; 31 32 32 33 doCheck = true;
+1 -2
pkgs/development/libraries/mvapich/default.nix
··· 21 21 sha256 = "0jd28vy9ivl3rcpkxmhw73b6krzm0pd9jps8asw92wa00lm2z9mk"; 22 22 }; 23 23 24 - nativeBuildInputs = [ pkg-config bison makeWrapper ]; 24 + nativeBuildInputs = [ pkg-config bison makeWrapper gfortran ]; 25 25 propagatedBuildInputs = [ numactl rdma-core zlib opensm ]; 26 26 buildInputs = with lib; [ 27 27 numactl 28 28 libxml2 29 29 perl 30 - gfortran 31 30 openssh 32 31 hwloc 33 32 ] ++ optionals (network == "infiniband") [ rdma-core opensm ]
+2 -1
pkgs/development/libraries/netcdf-fortran/default.nix
··· 8 8 sha256 = "00qwg4v250yg8kxp68srrnvfbfim241fnlm071p9ila2mihk8r01"; 9 9 }; 10 10 11 - buildInputs = [ netcdf hdf5 curl gfortran ]; 11 + nativeBuildInputs = [ gfortran ]; 12 + buildInputs = [ netcdf hdf5 curl ]; 12 13 doCheck = true; 13 14 14 15 meta = with lib; {
+6
pkgs/development/libraries/opencv/3.x.nix
··· 1 1 { lib, stdenv 2 2 , fetchFromGitHub 3 + , fetchpatch 3 4 , cmake, pkg-config, unzip, zlib, pcre, hdf5 4 5 , glog, boost, gflags, protobuf 5 6 , config ··· 154 155 # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV. 155 156 patches = [ 156 157 ./cmake-don-t-use-OpenCVFindOpenEXR.patch 158 + # Fix usage of deprecated version of protobuf' SetTotalBytesLimit. Remove with the next release. 159 + (fetchpatch { 160 + url = "https://github.com/opencv/opencv/commit/384875f4fcf1782b10699a379aa245a03cb27a04.patch"; 161 + sha256 = "1agwd0pm07m2dy8a62vmfl4n73dsmsdll2a73q6kara9wm3jlp41"; 162 + }) 157 163 ]; 158 164 159 165 # This prevents cmake from using libraries in impure paths (which
+6
pkgs/development/libraries/opencv/4.x.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchurl 4 + , fetchpatch 4 5 , fetchFromGitHub 5 6 , cmake 6 7 , pkg-config ··· 217 218 # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV. 218 219 patches = [ 219 220 ./cmake-don-t-use-OpenCVFindOpenEXR.patch 221 + # Fix usage of deprecated version of protobuf' SetTotalBytesLimit. Remove with the next release. 222 + (fetchpatch { 223 + url = "https://github.com/opencv/opencv/commit/384875f4fcf1782b10699a379aa245a03cb27a04.patch"; 224 + sha256 = "1agwd0pm07m2dy8a62vmfl4n73dsmsdll2a73q6kara9wm3jlp41"; 225 + }) 220 226 ] ++ lib.optional enableCuda ./cuda_opt_flow.patch; 221 227 222 228 # This prevents cmake from using libraries in impure paths (which
+2 -2
pkgs/development/libraries/openmpi/default.nix
··· 46 46 ''; 47 47 48 48 buildInputs = [ zlib ] 49 - ++ lib.optionals fortranSupport [ gfortran ] 50 49 ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ] 51 50 ++ lib.optionals cudaSupport [ cudatoolkit ] 52 51 ++ [ libevent hwloc ] 53 52 ++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core 54 53 ++ lib.optional fabricSupport [ libpsm2 libfabric ]; 55 54 56 - nativeBuildInputs = [ perl ]; 55 + nativeBuildInputs = [ perl ] 56 + ++ lib.optionals fortranSupport [ gfortran ]; 57 57 58 58 configureFlags = lib.optional (!cudaSupport) "--disable-mca-dso" 59 59 ++ lib.optional (!fortranSupport) "--disable-mpi-fortran"
+3 -1
pkgs/development/libraries/physics/applgrid/default.nix
··· 9 9 sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p"; 10 10 }; 11 11 12 + nativeBuildInputs = [ gfortran ]; 13 + 12 14 # For some reason zlib was only needed after bump to gfortran8 13 - buildInputs = [ gfortran hoppet lhapdf root5 zlib ]; 15 + buildInputs = [ hoppet lhapdf root5 zlib ]; 14 16 15 17 patches = [ 16 18 ./bad_code.patch
+2 -2
pkgs/development/libraries/physics/herwig/default.nix
··· 9 9 sha256 = "10y3fb33zsinr0z3hzap9rsbcqhy1yjqnv4b4vz21g7mdlw6pq2k"; 10 10 }; 11 11 12 - nativeBuildInputs = [ autoconf automake libtool ]; 12 + nativeBuildInputs = [ autoconf automake libtool gfortran ]; 13 13 14 - buildInputs = [ boost fastjet gfortran gsl thepeg zlib ] 14 + buildInputs = [ boost fastjet gsl thepeg zlib ] 15 15 # There is a bug that requires for default PDF's to be present during the build 16 16 ++ (with lhapdf.pdf_sets; [ CT14lo CT14nlo ]); 17 17
+1 -2
pkgs/development/libraries/physics/hoppet/default.nix
··· 9 9 sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz"; 10 10 }; 11 11 12 - buildInputs = [ gfortran ]; 13 - nativeBuildInputs = [ perl ]; 12 + nativeBuildInputs = [ perl gfortran ]; 14 13 15 14 enableParallelBuilding = true; 16 15
+1 -1
pkgs/development/libraries/physics/mela/default.nix
··· 11 11 sha256 = "01sgd4mwx4n58x95brphp4dskqkkx8434bvsr38r5drg9na5nc9y"; 12 12 }; 13 13 14 - buildInputs = [ gfortran ]; 14 + nativeBuildInputs = [ gfortran ]; 15 15 16 16 enableParallelBuilding = true; 17 17
+2
pkgs/development/libraries/pixman/default.nix
··· 9 9 sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4"; 10 10 }; 11 11 12 + separateDebugInfo = true; 13 + 12 14 nativeBuildInputs = [ pkg-config ]; 13 15 14 16 buildInputs = [ libpng ];
+6
pkgs/development/libraries/protobuf/3.18.nix
··· 1 + { callPackage, ... }: 2 + 3 + callPackage ./generic-v3.nix { 4 + version = "3.18.0"; 5 + sha256 = "0nhjw4m4dm6wqwwsi0b18js5wbh3ibrpsq195g6mk9cx54fx097f"; 6 + }
+1 -3
pkgs/development/libraries/qrupdate/default.nix
··· 42 42 43 43 installTargets = lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ]; 44 44 45 - buildInputs = [ gfortran ]; 46 - 47 - nativeBuildInputs = [ which ]; 45 + nativeBuildInputs = [ which gfortran ]; 48 46 49 47 meta = with lib; { 50 48 description = "Library for fast updating of qr and cholesky decompositions";
+1
pkgs/development/libraries/qt-5/modules/qtbase.nix
··· 177 177 ''-D${if compareVersion "5.11.0" >= 0 then "LIBRESOLV_SO" else "NIXPKGS_LIBRESOLV"}="${stdenv.cc.libc.out}/lib/libresolv"'' 178 178 ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' 179 179 ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' 180 + ++ lib.optional stdenv.isLinux "-DUSE_X11" 180 181 ++ lib.optionals withGtk3 [ 181 182 ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' 182 183 ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
+1 -2
pkgs/development/libraries/science/math/arpack/default.nix
··· 22 22 }) 23 23 ]; 24 24 25 - nativeBuildInputs = [ cmake ]; 25 + nativeBuildInputs = [ cmake gfortran ]; 26 26 buildInputs = assert (blas.isILP64 == lapack.isILP64); [ 27 - gfortran 28 27 blas 29 28 lapack 30 29 eigen
+1 -1
pkgs/development/libraries/science/math/blas/default.nix
··· 9 9 sha256 = "sha256-LjYNmcm9yEB6YYiMQKqFP7QhlCDruCZNtIbLiGBGirM="; 10 10 }; 11 11 12 - buildInputs = [ gfortran ]; 12 + nativeBuildInputs = [ gfortran ]; 13 13 14 14 configurePhase = '' 15 15 echo >make.inc "SHELL = ${stdenv.shell}"
+2 -1
pkgs/development/libraries/science/math/cholmod-extra/default.nix
··· 10 10 sha256 = "0hz1lfp0zaarvl0dv0zgp337hyd8np41kmdpz5rr3fc6yzw7vmkg"; 11 11 }; 12 12 13 - buildInputs = [ suitesparse gfortran blas lapack ]; 13 + nativeBuildInputs = [ gfortran ]; 14 + buildInputs = [ suitesparse blas lapack ]; 14 15 15 16 makeFlags = [ 16 17 "BLAS=-lcblas"
+1 -2
pkgs/development/libraries/science/math/clblas/default.nix
··· 35 35 "-DBUILD_TEST=OFF" 36 36 ]; 37 37 38 - nativeBuildInputs = [ cmake ]; 38 + nativeBuildInputs = [ cmake gfortran ]; 39 39 buildInputs = [ 40 - gfortran 41 40 blas 42 41 python3 43 42 boost
+2 -2
pkgs/development/libraries/science/math/ipopt/default.nix
··· 18 18 "--with-lapack-lib=-llapack" 19 19 ]; 20 20 21 - nativeBuildInputs = [ unzip ]; 21 + nativeBuildInputs = [ unzip gfortran ]; 22 22 23 - buildInputs = [ gfortran blas lapack ]; 23 + buildInputs = [ blas lapack ]; 24 24 25 25 enableParallelBuilding = true; 26 26
+2 -2
pkgs/development/libraries/science/math/scalapack/default.nix
··· 15 15 sha256 = "1c10d18gj3kvpmyv5q246x35hjxaqn4ygy1cygaydhyxnm4klzdj"; 16 16 }; 17 17 18 - nativeBuildInputs = [ cmake openssh ]; 19 - buildInputs = [ mpi gfortran blas lapack ]; 18 + nativeBuildInputs = [ cmake openssh gfortran ]; 19 + buildInputs = [ mpi blas lapack ]; 20 20 21 21 doCheck = true; 22 22
+1 -1
pkgs/development/libraries/science/math/spooles/default.nix
··· 1 - { lib, stdenv, fetchurl, gfortran, perl }: 1 + { lib, stdenv, fetchurl, perl }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "spooles";
+13 -1
pkgs/development/libraries/spandsp/default.nix
··· 1 - {lib, stdenv, fetchurl, audiofile, libtiff}: 1 + { lib, stdenv, fetchurl, audiofile, libtiff, buildPackages }: 2 2 stdenv.mkDerivation rec { 3 3 version = "0.0.6"; 4 4 pname = "spandsp"; ··· 8 8 }; 9 9 10 10 outputs = [ "out" "dev" ]; 11 + makeFlags = [ 12 + "CC=${stdenv.cc.targetPrefix}cc" 13 + ]; 11 14 15 + configureFlags = [ 16 + # This flag is required to prevent linking error in the cross-compilation case. 17 + # I think it's fair to assume that realloc(NULL, size) will return a valid memory 18 + # block for most libc implementation, so let's just assume that and hope for the best. 19 + "ac_cv_func_malloc_0_nonnull=yes" 20 + ]; 21 + 22 + strictDeps = true; 23 + depsBuildBuild = [ buildPackages.stdenv.cc ]; 12 24 propagatedBuildInputs = [audiofile libtiff]; 13 25 meta = { 14 26 description = "A portable and modular SIP User-Agent with audio and video support";
+2 -2
pkgs/development/libraries/sqlite/default.nix
··· 13 13 14 14 stdenv.mkDerivation rec { 15 15 pname = "sqlite"; 16 - version = "3.35.5"; 16 + version = "3.36.0"; 17 17 18 18 # NB! Make sure to update ./tools.nix src (in the same directory). 19 19 src = fetchurl { 20 20 url = "https://sqlite.org/2021/sqlite-autoconf-${archiveVersion version}.tar.gz"; 21 - sha256 = "9StypcMZw+UW7XqS4SMTmm6Hrwii3EPXdXck9hMubbA="; 21 + sha256 = "sha256-vZDD65a+6ZYga4O+cGXJzhmu84w/T7Uwc62g0LabvOM="; 22 22 }; 23 23 24 24 outputs = [ "bin" "dev" "out" ];
+33 -16
pkgs/development/libraries/srtp/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, pkg-config 2 - , openssl ? null, libpcap ? null 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , libpcap 5 + , meson 6 + , ninja 7 + , openssl 8 + , pkg-config 3 9 }: 4 10 5 - with lib; 6 11 stdenv.mkDerivation rec { 7 12 pname = "libsrtp"; 8 - version = "2.3.0"; 13 + version = "2.4.0"; 9 14 10 15 src = fetchFromGitHub { 11 16 owner = "cisco"; 12 17 repo = "libsrtp"; 13 18 rev = "v${version}"; 14 - sha256 = "1f7i3jdh1wzdv7zjlz7gs3xw5jqig9zw8z9awsqqcp54f94xdpvd"; 19 + sha256 = "0syl2ywddgqz29h43d6rc7waf3hp2yc14yhnrvdsja2bg8wrv6sb"; 15 20 }; 16 21 17 22 outputs = [ "out" "dev" ]; 18 23 19 - nativeBuildInputs = [ pkg-config ]; 24 + nativeBuildInputs = [ 25 + meson 26 + ninja 27 + pkg-config 28 + ]; 20 29 21 - # libsrtp.pc references -lcrypto -lpcap without -L 22 - propagatedBuildInputs = [ openssl libpcap ]; 30 + buildInputs = [ 31 + libpcap 32 + openssl 33 + ]; 23 34 24 - configureFlags = [ 25 - "--disable-debug" 26 - ] ++ optional (openssl != null) "--enable-openssl"; 35 + # rtpw tests hang 36 + preConfigure = '' 37 + rm test/rtpw_test.sh \ 38 + test/rtpw_test_gcm.sh 39 + ''; 27 40 28 - buildFlags = [ "shared_library" ]; 41 + mesonFlags = [ 42 + "-Dcrypto-library=openssl" 43 + "-Dcrypto-library-kdf=disabled" 44 + "-Ddoc=disabled" 45 + "-Dtests=${if doCheck then "enabled" else "disabled"}" 46 + ]; 29 47 30 - postInstall = '' 31 - rm -rf $out/bin 32 - ''; 48 + doCheck = true; 33 49 34 - meta = { 50 + meta = with lib; { 35 51 homepage = "https://github.com/cisco/libsrtp"; 36 52 description = "Secure RTP (SRTP) Reference Implementation"; 37 53 license = licenses.bsd3; 38 54 platforms = platforms.all; 55 + maintainers = with maintainers; [ r-burns ]; 39 56 }; 40 57 }
+1 -2
pkgs/development/libraries/sundials/default.nix
··· 21 21 hash = "sha256-SNp7qoFS3bIq7RsC2C0du0+/6iKs9nY0ARqgMDoQCkM="; 22 22 }; 23 23 24 - nativeBuildInputs = [ cmake ]; 24 + nativeBuildInputs = [ cmake gfortran ]; 25 25 26 26 buildInputs = [ 27 27 python ··· 29 29 ++ lib.optionals (lapackSupport) 30 30 # Check that the same index size is used for both libraries 31 31 (assert (blas.isILP64 == lapack.isILP64); [ 32 - gfortran 33 32 blas 34 33 lapack 35 34 ])
+9 -1
pkgs/development/libraries/tix/default.nix
··· 1 - { lib, stdenv, fetchurl, tcl, tk, fetchpatch } : 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , fetchpatch 5 + , tcl 6 + , tk 7 + }: 2 8 3 9 tcl.mkTclDerivation { 4 10 version = "8.4.3"; ··· 13 19 url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; 14 20 sha256 = "0wzqmcxxq0rqpnjgxz10spw92yhfygnlwv0h8pcx2ycnqiljz6vj"; 15 21 }) 22 + # Remove duplicated definition of XLowerWindow 23 + ./duplicated-xlowerwindow.patch 16 24 ] ++ lib.optional (tcl.release == "8.6") 17 25 (fetchpatch { 18 26 name = "tix-8.4.3-tcl8.6.patch";
+49
pkgs/development/libraries/tix/duplicated-xlowerwindow.patch
··· 1 + This is duplicated code from Tk. 2 + It causes errors during build since XLowerWindow is not only a function but also "defined" in tkIntXlibDecls.h. 3 + 4 + See 5 + https://github.com/tcltk/tk/blob/71dcaddc69769cbd3e2c4b5edb5810f974579527/generic/tkIntXlibDecls.h#L396 6 + and 7 + https://github.com/tcltk/tk/blob/71dcaddc69769cbd3e2c4b5edb5810f974579527/generic/tkIntXlibDecls.h#L1487 8 + 9 + --- a/unix/tixUnixWm.c 2005-03-25 13:15:53.000000000 -0700 10 + +++ b/unix/tixUnixWm.c 2021-03-20 07:31:52.000000000 -0700 11 + @@ -24,38 +24,3 @@ 12 + { 13 + return TCL_OK; 14 + } 15 + - 16 + -#ifdef MAC_OSX_TK 17 + -#include "tkInt.h" 18 + -/* 19 + - *---------------------------------------------------------------------- 20 + - * 21 + - * XLowerWindow -- 22 + - * 23 + - * Change the stacking order of a window. 24 + - * 25 + - * Results: 26 + - * None. 27 + - * 28 + - * Side effects: 29 + - * Changes the stacking order of the specified window. 30 + - * 31 + - *---------------------------------------------------------------------- 32 + - */ 33 + - 34 + -int 35 + -XLowerWindow( 36 + - Display* display, /* Display. */ 37 + - Window window) /* Window. */ 38 + -{ 39 + - TkWindow *winPtr = *((TkWindow **) window); 40 + - 41 + - display->request++; 42 + - if (Tk_IsTopLevel(winPtr) && !Tk_IsEmbedded(winPtr)) { 43 + - TkWmRestackToplevel(winPtr, Below, NULL); 44 + - } else { 45 + - /* TODO: this should generate damage */ 46 + - } 47 + - return 0; 48 + -} 49 + -#endif
+19 -1
pkgs/development/libraries/tk/8.5.nix
··· 1 - { callPackage, fetchurl, tcl, ... } @ args: 1 + { lib 2 + , stdenv 3 + , callPackage 4 + , fetchurl 5 + , fetchpatch 6 + , tcl 7 + , ... 8 + } @ args: 2 9 3 10 callPackage ./generic.nix (args // { 4 11 ··· 6 13 url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; 7 14 sha256 = "0an3wqkjzlyyq6l9l3nawz76axsrsppbyylx0zk9lkv7llrala03"; 8 15 }; 16 + 17 + patches = lib.optionals stdenv.isDarwin [ 18 + # Define MODULE_SCOPE before including tkPort.h 19 + # https://core.tcl-lang.org/tk/info/dba9f5ce3b 20 + (fetchpatch { 21 + name = "module_scope.patch"; 22 + url = "https://core.tcl-lang.org/tk/vpatch?from=ef6c6960c53ea30c&to=9b8aa74eebed509a"; 23 + extraPrefix = ""; 24 + sha256 = "0crhf4zrzdpc1jdgyv6l6mxqgmny12r3i39y1i0j8q3pbqkd04bv"; 25 + }) 26 + ]; 9 27 10 28 })
+20 -3
pkgs/development/libraries/tk/8.6.nix
··· 1 - { callPackage, fetchurl, tcl, lib, stdenv, ... } @ args: 1 + { lib 2 + , stdenv 3 + , callPackage 4 + , fetchurl 5 + , fetchpatch 6 + , tcl 7 + , ... 8 + } @ args: 2 9 3 10 callPackage ./generic.nix (args // { 4 11 5 12 src = fetchurl { 6 13 url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x 7 - sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg"; 14 + sha256 = "1gh9k7l76qg9l0sb78ijw9xz4xl1af47aqbdifb6mjpf3cbsnv00"; 8 15 }; 9 16 10 - patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; 17 + patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ 18 + ./Fix-bad-install_name-for-libtk8.6.dylib.patch 19 + # Define MODULE_SCOPE before including tkPort.h 20 + # https://core.tcl-lang.org/tk/info/dba9f5ce3b 21 + (fetchpatch { 22 + name = "module_scope.patch"; 23 + url = "https://core.tcl-lang.org/tk/vpatch?from=ef6c6960c53ea30c&to=9b8aa74eebed509a"; 24 + extraPrefix = ""; 25 + sha256 = "0crhf4zrzdpc1jdgyv6l6mxqgmny12r3i39y1i0j8q3pbqkd04bv"; 26 + }) 27 + ]; 11 28 12 29 })
+2
pkgs/development/libraries/tk/generic.nix
··· 41 41 42 42 propagatedBuildInputs = [ libXft ]; 43 43 44 + enableParallelBuilding = true; 45 + 44 46 doCheck = false; # fails. can't find itself 45 47 46 48 inherit tcl;
+9 -1
pkgs/development/libraries/tpm2-tss/default.nix
··· 3 3 , openssl, json_c, curl, libgcrypt 4 4 , cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which 5 5 }: 6 + let 7 + # Avoid a circular dependency on Linux systems (systemd depends on tpm2-tss, 8 + # tpm2-tss tests depend on procps, procps depends on systemd by default). This 9 + # needs to be conditional based on isLinux because procps for other systems 10 + # might not support the withSystemd option. 11 + procpsWithoutSystemd = procps.override { withSystemd = false; }; 12 + procps_pkg = if stdenv.isLinux then procpsWithoutSystemd else procps; 13 + in 6 14 7 15 stdenv.mkDerivation rec { 8 16 pname = "tpm2-tss"; ··· 20 28 ]; 21 29 buildInputs = [ openssl json_c curl libgcrypt ]; 22 30 checkInputs = [ 23 - cmocka uthash ibm-sw-tpm2 iproute2 procps which 31 + cmocka uthash ibm-sw-tpm2 iproute2 procps_pkg which 24 32 ]; 25 33 26 34 preAutoreconf = "./bootstrap";
+2 -2
pkgs/development/libraries/wayland/protocols.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "wayland-protocols"; 9 - version = "1.21"; 9 + version = "1.23"; 10 10 11 11 doCheck = stdenv.hostPlatform == stdenv.buildPlatform; 12 12 13 13 src = fetchurl { 14 14 url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; 15 - sha256 = "1rfdlkzz67qsb955zqb8jbw3m22pl6ppvrvfq8bqiqcb5n24b6dr"; 15 + sha256 = "0xizccackgwszjhlq7jjiv2z2gwppljx0w32ga91bxlnby8z22kc"; 16 16 }; 17 17 18 18 postPatch = lib.optionalString doCheck ''
+8 -5
pkgs/development/libraries/x264/default.nix
··· 1 - { stdenv, lib, fetchurl, nasm 1 + { stdenv, lib, fetchFromGitLab, nasm 2 2 , enableShared ? !stdenv.hostPlatform.isStatic 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { 6 6 pname = "x264"; 7 - version = "20191217-2245"; 7 + version = "unstable-2021-06-13"; 8 8 9 - src = fetchurl { 10 - url = "https://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2"; 11 - sha256 = "0q214q4rhbhigyx3dfhp6d5v5gzln01cxccl153ps5ih567mqjdj"; 9 + src = fetchFromGitLab { 10 + domain = "code.videolan.org"; 11 + owner = "videolan"; 12 + repo = pname; 13 + rev = "5db6aa6cab1b146e07b60cc1736a01f21da01154"; 14 + sha256 = "0swyrkz6nvajivxvrr08py0jrfcsjvpxw78xm1k5gd9xbdrxvknh"; 12 15 }; 13 16 14 17 # Upstream ./configure greps for (-mcpu|-march|-mfpu) in CFLAGS, which in nix
+2 -2
pkgs/development/python-modules/black/default.nix
··· 20 20 21 21 buildPythonPackage rec { 22 22 pname = "black"; 23 - version = "21.8b0"; 23 + version = "21.9b0"; 24 24 25 25 disabled = pythonOlder "3.6"; 26 26 27 27 src = fetchPypi { 28 28 inherit pname version; 29 - sha256 = "sha256-VwYI0oqjrxeSuYxKM326xjZ4d7R7EriKtCCVz8GmJ8I="; 29 + sha256 = "sha256-feTPx+trcQ3jJXEtQBJWiRAdIdJSg+7X6ZmHIs8Q65E="; 30 30 }; 31 31 32 32 nativeBuildInputs = [ setuptools-scm ];
+3 -3
pkgs/development/python-modules/cryptography/default.nix
··· 23 23 24 24 buildPythonPackage rec { 25 25 pname = "cryptography"; 26 - version = "3.4.7"; # Also update the hash in vectors.nix 26 + version = "3.4.8"; # Also update the hash in vectors.nix 27 27 28 28 src = fetchPypi { 29 29 inherit pname version; 30 - sha256 = "04x7bhjkglxpllad10821vxddlmxdkd3gjvp35iljmnj2s0xw41x"; 30 + sha256 = "072awar70cwfd2hnx0pvp1dkc7gw45mbm3wcyddvxz5frva5xk4l"; 31 31 }; 32 32 33 33 cargoDeps = rustPlatform.fetchCargoTarball { 34 34 inherit src; 35 35 sourceRoot = "${pname}-${version}/${cargoRoot}"; 36 36 name = "${pname}-${version}"; 37 - sha256 = "1m6smky4nahwlp4hn6yzibrcxlbsw4nx162dsq48vlw8h1lgjl62"; 37 + sha256 = "01h511h6l4qvjxbaw662m1l84pb4wrhwxmnb3qj6ik13mx2m477m"; 38 38 }; 39 39 40 40 cargoRoot = "src/rust";
+1 -1
pkgs/development/python-modules/cryptography/vectors.nix
··· 7 7 8 8 src = fetchPypi { 9 9 inherit pname version; 10 - sha256 = "1hh4j88ywil3jf62ppj1blygmdirbqz86pynd9lqfijiaym3mb57"; 10 + sha256 = "1wl0ynh3lzhc6q59g8mybvijmnp195x7fjxlb3h3sgcraw14312c"; 11 11 }; 12 12 13 13 # No tests included
+1 -1
pkgs/development/python-modules/fpyutils/default.nix
··· 16 16 owner = "frnmst"; 17 17 repo = pname; 18 18 rev = version; 19 - sha256 = "sha256-VYknHuBoU7XWkm6mt8ckBzFLMcYTPW5CXMGdOn3perY="; 19 + sha256 = "1dksx5ykm7f1bi16wg8kqqqlnc874k3vg9kfjbbbalv8w0g2g2am"; 20 20 }; 21 21 22 22 propagatedBuildInputs = [
+11 -1
pkgs/development/python-modules/libarcus/default.nix
··· 1 1 { lib, buildPythonPackage, python, fetchFromGitHub 2 + , fetchpatch 2 3 , cmake, sip_4, protobuf, pythonOlder }: 3 4 4 5 buildPythonPackage rec { ··· 13 14 sha256 = "1ahka8s8fjwymyr7pca7i7h51ikfr35zy4nkzfcjn946x7p0dprf"; 14 15 }; 15 16 16 - disabled = pythonOlder "3.4.0"; 17 + patches = [ 18 + # Fix build against protobuf 3.18+ 19 + # https://github.com/Ultimaker/libArcus/issues/121 20 + (fetchpatch { 21 + url = "https://raw.githubusercontent.com/coryan/vcpkg/f69b85aa403b04e7d442c90db3418d484e44024f/ports/arcus/0001-fix-protobuf-deprecated.patch"; 22 + sha256 = "0bqj7pxzpwsamknd6gadj419x6mwx8wnlfzg4zqn6cax3cmasjb2"; 23 + }) 24 + ]; 25 + 26 + disabled = pythonOlder "3.4"; 17 27 18 28 propagatedBuildInputs = [ sip_4 ]; 19 29 nativeBuildInputs = [ cmake ];
+11 -5
pkgs/development/python-modules/motor/default.nix
··· 1 - { lib, buildPythonPackage, fetchFromGitHub 2 - , pymongo, mockupdb 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + , mockupdb 5 + , pymongo 6 + , pythonOlder 3 7 }: 4 8 5 9 buildPythonPackage rec { 6 10 pname = "motor"; 7 - version = "2.4.0"; 11 + version = "2.5.1"; 12 + disabled = pythonOlder "3.6"; 8 13 9 14 src = fetchFromGitHub { 10 15 owner = "mongodb"; 11 16 repo = pname; 12 17 rev = version; 13 - sha256 = "1sgaqg98h35lazzdi015q1i60ig7krid8b10a5rm6lf755y8yj2c"; 18 + sha256 = "sha256-r+HyIEC+Jafn7eMqkAldsZ5hbem+n+P76RJGAymmBks="; 14 19 }; 15 20 16 21 propagatedBuildInputs = [ pymongo ]; 17 22 23 + checkInputs = [ mockupdb ]; 24 + 18 25 # network connections 19 26 doCheck = false; 20 - checkInputs = [ mockupdb ]; 21 27 22 28 pythonImportsCheck = [ "motor" ]; 23 29
+2
pkgs/development/python-modules/pandas/default.nix
··· 105 105 "test_missing_required_dependency" 106 106 # AssertionError with 1.2.3 107 107 "test_from_coo" 108 + # AssertionError: No common DType exists for the given inputs 109 + "test_comparison_invalid" 108 110 ] ++ lib.optionals stdenv.isDarwin [ 109 111 "test_locale" 110 112 "test_clipboard"
+1 -1
pkgs/development/python-modules/pathspec/default.nix
··· 9 9 10 10 src = fetchPypi { 11 11 inherit pname version; 12 - sha256 = "sha256-5WRJlDWiZz1Yb2shMLtblfBKO6Bvgbj4lbZRo8dqq7E="; 12 + sha256 = "e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"; 13 13 }; 14 14 15 15 meta = {
+2 -2
pkgs/development/python-modules/pillow/default.nix
··· 5 5 6 6 import ./generic.nix (rec { 7 7 pname = "Pillow"; 8 - version = "8.3.1"; 8 + version = "8.3.2"; 9 9 10 10 disabled = !isPy3k; 11 11 12 12 src = fetchPypi { 13 13 inherit pname version; 14 - sha256 = "2cac53839bfc5cece8fdbe7f084d5e3ee61e1303cccc86511d351adcb9e2c792"; 14 + sha256 = "1361y215ydmdh4il1vay5831aqivmpwgzjqrphqjdiq0ipnz7qyx"; 15 15 }; 16 16 17 17 meta = with lib; {
+3
pkgs/development/python-modules/poetry-core/default.nix
··· 53 53 54 54 pythonImportsCheck = [ "poetry.core" ]; 55 55 56 + # allow for package to use pep420's native namespaces 57 + pythonNamespaces = [ "poetry" ]; 58 + 56 59 meta = with lib; { 57 60 description = "Core utilities for Poetry"; 58 61 homepage = "https://github.com/python-poetry/poetry-core/";
+3
pkgs/development/python-modules/poetry/default.nix
··· 99 99 }) 100 100 ]; 101 101 102 + # allow for package to use pep420's native namespaces 103 + pythonNamespaces = [ "poetry" ]; 104 + 102 105 meta = with lib; { 103 106 homepage = "https://python-poetry.org/"; 104 107 description = "Python dependency management and packaging made easy";
+12 -4
pkgs/development/python-modules/pymongo/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi }: 1 + { lib 2 + , buildPythonPackage 3 + , fetchPypi 4 + , pythonOlder 5 + }: 2 6 3 7 buildPythonPackage rec { 4 8 pname = "pymongo"; 5 - version = "3.11.4"; 9 + version = "3.12.0"; 10 + disabled = pythonOlder "3.6"; 6 11 7 12 src = fetchPypi { 8 13 inherit pname version; 9 - sha256 = "539d4cb1b16b57026999c53e5aab857fe706e70ae5310cc8c232479923f932e6"; 14 + sha256 = "sha256-uI0XQhWbyToHhzP5eJ9WPO8m9eNw66gQR2pxqpjl+8I="; 10 15 }; 11 16 12 17 # Tests call a running mongodb instance 13 18 doCheck = false; 14 19 20 + pythonImportsCheck = [ "pymongo" ]; 21 + 15 22 meta = with lib; { 23 + description = "Python driver for MongoDB"; 16 24 homepage = "https://github.com/mongodb/mongo-python-driver"; 17 25 license = licenses.asl20; 18 - description = "Python driver for MongoDB"; 26 + maintainers = with maintainers; [ ]; 19 27 }; 20 28 }
+2 -1
pkgs/development/python-modules/scikit-learn/0.20.nix
··· 16 16 sha256 = "1z3w2c50dwwa297j88pr16pyrjysagsvdj7vrlq40q8777rs7a6z"; 17 17 }; 18 18 19 - buildInputs = [ pillow gfortran glibcLocales ]; 19 + nativeBuildInputs = [ gfortran ]; 20 + buildInputs = [ pillow glibcLocales ]; 20 21 propagatedBuildInputs = [ numpy scipy numpy.blas ]; 21 22 checkInputs = [ pytest ]; 22 23
+1 -1
pkgs/development/python-modules/scikit-learn/default.nix
··· 38 38 39 39 buildInputs = [ 40 40 pillow 41 - gfortran 42 41 glibcLocales 43 42 ] ++ lib.optionals stdenv.cc.isClang [ 44 43 llvmPackages.openmp ··· 46 45 47 46 nativeBuildInputs = [ 48 47 cython 48 + gfortran 49 49 ]; 50 50 51 51 propagatedBuildInputs = [
+23 -13
pkgs/development/python-modules/service_identity/default.nix
··· 1 1 { lib 2 + , attrs 2 3 , buildPythonPackage 4 + , cryptography 3 5 , fetchFromGitHub 4 - , pythonOlder 5 - , cryptography 6 + , idna 6 7 , ipaddress 7 8 , pyasn1 8 9 , pyasn1-modules 9 - , idna 10 - , attrs 11 - , pytest 10 + , pytestCheckHook 11 + , pythonOlder 12 12 }: 13 13 14 14 buildPythonPackage rec { 15 - pname = "service_identity"; 16 - version = "18.1.0"; 15 + pname = "service-identity"; 16 + version = "21.1.0"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "pyca"; 20 20 repo = pname; 21 21 rev = version; 22 - sha256 = "1aw475ksmd4vpl8cwfdcsw2v063nbhnnxpy633sb75iqp9aazhlx"; 22 + sha256 = "sha256-pWc2rU3ULqEukMhd1ySY58lTm3s8f/ayQ7CY4nG24AQ="; 23 23 }; 24 24 25 25 propagatedBuildInputs = [ 26 - pyasn1 pyasn1-modules idna attrs cryptography 27 - ] ++ lib.optionals (pythonOlder "3.3") [ ipaddress ]; 26 + attrs 27 + cryptography 28 + idna 29 + pyasn1 30 + pyasn1-modules 31 + ] ++ lib.optionals (pythonOlder "3.3") [ 32 + ipaddress 33 + ]; 28 34 29 - checkInputs = [ pytest ]; 30 - checkPhase = "py.test"; 35 + checkInputs = [ 36 + pytestCheckHook 37 + ]; 38 + 39 + pythonImportsCheck = [ "service_identity" ]; 31 40 32 41 meta = with lib; { 33 42 description = "Service identity verification for pyOpenSSL"; 43 + homepage = "https://service-identity.readthedocs.io"; 34 44 license = licenses.mit; 35 - homepage = "https://service-identity.readthedocs.io"; 45 + maintainers = with maintainers; [ fab ]; 36 46 }; 37 47 }
+21 -14
pkgs/development/python-modules/setuptools-scm/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi, toml, tomli }: 1 + { buildPythonPackage 2 + , callPackage 3 + , fetchPypi 4 + , packaging 5 + , tomli 6 + , lib 7 + }: 2 8 3 9 buildPythonPackage rec { 4 10 pname = "setuptools-scm"; 5 - # don't update to 6.1.0 or 6.2.0, releases were pulled because of regression 6 - # https://github.com/pypa/setuptools_scm/issues/615 7 - version = "6.0.1"; 11 + version = "6.3.1"; 8 12 9 13 src = fetchPypi { 10 14 pname = "setuptools_scm"; 11 15 inherit version; 12 - sha256 = "sha256-0ZJaacsH6bKUFqJ1ufrbAJojwUis6QWy+yIGSabBjpI="; 16 + sha256 = "sha256-D2omORKxN5jAKLmicdka873g5CeECRx5fezMOtOn9ZY="; 13 17 }; 14 18 15 - postPatch = '' 16 - substituteInPlace setup.cfg \ 17 - --replace "tomli~=1.0.0" "tomli>=1.0.0" 18 - ''; 19 + propagatedBuildInputs = [ 20 + packaging 21 + tomli 22 + ]; 19 23 20 - # TODO: figure out why both toml and tomli are needed when only tomli is listed in setuptools-scm 21 - # if not both are listed some packages like zipp silently fallback to a 0.0.0 version number and break version pins in other packages 22 - propagatedBuildInputs = [ toml tomli ]; 24 + pythonImportsCheck = [ 25 + "setuptools_scm" 26 + ]; 23 27 24 - # Requires pytest, circular dependency 28 + # check in passhtru.tests.pytest to escape infinite recursion on pytest 25 29 doCheck = false; 26 - pythonImportsCheck = [ "setuptools_scm" ]; 30 + 31 + passthru.tests = { 32 + pytest = callPackage ./tests.nix { }; 33 + }; 27 34 28 35 meta = with lib; { 29 36 homepage = "https://github.com/pypa/setuptools_scm/";
+33
pkgs/development/python-modules/setuptools-scm/tests.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , setuptools-scm 4 + , pytestCheckHook 5 + , git 6 + , mercurial 7 + , pip 8 + , virtualenv 9 + }: 10 + 11 + buildPythonPackage rec { 12 + pname = "setuptools-scm-tests"; 13 + inherit (setuptools-scm) version; 14 + 15 + src = setuptools-scm.src; 16 + 17 + dontBuild = true; 18 + dontInstall = true; 19 + 20 + checkInputs = [ 21 + pytestCheckHook 22 + setuptools-scm 23 + pip 24 + virtualenv 25 + git 26 + mercurial 27 + ]; 28 + 29 + disabledTests = [ 30 + # network access 31 + "test_pip_download" 32 + ]; 33 + }
+4 -2
pkgs/development/python-modules/sphinx/default.nix
··· 23 23 , sphinxcontrib-websupport 24 24 # check phase 25 25 , html5lib 26 - , imagemagick 27 26 , pytestCheckHook 28 27 , typed-ast 29 28 }: ··· 70 69 ]; 71 70 72 71 checkInputs = [ 73 - imagemagick 74 72 html5lib 75 73 pytestCheckHook 76 74 ] ++ lib.optionals (pythonOlder "3.8") [ ··· 83 81 "test_defaults" 84 82 "test_defaults_json" 85 83 "test_latex_images" 84 + 85 + # requires imagemagick (increases build closure size), doesn't 86 + # test anything substantial 87 + "test_ext_imgconverter" 86 88 ]; 87 89 88 90 meta = with lib; {
+2 -2
pkgs/development/python-modules/sqlalchemy/default.nix
··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "SQLAlchemy"; 16 - version = "1.4.22"; 16 + version = "1.4.23"; 17 17 18 18 src = fetchPypi { 19 19 inherit pname version; 20 - sha256 = "sha256-7BvibNzNYNGANZpSfVmA2VmiYmmix7GzJ6HuoMqzftg="; 20 + sha256 = "sha256-dv8kaIH1KAib8ZOFExuWYZe7SUZTmQOW0s4TjipEdYM="; 21 21 }; 22 22 23 23 propagatedBuildInputs = [
+7 -5
pkgs/development/python-modules/trustme/default.nix
··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "trustme"; 16 - version = "0.8.0"; 16 + version = "0.9.0"; 17 17 18 18 src = fetchPypi { 19 19 inherit pname version; 20 - sha256 = "3dcfbe186bf33d146347c6180b67564257f2708960027ab6d24fea2865daabca"; 20 + sha256 = "sha256-XgeyPXDO7WTzuzauS5q8UjVMFsmNRasDe+4rX7/+WGw="; 21 21 }; 22 22 23 23 checkInputs = [ ··· 42 42 # Some of the tests use localhost networking. 43 43 __darwinAllowLocalNetworking = true; 44 44 45 - meta = { 45 + pythonImportsCheck = [ "trustme" ]; 46 + 47 + meta = with lib; { 46 48 description = "High quality TLS certs while you wait, for the discerning tester"; 47 49 homepage = "https://github.com/python-trio/trustme"; 48 - license = with lib.licenses; [ mit asl20 ]; 49 - maintainers = with lib.maintainers; [ catern ]; 50 + license = with licenses; [ mit asl20 ]; 51 + maintainers = with maintainers; [ catern ]; 50 52 }; 51 53 }
+3 -3
pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "bazel-remote"; 8 - version = "2.1.1"; 8 + version = "2.1.3"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "buchgr"; 12 12 repo = pname; 13 13 rev = "v${version}"; 14 - sha256 = "sha256-tPjjYudUI+LlmdnEvHh+kUpAbmhiNPYhjf8fMglrzIM="; 14 + sha256 = "sha256-pTsiXyIgY0caKZbucwaJqdOs9a+w7PH6tVzNNNxqYyg="; 15 15 }; 16 16 17 - vendorSha256 = "sha256-JNVzy4WbpwH9ZfO78AHQM8pak/ZVQqapxxs9QraMhDo="; 17 + vendorSha256 = "sha256-N0UfC/M6EBbnpBpOTNkGgFEJpTA3VQ2jg9M7kxQQQc8="; 18 18 19 19 doCheck = false; 20 20
-15
pkgs/development/tools/misc/gnum4/darwin-secure-format.patch
··· 1 - With format string strictness, High Sierra also enforces that %n isn't used 2 - in dynamic format strings, but we should just disable its use on darwin in 3 - general. 4 - 5 - --- a/lib/vasnprintf.c 2017-06-22 15:19:15.000000000 -0700 6 - +++ b/lib/vasnprintf.c 2017-06-22 15:20:20.000000000 -0700 7 - @@ -4869,7 +4869,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * 8 - #endif 9 - *fbp = dp->conversion; 10 - #if USE_SNPRINTF 11 - -# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) 12 - +# if !defined(__APPLE__) && !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) 13 - fbp[1] = '%'; 14 - fbp[2] = 'n'; 15 - fbp[3] = '\0';
+2 -13
pkgs/development/tools/misc/gnum4/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "gnum4"; 10 - version = "1.4.18"; 10 + version = "1.4.19"; 11 11 12 12 src = fetchurl { 13 13 url = "mirror://gnu/m4/m4-${version}.tar.bz2"; 14 - sha256 = "1xkwwq0sgv05cla0g0a01yzhk0wpsn9y40w9kh9miiiv0imxfh36"; 14 + sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg="; 15 15 }; 16 16 17 17 doCheck = false; 18 18 19 19 configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; 20 - 21 - # Upstream is aware of it; it may be in the next release. 22 - patches = 23 - [ 24 - ./s_isdir.patch 25 - (fetchurl { 26 - url = "https://sources.debian.org/data/main/m/m4/1.4.18-2/debian/patches/01-fix-ftbfs-with-glibc-2.28.patch"; 27 - sha256 = "12lmdnbml9lfvy0khpjc42riicddaz7li8wmbnsam7zsw6al11qk"; 28 - }) 29 - ] 30 - ++ lib.optional stdenv.isDarwin ./darwin-secure-format.patch; 31 20 32 21 meta = { 33 22 homepage = "https://www.gnu.org/software/m4/";
-14
pkgs/development/tools/misc/gnum4/s_isdir.patch
··· 1 - Fails to build with glibc 2.12.1 without this patch. 2 - 3 - http://lists.gnu.org/archive/html/bug-m4/2010-05/msg00002.html 4 - 5 - --- a/src/path.c 6 - +++ b/src/path.c 7 - @@ -22,6 +22,7 @@ 8 - /* Handling of path search of included files via the builtins "include" 9 - and "sinclude". */ 10 - 11 - #include "m4.h" 12 - +#include "sys/stat.h" 13 - 14 - struct includes
+23 -2
pkgs/misc/ghostscript/default.nix
··· 1 1 { config, stdenv, lib, fetchurl, pkg-config, zlib, expat, openssl, autoconf 2 2 , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec 3 - , libiconv, ijs, lcms2, fetchpatch 3 + , libiconv, ijs, lcms2, fetchpatch, callPackage 4 4 , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null 5 5 , x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little 6 6 }: ··· 44 44 (fetchpatch { 45 45 url = "https://github.com/ArtifexSoftware/ghostpdl/commit/41ef9a0bc36b9db7115fbe9623f989bfb47bbade.patch"; 46 46 sha256 = "1qpc6q1fpxshqc0mqgg36kng47kgljk50bmr8p7wn21jgfkh7m8w"; 47 + }) 48 + (fetchpatch { 49 + url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=a9bd3dec9fde"; 50 + name = "CVE-2021-3781.patch"; 51 + sha256 = "FvbH7cb3ZDCbNRz9DF0kDmLdF7OWNYk90wv44pimU58="; 47 52 }) 48 53 ./urw-font-files.patch 49 54 ./doc-no-ref.diff ··· 85 90 "--with-cups-datadir=$(out)/share/cups" 86 91 ]; 87 92 88 - doCheck = true; 93 + # make check does nothing useful 94 + doCheck = false; 89 95 90 96 # don't build/install statically linked bin/gs 91 97 buildFlags = [ "so" ]; ··· 115 121 runHook preInstallCheck 116 122 117 123 $out/bin/gs --version 124 + pushd examples 125 + for f in *.{ps,eps,pdf}; do 126 + echo "Rendering $f" 127 + $out/bin/gs \ 128 + -dNOPAUSE \ 129 + -dBATCH \ 130 + -sDEVICE=bitcmyk \ 131 + -sOutputFile=/dev/null \ 132 + -r600 \ 133 + -dBufferSpace=100000 \ 134 + $f 135 + done 136 + popd # examples 118 137 119 138 runHook postInstallCheck 120 139 ''; 140 + 141 + passthru.tests.test-corpus-render = callPackage ./test-corpus-render.nix {}; 121 142 122 143 meta = { 123 144 homepage = "https://www.ghostscript.com/";
+38
pkgs/misc/ghostscript/test-corpus-render.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchgit 4 + , ghostscript 5 + }: 6 + 7 + stdenv.mkDerivation { 8 + pname = "ghostscript-test-corpus-render"; 9 + version = "unstable-2020-02-19"; 10 + 11 + src = fetchgit { 12 + url = "git://git.ghostscript.com/tests.git"; 13 + rev = "efdd224340d9a407ed3ec22afa1cb127c8fee73c"; 14 + sha256 = "1v1iqz897zzrwa8ng22zcf3y61ab5798jdwidgv10w1r9mjrl7ax"; 15 + }; 16 + 17 + dontConfigure = true; 18 + dontBuild = true; 19 + 20 + doCheck = true; 21 + checkPhase = '' 22 + find . -iregex '.*\.\(ps\|eps\|pdf\)' | while read f; do 23 + echo "Rendering $f" 24 + ${ghostscript}/bin/gs \ 25 + -dNOPAUSE \ 26 + -dBATCH \ 27 + -sDEVICE=bitcmyk \ 28 + -sOutputFile=/dev/null \ 29 + -r600 \ 30 + -dBufferSpace=100000 \ 31 + $f 32 + done 33 + ''; 34 + 35 + installPhase = '' 36 + touch $out 37 + ''; 38 + }
+22
pkgs/os-specific/bsd/netbsd/compat-dont-configure-twice.patch
··· 1 + commit f2d0ff85e05b49e9d11735ce4810b242c1dbf5af 2 + Author: John Ericson <John.Ericson@Obsidian.Systems> 3 + Date: Wed Sep 1 15:38:56 2021 +0000 4 + 5 + Make should not hit configure 6 + 7 + diff --git a/Makefile b/Makefile 8 + index b5adb8a5f2e9..1a914ef16739 100644 9 + --- a/Makefile 10 + +++ b/Makefile 11 + @@ -76,11 +76,6 @@ _CURDIR:= ${.CURDIR} 12 + 13 + SRCS:= ${SRCS:M*.c} 14 + 15 + -config.cache: include/.stamp configure nbtool_config.h.in defs.mk.in 16 + - rm -f ${.TARGET} 17 + - CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} LDFLAGS=${HOST_LDFLAGS:Q} \ 18 + - ${HOST_SH} ${.CURDIR}/configure --cache-file=config.cache 19 + - 20 + defs.mk: config.cache 21 + @touch ${.TARGET} 22 +
+101
pkgs/os-specific/bsd/netbsd/compat-no-force-native.patch
··· 1 + commit 5acf3bdea5140e90135d15d6479f29fbf624f75e 2 + Author: John Ericson <John.Ericson@Obsidian.Systems> 3 + Date: Wed Sep 1 15:38:56 2021 +0000 4 + 5 + Don't force building and installing for the build platform 6 + 7 + Also remove `compat/` subdir from install directories. 8 + 9 + diff --git a/Makefile b/Makefile 10 + index 4bcf227f0e75..9ed1d6eea6ff 100644 11 + --- a/Makefile 12 + +++ b/Makefile 13 + @@ -1,6 +1,6 @@ 14 + # $NetBSD: Makefile,v 1.87 2019/05/08 02:25:50 thorpej Exp $ 15 + 16 + -HOSTLIB= nbcompat 17 + +LIB= nbcompat 18 + 19 + -.include <bsd.hostinit.mk> 20 + +.include <bsd.own.mk> 21 + 22 + @@ -94,63 +94,37 @@ include/.stamp: 23 + 24 + # Install rules 25 + 26 + -HOST_LIBDIR= ${TOOLDIR}/lib 27 + -HOST_INCSDIR= ${TOOLDIR}/include 28 + -HOST_SHAREDIR= ${TOOLDIR}/share 29 + - 30 + -install: .PHONY install.lib includes install.defs.mk 31 + - 32 + -# Install lib${HOSTLIB}.a in ${TOOLDIR}/lib 33 + -install.lib: .PHONY ${HOST_LIBDIR}/lib${HOSTLIB}.a 34 + -${HOST_LIBDIR}/lib${HOSTLIB}.a: lib${HOSTLIB}.a 35 + - ${_MKTARGET_INSTALL} 36 + - ${HOST_INSTALL_DIR} ${HOST_LIBDIR} 37 + - ${HOST_INSTALL_FILE} -m ${LIBMODE} ${.ALLSRC} ${.TARGET} 38 + +install: .PHONY includes install.defs.mk 39 + 40 + .for _f in ${INCFILES} 41 + -HOST_INCINSTFILES+= ${HOST_INCSDIR}/compat/${_f} 42 + -${HOST_INCSDIR}/compat/${_f}: ${_f} 43 + +INCINSTFILES+= ${INCSDIR}/${_f} 44 + +${INCSDIR}/${_f}: ${_f} 45 + ${_MKTARGET_INSTALL} 46 + - ${HOST_INSTALL_FILE} ${.ALLSRC} ${.TARGET} 47 + + ${INSTALL_FILE} ${.ALLSRC} ${.TARGET} 48 + .endfor 49 + 50 + .for _d in ${INCSUBDIRS} 51 + -HOST_INCINSTDIRS+= ${HOST_INCSDIR}/compat/${_d} 52 + -${HOST_INCSDIR}/compat/${_d}: 53 + +INCINSTDIRS+= ${INCSDIR}/${_d} 54 + +${INCSDIR}/${_d}: 55 + ${_MKTARGET_INSTALL} 56 + - ${HOST_INSTALL_DIR} ${.TARGET} 57 + + ${INSTALL_DIR} ${.TARGET} 58 + .endfor 59 + 60 + -# Install include files in ${TOOLDIR}/include/compat 61 + -includes: .PHONY ${HOST_INCINSTDIRS} .WAIT ${HOST_INCINSTFILES} 62 + +# Install include files in ${INCSDIR} 63 + +includes: .PHONY ${INCINSTDIRS} .WAIT ${INCINSTFILES} 64 + @(cd include && find . -name '*.h' -print | while read f ; do \ 65 + - ${HOST_INSTALL_FILE} $$f ${HOST_INCSDIR}/compat/$$f ; \ 66 + + ${INSTALL_FILE} $$f ${INCSDIR}/$$f ; \ 67 + done) 68 + 69 + 70 + -# Install defs.mk in ${TOOLDIR}/share/compat 71 + -install.defs.mk: .PHONY ${HOST_SHAREDIR}/compat/defs.mk 72 + -${HOST_SHAREDIR}/compat/defs.mk: defs.mk 73 + +# Install defs.mk in ${DATADIR} 74 + +install.defs.mk: .PHONY ${DATADIR}/defs.mk 75 + +${DATADIR}/defs.mk: defs.mk 76 + ${_MKTARGET_INSTALL} 77 + - ${HOST_INSTALL_DIR} ${HOST_SHAREDIR} 78 + - ${HOST_INSTALL_DIR} ${HOST_SHAREDIR}/compat 79 + - ${HOST_INSTALL_FILE} ${.ALLSRC} ${.TARGET} 80 + - 81 + -# bsd.hostlib.mk wants HOST_CPPFLAGS, not CPPFLAGS 82 + - 83 + -HOST_CPPFLAGS:= ${CPPFLAGS} 84 + -CPPFLAGS:= # empty 85 + - 86 + -.include <bsd.hostlib.mk> 87 + - 88 + -# Use uninstalled copy of host-mkdep 89 + -HOST_MKDEP_OBJ!= cd ${.CURDIR}/../host-mkdep && ${PRINTOBJDIR} 90 + -HOST_MKDEP= ${HOST_MKDEP_OBJ}/host-mkdep 91 + -MKDEP= ${HOST_MKDEP} 92 + + ${INSTALL_DIR} ${DATADIR} 93 + + ${INSTALL_FILE} ${.ALLSRC} ${.TARGET} 94 + 95 + -# Use uninstalled copy of the install program 96 + -INSTALL_OBJ!= cd ${NETBSDSRCDIR}/tools/binstall && ${PRINTOBJDIR} 97 + -INSTALL= ${INSTALL_OBJ}/xinstall 98 + +.include <bsd.lib.mk> 99 + 100 + # Run "${TOOLDIR}/bin/nbmake-${MACHINE} regen" by hand after editing 101 + # configure.ac. See more detailed instructions in configure.ac.
pkgs/os-specific/bsd/netbsd/compat.patch pkgs/os-specific/bsd/netbsd/compat-cxx-safe-header.patch
+142 -43
pkgs/os-specific/bsd/netbsd/default.nix
··· 16 16 tag = "netbsd-${lib.replaceStrings ["."] ["-"] version}-RELEASE"; 17 17 }; 18 18 19 + netbsdSetupHook = makeSetupHook { 20 + name = "netbsd-setup-hook"; 21 + } ./setup-hook.sh; 22 + 19 23 otherSplices = { 20 24 selfBuildBuild = pkgsBuildBuild.netbsd; 21 25 selfBuildHost = pkgsBuildHost.netbsd; ··· 23 27 selfHostHost = pkgsHostHost.netbsd; 24 28 selfTargetTarget = pkgsTargetTarget.netbsd or {}; # might be missing 25 29 }; 30 + 31 + defaultMakeFlags = [ 32 + "MKSOFTFLOAT=${if stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft" 33 + then "yes" 34 + else "no"}" 35 + ]; 26 36 27 37 in lib.makeScopeWithSplicing 28 38 splicePackages ··· 60 70 extraPaths = [ ]; 61 71 62 72 nativeBuildInputs = with buildPackages.netbsd; [ 63 - bsdSetupHook 73 + bsdSetupHook netbsdSetupHook 64 74 makeMinimal 65 75 install tsort lorder mandoc groff statHook rsync 66 76 ]; ··· 86 96 87 97 BSD_PATH = attrs.path; 88 98 99 + makeFlags = defaultMakeFlags; 100 + 89 101 strictDeps = true; 90 102 91 103 meta = with lib; { ··· 93 105 platforms = platforms.unix; 94 106 license = licenses.bsd2; 95 107 }; 108 + 96 109 } // lib.optionalAttrs stdenv'.hasCC { 97 110 # TODO should CC wrapper set this? 98 111 CPP = "${stdenv'.cc.targetPrefix}cpp"; ··· 118 131 version = "9.2"; 119 132 120 133 buildInputs = with self; []; 121 - nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook rsync ]; 134 + nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook netbsdSetupHook rsync ]; 122 135 123 136 skipIncludesPhase = true; 124 137 ··· 126 139 patchShebangs configure 127 140 ${self.make.postPatch} 128 141 ''; 142 + 129 143 buildPhase = '' 130 144 runHook preBuild 131 145 ··· 133 147 134 148 runHook postBuild 135 149 ''; 150 + 136 151 installPhase = '' 137 152 runHook preInstall 138 153 ··· 143 158 144 159 runHook postInstall 145 160 ''; 161 + 146 162 extraPaths = with self; [ make.src ] ++ make.extraPaths; 147 163 }; 148 164 ··· 159 175 ./compat-setup-hook.sh 160 176 ]; 161 177 162 - # the build system re-runs `./configure` with `HOST_CC` (which is their 163 - # name for Build CC) as a compiler to make `defs.mk`, which is installed 164 - depsBuildBuild = [ buildPackages.stdenv.cc ] ++ commonDeps; 165 - HOST_CC = "${buildPackages.stdenv.cc.targetPrefix}cc"; 178 + preConfigure = '' 179 + make include/.stamp configure nbtool_config.h.in defs.mk.in 180 + ''; 181 + 182 + configurePlatforms = [ "build" "host" ]; 183 + configureFlags = [ 184 + "--cache-file=config.cache" 185 + ]; 166 186 167 187 nativeBuildInputs = with buildPackages.netbsd; commonDeps ++ [ 168 - bsdSetupHook 188 + bsdSetupHook netbsdSetupHook 169 189 makeMinimal 170 190 rsync 171 191 ]; ··· 174 194 175 195 # temporarily use gnuinstall for bootstrapping 176 196 # bsdinstall will be built later 177 - makeFlags = [ 197 + makeFlags = defaultMakeFlags ++ [ 178 198 "INSTALL=${buildPackages.coreutils}/bin/install" 179 - "TOOLDIR=$(out)" 199 + "DATADIR=$(out)/share" 200 + # Can't sort object files yet 201 + "LORDER=echo" 202 + "TSORT=cat" 203 + # Can't process man pages yet 204 + "MKSHARE=no" 205 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 206 + # GNU objcopy produces broken .a libs which won't link into dependers. 207 + # Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here. 208 + "OBJCOPY=${buildPackages.darwin.cctools}/bin/strip" 180 209 ]; 181 210 RENAME = "-D"; 182 211 183 - patches = [ ./compat.patch ]; 212 + passthru.tests = { netbsd-install = self.install; }; 213 + 214 + patches = [ 215 + ./compat-cxx-safe-header.patch 216 + ./compat-dont-configure-twice.patch 217 + ./compat-no-force-native.patch 218 + ]; 219 + 220 + preInstall = '' 221 + makeFlagsArray+=('INSTALL_FILE=''${INSTALL} ''${COPY} ''${PRESERVE} ''${RENAME}') 222 + makeFlagsArray+=('INSTALL_DIR=''${INSTALL} -d') 223 + makeFlagsArray+=('INSTALL_SYMLINK=''${INSTALL} ''${SYMLINK} ''${RENAME}') 224 + ''; 184 225 185 226 postInstall = '' 186 - mv $out/include/compat/* $out/include 187 - rmdir $out/include/compat 188 - 189 227 # why aren't these installed by netbsd? 190 228 install -D compat_defs.h $out/include/compat_defs.h 191 229 install -D $BSDSRCDIR/include/cdbw.h $out/include/cdbw.h ··· 238 276 sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; 239 277 extraPaths = with self; [ mtree.src make.src ]; 240 278 nativeBuildInputs = with buildPackages.netbsd; [ 241 - bsdSetupHook 279 + bsdSetupHook netbsdSetupHook 242 280 makeMinimal 243 281 mandoc groff rsync 244 282 ]; ··· 254 292 255 293 runHook postInstall 256 294 ''; 295 + setupHook = ./install-setup-hook.sh; 257 296 }; 258 297 259 298 fts = mkDerivation { ··· 262 301 sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; 263 302 version = "9.2"; 264 303 nativeBuildInputs = with buildPackages.netbsd; [ 265 - bsdSetupHook rsync 304 + bsdSetupHook netbsdSetupHook rsync 266 305 ]; 267 306 propagatedBuildInputs = with self; compatIfNeeded; 268 307 extraPaths = with self; [ ··· 298 337 version = "9.2"; 299 338 sha256 = "18nqwlndfc34qbbgqx5nffil37jfq9aw663ippasfxd2hlyc106x"; 300 339 nativeBuildInputs = with buildPackages.netbsd; [ 301 - bsdSetupHook 340 + bsdSetupHook netbsdSetupHook 302 341 makeMinimal 303 342 install mandoc groff rsync 304 343 ]; ··· 320 359 version = "9.2"; 321 360 sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; 322 361 nativeBuildInputs = with buildPackages.netbsd; [ 323 - bsdSetupHook 362 + bsdSetupHook netbsdSetupHook 324 363 makeMinimal 325 364 install mandoc groff rsync 326 365 ]; ··· 331 370 version = "9.2"; 332 371 sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; 333 372 nativeBuildInputs = with buildPackages.netbsd; [ 334 - bsdSetupHook 373 + bsdSetupHook netbsdSetupHook 335 374 makeMinimal 336 375 install mandoc groff rsync 337 376 ]; ··· 347 386 path = "usr.bin/make"; 348 387 sha256 = "0vi73yicbmbp522qzqvd979cx6zm5jakhy77xh73c1kygf8klccs"; 349 388 version = "9.2"; 350 - postPatch = '' 389 + 390 + postPatch = '' 391 + substituteInPlace $BSDSRCDIR/share/mk/bsd.doc.mk \ 392 + --replace '-o ''${DOCOWN}' "" \ 393 + --replace '-g ''${DOCGRP}' "" 394 + for mk in $BSDSRCDIR/share/mk/bsd.inc.mk $BSDSRCDIR/share/mk/bsd.kinc.mk; do 395 + substituteInPlace $mk \ 396 + --replace '-o ''${BINOWN}' "" \ 397 + --replace '-g ''${BINGRP}' "" 398 + done 399 + substituteInPlace $BSDSRCDIR/share/mk/bsd.kmodule.mk \ 400 + --replace '-o ''${KMODULEOWN}' "" \ 401 + --replace '-g ''${KMODULEGRP}' "" 402 + substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \ 403 + --replace '-o ''${LIBOWN}' "" \ 404 + --replace '-g ''${LIBGRP}' "" \ 405 + --replace '-o ''${DEBUGOWN}' "" \ 406 + --replace '-g ''${DEBUGGRP}' "" 407 + substituteInPlace $BSDSRCDIR/share/mk/bsd.lua.mk \ 408 + --replace '-o ''${LIBOWN}' "" \ 409 + --replace '-g ''${LIBGRP}' "" 410 + substituteInPlace $BSDSRCDIR/share/mk/bsd.man.mk \ 411 + --replace '-o ''${MANOWN}' "" \ 412 + --replace '-g ''${MANGRP}' "" 413 + substituteInPlace $BSDSRCDIR/share/mk/bsd.nls.mk \ 414 + --replace '-o ''${NLSOWN}' "" \ 415 + --replace '-g ''${NLSGRP}' "" 416 + substituteInPlace $BSDSRCDIR/share/mk/bsd.prog.mk \ 417 + --replace '-o ''${BINOWN}' "" \ 418 + --replace '-g ''${BINGRP}' "" \ 419 + --replace '-o ''${RUMPBINOWN}' "" \ 420 + --replace '-g ''${RUMPBINGRP}' "" \ 421 + --replace '-o ''${DEBUGOWN}' "" \ 422 + --replace '-g ''${DEBUGGRP}' "" 423 + 351 424 # make needs this to pick up our sys make files 352 425 export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" 353 426 ··· 433 506 HOSTPROG = "tic"; 434 507 buildInputs = with self; compatIfNeeded; 435 508 nativeBuildInputs = with buildPackages.netbsd; [ 436 - bsdSetupHook 509 + bsdSetupHook netbsdSetupHook 437 510 makeMinimal 438 511 install mandoc groff nbperf 439 512 ]; 440 - makeFlags = [ "TOOLDIR=$(out)" ]; 513 + makeFlags = defaultMakeFlags ++ [ "TOOLDIR=$(out)" ]; 441 514 extraPaths = with self; [ 442 515 libterminfo.src 443 516 (fetchNetBSD "usr.bin/tic" "9.2" "1mwdfg7yx1g43ss378qsgl5rqhsxskqvsd2mqvrn38qw54i8v5i1") ··· 465 538 sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj"; 466 539 NIX_CFLAGS_COMPILE = [ "-DMAKE_BOOTSTRAP" ]; 467 540 nativeBuildInputs = with buildPackages.netbsd; [ 468 - bsdSetupHook 541 + bsdSetupHook netbsdSetupHook 469 542 makeMinimal install mandoc byacc flex rsync 470 543 ]; 471 544 buildInputs = with self; compatIfNeeded; ··· 483 556 version = "9.2"; 484 557 sha256 = "0nxnmj4c8s3hb9n3fpcmd0zl3l1nmhivqgi9a35sis943qvpgl9h"; 485 558 nativeBuildInputs = with buildPackages.netbsd; [ 486 - bsdSetupHook 559 + bsdSetupHook netbsdSetupHook 487 560 makeMinimal 488 561 install mandoc groff rsync nbperf rpcgen 489 562 ]; 563 + 564 + # The makefiles define INCSDIR per subdirectory, so we have to set 565 + # something else on the command line so those definitions aren't 566 + # overridden. 567 + postPatch = '' 568 + find "$BSDSRCDIR" -name Makefile -exec \ 569 + sed -i -E \ 570 + -e 's_/usr/include_''${INCSDIR0}_' \ 571 + {} \; 572 + ''; 573 + 574 + # multiple header dirs, see above 575 + postConfigure = '' 576 + makeFlags=''${makeFlags/INCSDIR/INCSDIR0} 577 + ''; 578 + 490 579 extraPaths = with self; [ common ]; 491 580 headersOnly = true; 492 581 noCC = true; 493 582 meta.platforms = lib.platforms.netbsd; 494 - makeFlags = [ "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" ]; 583 + makeFlags = defaultMakeFlags ++ [ "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" ]; 495 584 }; 496 585 497 586 common = fetchNetBSD "common" "9.2" "1pfylz9r3ap5wnwwbwczbfjb1m5qdyspzbnmxmcdkpzz2zgj64b9"; ··· 502 591 version = "9.2"; 503 592 sha256 = "03s18q8d9giipf05bx199fajc2qwikji0djz7hw63d2lya6bfnpj"; 504 593 505 - # Fix this error when building bootia32.efi and bootx64.efi: 506 - # error: PHDR segment not covered by LOAD segment 507 - patches = [ ./no-dynamic-linker.patch ]; 594 + patches = [ 595 + # Fix this error when building bootia32.efi and bootx64.efi: 596 + # error: PHDR segment not covered by LOAD segment 597 + ./no-dynamic-linker.patch 598 + 599 + # multiple header dirs, see above 600 + ./sys-headers-incsdir.patch 601 + ]; 602 + 603 + # multiple header dirs, see above 604 + inherit (self.include) postPatch; 508 605 509 606 CONFIG = "GENERIC"; 510 607 511 608 propagatedBuildInputs = with self; [ include ]; 512 609 nativeBuildInputs = with buildPackages.netbsd; [ 513 - bsdSetupHook 610 + bsdSetupHook netbsdSetupHook 514 611 makeMinimal install tsort lorder statHook rsync uudecode config genassym 515 612 ]; 516 613 ··· 518 615 pushd arch/$MACHINE/conf 519 616 config $CONFIG 520 617 popd 521 - ''; 618 + '' 619 + # multiple header dirs, see above 620 + + self.include.postConfigure; 522 621 523 - makeFlags = [ "FIRMWAREDIR=$(out)/libdata/firmware" ]; 622 + makeFlags = defaultMakeFlags ++ [ "FIRMWAREDIR=$(out)/libdata/firmware" ]; 524 623 hardeningDisable = [ "pic" ]; 525 624 MKKMOD = "no"; 526 625 NIX_CFLAGS_COMPILE = [ "-Wa,--no-warn" ]; ··· 573 672 sha256 = "02gm5a5zhh8qp5r5q5r7x8x6x50ir1i0ncgsnfwh1vnrz6mxbq7z"; 574 673 extraPaths = with self; [ common libc.src sys.src ]; 575 674 nativeBuildInputs = with buildPackages.netbsd; [ 576 - bsdSetupHook 675 + bsdSetupHook netbsdSetupHook 577 676 makeMinimal 578 677 byacc install tsort lorder mandoc statHook 579 678 ]; ··· 588 687 buildInputs = with self; [ libterminfo libcurses ]; 589 688 propagatedBuildInputs = with self; compatIfNeeded; 590 689 SHLIBINSTALLDIR = "$(out)/lib"; 591 - makeFlags = [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; 690 + makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; 592 691 postPatch = '' 593 692 sed -i '1i #undef bool_t' el.h 594 693 substituteInPlace config.h \ ··· 607 706 version = "9.2"; 608 707 sha256 = "0pq05k3dj0dfsczv07frnnji92mazmy2qqngqbx2zgqc1x251414"; 609 708 nativeBuildInputs = with buildPackages.netbsd; [ 610 - bsdSetupHook 709 + bsdSetupHook netbsdSetupHook 611 710 makeMinimal install tsort lorder mandoc statHook nbperf tic 612 711 ]; 613 712 buildInputs = with self; compatIfNeeded; ··· 640 739 ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; 641 740 propagatedBuildInputs = with self; compatIfNeeded; 642 741 MKDOC = "no"; # missing vfontedpr 643 - makeFlags = [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; 742 + makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; 644 743 postPatch = lib.optionalString (!stdenv.isDarwin) '' 645 744 substituteInPlace printw.c \ 646 745 --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ ··· 667 766 path = "lib/librpcsvc"; 668 767 version = "9.2"; 669 768 sha256 = "1q34pfiyjbrgrdqm46jwrsqms49ly6z3b0xh1wg331zga900vq5n"; 670 - makeFlags = [ "INCSDIR=$(out)/include/rpcsvc" ]; 769 + makeFlags = defaultMakeFlags ++ [ "INCSDIR=$(out)/include/rpcsvc" ]; 671 770 meta.platforms = lib.platforms.netbsd; 672 771 nativeBuildInputs = with buildPackages.netbsd; [ 673 - bsdSetupHook 772 + bsdSetupHook netbsdSetupHook 674 773 makeMinimal 675 774 install tsort lorder rpcgen statHook 676 775 ]; ··· 748 847 sha256 = "0al5jfazvhlzn9hvmnrbchx4d0gm282hq5gp4xs2zmj9ycmf6d03"; 749 848 meta.platforms = lib.platforms.netbsd; 750 849 nativeBuildInputs = with buildPackages.netbsd; [ 751 - bsdSetupHook 850 + bsdSetupHook netbsdSetupHook 752 851 makeMinimal 753 852 install mandoc groff flex 754 853 byacc genassym gencat lorder tsort statHook rsync ··· 766 865 # Hack to prevent a symlink being installed here for compatibility. 767 866 SHLINKINSTALLDIR = "/usr/libexec"; 768 867 USE_FORT = "yes"; 769 - makeFlags = [ "BINDIR=$(out)/libexec" "CLIBOBJ=${self.libc}/lib" ]; 868 + makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/libexec" "CLIBOBJ=${self.libc}/lib" ]; 770 869 extraPaths = with self; [ libc.src ] ++ libc.extraPaths; 771 870 }; 772 871 ··· 786 885 (fetchNetBSD "external/bsd/jemalloc" "9.2" "0cq704swa0h2yxv4gc79z2lwxibk9k7pxh3q5qfs7axx3jx3n8kb") 787 886 ]; 788 887 nativeBuildInputs = with buildPackages.netbsd; [ 789 - bsdSetupHook 888 + bsdSetupHook netbsdSetupHook 790 889 makeMinimal 791 890 install mandoc groff flex 792 891 byacc genassym gencat lorder tsort statHook rsync rpcgen ··· 797 896 SHLIBINSTALLDIR = "$(out)/lib"; 798 897 MKPICINSTALL = "yes"; 799 898 NLSDIR = "$(out)/share/nls"; 800 - makeFlags = [ "FILESDIR=$(out)/var/db"]; 899 + makeFlags = defaultMakeFlags ++ [ "FILESDIR=$(out)/var/db"]; 801 900 postInstall = '' 802 901 pushd ${self.headers} 803 902 find . -type d -exec mkdir -p $out/\{} \; ··· 851 950 noCC = true; 852 951 version = "9.2"; 853 952 sha256 = "0svfc0byk59ri37pyjslv4c4rc7zw396r73mr593i78d39q5g3ad"; 854 - makeFlags = [ "BINDIR=$(out)/share" ]; 953 + makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; 855 954 }; 856 955 857 956 misc = mkDerivation { ··· 859 958 noCC = true; 860 959 version = "9.2"; 861 960 sha256 = "1j2cdssdx6nncv8ffj7f7ybl7m9hadjj8vm8611skqdvxnjg6nbc"; 862 - makeFlags = [ "BINDIR=$(out)/share" ]; 961 + makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; 863 962 }; 864 963 865 964 man = mkDerivation { ··· 867 966 noCC = true; 868 967 version = "9.2"; 869 968 sha256 = "1l4lmj4kmg8dl86x94sr45w0xdnkz8dn4zjx0ipgr9bnq98663zl"; 870 - makeFlags = [ "FILESDIR=$(out)/share" ]; 969 + makeFlags = defaultMakeFlags ++ [ "FILESDIR=$(out)/share" ]; 871 970 }; 872 971 # 873 972 # END MISCELLANEOUS
+8
pkgs/os-specific/bsd/netbsd/install-setup-hook.sh
··· 1 + addNetBSDInstallMakeFlags() { 2 + export INSTALL_FILE="install -U -c" 3 + export INSTALL_DIR="install -U -d" 4 + export INSTALL_LINK="install -U -l h" 5 + export INSTALL_SYMLINK="install -U -l s" 6 + } 7 + 8 + preConfigureHooks+=(addNetBSDInstallMakeFlags)
+15
pkgs/os-specific/bsd/netbsd/setup-hook.sh
··· 1 + mergeNetBSDSourceDir() { 2 + # merge together all extra paths 3 + # there should be a better way to do this 4 + chmod -R u+w $BSDSRCDIR 5 + for path in $extraPaths; do 6 + rsync -Er --chmod u+w $path/ $BSDSRCDIR/ 7 + done 8 + } 9 + 10 + addNetBSDMakeFlags() { 11 + makeFlags="INCSDIR=${!outputDev}/include $makeFlags" 12 + } 13 + 14 + postUnpackHooks+=(mergeNetBSDSourceDir) 15 + preConfigureHooks+=(addNetBSDMakeFlags)
+13
pkgs/os-specific/bsd/netbsd/sys-headers-incsdir.patch
··· 1 + diff --git a/Makefile b/Makefile 2 + index 3f1e18dc659d..163362b82f94 100644 3 + --- a/Makefile 4 + +++ b/Makefile 5 + @@ -2,6 +2,8 @@ 6 + 7 + .include <bsd.own.mk> 8 + 9 + +INCSDIR= ${INCSDIR0} 10 + + 11 + SUBDIR= altq arch compat dev fs miscfs \ 12 + net net80211 netatalk netbt netcan netipsec netinet netinet6 \ 13 + netmpls netsmb \
+1 -12
pkgs/os-specific/bsd/setup-hook.sh
··· 36 36 export MKUNPRIVED=yes 37 37 export EXTERNAL_TOOLCHAIN=yes 38 38 39 - export INSTALL_FILE="install -U -c" 40 - export INSTALL_DIR="xinstall -U -d" 41 - export INSTALL_LINK="install -U -l h" 42 - export INSTALL_SYMLINK="install -U -l s" 43 - 44 39 makeFlags="MACHINE=$MACHINE $makeFlags" 45 40 makeFlags="MACHINE_ARCH=$MACHINE_ARCH $makeFlags" 46 41 makeFlags="AR=$AR $makeFlags" ··· 63 58 } 64 59 65 60 setBSDSourceDir() { 66 - # merge together all extra paths 67 - # there should be a better way to do this 68 61 sourceRoot=$PWD/$sourceRoot 69 62 export BSDSRCDIR=$sourceRoot 70 63 export _SRC_TOP_=$BSDSRCDIR 71 - chmod -R u+w $sourceRoot 72 - for path in $extraPaths; do 73 - rsync -Er --chmod u+w $path/ $sourceRoot/ 74 - done 75 64 76 65 cd $sourceRoot 77 66 if [ -d "$BSD_PATH" ] ··· 85 74 86 75 local flagsArray=( 87 76 $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} 88 - DESTDIR=${!outputInclude} includes 77 + includes 89 78 ) 90 79 91 80 echoCmd 'includes flags' "${flagsArray[@]}"
+3 -2
pkgs/os-specific/linux/915resolution/default.nix
··· 1 1 {lib, stdenv, fetchurl}: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "915resolution-0.5.3"; 4 + pname = "915resolution"; 5 + version = "0.5.3"; 5 6 6 7 src = fetchurl { 7 - url = "http://915resolution.mango-lang.org/${name}.tar.gz"; 8 + url = "http://915resolution.mango-lang.org/915resolution-${version}.tar.gz"; 8 9 sha256 = "0hmmy4kkz3x6yigz6hk99416ybznd67dpjaxap50nhay9f1snk5n"; 9 10 }; 10 11
+3 -2
pkgs/os-specific/linux/acpid/default.nix
··· 1 1 { lib, stdenv, fetchurl, autoreconfHook }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "acpid-2.0.32"; 4 + pname = "acpid"; 5 + version = "2.0.32"; 5 6 6 7 src = fetchurl { 7 - url = "mirror://sourceforge/acpid2/${name}.tar.xz"; 8 + url = "mirror://sourceforge/acpid2/acpid-${version}.tar.xz"; 8 9 sha256 = "0zhmxnhnhg4v1viw82yjr22kram6k5k1ixznhayk8cnw7q5x7lpj"; 9 10 }; 10 11
+3 -2
pkgs/os-specific/linux/acpitool/default.nix
··· 7 7 }; 8 8 9 9 in stdenv.mkDerivation rec { 10 - name = "acpitool-0.5.1"; 10 + pname = "acpitool"; 11 + version = "0.5.1"; 11 12 12 13 src = fetchurl { 13 - url = "mirror://sourceforge/acpitool/${name}.tar.bz2"; 14 + url = "mirror://sourceforge/acpitool/acpitool-${version}.tar.bz2"; 14 15 sha256 = "004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f"; 15 16 }; 16 17
+2 -2
pkgs/os-specific/linux/afuse/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, fuse }: 2 2 3 3 stdenv.mkDerivation rec { 4 - pname = "afuse-0.4.1"; 4 + pname = "afuse"; 5 5 version = "0.4.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "pcarrier"; 9 9 repo = "afuse"; 10 10 rev = "v${version}"; 11 - hash = "sha256-JivJ/xRxUiR0Mnm41T0514kF+T7ePeGpk4IHhWApKBo="; 11 + sha256 = "06i855h8a1w2jfly2gfy7vwhb2fp74yxbf3r69s28lki2kzwjar6"; 12 12 }; 13 13 14 14 nativeBuildInputs = [ autoreconfHook pkg-config ];
+3 -2
pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix
··· 1 1 { lib, stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "alsa-firmware-1.2.1"; 4 + pname = "alsa-firmware"; 5 + version = "1.2.1"; 5 6 6 7 src = fetchurl { 7 - url = "mirror://alsa/firmware/${name}.tar.bz2"; 8 + url = "mirror://alsa/firmware/alsa-firmware-${version}.tar.bz2"; 8 9 sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf"; 9 10 }; 10 11
+3 -2
pkgs/os-specific/linux/audit/default.nix
··· 8 8 assert enablePython -> python != null; 9 9 10 10 stdenv.mkDerivation rec { 11 - name = "audit-2.8.5"; # at the next release, remove the patches below! 11 + pname = "audit"; 12 + version = "2.8.5"; # at the next release, remove the patches below! 12 13 13 14 src = fetchurl { 14 - url = "https://people.redhat.com/sgrubb/audit/${name}.tar.gz"; 15 + url = "https://people.redhat.com/sgrubb/audit/audit-${version}.tar.gz"; 15 16 sha256 = "1dzcwb2q78q7x41shcachn7f4aksxbxd470yk38zh03fch1l2p8f"; 16 17 }; 17 18
+2 -2
pkgs/os-specific/linux/bluez/default.nix
··· 21 21 ]; 22 22 in stdenv.mkDerivation rec { 23 23 pname = "bluez"; 24 - version = "5.60"; 24 + version = "5.61"; 25 25 26 26 src = fetchurl { 27 27 url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; 28 - sha256 = "sha256-cQmZWA0B7lnsWF5efAf9lO3e3AAaom/nRkxUb52UUwQ="; 28 + sha256 = "sha256-g6/WxSF5VUv+q7y1OP7C62vpCorDxAhxtJ162LScQjs="; 29 29 }; 30 30 31 31 buildInputs = [
+3 -2
pkgs/os-specific/linux/bridge-utils/default.nix
··· 1 1 { lib, stdenv, fetchurl, autoreconfHook }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "bridge-utils-1.5"; 4 + pname = "bridge-utils"; 5 + version = "1.5"; 5 6 6 7 src = fetchurl { 7 - url = "mirror://sourceforge/bridge/${name}.tar.gz"; 8 + url = "mirror://sourceforge/bridge/bridge-utils-${version}.tar.gz"; 8 9 sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688"; 9 10 }; 10 11
+3 -2
pkgs/os-specific/linux/cpufrequtils/default.nix
··· 1 1 { lib, stdenv, fetchurl, libtool, gettext }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "cpufrequtils-008"; 4 + pname = "cpufrequtils"; 5 + version = "008"; 5 6 6 7 src = fetchurl { 7 - url = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/${name}.tar.gz"; 8 + url = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-${version}.tar.gz"; 8 9 sha256 = "127i38d4w1hv2dzdy756gmbhq25q3k34nqb2s0xlhsfhhdqs0lq0"; 9 10 }; 10 11
+4 -3
pkgs/os-specific/linux/cryptsetup/default.nix
··· 3 3 4 4 stdenv.mkDerivation rec { 5 5 pname = "cryptsetup"; 6 - version = "2.3.6"; 6 + version = "2.4.0"; 7 7 8 8 outputs = [ "out" "dev" "man" ]; 9 9 10 10 src = fetchurl { 11 - url = "mirror://kernel/linux/utils/cryptsetup/v2.3/${pname}-${version}.tar.xz"; 12 - sha256 = "sha256-spa3oh6ldsKxgGEcyxnQauyN3a7ffHBLDGqBIQwlY18="; 11 + url = "mirror://kernel/linux/utils/cryptsetup/v2.4/${pname}-${version}.tar.xz"; 12 + sha256 = "sha256-xci9oxFZqcAQ6nLnCAU8xCUs9e69ylIOFQq8Bgkof/g="; 13 13 }; 14 14 15 15 # Disable 4 test cases that fail in a sandbox ··· 29 29 configureFlags = [ 30 30 "--enable-cryptsetup-reencrypt" 31 31 "--with-crypto_backend=openssl" 32 + "--disable-ssh-token" 32 33 ]; 33 34 34 35 nativeBuildInputs = [ pkg-config ];
+2 -1
pkgs/os-specific/linux/devmem2/default.nix
··· 1 1 { lib, stdenv, fetchurl }: 2 2 3 3 stdenv.mkDerivation { 4 - name = "devmem2-2004-08-05"; 4 + pname = "devmem2"; 5 + version = "unstable-2004-08-05"; 5 6 6 7 src = fetchurl { 7 8 urls = [
+2 -1
pkgs/os-specific/linux/disk-indicator/default.nix
··· 1 1 { lib, stdenv, fetchgit, libX11 }: 2 2 3 3 stdenv.mkDerivation { 4 - name = "disk-indicator-2014-05-19"; 4 + pname = "disk-indicator"; 5 + version = "unstable-2014-05-19"; 5 6 6 7 src = fetchgit { 7 8 url = "git://github.com/MeanEYE/Disk-Indicator.git";
+3 -2
pkgs/os-specific/linux/dmidecode/default.nix
··· 1 1 { lib, stdenv, fetchurl, fetchpatch }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "dmidecode-3.2"; 4 + pname = "dmidecode"; 5 + version = "3.2"; 5 6 6 7 src = fetchurl { 7 - url = "mirror://savannah/dmidecode/${name}.tar.xz"; 8 + url = "mirror://savannah/dmidecode/dmidecode-${version}.tar.xz"; 8 9 sha256 = "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07"; 9 10 }; 10 11
+3 -2
pkgs/os-specific/linux/dmraid/default.nix
··· 1 1 { lib, stdenv, fetchurl, fetchpatch, lvm2 }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "dmraid-1.0.0.rc16"; 4 + pname = "dmraid"; 5 + version = "1.0.0.rc16"; 5 6 6 7 src = fetchurl { 7 - url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; 8 + url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${version}.tar.bz2"; 8 9 sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq"; 9 10 }; 10 11
+3 -2
pkgs/os-specific/linux/drbd/default.nix
··· 1 1 { lib, stdenv, fetchurl, flex, systemd, perl }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "drbd-8.4.4"; 4 + pname = "drbd"; 5 + version = "8.4.4"; 5 6 6 7 src = fetchurl { 7 - url = "http://oss.linbit.com/drbd/8.4/${name}.tar.gz"; 8 + url = "http://oss.linbit.com/drbd/8.4/drbd-${version}.tar.gz"; 8 9 sha256 = "1w4889h1ak7gy9w33kd4fgjlfpgmp6hzfya16p1pkc13bjf22mm0"; 9 10 }; 10 11
+2 -1
pkgs/os-specific/linux/edac-utils/default.nix
··· 2 2 , sysfsutils, dmidecode, kmod }: 3 3 4 4 stdenv.mkDerivation { 5 - name = "edac-utils-2015-01-07"; 5 + pname = "edac-utils"; 6 + version = "unstable-2015-01-07"; 6 7 7 8 src = fetchFromGitHub { 8 9 owner = "grondo";
+2 -2
pkgs/os-specific/linux/ell/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "ell"; 10 - version = "0.42"; 10 + version = "0.43"; 11 11 12 12 outputs = [ "out" "dev" ]; 13 13 14 14 src = fetchgit { 15 15 url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; 16 16 rev = version; 17 - sha256 = "sha256-GgQhSzVqGCpljWewtevCc9rpkks7devRNp5TN+5JNN4="; 17 + sha256 = "sha256-ttKFKV8spxnkFpZHV4Dn9BxJdjxYLWYrHY+qq6uAOlg="; 18 18 }; 19 19 20 20 nativeBuildInputs = [
+3 -2
pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
··· 1 1 { lib, stdenv, fetchurl }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "b43-fwcutter-019"; 4 + pname = "b43-fwcutter"; 5 + version = "019"; 5 6 6 7 src = fetchurl { 7 - url = "https://bues.ch/b43/fwcutter/${name}.tar.bz2"; 8 + url = "https://bues.ch/b43/fwcutter/b43-fwcutter-${version}.tar.bz2"; 8 9 sha256 = "1ki1f5fy3yrw843r697f8mqqdz0pbsbqnvg4yzkhibpn1lqqbsnn"; 9 10 }; 10 11
+2 -1
pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub }: 2 2 with lib; 3 3 stdenv.mkDerivation { 4 - name = "rtl8192su-unstable-2016-10-05"; 4 + pname = "rtl8192su"; 5 + version = "unstable-2016-10-05"; 5 6 6 7 src = fetchFromGitHub { 7 8 owner = "chunkeey";
+3 -2
pkgs/os-specific/linux/fswebcam/default.nix
··· 1 1 { lib, stdenv, fetchurl, libv4l, gd }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "fswebcam-20200725"; 4 + pname = "fswebcam"; 5 + version = "2020-07-25"; 5 6 6 7 src = fetchurl { 7 - url = "https://www.sanslogic.co.uk/fswebcam/files/${name}.tar.gz"; 8 + url = "https://www.sanslogic.co.uk/fswebcam/files/fswebcam-${lib.replaceStrings ["."] [""] version}.tar.gz"; 8 9 sha256 = "1dazsrcaw9s30zz3jpxamk9lkff5dkmflp1s0jjjvdbwa0k6k6ii"; 9 10 }; 10 11
+4 -3
pkgs/os-specific/linux/fxload/default.nix
··· 1 1 {lib, stdenv, fetchurl}: 2 2 3 - stdenv.mkDerivation { 4 - name = "fxload-2002_04_11"; 3 + stdenv.mkDerivation rec { 4 + pname = "fxload"; 5 + version = "2002.04.11"; 5 6 6 7 src = fetchurl { 7 - url = "mirror://sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz"; 8 + url = "mirror://sourceforge/linux-hotplug/fxload-${lib.replaceStrings ["."] ["_"] version}.tar.gz"; 8 9 sha256 = "1hql93bp3dxrv1p67nc63xsbqwljyynm997ysldrc3n9ifi6s48m"; 9 10 }; 10 11
+3 -2
pkgs/os-specific/linux/hd-idle/default.nix
··· 1 1 { lib, stdenv, fetchurl }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "hd-idle-1.05"; 4 + pname = "hd-idle"; 5 + version = "1.05"; 5 6 6 7 src = fetchurl { 7 - url = "mirror://sourceforge/project/hd-idle/${name}.tgz"; 8 + url = "mirror://sourceforge/project/hd-idle/hd-idle-${version}.tgz"; 8 9 sha256 = "031sm996s0rhy3z91b9xvyimsj2yd2fhsww2al2hxda5s5wzxzjf"; 9 10 }; 10 11
+7 -3
pkgs/os-specific/linux/ioport/default.nix
··· 1 1 { lib, stdenv, perl, fetchurl }: 2 2 3 - stdenv.mkDerivation { 4 - name = "ioport-1.2"; 3 + stdenv.mkDerivation rec { 4 + pname = "ioport"; 5 + version = "1.2"; 6 + 5 7 src = fetchurl { 6 - url = "https://people.redhat.com/rjones/ioport/files/ioport-1.2.tar.gz"; 8 + url = "https://people.redhat.com/rjones/ioport/files/ioport-${version}.tar.gz"; 7 9 sha256 = "1h4d5g78y7kla0zl25jgyrk43wy3m3bygqg0blki357bc55irb3z"; 8 10 }; 11 + 9 12 buildInputs = [ perl ]; 13 + 10 14 meta = with lib; { 11 15 description = "Direct access to I/O ports from the command line"; 12 16 homepage = "https://people.redhat.com/rjones/ioport/";
+3 -2
pkgs/os-specific/linux/iotop/default.nix
··· 1 1 { lib, fetchurl, python3Packages, fetchpatch }: 2 2 3 3 python3Packages.buildPythonApplication rec { 4 - name = "iotop-0.6"; 4 + pname = "iotop"; 5 + version = "0.6"; 5 6 6 7 src = fetchurl { 7 - url = "http://guichaz.free.fr/iotop/files/${name}.tar.bz2"; 8 + url = "http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2"; 8 9 sha256 = "0nzprs6zqax0cwq8h7hnszdl3d2m4c2d4vjfxfxbnjfs9sia5pis"; 9 10 }; 10 11
+11 -3
pkgs/os-specific/linux/iproute/default.nix
··· 1 - { lib, stdenv, fetchurl 1 + { lib, stdenv, fetchurl, fetchpatch 2 2 , buildPackages, bison, flex, pkg-config 3 3 , db, iptables, libelf, libmnl 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "iproute2"; 8 - version = "5.13.0"; 8 + version = "5.14.0"; 9 9 10 10 src = fetchurl { 11 11 url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; 12 - sha256 = "sha256-cqLlN3TKyeZfe2F97rsgWfh+iWDW6XE+TXiM6pZvGzY="; 12 + sha256 = "1m4ifnxq7lxnm95l5354z8dk3xj6w9isxmbz53266drgln2sf3r1"; 13 13 }; 14 + 15 + patches = [ 16 + # To avoid ./configure failing due to invalid arguments: 17 + (fetchpatch { # configure: restore backward compatibility 18 + url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=a3272b93725a406bc98b67373da67a4bdf6fcdb0"; 19 + sha256 = "0hyagh2lf6rrfss4z7ca8q3ydya6gg7vfhh25slhpgcn6lnk0xbv"; 20 + }) 21 + ]; 14 22 15 23 preConfigure = '' 16 24 # Don't try to create /var/lib/arpd:
+4 -3
pkgs/os-specific/linux/iproute/mptcp.nix
··· 11 11 sha256 = "07fihvwlaj0ng8s8sxqhd0a9h1narcnp4ibk88km9cpsd32xv4q3"; 12 12 }; 13 13 14 - preConfigure = '' 15 - # Don't try to create /var/lib/arpd: 16 - sed -e '/ARPDDIR/d' -i Makefile 14 + preConfigure = oa.preConfigure + '' 17 15 patchShebangs configure 18 16 ''; 17 + 18 + # We override "patches" to never apply any iproute2 patches: 19 + patches = [ ]; 19 20 20 21 meta = with lib; { 21 22 homepage = "https://github.com/multipath-tcp/iproute-mptcp";
+3 -2
pkgs/os-specific/linux/ipsec-tools/default.nix
··· 7 7 # the time being. 8 8 9 9 stdenv.mkDerivation rec { 10 - name = "ipsec-tools-0.8.2"; 10 + pname = "ipsec-tools"; 11 + version = "0.8.2"; 11 12 12 13 src = fetchurl { 13 - url = "mirror://sourceforge/ipsec-tools/${name}.tar.bz2"; 14 + url = "mirror://sourceforge/ipsec-tools/ipsec-tools-${version}.tar.bz2"; 14 15 sha256 = "0b9gfbz78k2nj0k7jdlm5kajig628ja9qm0z5yksiwz22s3v7dlf"; 15 16 }; 16 17
+11 -2
pkgs/os-specific/linux/iwd/default.nix
··· 8 8 , readline 9 9 , openssl 10 10 , python3Packages 11 + , fetchpatch 11 12 }: 12 13 13 14 stdenv.mkDerivation rec { 14 15 pname = "iwd"; 15 - version = "1.16"; 16 + version = "1.17"; 16 17 17 18 src = fetchgit { 18 19 url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; 19 20 rev = version; 20 - sha256 = "sha256-Nu6vb5UOJ/KgmJZM4bMKwLpOoKMLcnZPYCqFBQjuCYY="; 21 + sha256 = "sha256-uWWdKjxctz8fdiIkSiuOYNcZPhxEWDXaA8QPLnd/I9c="; 21 22 }; 22 23 23 24 outputs = [ "out" "man" ] ··· 54 55 "--with-systemd-modloaddir=${placeholder "out"}/etc/modules-load.d/" # maybe 55 56 "--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/" 56 57 "--with-systemd-networkdir=${placeholder "out"}/lib/systemd/network/" 58 + ]; 59 + 60 + patches = [ 61 + # Fix failure in test-eapol. Remove when bumping to 1.18 62 + (fetchpatch { 63 + url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=ed10b00afa3f4c087b46d7ba0b60a47bd05d8b39"; 64 + sha256 = "0n8ixrbfh428ajncakcb9kd2n4fw82kw9sfskn1d9ny0lrg39nvg"; 65 + }) 57 66 ]; 58 67 59 68 postUnpack = ''
+4 -3
pkgs/os-specific/linux/jujuutils/default.nix
··· 1 1 { lib, stdenv, fetchurl, linuxHeaders }: 2 2 3 - stdenv.mkDerivation { 4 - name = "jujuutils-0.2"; 3 + stdenv.mkDerivation rec { 4 + pname = "jujuutils"; 5 + version = "0.2"; 5 6 6 7 src = fetchurl { 7 - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jujuutils/jujuutils-0.2.tar.gz"; 8 + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jujuutils/jujuutils-${version}.tar.gz"; 8 9 sha256 = "1r74m7s7rs9d6y7cffi7mdap3jf96qwm1v6jcw53x5cikgmfxn4x"; 9 10 }; 10 11
+6 -1
pkgs/os-specific/linux/kernel/common-config.nix
··· 35 35 options = { 36 36 37 37 debug = { 38 - DEBUG_INFO = if (features.debug or false) then yes else no; 38 + # Necessary for BTF 39 + DEBUG_INFO = mkMerge [ 40 + (whenOlder "5.2" (if (features.debug or false) then yes else no)) 41 + (whenAtLeast "5.2" yes) 42 + ]; 43 + DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes); 39 44 DEBUG_KERNEL = yes; 40 45 DEBUG_DEVRES = no; 41 46 DYNAMIC_DEBUG = yes;
+4 -2
pkgs/os-specific/linux/kernel/manual-config.nix
··· 1 1 { lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl 2 - , libelf, cpio, elfutils, zstd, gawk, python3Minimal 2 + , libelf, cpio, elfutils, zstd, gawk, python3Minimal, zlib, pahole 3 3 , writeTextFile 4 4 }: 5 5 ··· 316 316 ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf 317 317 # Removed util-linuxMinimal since it should not be a dependency. 318 318 ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] 319 - ++ optional (lib.versionAtLeast version "5.2") cpio 319 + ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole ] 320 320 ++ optional (lib.versionAtLeast version "5.8") elfutils 321 321 ; 322 + 323 + buildInputs = optional (lib.versionAtLeast version "5.2") zlib; 322 324 323 325 hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; 324 326
+9 -6
pkgs/os-specific/linux/kmod/darwin.patch
··· 69 69 index 4fc5405..b5a2702 100644 70 70 --- a/shared/macro.h 71 71 +++ b/shared/macro.h 72 - @@ -71,3 +71,7 @@ 73 - #endif 74 - 75 - #define UNIQ __COUNTER__ 76 - + 77 - + #if !defined(__linux__) 72 + @@ -53,6 +53,10 @@ 73 + #define CONCATENATE(x, y) XCONCATENATE(x, y) 74 + #define UNIQ(x) CONCATENATE(x, __COUNTER__) 75 + 76 + +#if !defined(__linux__) 78 77 +#define program_invocation_short_name getprogname() 79 78 +#endif 79 + + 80 + /* Temporaries for importing index handling */ 81 + #define NOFAIL(x) (x) 82 + #define fatal(x...) do { } while (0) 80 83 diff --git a/shared/missing.h b/shared/missing.h 81 84 index 4c0d136..ad8ec0f 100644 82 85 --- a/shared/missing.h
+7 -6
pkgs/os-specific/linux/kmod/default.nix
··· 1 1 { stdenv, lib, fetchurl, autoreconfHook, pkg-config 2 - , libxslt, xz, elf-header 2 + , libxslt, xz, zstd, elf-header 3 3 , withStatic ? stdenv.hostPlatform.isStatic 4 4 }: 5 5 ··· 9 9 10 10 in stdenv.mkDerivation rec { 11 11 pname = "kmod"; 12 - version = "27"; 12 + version = "29"; 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/utils/kernel/${pname}/${pname}-${version}.tar.xz"; 16 - sha256 = "035wzfzjx4nwidk747p8n085mgkvy531ppn16krrajx2dkqzply1"; 16 + sha256 = "0am54mi5rk72g5q7k6l6f36gw3r9vwgjmyna43ywcjhqmakyx00b"; 17 17 }; 18 18 19 19 nativeBuildInputs = [ autoreconfHook pkg-config libxslt ]; 20 - buildInputs = [ xz ] ++ lib.optional stdenv.isDarwin elf-header; 20 + buildInputs = [ xz zstd ] ++ lib.optional stdenv.isDarwin elf-header; 21 21 22 22 configureFlags = [ 23 23 "--sysconfdir=/etc" 24 24 "--with-xz" 25 + "--with-zstd" 25 26 "--with-modulesdirs=${modulesDirs}" 26 27 ] ++ lib.optional withStatic "--enable-static"; 27 28 28 - patches = [ ./module-dir.patch ./no-name-field.patch ] 29 + patches = [ ./module-dir.patch ] 29 30 ++ lib.optional stdenv.isDarwin ./darwin.patch 30 31 ++ lib.optional withStatic ./enable-static.patch; 31 32 ··· 49 50 homepage = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/"; 50 51 downloadPage = "https://www.kernel.org/pub/linux/utils/kernel/kmod/"; 51 52 changelog = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/plain/NEWS?h=v${version}"; 52 - license = licenses.lgpl21; 53 + license = with licenses; [ lgpl21Plus gpl2Plus ]; # GPLv2+ for tools 53 54 platforms = platforms.unix; 54 55 }; 55 56 }
-24
pkgs/os-specific/linux/kmod/no-name-field.patch
··· 1 - 2 - --- 3 - tools/modinfo.c | 5 ++++- 4 - 1 file changed, 4 insertions(+), 1 deletion(-) 5 - 6 - diff --git a/tools/modinfo.c b/tools/modinfo.c 7 - index 0231bb0..7b2259e 100644 8 - --- a/tools/modinfo.c 9 - +++ b/tools/modinfo.c 10 - @@ -178,7 +178,10 @@ static int modinfo_do(struct kmod_module *mod) 11 - is_builtin = (filename == NULL); 12 - 13 - if (is_builtin) { 14 - - printf("%-16s%s%c", "name:", kmod_module_get_name(mod), separator); 15 - + if (field == NULL || field != NULL && streq(field, "name")){ 16 - + printf("%-16s%s%c", "name:", 17 - + kmod_module_get_name(mod), separator); 18 - + } 19 - filename = "(builtin)"; 20 - } 21 - 22 - -- 23 - 2.28.0 24 -
+2 -1
pkgs/os-specific/linux/kmscube/default.nix
··· 1 1 { lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkg-config }: 2 2 3 3 stdenv.mkDerivation { 4 - name = "kmscube-2018-06-17"; 4 + pname = "kmscube"; 5 + version = "unstable-2018-06-17"; 5 6 6 7 src = fetchgit { 7 8 url = "git://anongit.freedesktop.org/mesa/kmscube";
+3 -2
pkgs/os-specific/linux/latencytop/default.nix
··· 1 1 { lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2 }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "latencytop-0.5"; 4 + pname = "latencytop"; 5 + version = "0.5"; 5 6 6 7 patchPhase = "sed -i s,/usr,$out, Makefile"; 7 8 preInstall = "mkdir -p $out/sbin"; 8 9 9 10 src = fetchurl { 10 - urls = [ "http://latencytop.org/download/${name}.tar.gz" 11 + urls = [ "http://latencytop.org/download/latencytop-${version}.tar.gz" 11 12 "http://dbg.download.sourcemage.org/mirror/latencytop-0.5.tar.gz" ]; 12 13 sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy"; 13 14 };
+3 -2
pkgs/os-specific/linux/libatasmart/default.nix
··· 1 1 { lib, stdenv, fetchurl, pkg-config, udev, buildPackages }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "libatasmart-0.19"; 4 + pname = "libatasmart"; 5 + version = "0.19"; 5 6 6 7 src = fetchurl { 7 - url = "http://0pointer.de/public/${name}.tar.xz"; 8 + url = "http://0pointer.de/public/libatasmart-${version}.tar.xz"; 8 9 sha256 = "138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31"; 9 10 }; 10 11
+2 -17
pkgs/os-specific/linux/libbpf/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "libbpf"; 10 - version = "0.1.1"; 10 + version = "0.4.0"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "libbpf"; 14 14 repo = "libbpf"; 15 15 rev = "v${version}"; 16 - sha256 = "0ilnnm4q22f8fagwp8kb37licy4ks861i2iqh2djsypqhnxvx3fv"; 16 + sha256 = "1by5w7g3i2fc10bi6f0j8jqi2nq0x8r973j2qx7qlfryjxr7b2v3"; 17 17 }; 18 - 19 - patches = [ 20 - (fetchpatch { # included upstream for > 0.1.0 21 - name = "link-zlib.patch"; 22 - url = "https://github.com/libbpf/libbpf/commit/8b14cb43ff837.diff"; 23 - sha256 = "17mvjrs7s727drz013a8qlyj0345ldi2kph6pazcmxv6kl1qrz2z"; 24 - }) 25 - ]; 26 - patchFlags = "-p2"; 27 - # https://github.com/libbpf/libbpf/pull/201#issuecomment-689174740 28 - postPatch = '' 29 - substituteInPlace ../scripts/check-reallocarray.sh \ 30 - --replace 'mktemp /tmp/' 'mktemp ' \ 31 - --replace '/bin/rm' 'rm' 32 - ''; 33 18 34 19 nativeBuildInputs = [ pkg-config ]; 35 20 buildInputs = [ libelf zlib ];
+5 -3
pkgs/os-specific/linux/libvolume_id/default.nix
··· 1 1 {lib, stdenv, fetchurl}: 2 2 3 - stdenv.mkDerivation { 4 - name = "libvolume_id-0.81.1"; 3 + stdenv.mkDerivation rec { 4 + pname = "libvolume_id"; 5 + version = "0.81.1"; 5 6 6 7 src = fetchurl { 7 - url = "https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2"; 8 + url = "https://www.marcuscom.com/downloads/libvolume_id-${version}.tar.bz2"; 8 9 sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5"; 9 10 }; 10 11 ··· 21 22 meta = with lib; { 22 23 platforms = platforms.linux; 23 24 license = licenses.gpl2; 25 + homepage = "http://www.marcuscom.com/downloads/"; 24 26 }; 25 27 }
+2 -1
pkgs/os-specific/linux/lightum/default.nix
··· 1 1 { lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }: 2 2 3 3 stdenv.mkDerivation { 4 - name = "lightum-2014-06-07"; 4 + pname = "lightum"; 5 + version = "unstable-2014-06-07"; 5 6 src = fetchgit { 6 7 url = "https://github.com/poliva/lightum"; 7 8 rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8";
+3 -2
pkgs/os-specific/linux/lksctp-tools/default.nix
··· 1 1 { lib, stdenv, fetchurl }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "lksctp-tools-1.0.17"; 4 + pname = "lksctp-tools"; 5 + version = "1.0.17"; 5 6 6 7 src = fetchurl { 7 - url = "mirror://sourceforge/lksctp/${name}.tar.gz"; 8 + url = "mirror://sourceforge/lksctp/lksctp-tools-${version}.tar.gz"; 8 9 sha256 = "05da6c2v3acc18ndvmkrag6x5lf914b7s0xkkr6wkvrbvd621sqs"; 9 10 }; 10 11
+4 -3
pkgs/os-specific/linux/lsscsi/default.nix
··· 1 1 { lib, stdenv, fetchurl }: 2 2 3 - stdenv.mkDerivation { 4 - name = "lsscsi-0.32"; 3 + stdenv.mkDerivation rec { 4 + pname = "lsscsi"; 5 + version = "0.32"; 5 6 6 7 src = fetchurl { 7 - url = "http://sg.danny.cz/scsi/lsscsi-0.32.tgz"; 8 + url = "http://sg.danny.cz/scsi/lsscsi-${version}.tgz"; 8 9 sha256 = "sha256-CoAOnpTcoqtwLWXXJ3eujK4Hjj100Ly+1kughJ6AKaE="; 9 10 }; 10 11
+2 -1
pkgs/os-specific/linux/mba6x_bl/default.nix
··· 1 1 { fetchFromGitHub, kernel, lib, stdenv }: 2 2 3 3 stdenv.mkDerivation { 4 - name = "mba6x_bl-2016-12-08"; 4 + pname = "mba6x_bl"; 5 + version = "unstable-2016-12-08"; 5 6 6 7 src = fetchFromGitHub { 7 8 owner = "patjak";
+3 -2
pkgs/os-specific/linux/mdadm/default.nix
··· 1 1 { lib, stdenv, util-linux, coreutils, fetchurl, groff, system-sendmail }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "mdadm-4.1"; 4 + pname = "mdadm"; 5 + version = "4.1"; 5 6 6 7 src = fetchurl { 7 - url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; 8 + url = "mirror://kernel/linux/utils/raid/mdadm/mdadm-${version}.tar.xz"; 8 9 sha256 = "0jjgjgqijpdp7ijh8slzzjjw690kydb1jjadf0x5ilq85628hxmb"; 9 10 }; 10 11
+4 -3
pkgs/os-specific/linux/mingetty/default.nix
··· 1 1 { lib, stdenv, fetchurl }: 2 2 3 - stdenv.mkDerivation { 4 - name = "mingetty-1.08"; 3 + stdenv.mkDerivation rec { 4 + pname = "mingetty"; 5 + version = "1.08"; 5 6 6 7 src = fetchurl { 7 - url = "mirror://sourceforge/mingetty/mingetty-1.08.tar.gz"; 8 + url = "mirror://sourceforge/mingetty/mingetty-${version}.tar.gz"; 8 9 sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"; 9 10 }; 10 11
+4 -3
pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
··· 1 1 { lib, stdenv, fetchurl }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "mkinitcpio-nfs-utils-0.3"; 4 + pname = "mkinitcpio-nfs-utils"; 5 + version = "0.3"; 5 6 6 7 src = fetchurl { 7 - url = "https://sources.archlinux.org/other/mkinitcpio/${name}.tar.xz"; 8 + url = "https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-nfs-utils-${version}.tar.xz"; 8 9 sha256 = "0fc93sfk41ycpa33083kyd7i4y00ykpbhj5qlw611bjghj4x946j"; 9 10 # ugh, upstream... 10 - name = "${name}.tar.gz"; 11 + name = "mkinitcpio-nfs-utils-${version}.tar.gz"; 11 12 }; 12 13 13 14 makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ];
+2 -1
pkgs/os-specific/linux/mxu11x0/default.nix
··· 1 1 { lib, stdenv, fetchurl, kernel }: 2 2 3 3 stdenv.mkDerivation { 4 - name = "mxu11x0-1.4-${kernel.version}"; 4 + pname = "mxu11x0"; 5 + version = "1.4-${kernel.version}"; 5 6 6 7 src = fetchurl { 7 8 url = "https://www.moxa.com/Moxa/media/PDIM/S100000385/moxa-uport-1000-series-linux-3.x-and-4.x-for-uport-11x0-series-driver-v1.4.tgz";
+4 -3
pkgs/os-specific/linux/nss_ldap/default.nix
··· 1 1 {lib, stdenv, fetchurl, openldap, perl}: 2 2 3 - stdenv.mkDerivation { 4 - name = "nss_ldap-265"; 3 + stdenv.mkDerivation rec { 4 + pname = "nss_ldap"; 5 + version = "265"; 5 6 6 7 src = fetchurl { 7 - url = "http://www.padl.com/download/nss_ldap-265.tar.gz"; 8 + url = "http://www.padl.com/download/nss_ldap-${version}.tar.gz"; 8 9 sha256 = "1a16q9p97d2blrj0h6vl1xr7dg7i4s8x8namipr79mshby84vdbp"; 9 10 }; 10 11
+3 -2
pkgs/os-specific/linux/numad/default.nix
··· 1 1 { lib, stdenv, fetchurl }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "numad-0.5"; 4 + pname = "numad"; 5 + version = "0.5"; 5 6 6 7 src = fetchurl { 7 - url = "https://git.fedorahosted.org/cgit/numad.git/snapshot/${name}.tar.xz"; 8 + url = "https://git.fedorahosted.org/cgit/numad.git/snapshot/numad-${version}.tar.xz"; 8 9 sha256 = "08zd1yc3w00yv4mvvz5sq1gf91f6p2s9ljcd72m33xgnkglj60v4"; 9 10 }; 10 11
+2 -1
pkgs/os-specific/linux/opengl/xorg-sys/default.nix
··· 9 9 {lib, stdenv, xorg, expat, libdrm}: 10 10 11 11 stdenv.mkDerivation { 12 - name = "xorg-sys-opengl-3"; 12 + pname = "xorg-sys-opengl"; 13 + version = "3"; 13 14 builder = ./builder.sh; 14 15 neededLibs = map (p: p.out) 15 16 [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc];
+3 -2
pkgs/os-specific/linux/otpw/default.nix
··· 1 1 { lib, stdenv, fetchurl, pam }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "otpw-1.3"; 4 + pname = "otpw"; 5 + version = "1.3"; 5 6 6 7 src = fetchurl { 7 - url = "https://www.cl.cam.ac.uk/~mgk25/download/${name}.tar.gz"; 8 + url = "https://www.cl.cam.ac.uk/~mgk25/download/otpw-${version}.tar.gz"; 8 9 sha256 = "1k3hc7xbxz6hkc55kvddi3cibafwf93ivn58sy1l888d3l5dwmrk"; 9 10 }; 10 11
+3 -2
pkgs/os-specific/linux/pam_ccreds/default.nix
··· 1 1 {lib, stdenv, fetchurl, pam, openssl, db}: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "pam_ccreds-10"; 4 + pname = "pam_ccreds"; 5 + version = "10"; 5 6 6 7 src = fetchurl { 7 - url = "https://www.padl.com/download/${name}.tar.gz"; 8 + url = "https://www.padl.com/download/pam_ccreds-${version}.tar.gz"; 8 9 sha256 = "1h7zyg1b1h69civyvrj95w22dg0y7lgw3hq4gqkdcg35w1y76fhz"; 9 10 }; 10 11 patchPhase = ''
+3 -2
pkgs/os-specific/linux/pam_krb5/default.nix
··· 1 1 { lib, stdenv, fetchurl, pam, libkrb5 }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "pam-krb5-4.10"; 4 + pname = "pam-krb5"; 5 + version = "4.10"; 5 6 6 7 src = fetchurl { 7 - url = "https://archives.eyrie.org/software/kerberos/${name}.tar.gz"; 8 + url = "https://archives.eyrie.org/software/kerberos/pam-krb5-${version}.tar.gz"; 8 9 sha256 = "09wzxd5zrj5bzqpb01qf148npj5k8hmd2bx2ij1qsy40hdxqyq79"; 9 10 }; 10 11
+3 -2
pkgs/os-specific/linux/pam_ldap/default.nix
··· 1 1 { stdenv, fetchurl, pam, openldap, perl }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "pam_ldap-186"; 4 + pname = "pam_ldap"; 5 + version = "186"; 5 6 6 7 src = fetchurl { 7 - url = "https://www.padl.com/download/${name}.tar.gz"; 8 + url = "https://www.padl.com/download/pam_ldap-${version}.tar.gz"; 8 9 sha256 = "0lv4f7hc02jrd2l3gqxd247qq62z11sp3fafn8lgb8ymb7aj5zn8"; 9 10 }; 10 11
+3 -2
pkgs/os-specific/linux/pam_usb/default.nix
··· 33 33 in 34 34 35 35 stdenv.mkDerivation rec { 36 - name = "pam_usb-0.5.0"; 36 + pname = "pam_usb"; 37 + version = "0.5.0"; 37 38 38 39 src = fetchurl { 39 - url = "mirror://sourceforge/pamusb/${name}.tar.gz"; 40 + url = "mirror://sourceforge/pamusb/pam_usb-${version}.tar.gz"; 40 41 sha256 = "1g1w0s9d8mfld8abrn405ll5grv3xgs0b0hsganrz6qafdq9j7q1"; 41 42 }; 42 43
+3 -2
pkgs/os-specific/linux/pcmciautils/default.nix
··· 7 7 8 8 # FIXME: should add an option to choose between hotplug and udev. 9 9 stdenv.mkDerivation rec { 10 - name = "pcmciautils-018"; 10 + pname = "pcmciautils"; 11 + version = "018"; 11 12 12 13 src = fetchurl { 13 - url = "https://kernel.org/pub/linux/utils/kernel/pcmcia/${name}.tar.gz"; 14 + url = "https://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${version}.tar.gz"; 14 15 sha256 = "0sfm3w2n73kl5w7gb1m6q8gy5k4rgwvzz79n6yhs9w3sag3ix8sk"; 15 16 }; 16 17
+2 -1
pkgs/os-specific/linux/perf-tools/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, perl }: 2 2 3 3 stdenv.mkDerivation { 4 - name = "perf-tools-20171219"; 4 + pname = "perf-tools"; 5 + version = "unstable-2017-12-19"; 5 6 6 7 src = fetchFromGitHub { 7 8 owner = "brendangregg";
+3 -2
pkgs/os-specific/linux/pm-utils/default.nix
··· 12 12 in 13 13 14 14 stdenv.mkDerivation rec { 15 - name = "pm-utils-1.4.1"; 15 + pname = "pm-utils"; 16 + version = "1.4.1"; 16 17 17 18 src = fetchurl { 18 - url = "https://pm-utils.freedesktop.org/releases/${name}.tar.gz"; 19 + url = "https://pm-utils.freedesktop.org/releases/pm-utils-${version}.tar.gz"; 19 20 sha256 = "02qc6zaf7ams6qcc470fwb6jvr4abv3lrlx16clqpn36501rkn4f"; 20 21 }; 21 22
+2 -1
pkgs/os-specific/linux/sch_cake/default.nix
··· 3 3 assert lib.versionAtLeast kernel.version "4.4"; 4 4 5 5 stdenv.mkDerivation { 6 - name = "sch_cake-2017-07-16"; 6 + pname = "sch_cake"; 7 + version = "unstable-2017-07-16"; 7 8 8 9 src = fetchFromGitHub { 9 10 owner = "dtaht";
+3 -2
pkgs/os-specific/linux/sysfsutils/default.nix
··· 1 1 { lib, stdenv, fetchurl }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "sysfsutils-2.1.0"; 4 + pname = "sysfsutils"; 5 + version = "2.1.0"; 5 6 6 7 src = fetchurl { 7 - url = "mirror://sourceforge/linux-diag/${name}.tar.gz"; 8 + url = "mirror://sourceforge/linux-diag/sysfsutils-${version}.tar.gz"; 8 9 sha256 = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a"; 9 10 }; 10 11
+4 -3
pkgs/os-specific/linux/sysklogd/default.nix
··· 1 1 {lib, stdenv, fetchurl}: 2 2 3 - stdenv.mkDerivation { 4 - name = "sysklogd-1.5.1"; 3 + stdenv.mkDerivation rec { 4 + pname = "sysklogd"; 5 + version = "1.5.1"; 5 6 6 7 src = fetchurl { 7 - url = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz"; 8 + url = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${version}.tar.gz"; 8 9 sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji"; 9 10 }; 10 11
+3 -2
pkgs/os-specific/linux/sysstat/default.nix
··· 1 1 { lib, stdenv, fetchurl, gettext, bzip2 }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "sysstat-12.4.3"; 4 + pname = "sysstat"; 5 + version = "12.4.3"; 5 6 6 7 src = fetchurl { 7 - url = "http://pagesperso-orange.fr/sebastien.godard/${name}.tar.xz"; 8 + url = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${version}.tar.xz"; 8 9 sha256 = "sha256-rkMkMfRarLyrrPu+Ep4lBeIVyvqc6ZbXVQxgkaRvC/0="; 9 10 }; 10 11
+3 -3
pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
··· 1 - From 2f4a5e9c9ef1cd57662e8bd4c24e1029a00d55b5 Mon Sep 17 00:00:00 2001 1 + From 57e31a2d4a5d5bd7a9e1cd8a0d8bc6a00624ad68 Mon Sep 17 00:00:00 2001 2 2 From: Eelco Dolstra <eelco.dolstra@logicblox.com> 3 3 Date: Tue, 8 Jan 2013 15:46:30 +0100 4 4 Subject: [PATCH 01/19] Start device units for uninitialised encrypted devices ··· 13 13 1 file changed, 4 deletions(-) 14 14 15 15 diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in 16 - index 7c22eefdb7..e3a55e00b5 100644 16 + index 25b8a590a6..d18999ea87 100644 17 17 --- a/rules.d/99-systemd.rules.in 18 18 +++ b/rules.d/99-systemd.rules.in 19 19 @@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd" ··· 28 28 SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root" 29 29 SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks" 30 30 -- 31 - 2.30.1 31 + 2.32.0 32 32
+5 -5
pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
··· 1 - From 4e96b2e074c4a4f4ce900409872ce2f86704ee5b Mon Sep 17 00:00:00 2001 1 + From 43465a392b47238a32f8719f603ed9e2c9bb0363 Mon Sep 17 00:00:00 2001 2 2 From: Eelco Dolstra <eelco.dolstra@logicblox.com> 3 3 Date: Fri, 12 Apr 2013 13:16:57 +0200 4 4 Subject: [PATCH 02/19] Don't try to unmount /nix or /nix/store ··· 12 12 2 files changed, 4 insertions(+) 13 13 14 14 diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c 15 - index 292b97cd69..791b8e6b7e 100644 15 + index f683f05981..5a04c2c2a6 100644 16 16 --- a/src/shared/fstab-util.c 17 17 +++ b/src/shared/fstab-util.c 18 18 @@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { ··· 25 25 "/etc")) 26 26 return true; 27 27 diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c 28 - index 3a72a13e1a..541320dc9d 100644 28 + index c2a26242c0..9936398f32 100644 29 29 --- a/src/shutdown/umount.c 30 30 +++ b/src/shutdown/umount.c 31 - @@ -500,6 +500,8 @@ static int delete_md(MountPoint *m) { 31 + @@ -496,6 +496,8 @@ static int delete_md(MountPoint *m) { 32 32 33 33 static bool nonunmountable_path(const char *path) { 34 34 return path_equal(path, "/") ··· 38 38 || path_equal(path, "/usr") 39 39 #endif 40 40 -- 41 - 2.30.1 41 + 2.32.0 42 42
+5 -5
pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
··· 1 - From 3d1b2e56a6ed6cc86a64f6f89765a2900e576402 Mon Sep 17 00:00:00 2001 1 + From a99666d3d7012c2162fdacf84a57fc0b848fd957 Mon Sep 17 00:00:00 2001 2 2 From: Eelco Dolstra <eelco.dolstra@logicblox.com> 3 3 Date: Wed, 16 Apr 2014 10:59:28 +0200 4 4 Subject: [PATCH 03/19] Fix NixOS containers ··· 10 10 1 file changed, 2 insertions(+) 11 11 12 12 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c 13 - index 7515380fcd..14f8a82eb8 100644 13 + index 04685fecba..0e5ece5f91 100644 14 14 --- a/src/nspawn/nspawn.c 15 15 +++ b/src/nspawn/nspawn.c 16 - @@ -5323,6 +5323,7 @@ static int run(int argc, char *argv[]) { 16 + @@ -5590,6 +5590,7 @@ static int run(int argc, char *argv[]) { 17 17 goto finish; 18 18 } 19 19 } else { ··· 21 21 const char *p, *q; 22 22 23 23 if (arg_pivot_root_new) 24 - @@ -5337,6 +5338,7 @@ static int run(int argc, char *argv[]) { 24 + @@ -5604,6 +5605,7 @@ static int run(int argc, char *argv[]) { 25 25 r = -EINVAL; 26 26 goto finish; 27 27 } ··· 30 30 31 31 } else { 32 32 -- 33 - 2.30.1 33 + 2.32.0 34 34
+3 -3
pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
··· 1 - From 3a721cf70e952e933ef5374006bbb11a3a0ad36a Mon Sep 17 00:00:00 2001 1 + From 3f0780b25bdbe4156a2f761c90083bbba5f4d473 Mon Sep 17 00:00:00 2001 2 2 From: Eelco Dolstra <eelco.dolstra@logicblox.com> 3 3 Date: Thu, 1 May 2014 14:10:10 +0200 4 4 Subject: [PATCH 04/19] Look for fsck in the right place ··· 8 8 1 file changed, 1 insertion(+), 1 deletion(-) 9 9 10 10 diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c 11 - index 510689f3b7..25cab5acae 100644 11 + index cd7adfaeb9..68cebdd158 100644 12 12 --- a/src/fsck/fsck.c 13 13 +++ b/src/fsck/fsck.c 14 14 @@ -368,7 +368,7 @@ static int run(int argc, char *argv[]) { ··· 21 21 cmdline[i++] = "-T"; 22 22 23 23 -- 24 - 2.30.1 24 + 2.32.0 25 25
+27 -15
pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
··· 1 - From 8b7f881cf22e98e907506f4c403b9e304e332bf9 Mon Sep 17 00:00:00 2001 1 + From 82698c6a5142e710c302f9c38367ed00d8ec94ba Mon Sep 17 00:00:00 2001 2 2 From: Eelco Dolstra <eelco.dolstra@logicblox.com> 3 3 Date: Fri, 19 Dec 2014 14:46:17 +0100 4 4 Subject: [PATCH 05/19] Add some NixOS-specific unit directories ··· 10 10 Also, remove /usr and /lib as these don't exist on NixOS. 11 11 --- 12 12 src/basic/path-lookup.c | 17 ++--------------- 13 - src/core/systemd.pc.in | 5 +++-- 14 - 2 files changed, 5 insertions(+), 17 deletions(-) 13 + src/core/systemd.pc.in | 8 ++++---- 14 + 2 files changed, 6 insertions(+), 19 deletions(-) 15 15 16 16 diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c 17 - index 96b82170d0..bf66bd6b77 100644 17 + index 05eb17d66c..1cd141d012 100644 18 18 --- a/src/basic/path-lookup.c 19 19 +++ b/src/basic/path-lookup.c 20 - @@ -94,11 +94,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) { 20 + @@ -91,11 +91,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) { 21 21 } 22 22 23 23 static const char* const user_data_unit_paths[] = { ··· 29 29 NULL 30 30 }; 31 31 32 - @@ -616,15 +612,13 @@ int lookup_paths_init( 32 + @@ -613,15 +609,13 @@ int lookup_paths_init( 33 33 persistent_config, 34 34 SYSTEM_CONFIG_UNIT_DIR, 35 35 "/etc/systemd/system", ··· 40 40 STRV_IFNOTNULL(runtime_attached), 41 41 STRV_IFNOTNULL(generator), 42 42 - "/usr/local/lib/systemd/system", 43 - SYSTEM_DATA_UNIT_PATH, 43 + SYSTEM_DATA_UNIT_DIR, 44 44 - "/usr/lib/systemd/system", 45 45 - STRV_IFNOTNULL(flags & LOOKUP_PATHS_SPLIT_USR ? "/lib/systemd/system" : NULL), 46 46 STRV_IFNOTNULL(generator_late)); 47 47 break; 48 48 49 - @@ -640,14 +634,11 @@ int lookup_paths_init( 49 + @@ -637,14 +631,11 @@ int lookup_paths_init( 50 50 persistent_config, 51 51 USER_CONFIG_UNIT_DIR, 52 52 "/etc/systemd/user", ··· 62 62 STRV_IFNOTNULL(generator_late)); 63 63 break; 64 64 65 - @@ -797,7 +788,6 @@ char **generator_binary_paths(UnitFileScope scope) { 65 + @@ -794,7 +785,6 @@ char **generator_binary_paths(UnitFileScope scope) { 66 66 case UNIT_FILE_SYSTEM: 67 67 add = strv_new("/run/systemd/system-generators", 68 68 "/etc/systemd/system-generators", ··· 70 70 SYSTEM_GENERATOR_DIR); 71 71 break; 72 72 73 - @@ -805,7 +795,6 @@ char **generator_binary_paths(UnitFileScope scope) { 73 + @@ -802,7 +792,6 @@ char **generator_binary_paths(UnitFileScope scope) { 74 74 case UNIT_FILE_USER: 75 75 add = strv_new("/run/systemd/user-generators", 76 76 "/etc/systemd/user-generators", ··· 78 78 USER_GENERATOR_DIR); 79 79 break; 80 80 81 - @@ -844,12 +833,10 @@ char **env_generator_binary_paths(bool is_system) { 81 + @@ -841,12 +830,10 @@ char **env_generator_binary_paths(bool is_system) { 82 82 if (is_system) 83 83 add = strv_new("/run/systemd/system-environment-generators", 84 84 "/etc/systemd/system-environment-generators", ··· 92 92 93 93 if (!add) 94 94 diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in 95 - index b5cc8f94a5..a701cd05f8 100644 95 + index fc0f8c34fa..ded74ce50a 100644 96 96 --- a/src/core/systemd.pc.in 97 97 +++ b/src/core/systemd.pc.in 98 - @@ -38,10 +38,11 @@ systemdsystemconfdir=${systemd_system_conf_dir} 98 + @@ -38,10 +38,10 @@ systemdsystemconfdir=${systemd_system_conf_dir} 99 99 systemd_user_conf_dir=${sysconfdir}/systemd/user 100 100 systemduserconfdir=${systemd_user_conf_dir} 101 101 ··· 105 105 106 106 -systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemd_user_unit_dir}:/usr/lib/systemd/user:/usr/share/systemd/user 107 107 +systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir} 108 - + 109 108 systemduserunitpath=${systemd_user_unit_path} 110 109 111 110 systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators 111 + @@ -50,10 +50,10 @@ systemdsystemgeneratordir=${systemd_system_generator_dir} 112 + systemd_user_generator_dir=${prefix}/lib/systemd/user-generators 113 + systemdusergeneratordir=${systemd_user_generator_dir} 114 + 115 + -systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemd_system_generator_dir} 116 + +systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:${systemd_system_generator_dir} 117 + systemdsystemgeneratorpath=${systemd_system_generator_path} 118 + 119 + -systemd_user_generator_path=/run/systemd/user-generators:/etc/systemd/user-generators:/usr/local/lib/systemd/user-generators:${systemd_user_generator_dir} 120 + +systemd_user_generator_path=/run/systemd/user-generators:/etc/systemd/user-generators:${systemd_user_generator_dir} 121 + systemdusergeneratorpath=${systemd_user_generator_path} 122 + 123 + systemd_sleep_dir=${root_prefix}/lib/systemd/system-sleep 112 124 -- 113 - 2.30.1 125 + 2.32.0 114 126
+15 -15
pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
··· 1 - From 7a6529ee27028860b93bc539e8bbf3f2374d712f Mon Sep 17 00:00:00 2001 1 + From e2a8db60ebfb1e0477ce989f6c3d4a95f2e08120 Mon Sep 17 00:00:00 2001 2 2 From: Eelco Dolstra <eelco.dolstra@logicblox.com> 3 3 Date: Mon, 11 May 2015 15:39:38 +0200 4 4 Subject: [PATCH 06/19] Get rid of a useless message in user sessions ··· 9 9 10 10 in containers. 11 11 --- 12 - src/core/unit.c | 3 ++- 12 + src/core/manager.c | 3 ++- 13 13 1 file changed, 2 insertions(+), 1 deletion(-) 14 14 15 - diff --git a/src/core/unit.c b/src/core/unit.c 16 - index 45a417a090..8af3cb08d6 100644 17 - --- a/src/core/unit.c 18 - +++ b/src/core/unit.c 19 - @@ -2163,7 +2163,8 @@ static void unit_check_binds_to(Unit *u) { 20 - } 15 + diff --git a/src/core/manager.c b/src/core/manager.c 16 + index 8884437347..e23d47b4a4 100644 17 + --- a/src/core/manager.c 18 + +++ b/src/core/manager.c 19 + @@ -1375,7 +1375,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { 20 + if (!unit_is_bound_by_inactive(u, &culprit)) 21 + continue; 21 22 22 - assert(other); 23 - - log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id); 24 - + if (u->type != UNIT_MOUNT || detect_container() <= 0) 25 - + log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id); 23 + - log_unit_debug(u, "Unit is stopped because bound to inactive unit %s.", culprit->id); 24 + + if (u->type != UNIT_MOUNT || detect_container() <= 0) 25 + + log_unit_debug(u, "Unit is stopped because bound to inactive unit %s.", culprit->id); 26 26 27 - /* A unit we need to run is gone. Sniff. Let's stop this. */ 28 - r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL); 27 + /* If stopping a unit fails continuously we might enter a stop loop here, hence stop acting on the 28 + * service being unnecessary after a while. */ 29 29 -- 30 - 2.30.1 30 + 2.32.0 31 31
+16 -16
pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
··· 1 - From 5580303956ca7d8eb431d23c2af0030c9cc0e6e9 Mon Sep 17 00:00:00 2001 1 + From 56ae06b48c6852071dfc57c1203c04f07309d757 Mon Sep 17 00:00:00 2001 2 2 From: Gabriel Ebner <gebner@gebner.org> 3 3 Date: Sun, 6 Dec 2015 14:26:36 +0100 4 4 Subject: [PATCH 07/19] hostnamed, localed, timedated: disable methods that ··· 11 11 3 files changed, 25 insertions(+) 12 12 13 13 diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c 14 - index a1794bdab1..77134731e1 100644 14 + index 36702f2fb0..669257ea2f 100644 15 15 --- a/src/hostname/hostnamed.c 16 16 +++ b/src/hostname/hostnamed.c 17 - @@ -643,6 +643,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ 17 + @@ -797,6 +797,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ 18 18 if (r < 0) 19 19 return r; 20 20 ··· 24 24 name = empty_to_null(name); 25 25 26 26 context_read_etc_hostname(c); 27 - @@ -702,6 +705,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess 27 + @@ -860,6 +863,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess 28 28 if (r < 0) 29 29 return r; 30 30 ··· 35 35 36 36 context_read_machine_info(c); 37 37 diff --git a/src/locale/localed.c b/src/locale/localed.c 38 - index 736dacdee9..53e0ee935e 100644 38 + index df0eb030d4..d026eae97e 100644 39 39 --- a/src/locale/localed.c 40 40 +++ b/src/locale/localed.c 41 - @@ -317,6 +317,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er 41 + @@ -360,6 +360,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er 42 42 if (r < 0) 43 43 return r; 44 44 45 45 + return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, 46 - + "Changing system settings via systemd is not supported on NixOS."); 46 + + "Changing system settings via systemd is not supported on NixOS."); 47 47 + 48 + use_localegen = locale_gen_check_available(); 49 + 48 50 /* If single locale without variable name is provided, then we assume it is LANG=. */ 49 - if (strv_length(l) == 1 && !strchr(l[0], '=')) { 50 - if (!locale_is_valid(l[0])) 51 - @@ -432,6 +435,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro 51 + @@ -485,6 +488,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro 52 52 if (r < 0) 53 53 return r; 54 54 ··· 58 58 keymap = empty_to_null(keymap); 59 59 keymap_toggle = empty_to_null(keymap_toggle); 60 60 61 - @@ -606,6 +612,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err 61 + @@ -665,6 +671,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err 62 62 if (r < 0) 63 63 return r; 64 64 ··· 69 69 model = empty_to_null(model); 70 70 variant = empty_to_null(variant); 71 71 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c 72 - index 76fe04900d..e87c4c8919 100644 72 + index 66b454269d..0a8fe25d0f 100644 73 73 --- a/src/timedate/timedated.c 74 74 +++ b/src/timedate/timedated.c 75 - @@ -646,6 +646,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * 75 + @@ -668,6 +668,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * 76 76 if (r < 0) 77 77 return r; 78 78 ··· 83 83 if (!timezone_is_valid(z, LOG_DEBUG)) 84 84 return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z); 85 85 86 - @@ -725,6 +729,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error 86 + @@ -747,6 +751,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error 87 87 if (r < 0) 88 88 return r; 89 89 ··· 93 93 if (lrtc == c->local_rtc && !fix_system) 94 94 return sd_bus_reply_method_return(m, NULL); 95 95 96 - @@ -907,6 +914,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error 96 + @@ -930,6 +937,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error 97 97 if (r < 0) 98 98 return r; 99 99 ··· 104 104 if (r < 0) 105 105 return r; 106 106 -- 107 - 2.30.1 107 + 2.32.0 108 108
+18 -22
pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
··· 1 - From 874698425f6d68fc0d662cb17c7c29e0af3e8c25 Mon Sep 17 00:00:00 2001 1 + From b783b2da164482f26ac5e6e347dc41930c072ea5 Mon Sep 17 00:00:00 2001 2 2 From: Nikolay Amiantov <ab@fmap.me> 3 3 Date: Thu, 7 Jul 2016 02:47:13 +0300 4 4 Subject: [PATCH 08/19] Fix hwdb paths 5 5 6 6 Patch by vcunat. 7 7 --- 8 - src/libsystemd/sd-hwdb/sd-hwdb.c | 7 +------ 9 - 1 file changed, 1 insertion(+), 6 deletions(-) 8 + src/libsystemd/sd-hwdb/hwdb-internal.h | 7 ++----- 9 + 1 file changed, 2 insertions(+), 5 deletions(-) 10 10 11 - diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c 12 - index cb3c77ce96..7b8c80071f 100644 13 - --- a/src/libsystemd/sd-hwdb/sd-hwdb.c 14 - +++ b/src/libsystemd/sd-hwdb/sd-hwdb.c 15 - @@ -297,13 +297,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) { 16 - } 17 - 18 - static const char hwdb_bin_paths[] = 19 - - "/etc/systemd/hwdb/hwdb.bin\0" 20 - "/etc/udev/hwdb.bin\0" 21 - - "/usr/lib/systemd/hwdb/hwdb.bin\0" 22 - -#if HAVE_SPLIT_USR 23 - - "/lib/systemd/hwdb/hwdb.bin\0" 24 - -#endif 25 - - UDEVLIBEXECDIR "/hwdb.bin\0"; 26 - + ; 11 + diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h 12 + index 5ddc2211e6..ee621eec46 100644 13 + --- a/src/libsystemd/sd-hwdb/hwdb-internal.h 14 + +++ b/src/libsystemd/sd-hwdb/hwdb-internal.h 15 + @@ -82,8 +82,5 @@ struct trie_value_entry2_f { 16 + } _packed_; 27 17 28 - _public_ int sd_hwdb_new(sd_hwdb **ret) { 29 - _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; 18 + #define hwdb_bin_paths \ 19 + - "/etc/systemd/hwdb/hwdb.bin\0" \ 20 + - "/etc/udev/hwdb.bin\0" \ 21 + - "/usr/lib/systemd/hwdb/hwdb.bin\0" \ 22 + - _CONF_PATHS_SPLIT_USR_NULSTR("systemd/hwdb/hwdb.bin") \ 23 + - UDEVLIBEXECDIR "/hwdb.bin\0" 24 + + "/etc/udev/hwdb.bin\0" 25 + + 30 26 -- 31 - 2.30.1 27 + 2.32.0 32 28
+32 -23
pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
··· 1 - From 367d0dad3d1853048569e315931cb8a27e16a098 Mon Sep 17 00:00:00 2001 1 + From e24c05ef8cfe48c4f0ebdb92e8147ae2151e4c87 Mon Sep 17 00:00:00 2001 2 2 From: Nikolay Amiantov <ab@fmap.me> 3 3 Date: Tue, 11 Oct 2016 13:12:08 +0300 4 4 Subject: [PATCH 09/19] Change /usr/share/zoneinfo to /etc/zoneinfo ··· 6 6 NixOS uses this path. 7 7 --- 8 8 man/localtime.xml | 4 ++-- 9 - src/basic/time-util.c | 6 +++--- 9 + src/basic/time-util.c | 8 ++++---- 10 10 src/firstboot/firstboot.c | 2 +- 11 11 src/nspawn/nspawn.c | 4 ++-- 12 12 src/timedate/timedated.c | 8 ++++---- 13 - 5 files changed, 12 insertions(+), 12 deletions(-) 13 + 5 files changed, 13 insertions(+), 13 deletions(-) 14 14 15 15 diff --git a/man/localtime.xml b/man/localtime.xml 16 16 index e486474c44..5f373d0723 100644 ··· 35 35 <literal>Etc/UTC</literal>. The resulting link should lead to the 36 36 corresponding binary 37 37 diff --git a/src/basic/time-util.c b/src/basic/time-util.c 38 - index 5318d6378d..04069dc27b 100644 38 + index 5d162e8ffe..1bec83e555 100644 39 39 --- a/src/basic/time-util.c 40 40 +++ b/src/basic/time-util.c 41 - @@ -1277,7 +1277,7 @@ int get_timezones(char ***ret) { 42 - n_allocated = 2; 43 - n_zones = 1; 41 + @@ -1269,7 +1269,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { 42 + 43 + assert(ret); 44 44 45 45 - f = fopen("/usr/share/zoneinfo/zone1970.tab", "re"); 46 46 + f = fopen("/etc/zoneinfo/zone1970.tab", "re"); 47 - if (f) { 48 - for (;;) { 49 - _cleanup_free_ char *line = NULL; 50 - @@ -1372,7 +1372,7 @@ bool timezone_is_valid(const char *name, int log_level) { 47 + if (!f) 48 + return -errno; 49 + 50 + @@ -1308,7 +1308,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { 51 + _cleanup_strv_free_ char **zones = NULL; 52 + int r; 53 + 54 + - f = fopen("/usr/share/zoneinfo/tzdata.zi", "re"); 55 + + f = fopen("/etc/zoneinfo/tzdata.zi", "re"); 56 + if (!f) 57 + return -errno; 58 + 59 + @@ -1421,7 +1421,7 @@ int verify_timezone(const char *name, int log_level) { 51 60 if (p - name >= PATH_MAX) 52 - return false; 61 + return -ENAMETOOLONG; 53 62 54 63 - t = strjoina("/usr/share/zoneinfo/", name); 55 64 + t = strjoina("/etc/zoneinfo/", name); 56 65 57 66 fd = open(t, O_RDONLY|O_CLOEXEC); 58 - if (fd < 0) { 59 - @@ -1470,7 +1470,7 @@ int get_timezone(char **ret) { 67 + if (fd < 0) 68 + @@ -1512,7 +1512,7 @@ int get_timezone(char **ret) { 60 69 if (r < 0) 61 70 return r; /* returns EINVAL if not a symlink */ 62 71 ··· 66 75 return -EINVAL; 67 76 68 77 diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c 69 - index 742b43f9fc..f2cb121816 100644 78 + index 2cb4f80d5d..ebeaeac52f 100644 70 79 --- a/src/firstboot/firstboot.c 71 80 +++ b/src/firstboot/firstboot.c 72 - @@ -459,7 +459,7 @@ static int process_timezone(void) { 81 + @@ -491,7 +491,7 @@ static int process_timezone(void) { 73 82 if (isempty(arg_timezone)) 74 83 return 0; 75 84 ··· 79 88 (void) mkdir_parents(etc_localtime, 0755); 80 89 if (symlink(e, etc_localtime) < 0) 81 90 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c 82 - index 14f8a82eb8..8632dadec6 100644 91 + index 0e5ece5f91..cc46435472 100644 83 92 --- a/src/nspawn/nspawn.c 84 93 +++ b/src/nspawn/nspawn.c 85 - @@ -1810,8 +1810,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u 94 + @@ -1887,8 +1887,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid 86 95 static const char *timezone_from_path(const char *path) { 87 96 return PATH_STARTSWITH_SET( 88 97 path, ··· 94 103 95 104 static bool etc_writable(void) { 96 105 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c 97 - index e87c4c8919..964a40ba81 100644 106 + index 0a8fe25d0f..2f02b9a520 100644 98 107 --- a/src/timedate/timedated.c 99 108 +++ b/src/timedate/timedated.c 100 - @@ -269,7 +269,7 @@ static int context_read_data(Context *c) { 109 + @@ -279,7 +279,7 @@ static int context_read_data(Context *c) { 101 110 102 111 r = get_timezone(&t); 103 112 if (r == -EINVAL) ··· 106 115 else if (r < 0) 107 116 log_warning_errno(r, "Failed to get target of /etc/localtime: %m"); 108 117 109 - @@ -293,7 +293,7 @@ static int context_write_data_timezone(Context *c) { 118 + @@ -303,7 +303,7 @@ static int context_write_data_timezone(Context *c) { 110 119 111 120 if (isempty(c->zone) || streq(c->zone, "UTC")) { 112 121 ··· 115 124 116 125 if (unlink("/etc/localtime") < 0 && errno != ENOENT) 117 126 return -errno; 118 - @@ -301,9 +301,9 @@ static int context_write_data_timezone(Context *c) { 127 + @@ -311,9 +311,9 @@ static int context_write_data_timezone(Context *c) { 119 128 return 0; 120 129 } 121 130 ··· 128 137 return -ENOMEM; 129 138 130 139 -- 131 - 2.30.1 140 + 2.32.0 132 141
+4 -4
pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
··· 1 - From bf285fe7e12bd22f95c14bcefbb5008888c32bfa Mon Sep 17 00:00:00 2001 1 + From 09f6ca91b4131637038686dafd57b5da642c100e Mon Sep 17 00:00:00 2001 2 2 From: Imuli <i@imu.li> 3 3 Date: Wed, 19 Oct 2016 08:46:47 -0400 4 4 Subject: [PATCH 10/19] localectl: use /etc/X11/xkb for list-x11-* ··· 10 10 1 file changed, 1 insertion(+), 1 deletion(-) 11 11 12 12 diff --git a/src/locale/localectl.c b/src/locale/localectl.c 13 - index 7d2e887660..91c5139eed 100644 13 + index 548ac8eb2c..5e372f1566 100644 14 14 --- a/src/locale/localectl.c 15 15 +++ b/src/locale/localectl.c 16 - @@ -277,7 +277,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { 16 + @@ -280,7 +280,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { 17 17 } state = NONE, look_for; 18 18 int r; 19 19 ··· 23 23 return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); 24 24 25 25 -- 26 - 2.30.1 26 + 2.32.0 27 27
+6 -6
pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
··· 1 - From 293b19c5fdbda1b4ee579a7e8ba12f024a6f34c9 Mon Sep 17 00:00:00 2001 1 + From d5716cd93fdaad16b590a581f39d95954f40748e Mon Sep 17 00:00:00 2001 2 2 From: Franz Pletz <fpletz@fnordicwalking.de> 3 3 Date: Sun, 11 Feb 2018 04:37:44 +0100 4 4 Subject: [PATCH 11/19] build: don't create statedir and don't touch prefixdir ··· 8 8 1 file changed, 3 deletions(-) 9 9 10 10 diff --git a/meson.build b/meson.build 11 - index 580964c3fa..f99d4f3ab5 100644 11 + index 738879eb21..453ee4b1c0 100644 12 12 --- a/meson.build 13 13 +++ b/meson.build 14 - @@ -3518,9 +3518,6 @@ install_data('LICENSE.GPL2', 15 - 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION', 14 + @@ -3538,9 +3538,6 @@ install_data('LICENSE.GPL2', 15 + 'docs/GVARIANT-SERIALIZATION.md', 16 16 install_dir : docdir) 17 17 18 18 -meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir)) ··· 20 20 - 21 21 ############################################################ 22 22 23 - check_help = find_program('tools/check-help.sh') 23 + # Ensure that changes to the docs/ directory do not break the 24 24 -- 25 - 2.30.1 25 + 2.32.0 26 26
+10 -8
pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch
··· 1 - From 63777e7f690b67952bf4571f8e09e5d8e769d3c0 Mon Sep 17 00:00:00 2001 1 + From 40a5df71e7af5feefacae9fc95bf94e72c6c12f4 Mon Sep 17 00:00:00 2001 2 2 From: Andreas Rammhold <andreas@rammhold.de> 3 3 Date: Fri, 2 Nov 2018 21:15:42 +0100 4 4 Subject: [PATCH 12/19] inherit systemd environment when calling generators. ··· 12 12 "environment-generators" and then seems to pass that on to all the other 13 13 executables that are being called from managers. 14 14 --- 15 - src/core/manager.c | 11 ++++++++--- 16 - 1 file changed, 8 insertions(+), 3 deletions(-) 15 + src/core/manager.c | 13 +++++++++---- 16 + 1 file changed, 9 insertions(+), 4 deletions(-) 17 17 18 18 diff --git a/src/core/manager.c b/src/core/manager.c 19 - index 6858950107..07a599ede7 100644 19 + index e23d47b4a4..1047aadebc 100644 20 20 --- a/src/core/manager.c 21 21 +++ b/src/core/manager.c 22 - @@ -4142,9 +4142,14 @@ static int manager_run_generators(Manager *m) { 22 + @@ -4145,10 +4145,15 @@ static int manager_run_generators(Manager *m) { 23 23 argv[4] = NULL; 24 24 25 25 RUN_WITH_UMASK(0022) 26 26 - (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, NULL, NULL, 27 - - (char**) argv, m->transient_environment, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS); 27 + - (char**) argv, m->transient_environment, 28 + - EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS | EXEC_DIR_SET_SYSTEMD_EXEC_PID); 28 29 - 29 30 + (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, 30 31 + // On NixOS we must propagate PATH to generators so they are ··· 33 34 + // function (envp) is set to NULL. This propagates systemd's 34 35 + // environment (e.g. PATH) that was setup 35 36 + // before calling systemd from stage-2-init.sh. 36 - + NULL, NULL, (char**) argv, /* NixOS: use inherited env */ NULL, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS); 37 + + NULL, NULL, (char**) argv, /* NixOS: use inherited env */ NULL, 38 + + EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS | EXEC_DIR_SET_SYSTEMD_EXEC_PID); 37 39 r = 0; 38 40 39 41 finish: 40 42 -- 41 - 2.30.1 43 + 2.32.0 42 44
+2 -2
pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch
··· 1 - From 561dc3b864d96753b5dc448e6e1a80460d5f0bc4 Mon Sep 17 00:00:00 2001 1 + From fe3aff271cf127c1484533237fe0a024e07ae7bc Mon Sep 17 00:00:00 2001 2 2 From: Andreas Rammhold <andreas@rammhold.de> 3 3 Date: Thu, 9 May 2019 11:15:22 +0200 4 4 Subject: [PATCH 13/19] add rootprefix to lookup dir paths ··· 34 34 #define CONF_PATHS(n) \ 35 35 CONF_PATHS_USR(n) \ 36 36 -- 37 - 2.30.1 37 + 2.32.0 38 38
+3 -3
pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
··· 1 - From 8f619304804b02f4e9d7a340ca90359f96adc6e8 Mon Sep 17 00:00:00 2001 1 + From 31732478745f7a200004fb8ec013f54dbc536f2e Mon Sep 17 00:00:00 2001 2 2 From: Nikolay Amiantov <ab@fmap.me> 3 3 Date: Thu, 25 Jul 2019 20:45:55 +0300 4 4 Subject: [PATCH 14/19] systemd-shutdown: execute scripts in ··· 10 10 1 file changed, 1 insertion(+), 1 deletion(-) 11 11 12 12 diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c 13 - index 0d07865542..26d974ef73 100644 13 + index a98cfc4d8a..b0b34edda7 100644 14 14 --- a/src/shutdown/shutdown.c 15 15 +++ b/src/shutdown/shutdown.c 16 16 @@ -312,7 +312,7 @@ int main(int argc, char *argv[]) { ··· 23 23 /* The log target defaults to console, but the original systemd process will pass its log target in through a 24 24 * command line argument, which will override this default. Also, ensure we'll never log to the journal or 25 25 -- 26 - 2.30.1 26 + 2.32.0 27 27
+4 -4
pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
··· 1 - From 577b11afe38fc185d785ca8f125f518a4eb21a00 Mon Sep 17 00:00:00 2001 1 + From 3f2277b86f39cb55936ae11c2365feb283b547cb Mon Sep 17 00:00:00 2001 2 2 From: Nikolay Amiantov <ab@fmap.me> 3 3 Date: Thu, 25 Jul 2019 20:46:58 +0300 4 4 Subject: [PATCH 15/19] systemd-sleep: execute scripts in ··· 10 10 1 file changed, 1 insertion(+) 11 11 12 12 diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c 13 - index 39ab554290..880ac7ccb0 100644 13 + index a3aeb24633..0ed6a34d79 100644 14 14 --- a/src/sleep/sleep.c 15 15 +++ b/src/sleep/sleep.c 16 - @@ -178,6 +178,7 @@ static int execute(char **modes, char **states) { 16 + @@ -182,6 +182,7 @@ static int execute( 17 17 }; 18 18 static const char* const dirs[] = { 19 19 SYSTEM_SLEEP_PATH, ··· 22 22 }; 23 23 24 24 -- 25 - 2.30.1 25 + 2.32.0 26 26
+4 -4
pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
··· 1 - From ba19f629c1806ca2d2ab58154e45bce4ae4a3f0c Mon Sep 17 00:00:00 2001 1 + From 330490aa8a44206bc03205654680913ab01408a1 Mon Sep 17 00:00:00 2001 2 2 From: Florian Klink <flokli@flokli.de> 3 3 Date: Sat, 7 Mar 2020 22:40:27 +0100 4 4 Subject: [PATCH 16/19] kmod-static-nodes.service: Update ConditionFileNotEmpty ··· 10 10 1 file changed, 1 insertion(+), 1 deletion(-) 11 11 12 12 diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in 13 - index f4170d6a99..9a6a591bea 100644 13 + index 777e82d16b..b6abc2bba0 100644 14 14 --- a/units/kmod-static-nodes.service.in 15 15 +++ b/units/kmod-static-nodes.service.in 16 - @@ -12,7 +12,7 @@ Description=Create list of static device nodes for the current kernel 16 + @@ -12,7 +12,7 @@ Description=Create List of Static Device Nodes 17 17 DefaultDependencies=no 18 18 Before=sysinit.target systemd-tmpfiles-setup-dev.service 19 19 ConditionCapability=CAP_SYS_MODULE ··· 23 23 [Service] 24 24 Type=oneshot 25 25 -- 26 - 2.30.1 26 + 2.32.0 27 27
+3 -3
pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
··· 1 - From c639f311bd27c2bff62a22c34bc92613aaf77587 Mon Sep 17 00:00:00 2001 1 + From 216018be7b422586b937dae8fd83f51989479a41 Mon Sep 17 00:00:00 2001 2 2 From: Florian Klink <flokli@flokli.de> 3 3 Date: Sun, 8 Mar 2020 01:05:54 +0100 4 4 Subject: [PATCH 17/19] path-util.h: add placeholder for DEFAULT_PATH_NORMAL ··· 10 10 1 file changed, 3 insertions(+), 3 deletions(-) 11 11 12 12 diff --git a/src/basic/path-util.h b/src/basic/path-util.h 13 - index d613709f0b..5cced4c115 100644 13 + index 26e7362d1f..a8f8a863ec 100644 14 14 --- a/src/basic/path-util.h 15 15 +++ b/src/basic/path-util.h 16 16 @@ -24,11 +24,11 @@ ··· 29 29 #if HAVE_SPLIT_USR 30 30 # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR 31 31 -- 32 - 2.30.1 32 + 2.32.0 33 33
+4 -4
pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch
··· 1 - From ebb37f81c28aaa80acd9187a7d77dcb3cb3828db Mon Sep 17 00:00:00 2001 1 + From beb594ff3bceb95598ffa8ec47c31bacb2449473 Mon Sep 17 00:00:00 2001 2 2 From: Thomas Tuegel <ttuegel@mailbox.org> 3 3 Date: Mon, 26 Oct 2020 21:21:38 +0100 4 4 Subject: [PATCH 18/19] logind-seat-debus: show CanMultiSession again ··· 9 9 1 file changed, 1 insertion(+), 1 deletion(-) 10 10 11 11 diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c 12 - index a60ed2d3c2..69b6271075 100644 12 + index cceb3b1d2d..94b4723bb9 100644 13 13 --- a/src/login/logind-seat-dbus.c 14 14 +++ b/src/login/logind-seat-dbus.c 15 - @@ -450,7 +450,7 @@ static const sd_bus_vtable seat_vtable[] = { 15 + @@ -419,7 +419,7 @@ static const sd_bus_vtable seat_vtable[] = { 16 16 17 17 SD_BUS_PROPERTY("Id", "s", NULL, offsetof(Seat, id), SD_BUS_VTABLE_PROPERTY_CONST), 18 18 SD_BUS_PROPERTY("ActiveSession", "(so)", property_get_active_session, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), ··· 22 22 SD_BUS_PROPERTY("CanGraphical", "b", property_get_can_graphical, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), 23 23 SD_BUS_PROPERTY("Sessions", "a(so)", property_get_sessions, 0, 0), 24 24 -- 25 - 2.30.1 25 + 2.32.0 26 26
+6 -6
pkgs/os-specific/linux/systemd/0019-pkg-config-derive-prefix-from-prefix.patch
··· 1 - From 5439a516995f9fd57fc91c2cdd016bb18f31aadf Mon Sep 17 00:00:00 2001 1 + From 2e7477dc29095141a0556ded11f0ee370d82bfbb Mon Sep 17 00:00:00 2001 2 2 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> 3 3 Date: Sun, 6 Dec 2020 08:34:19 +0100 4 4 Subject: [PATCH 19/19] pkg-config: derive prefix from --prefix ··· 16 16 1 file changed, 1 insertion(+), 1 deletion(-) 17 17 18 18 diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in 19 - index a701cd05f8..85d6911bdf 100644 19 + index ded74ce50a..0262f53154 100644 20 20 --- a/src/core/systemd.pc.in 21 21 +++ b/src/core/systemd.pc.in 22 22 @@ -11,7 +11,7 @@ ··· 24 24 # shall have underscores. 25 25 26 26 -prefix=/usr 27 - +prefix=@prefix@ 28 - root_prefix=@rootprefix_noslash@ 27 + +prefix={{PREFIX}} 28 + root_prefix={{ROOTPREFIX_NOSLASH}} 29 29 rootprefix=${root_prefix} 30 - sysconf_dir=@sysconfdir@ 30 + sysconf_dir={{SYSCONF_DIR}} 31 31 -- 32 - 2.30.1 32 + 2.32.0 33 33
+31
pkgs/os-specific/linux/systemd/0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch
··· 1 + From 1a2d24d210c9329e8b900fdb01576c57374581d8 Mon Sep 17 00:00:00 2001 2 + From: Andreas Rammhold <andreas@rammhold.de> 3 + Date: Mon, 26 Jul 2021 16:57:43 +0200 4 + Subject: [PATCH 20/20] core: respect install_sysconfdir_samples in meson file 5 + 6 + The refactoring done in e11a25cadbe caused the configuration files to be 7 + installed into the pkgsysconfdir regardless of the state of the 8 + install_sysconfdir_samples boolean that indicated whether or not the 9 + sample files should be installed. 10 + --- 11 + src/core/meson.build | 4 ++++ 12 + 1 file changed, 4 insertions(+) 13 + 14 + diff --git a/src/core/meson.build b/src/core/meson.build 15 + index f0d2c6f642..4ff7e00e36 100644 16 + --- a/src/core/meson.build 17 + +++ b/src/core/meson.build 18 + @@ -187,6 +187,10 @@ foreach item : in_files 19 + file = item[0] 20 + dir = item[1] 21 + 22 + + if not install_sysconfdir_samples and dir == pkgsysconfdir 23 + + continue 24 + + endif 25 + + 26 + custom_target( 27 + file, 28 + input : file + '.in', 29 + -- 30 + 2.32.0 31 +
+29
pkgs/os-specific/linux/systemd/0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch
··· 1 + From 189ba3af8b21cfc53527453907e800a2917b1bfd Mon Sep 17 00:00:00 2001 2 + From: Andreas Rammhold <andreas@rammhold.de> 3 + Date: Mon, 26 Jul 2021 17:20:34 +0200 4 + Subject: [PATCH] login: respect install_sysconfdir_samples in meson file 5 + 6 + The refactoring done in c900d89faa0 caused the configuration files to be 7 + installed into the pkgsysconfdir regardless of the state of the 8 + install_sysconfdir_samples boolean that indicates whether or not the 9 + sample files should be installed. 10 + --- 11 + src/login/meson.build | 2 +- 12 + 1 file changed, 1 insertion(+), 1 deletion(-) 13 + 14 + diff --git a/src/login/meson.build b/src/login/meson.build 15 + index 8c20e6be65..b637adc9a2 100644 16 + --- a/src/login/meson.build 17 + +++ b/src/login/meson.build 18 + @@ -67,7 +67,7 @@ pam_systemd_c = files('pam_systemd.c') 19 + 20 + enable_logind = conf.get('ENABLE_LOGIND') == 1 21 + in_files = [ 22 + - ['logind.conf', pkgsysconfdir, enable_logind], 23 + + ['logind.conf', pkgsysconfdir, enable_logind and install_sysconfdir_samples], 24 + ['70-uaccess.rules', udevrulesdir, enable_logind and conf.get('HAVE_ACL') == 1], 25 + ['71-seat.rules', udevrulesdir, enable_logind], 26 + ['73-seat-late.rules', udevrulesdir, enable_logind], 27 + -- 28 + 2.32.0 29 +
+80
pkgs/os-specific/linux/systemd/0022-core-Handle-lookup-paths-being-symlinks.patch
··· 1 + From 5f17b65d30480e489e135b403a072b38535b2911 Mon Sep 17 00:00:00 2001 2 + From: Andreas Rammhold <andreas@rammhold.de> 3 + Date: Wed, 18 Aug 2021 19:10:08 +0200 4 + Subject: [PATCH] core: handle lookup paths being symlinks 5 + 6 + With a recent change paths leaving the statically known lookup paths 7 + would be treated differently then those that remained within those. That 8 + was done (AFAIK) to consistently handle alias names. Unfortunately that 9 + means that on some distributions, especially those where /etc/ consists 10 + mostly of symlinks, would trigger that new detection for every single 11 + unit in /etc/systemd/system. The reason for that is that the units 12 + directory itself is already a symlink. 13 + --- 14 + src/basic/unit-file.c | 33 +++++++++++++++++++++++++++++++-- 15 + 1 file changed, 31 insertions(+), 2 deletions(-) 16 + 17 + diff --git a/src/basic/unit-file.c b/src/basic/unit-file.c 18 + index 884a0674a9..3ae2a115d0 100644 19 + --- a/src/basic/unit-file.c 20 + +++ b/src/basic/unit-file.c 21 + @@ -254,6 +254,7 @@ int unit_file_build_name_map( 22 + 23 + _cleanup_hashmap_free_ Hashmap *ids = NULL, *names = NULL; 24 + _cleanup_set_free_free_ Set *paths = NULL; 25 + + _cleanup_strv_free_ char **expanded_search_paths = NULL; 26 + uint64_t timestamp_hash; 27 + char **dir; 28 + int r; 29 + @@ -273,6 +274,34 @@ int unit_file_build_name_map( 30 + return log_oom(); 31 + } 32 + 33 + + /* Go over all our search paths, chase their symlinks and store the 34 + + * result in the expanded_search_paths list. 35 + + * 36 + + * This is important for cases where any of the unit directories itself 37 + + * are symlinks into other directories and would therefore cause all of 38 + + * the unit files to be recognized as linked units. 39 + + * 40 + + * This is important for distributions such as NixOS where most paths 41 + + * in /etc/ are symlinks to some other location on the filesystem (e.g. 42 + + * into /nix/store/). 43 + + */ 44 + + STRV_FOREACH(dir, (char**) lp->search_path) { 45 + + _cleanup_free_ char *resolved_dir = NULL; 46 + + r = strv_extend(&expanded_search_paths, *dir); 47 + + if (r < 0) 48 + + return log_oom(); 49 + + 50 + + r = chase_symlinks(*dir, NULL, 0, &resolved_dir, NULL); 51 + + if (r < 0) { 52 + + if (r != -ENOENT) 53 + + log_warning_errno(r, "Failed to resolve symlink %s, ignoring: %m", *dir); 54 + + continue; 55 + + } 56 + + 57 + + if (strv_consume(&expanded_search_paths, TAKE_PTR(resolved_dir)) < 0) 58 + + return log_oom(); 59 + + } 60 + + 61 + STRV_FOREACH(dir, (char**) lp->search_path) { 62 + struct dirent *de; 63 + _cleanup_closedir_ DIR *d = NULL; 64 + @@ -351,11 +380,11 @@ int unit_file_build_name_map( 65 + continue; 66 + } 67 + 68 + - /* Check if the symlink goes outside of our search path. 69 + + /* Check if the symlink goes outside of our (expanded) search path. 70 + * If yes, it's a linked unit file or mask, and we don't care about the target name. 71 + * Let's just store the link source directly. 72 + * If not, let's verify that it's a good symlink. */ 73 + - char *tail = path_startswith_strv(simplified, lp->search_path); 74 + + char *tail = path_startswith_strv(simplified, expanded_search_paths); 75 + if (!tail) { 76 + log_debug("%s: linked unit file: %s → %s", 77 + __func__, filename, simplified); 78 + -- 79 + 2.32.0 80 +
+29
pkgs/os-specific/linux/systemd/0023-path-util-make-find_executable-work-without-proc-mounted.patch
··· 1 + From 93413acd3ef3a637a0f31a1d133b103e1dc81fd6 Mon Sep 17 00:00:00 2001 2 + From: Yu Watanabe <watanabe.yu+github@gmail.com> 3 + Date: Mon, 23 Aug 2021 06:16:48 +0900 4 + Subject: [PATCH] path-util: make find_executable() work without /proc mounted 5 + 6 + Follow-up for 888f65ace6296ed61285d31db846babf1c11885e. 7 + 8 + Hopefully fixes #20514. 9 + --- 10 + src/basic/path-util.c | 6 +++++- 11 + 1 file changed, 5 insertions(+), 1 deletion(-) 12 + 13 + diff --git a/src/basic/path-util.c b/src/basic/path-util.c 14 + index d11f254a9f6a..a21981616b59 100644 15 + --- a/src/basic/path-util.c 16 + +++ b/src/basic/path-util.c 17 + @@ -630,7 +630,11 @@ static int check_x_access(const char *path, int *ret_fd) { 18 + return r; 19 + 20 + r = access_fd(fd, X_OK); 21 + - if (r < 0) 22 + + if (r == -ENOSYS) { 23 + + /* /proc is not mounted. Fallback to access(). */ 24 + + if (access(path, X_OK) < 0) 25 + + return -errno; 26 + + } else if (r < 0) 27 + return r; 28 + 29 + if (ret_fd)
+147 -97
pkgs/os-specific/linux/systemd/default.nix
··· 39 39 , gnupg 40 40 , zlib 41 41 , xz 42 + , tpm2-tss 42 43 , libuuid 43 44 , libapparmor 44 45 , intltool ··· 57 58 , bashInteractive 58 59 , libmicrohttpd 59 60 61 + # the (optional) BPF feature requires bpftool, libbpf, clang and llmv-strip to be avilable during build time. 62 + # Only libbpf should be a runtime dependency. 63 + , bpftools 64 + , libbpf 65 + , llvmPackages 66 + 60 67 , withAnalyze ? true 61 68 , withApparmor ? true 62 69 , withCompression ? true # adds bzip2, lz4 and xz ··· 64 71 , withCryptsetup ? true 65 72 , withDocumentation ? true 66 73 , withEfi ? stdenv.hostPlatform.isEfi 74 + , withFido2 ? true 67 75 , withHomed ? false 68 76 , withHostnamed ? true 69 77 , withHwdb ? true 70 78 , withImportd ? true 79 + , withLibBPF ? false # currently fails while generating BPF objects 71 80 , withLocaled ? true 72 81 , withLogind ? true 73 82 , withMachined ? true ··· 82 91 , withShellCompletions ? true 83 92 , withTimedated ? true 84 93 , withTimesyncd ? true 94 + , withTpm2Tss ? true 85 95 , withUserDb ? true 86 96 , libfido2 87 97 , p11-kit ··· 106 116 107 117 assert withHomed -> withCryptsetup; 108 118 109 - assert withCryptsetup -> 110 - (cryptsetup != null); 119 + assert withCryptsetup -> (cryptsetup != null); 111 120 let 112 121 wantCurl = withRemote || withImportd; 113 - 122 + version = "249.4"; 114 123 in 115 - stdenv.mkDerivation rec { 116 - inherit pname; 117 - version = "247.6"; 124 + stdenv.mkDerivation { 125 + inherit pname version; 118 126 119 127 # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly 120 128 # This has proven to be less error-prone than the previous systemd fork. ··· 122 130 owner = "systemd"; 123 131 repo = "systemd-stable"; 124 132 rev = "v${version}"; 125 - sha256 = "sha256-7XYEq3Qw25suwjbtPzx9lVPHUu9ZY/1bADXl2wQbkJc="; 133 + sha256 = "0pqi9gbk9kgwvd0idf13ybxz7s4h5przn01bwj6fna44jr0wy41c"; 126 134 }; 127 135 128 136 # If these need to be regenerated, `git am path/to/00*.patch` them into a ··· 150 158 ./0018-logind-seat-debus-show-CanMultiSession-again.patch 151 159 ./0019-pkg-config-derive-prefix-from-prefix.patch 152 160 153 - # Fix -Werror=format. 154 - (fetchpatch { 155 - url = "https://github.com/systemd/systemd/commit/ab1aa6368a883bce88e3162fee2bea14aacedf23.patch"; 156 - sha256 = "1b280l5jrjsg8qhsang199mpqjhkpix4c8bm3blknjnq9iv43add"; 157 - }) 161 + # In v249 a bunch of meson files had been touched as part of the migration to 162 + # jinja2 for templating. Unfortunately some of those files lost the `install_sysconfdir_samples` check. 163 + # The following two patches are part of a PR that was filed to fix those cases. 164 + # https://github.com/systemd/systemd/pull/20303 165 + ./0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch 166 + ./0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch 167 + 168 + # In v248 or v249 we started to get in trouble due to our /etc/systemd/sytem being 169 + # a symlink and thus being treated differently by systemd. With the below 170 + # patch we mitigate that effect by special casing all our root unit dirs 171 + # if they are symlinks. This does exactly what we need (AFAICT). 172 + ./0022-core-Handle-lookup-paths-being-symlinks.patch 158 173 159 - # Fix CVE-2021-33910, disclosed 2021-07-20 160 - (fetchpatch { 161 - name = "CVE-2021-33910.patch"; 162 - url = "https://github.com/systemd/systemd/commit/441e0115646d54f080e5c3bb0ba477c892861ab9.patch"; 163 - sha256 = "1g1lk95igaadg67kah9bpi4zsc01rg398sd1247ghjsvl5hxn4v4"; 164 - }) 174 + # The way files are being tested for being executable changed in v248/v249 175 + # which caused our confinement setup to fail as we do not mount /proc by 176 + # default. 177 + # The issue has been reported upstream and this patch carries the upstream 178 + # fix for the same. Upstream now has a test for this scenario. 179 + # https://github.com/systemd/systemd/issues/20514 180 + ./0023-path-util-make-find_executable-work-without-proc-mounted.patch 165 181 ]; 166 182 167 183 postPatch = '' ··· 175 191 "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" 176 192 '' + ( 177 193 let 178 - # The folllowing dlopen patches ensure that all the features that are 179 - # implemented via dlopen(3) are available (or explicitly deactivated) by 180 - # pointing dlopen to the absolute store path instead of relying on the 181 - # linkers runtime lookup code. 194 + # The folllowing patches references to dynamic libraries to ensure that 195 + # all the features that are implemented via dlopen(3) are available (or 196 + # explicitly deactivated) by pointing dlopen to the absolute store path 197 + # instead of relying on the linkers runtime lookup code. 182 198 # 183 - # All of the dlopen calls have to be handled. When new ones are introduced 184 - # by upstream (or one of our patches) they must be explicitly declared, 185 - # otherwise the build will fail. 199 + # All of the shared library references have to be handled. When new ones 200 + # are introduced by upstream (or one of our patches) they must be 201 + # explicitly declared, otherwise the build will fail. 186 202 # 187 203 # As of systemd version 247 we've seen a few errors like `libpcre2.… not 188 204 # found` when using e.g. --grep with journalctl. Those errors should ··· 201 217 # path location). 202 218 # 203 219 # To get a list of dynamically loaded libraries issue something like 204 - # `grep -ri 'dlopen("lib' $src` and update the below list. 205 - dlopenLibs = [ 206 - # We did never provide support for libxkbcommon & qrencode 207 - { name = "libxkbcommon.so.0"; pkg = null; } 208 - { name = "libqrencode.so.4"; pkg = null; } 220 + # `grep -ri '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"'' $src` and update the below list. 221 + dlopenLibs = 222 + let 223 + opt = condition: pkg: if condition then pkg else null; 224 + in 225 + [ 226 + # bpf compilation support 227 + { name = "libbpf.so.0"; pkg = opt withLibBPF libbpf; } 228 + 229 + # We did never provide support for libxkbcommon & qrencode 230 + { name = "libxkbcommon.so.0"; pkg = null; } 231 + { name = "libqrencode.so.4"; pkg = null; } 209 232 210 - # We did not provide libpwquality before so it is safe to disable it for 211 - # now. 212 - { name = "libpwquality.so.1"; pkg = null; } 233 + # We did not provide libpwquality before so it is safe to disable it for 234 + # now. 235 + { name = "libpwquality.so.1"; pkg = null; } 213 236 214 - # Only include cryptsetup if it is enabled. We might not be able to 215 - # provide it during "bootstrap" in e.g. the minimal systemd build as 216 - # cryptsetup has udev (aka systemd) in it's dependencies. 217 - { name = "libcryptsetup.so.12"; pkg = if withCryptsetup then cryptsetup else null; } 237 + # Only include cryptsetup if it is enabled. We might not be able to 238 + # provide it during "bootstrap" in e.g. the minimal systemd build as 239 + # cryptsetup has udev (aka systemd) in it's dependencies. 240 + { name = "libcryptsetup.so.12"; pkg = opt withCryptsetup cryptsetup; } 218 241 219 - # We are using libidn2 so we only provide that and ignore the others. 220 - # Systemd does this decision during configure time and uses ifdef's to 221 - # enable specific branches. We can safely ignore (nuke) the libidn "v1" 222 - # libraries. 223 - { name = "libidn2.so.0"; pkg = libidn2; } 224 - { name = "libidn.so.12"; pkg = null; } 225 - { name = "libidn.so.11"; pkg = null; } 242 + # We are using libidn2 so we only provide that and ignore the others. 243 + # Systemd does this decision during configure time and uses ifdef's to 244 + # enable specific branches. We can safely ignore (nuke) the libidn "v1" 245 + # libraries. 246 + { name = "libidn2.so.0"; pkg = libidn2; } 247 + { name = "libidn.so.12"; pkg = null; } 248 + { name = "libidn.so.11"; pkg = null; } 226 249 227 - # journalctl --grep requires libpcre so lets provide it 228 - { name = "libpcre2-8.so.0"; pkg = pcre2; } 229 - ]; 250 + # journalctl --grep requires libpcre so lets provide it 251 + { name = "libpcre2-8.so.0"; pkg = pcre2; } 252 + 253 + # Support for TPM2 in systemd-cryptsetup, systemd-repart and systemd-cryptenroll 254 + { name = "libtss2-esys.so.0"; pkg = opt withTpm2Tss tpm2-tss; } 255 + { name = "libtss2-rc.so.0"; pkg = opt withTpm2Tss tpm2-tss; } 256 + { name = "libtss2-mu.so.0"; pkg = opt withTpm2Tss tpm2-tss; } 257 + { name = "libfido2.so.1"; pkg = opt withFido2 libfido2; } 258 + ]; 230 259 231 260 patchDlOpen = dl: 232 261 let ··· 234 263 in 235 264 if dl.pkg == null then '' 236 265 # remove the dependency on the library by replacing it with an invalid path 237 - for file in $(grep -lr 'dlopen("${dl.name}"' src); do 266 + for file in $(grep -lr '"${dl.name}"' src); do 238 267 echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…" 239 - substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"' 268 + substituteInPlace "$file" --replace '"${dl.name}"' '"/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"' 240 269 done 241 270 '' else '' 242 271 # ensure that the library we provide actually exists ··· 245 274 exit 1 246 275 fi 247 276 # make the path to the dependency explicit 248 - for file in $(grep -lr 'dlopen("${dl.name}"' src); do 277 + for file in $(grep -lr '"${dl.name}"' src); do 249 278 echo "patching dlopen(\"${dl.name}\", …) in $file to ${library}…" 250 - substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("${library}"' 279 + substituteInPlace "$file" --replace '"${dl.name}"' '"${library}"' 251 280 done 281 + 252 282 ''; 253 283 in 254 284 # patch all the dlopen calls to contain absolute paths to the libraries 255 285 lib.concatMapStringsSep "\n" patchDlOpen dlopenLibs 256 286 ) 257 - # finally ensure that there are no left-over dlopen calls that we didn't handle 287 + # finally ensure that there are no left-over dlopen calls (or rather strings pointing to shared libraries) that we didn't handle 258 288 + '' 259 - if grep -qr 'dlopen("[^/]' src; then 260 - echo "Found unhandled dlopen calls: " 261 - grep -r 'dlopen("[^/]' src 289 + if grep -qr '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"' src; then 290 + echo "Found unhandled dynamic library calls: " 291 + grep -r '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"' src 262 292 exit 1 263 293 fi 294 + '' 295 + # Finally patch shebangs that might need patching. 296 + # Should no longer be necessary with v250. 297 + # https://github.com/systemd/systemd/pull/19638 298 + + '' 299 + patchShebangs . 264 300 ''; 265 301 266 302 outputs = [ "out" "man" "dev" ]; 267 303 268 - nativeBuildInputs = [ 269 - pkg-config 270 - gperf 271 - ninja 272 - meson 273 - glibcLocales 274 - getent 275 - m4 304 + nativeBuildInputs = 305 + [ 306 + pkg-config 307 + gperf 308 + ninja 309 + meson 310 + glibcLocales 311 + getent 312 + m4 276 313 277 - intltool 278 - gettext 314 + intltool 315 + gettext 279 316 280 - libxslt 281 - docbook_xsl 282 - docbook_xml_dtd_42 283 - docbook_xml_dtd_45 284 - (buildPackages.python3Packages.python.withPackages (ps: with ps; [ python3Packages.lxml ])) 285 - ]; 317 + libxslt 318 + docbook_xsl 319 + docbook_xml_dtd_42 320 + docbook_xml_dtd_45 321 + (buildPackages.python3Packages.python.withPackages (ps: with ps; [ lxml jinja2 ])) 322 + ] 323 + ++ lib.optional withLibBPF [ 324 + bpftools 325 + llvmPackages.clang 326 + llvmPackages.libllvm 327 + ] 328 + ; 286 329 287 - buildInputs = [ 288 - acl 289 - audit 290 - glib 291 - kmod 292 - libcap 293 - libgcrypt 294 - libidn2 295 - libuuid 296 - linuxHeaders 297 - pam 298 - ] 330 + buildInputs = 331 + [ 332 + acl 333 + audit 334 + glib 335 + kmod 336 + libcap 337 + libgcrypt 338 + libidn2 339 + libuuid 340 + linuxHeaders 341 + pam 342 + ] 299 343 300 - ++ lib.optional withApparmor libapparmor 301 - ++ lib.optional wantCurl (lib.getDev curl) 302 - ++ lib.optionals withCompression [ bzip2 lz4 xz ] 303 - ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) 304 - ++ lib.optional withEfi gnu-efi 305 - ++ lib.optional withKexectools kexec-tools 306 - ++ lib.optional withLibseccomp libseccomp 307 - ++ lib.optional withNetworkd iptables 308 - ++ lib.optional withPCRE2 pcre2 309 - ++ lib.optional withResolved libgpgerror 310 - ++ lib.optional withSelinux libselinux 311 - ++ lib.optional withRemote libmicrohttpd 312 - ++ lib.optionals withHomed [ p11-kit libfido2 ] 344 + ++ lib.optional withApparmor libapparmor 345 + ++ lib.optional wantCurl (lib.getDev curl) 346 + ++ lib.optionals withCompression [ bzip2 lz4 xz ] 347 + ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) 348 + ++ lib.optional withEfi gnu-efi 349 + ++ lib.optional withKexectools kexec-tools 350 + ++ lib.optional withLibseccomp libseccomp 351 + ++ lib.optional withNetworkd iptables 352 + ++ lib.optional withPCRE2 pcre2 353 + ++ lib.optional withResolved libgpgerror 354 + ++ lib.optional withSelinux libselinux 355 + ++ lib.optional withRemote libmicrohttpd 356 + ++ lib.optionals withHomed [ p11-kit ] 357 + ++ lib.optionals (withHomed || withCryptsetup) [ libfido2 ] 358 + ++ lib.optionals withLibBPF [ libbpf ] 313 359 ; 314 360 315 361 #dontAddPrefix = true; 316 362 317 363 mesonFlags = [ 364 + "-Dversion-tag=${version}" 318 365 "-Ddbuspolicydir=${placeholder "out"}/share/dbus-1/system.d" 319 366 "-Ddbussessionservicedir=${placeholder "out"}/share/dbus-1/services" 320 367 "-Ddbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services" ··· 405 452 "-Dnss-mymachines=false" 406 453 "-Dnss-resolve=false" 407 454 "-Dnss-systemd=false" 455 + ] ++ lib.optionals withLibBPF [ 456 + "-Dbpf-framework=true" 408 457 ]; 409 458 410 459 preConfigure = '' ··· 453 502 --replace '"tar"' '"${gnutar}/bin/tar"' 454 503 done 455 504 456 - substituteInPlace src/journal/catalog.c \ 505 + 506 + substituteInPlace src/libsystemd/sd-journal/catalog.c \ 457 507 --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ 458 508 ''; 459 509
+2 -1
pkgs/os-specific/linux/tbs/default.nix
··· 18 18 }; 19 19 20 20 in stdenv.mkDerivation { 21 - name = "tbs-2018.04.18-${kernel.version}"; 21 + pname = "tbs"; 22 + version = "2018.04.18-${kernel.version}"; 22 23 23 24 srcs = [ media build ]; 24 25 sourceRoot = build.name;
+5 -3
pkgs/os-specific/linux/tunctl/default.nix
··· 1 1 {lib, stdenv, fetchurl}: 2 2 3 - stdenv.mkDerivation { 4 - name = "tunctl-1.5"; 3 + stdenv.mkDerivation rec { 4 + pname = "tunctl"; 5 + version = "1.5"; 6 + 5 7 src = fetchurl { 6 - url = "mirror://sourceforge/tunctl/tunctl-1.5.tar.gz"; 8 + url = "mirror://sourceforge/tunctl/tunctl-${version}.tar.gz"; 7 9 sha256 = "aa2a6c4cc6bfacb11e0d9f62334a6638a0d435475c61230116f00b6af8b14fff"; 8 10 }; 9 11
+2 -1
pkgs/os-specific/linux/usermount/default.nix
··· 1 1 { lib, stdenv, fetchgit, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }: 2 2 3 3 stdenv.mkDerivation { 4 - name = "usermount-0.1"; 4 + pname = "usermount"; 5 + version = "0.1"; 5 6 6 7 src = fetchgit { 7 8 url = "https://github.com/tom5760/usermount.git";
+2 -1
pkgs/os-specific/linux/xf86-video-nested/default.nix
··· 3 3 }: 4 4 5 5 stdenv.mkDerivation { 6 - name = "xf86-video-nested-2017-06-12"; 6 + pname = "xf86-video-nested"; 7 + version = "unstable-2017-06-12"; 7 8 8 9 src = fetchgit { 9 10 url = "git://anongit.freedesktop.org/xorg/driver/xf86-video-nested";
+2 -1
pkgs/servers/home-assistant/default.nix
··· 829 829 "test_onboarding_core_no_rpi_power" 830 830 # hue/test_sensor_base.py: Race condition when counting events 831 831 "test_hue_events" 832 - # august/test_lock.py: AssertionError: assert 'unlocked' == 'locked' 832 + # august/test_lock.py: AssertionError: assert 'unlocked' == 'locked' / assert 'off' == 'on' 833 833 "test_lock_update_via_pubnub" 834 + "test_door_sense_update_via_pubnub" 834 835 ]; 835 836 836 837 preCheck = ''
+12 -12
pkgs/servers/sql/postgresql/default.nix
··· 198 198 in self: { 199 199 200 200 postgresql_9_6 = self.callPackage generic { 201 - version = "9.6.22"; 201 + version = "9.6.23"; 202 202 psqlSchema = "9.6"; 203 - sha256 = "0c19kzrj5ib5ygmavf5d6qvxdwrxzzz6jz1r2dl5b815208cscix"; 203 + sha256 = "1fa735lrmv2vrfiixg73nh024gxlagcbrssklvgwdf0s82cgfjd8"; 204 204 this = self.postgresql_9_6; 205 205 thisAttr = "postgresql_9_6"; 206 206 inherit self; 207 207 }; 208 208 209 209 postgresql_10 = self.callPackage generic { 210 - version = "10.17"; 210 + version = "10.18"; 211 211 psqlSchema = "10.0"; # should be 10, but changing it is invasive 212 - sha256 = "0v5jahkqm6gkq67s4bac3h7297bscn2ab6y128idi73cc1qq1wjs"; 212 + sha256 = "009qpb02bq0rx0aaw5ck70gk07xwparhfxvlfimgihw2vhp7qisp"; 213 213 this = self.postgresql_10; 214 214 thisAttr = "postgresql_10"; 215 215 inherit self; ··· 217 217 }; 218 218 219 219 postgresql_11 = self.callPackage generic { 220 - version = "11.12"; 220 + version = "11.13"; 221 221 psqlSchema = "11.1"; # should be 11, but changing it is invasive 222 - sha256 = "016bacpmqxc676ipzc1l8zv1jj44mjz7dv7jhqazg3ibdfqxiyc7"; 222 + sha256 = "0j5wnscnxa3sx8d39s55654df8aikmvkihfb0a02hrgmyygnihx0"; 223 223 this = self.postgresql_11; 224 224 thisAttr = "postgresql_11"; 225 225 inherit self; 226 226 }; 227 227 228 228 postgresql_12 = self.callPackage generic { 229 - version = "12.7"; 229 + version = "12.8"; 230 230 psqlSchema = "12"; 231 - sha256 = "15frsmsl1n2i4p76ji0wng4lvnlzw6f01br4cs5xr3n88wgp9444"; 231 + sha256 = "0an6v5bsp26d276wbdx76lsq6cq86hgi2fmkzwawnk63j3h02r72"; 232 232 this = self.postgresql_12; 233 233 thisAttr = "postgresql_12"; 234 234 inherit self; 235 235 }; 236 236 237 237 postgresql_13 = self.callPackage generic { 238 - version = "13.3"; 238 + version = "13.4"; 239 239 psqlSchema = "13"; 240 - sha256 = "18dliq7h2l8irffhyyhdmfwx3si515q6gds3cxdjb9n7m17lbn9w"; 240 + sha256 = "1kf0gcsrl5n25rjlvkh87aywmn28kbwvakm5c7j1qpr4j01y34za"; 241 241 this = self.postgresql_13; 242 242 thisAttr = "postgresql_13"; 243 243 inherit self; 244 244 }; 245 245 246 246 postgresql_14 = self.callPackage generic { 247 - version = "14beta1"; 247 + version = "14beta3"; 248 248 psqlSchema = "14"; 249 - sha256 = "0lih2iykychhvis3mxqyp087m1hld3lyi48n3qwd2js44prxv464"; 249 + sha256 = "1yjbc8q4hk9pvlfr3lwhk2zp4bavxqpil83ncl871nwk06c6b8if"; 250 250 this = self.postgresql_14; 251 251 thisAttr = "postgresql_14"; 252 252 inherit self;
+3 -3
pkgs/servers/x11/xorg/default.nix
··· 1017 1017 # THIS IS A GENERATED FILE. DO NOT EDIT! 1018 1018 libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { 1019 1019 pname = "libXft"; 1020 - version = "2.3.3"; 1020 + version = "2.3.4"; 1021 1021 builder = ./builder.sh; 1022 1022 src = fetchurl { 1023 - url = "mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2"; 1024 - sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; 1023 + url = "mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2"; 1024 + sha256 = "1pdbr6gzfvixc791pjf42i9gg8wvfq6cpq6sdca04h4i42mxmpjp"; 1025 1025 }; 1026 1026 hardeningDisable = [ "bindnow" "relro" ]; 1027 1027 nativeBuildInputs = [ pkg-config ];
+11 -3
pkgs/servers/x11/xorg/overrides.nix
··· 200 200 ++ malloc0ReturnsNullCrossFlag; 201 201 202 202 patches = [ 203 - # Adds color emoji rendering support. 203 + # The following three patches add color emoji rendering support. 204 204 # https://gitlab.freedesktop.org/xorg/lib/libxft/merge_requests/1 205 205 (fetchpatch { 206 - url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/fe41537b5714a2301808eed2d76b2e7631176573.patch"; 207 - sha256 = "045lp1q50i2wlwvpsq6ycxdc6p3asm2r3bk2nbad1dwkqw2xf9jc"; 206 + url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/723092ece088559f1af299236305911f4ee4d450.patch"; 207 + sha256 = "1y5s6x5b7n2rqxapdx65zlcz35s7i7075qxkfnj859hx7k5ybx53"; 208 + }) 209 + (fetchpatch { 210 + url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/e0fc4ce7e87ab9c4b47e5c8e693f070dfd0d2f7b.patch"; 211 + sha256 = "1x7cbhdrprrmngyy3l3b45bz6717dzp881687h5hxa4g2bg5c764"; 212 + }) 213 + (fetchpatch { 214 + url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/d385aa3e5320d18918413df0e8aef3a713a47e0b.patch"; 215 + sha256 = "1acnks2g88hari2708x93ywa9m2f4lm60yhn9va45151ma2qb5n0"; 208 216 }) 209 217 ]; 210 218
+1 -1
pkgs/servers/x11/xorg/tarballs.list
··· 188 188 mirror://xorg/individual/lib/libXfixes-6.0.0.tar.bz2 189 189 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 190 190 mirror://xorg/individual/lib/libXfont2-2.0.5.tar.bz2 191 - mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2 191 + mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2 192 192 mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2 193 193 mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 194 194 mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2
+8 -6
pkgs/stdenv/generic/builder.sh
··· 6 6 7 7 mkdir $out 8 8 9 - echo "export SHELL=$shell" > $out/setup 10 - echo "initialPath=\"$initialPath\"" >> $out/setup 11 - echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup 12 - echo "defaultBuildInputs=\"$defaultBuildInputs\"" >> $out/setup 13 - echo "$preHook" >> $out/setup 14 - cat "$setup" >> $out/setup 9 + { 10 + echo "export SHELL=$shell" 11 + echo "initialPath=\"$initialPath\"" 12 + echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" 13 + echo "defaultBuildInputs=\"$defaultBuildInputs\"" 14 + echo "$preHook" 15 + cat "$setup" 16 + } > "$out/setup" 15 17 16 18 # Allow the user to install stdenv using nix-env and get the packages 17 19 # in stdenv.
+77 -71
pkgs/stdenv/generic/setup.sh
··· 1 1 set -eu 2 2 set -o pipefail 3 3 4 - if [ -n "${BASH_VERSINFO-}" ] && [ "${BASH_VERSINFO-}" -lt 4 ]; then 4 + if [[ -n "${BASH_VERSINFO-}" && "${BASH_VERSINFO-}" -lt 4 ]]; then 5 5 echo "Detected Bash version that isn't supported by Nixpkgs (${BASH_VERSION})" 6 6 echo "Please install Bash 4 or greater to continue." 7 7 exit 1 ··· 121 121 set +e 122 122 123 123 if [ -n "${showBuildStats:-}" ]; then 124 - times > "$NIX_BUILD_TOP/.times" 125 - local -a times=($(cat "$NIX_BUILD_TOP/.times")) 126 - # Print the following statistics: 127 - # - user time for the shell 128 - # - system time for the shell 129 - # - user time for all child processes 130 - # - system time for all child processes 131 - echo "build time elapsed: " "${times[@]}" 124 + read -r -d '' -a buildTimes < <(times) 125 + echo "build times:" 126 + echo "user time for the shell ${buildTimes[0]}" 127 + echo "system time for the shell ${buildTimes[1]}" 128 + echo "user time for all child processes ${buildTimes[2]}" 129 + echo "system time for all child processes ${buildTimes[3]}" 132 130 fi 133 131 134 132 if (( "$exitCode" != 0 )); then ··· 207 205 exec {fd}< "$fn" 208 206 read -r -n 4 -u "$fd" magic 209 207 exec {fd}<&- 208 + 209 + # nix uses 'declare -F' in get-env.sh to retrieve the loaded functions. 210 + # If we use the $'string' syntax instead of 'echo -ne' then 'declare' will print the raw characters and break nix. 211 + # See https://github.com/NixOS/nixpkgs/pull/138334 and https://github.com/NixOS/nix/issues/5262. 212 + 210 213 # https://opensource.apple.com/source/lldb/lldb-310.2.36/examples/python/mach_o.py.auto.html 211 - if [[ "$magic" = $'\xfe\xed\xfa\xcf' || "$magic" = $'\xcf\xfa\xed\xfe' ]]; then 214 + if [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xcf") || "$magic" = $(echo -ne "\xcf\xfa\xed\xfe") ]]; then 212 215 # MH_MAGIC_64 || MH_CIGAM_64 213 216 return 0; 214 - elif [[ "$magic" = $'\xfe\xed\xfa\xce' || "$magic" = $'\xce\xfa\xed\xfe' ]]; then 217 + elif [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xce") || "$magic" = $(echo -ne "\xce\xfa\xed\xfe") ]]; then 215 218 # MH_MAGIC || MH_CIGAM 216 219 return 0; 217 - elif [[ "$magic" = $'\xca\xfe\xba\xbe' || "$magic" = $'\xbe\xba\xfe\xca' ]]; then 220 + elif [[ "$magic" = $(echo -ne "\xca\xfe\xba\xbe") || "$magic" = $(echo -ne "\xbe\xba\xfe\xca") ]]; then 218 221 # FAT_MAGIC || FAT_CIGAM 219 222 return 0; 220 223 else ··· 329 332 330 333 declare -a pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars) 331 334 335 + # those variables are declared here, since where and if they are used varies 336 + # shellcheck disable=SC2034 337 + declare -a preFixupHooks fixupOutputHooks preConfigureHooks postFixupHooks postUnpackHooks unpackCmdHooks 338 + 332 339 # Add env hooks for all sorts of deps with the specified host offset. 333 340 addEnvHooks() { 334 341 local depHostOffset="$1" ··· 370 377 # implements. 371 378 findInputs() { 372 379 local -r pkg="$1" 373 - local -ri hostOffset="$2" 374 - local -ri targetOffset="$3" 380 + local -r hostOffset="$2" 381 + local -r targetOffset="$3" 375 382 376 383 # Sanity check 377 - (( "$hostOffset" <= "$targetOffset" )) || exit -1 384 + (( hostOffset <= targetOffset )) || exit -1 378 385 379 - local varVar="${pkgAccumVarVars[$hostOffset + 1]}" 380 - local varRef="$varVar[\$targetOffset - \$hostOffset]" 386 + local varVar="${pkgAccumVarVars[hostOffset + 1]}" 387 + local varRef="$varVar[$((targetOffset - hostOffset))]" 381 388 local var="${!varRef}" 382 389 unset -v varVar varRef 383 390 ··· 404 411 # offsets to current offset 405 412 local -i mapOffsetResult 406 413 function mapOffset() { 407 - local -ri inputOffset="$1" 408 - if (( "$inputOffset" <= 0 )); then 409 - local -ri outputOffset="$inputOffset + $hostOffset" 414 + local -r inputOffset="$1" 415 + if (( inputOffset <= 0 )); then 416 + local -r outputOffset=$((inputOffset + hostOffset)) 410 417 else 411 - local -ri outputOffset="$inputOffset - 1 + $targetOffset" 418 + local -r outputOffset=$((inputOffset - 1 + targetOffset)) 412 419 fi 413 420 mapOffsetResult="$outputOffset" 414 421 } 415 422 416 423 # Host offset relative to that of the package whose immediate 417 424 # dependencies we are currently exploring. 418 - local -i relHostOffset 425 + local relHostOffset 419 426 for relHostOffset in "${allPlatOffsets[@]}"; do 420 427 # `+ 1` so we start at 0 for valid index 421 - local files="${propagatedDepFilesVars[$relHostOffset + 1]}" 428 + local files="${propagatedDepFilesVars[relHostOffset + 1]}" 422 429 423 430 # Host offset relative to the package currently being 424 431 # built---as absolute an offset as will be used. ··· 496 503 # Add package to the future PATH and run setup hooks 497 504 activatePackage() { 498 505 local pkg="$1" 499 - local -ri hostOffset="$2" 500 - local -ri targetOffset="$3" 506 + local -r hostOffset="$2" 507 + local -r targetOffset="$3" 501 508 502 509 # Sanity check 503 - (( "$hostOffset" <= "$targetOffset" )) || exit -1 510 + (( hostOffset <= targetOffset )) || exit -1 504 511 505 512 if [ -f "$pkg" ]; then 506 513 source "$pkg" ··· 517 524 addToSearchPath _PATH "$pkg/bin" 518 525 fi 519 526 520 - if [[ "$hostOffset" -le -1 ]]; then 527 + if (( hostOffset <= -1 )); then 521 528 addToSearchPath _XDG_DATA_DIRS "$pkg/share" 522 529 fi 523 530 ··· 531 538 } 532 539 533 540 _activatePkgs() { 534 - local -i hostOffset targetOffset 541 + local hostOffset targetOffset 535 542 local pkg 536 543 537 544 for hostOffset in "${allPlatOffsets[@]}"; do 538 - local pkgsVar="${pkgAccumVarVars[$hostOffset + 1]}" 545 + local pkgsVar="${pkgAccumVarVars[hostOffset + 1]}" 539 546 for targetOffset in "${allPlatOffsets[@]}"; do 540 - (( "$hostOffset" <= "$targetOffset" )) || continue 547 + (( hostOffset <= targetOffset )) || continue 541 548 local pkgsRef="${pkgsVar}[$targetOffset - $hostOffset]" 542 549 local pkgsSlice="${!pkgsRef}[@]" 543 550 for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do ··· 559 566 # with this information to the relevant env hook array, but bash 560 567 # doesn't have closures, so it's easier to just pass this in. 561 568 _addToEnv() { 562 - local -i depHostOffset depTargetOffset 569 + local depHostOffset depTargetOffset 563 570 local pkg 564 571 565 572 for depHostOffset in "${allPlatOffsets[@]}"; do 566 - local hookVar="${pkgHookVarVars[$depHostOffset + 1]}" 567 - local pkgsVar="${pkgAccumVarVars[$depHostOffset + 1]}" 573 + local hookVar="${pkgHookVarVars[depHostOffset + 1]}" 574 + local pkgsVar="${pkgAccumVarVars[depHostOffset + 1]}" 568 575 for depTargetOffset in "${allPlatOffsets[@]}"; do 569 - (( "$depHostOffset" <= "$depTargetOffset" )) || continue 576 + (( depHostOffset <= depTargetOffset )) || continue 570 577 local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]" 571 578 if [[ -z "${strictDeps-}" ]]; then 572 579 ··· 578 585 # 579 586 # TODO(@Ericson2314): Don't special-case native compilation 580 587 for pkg in \ 581 - ${pkgsBuildBuild+"${pkgsBuildBuild[@]}"} \ 582 - ${pkgsBuildHost+"${pkgsBuildHost[@]}"} \ 583 - ${pkgsBuildTarget+"${pkgsBuildTarget[@]}"} \ 584 - ${pkgsHostHost+"${pkgsHostHost[@]}"} \ 585 - ${pkgsHostTarget+"${pkgsHostTarget[@]}"} \ 586 - ${pkgsTargetTarget+"${pkgsTargetTarget[@]}"} 588 + "${pkgsBuildBuild[@]}" \ 589 + "${pkgsBuildHost[@]}" \ 590 + "${pkgsBuildTarget[@]}" \ 591 + "${pkgsHostHost[@]}" \ 592 + "${pkgsHostTarget[@]}" \ 593 + "${pkgsTargetTarget[@]}" 587 594 do 588 595 if [[ "$visitedPkgs" = *"$pkg"* ]]; then 589 596 continue ··· 656 663 # means that we're supposed to try and auto-detect the number of 657 664 # available CPU cores at run-time. 658 665 659 - if [ -z "${NIX_BUILD_CORES:-}" ]; then 660 - NIX_BUILD_CORES="1" 661 - elif [ "$NIX_BUILD_CORES" -le 0 ]; then 662 - NIX_BUILD_CORES=$(nproc 2>/dev/null || true) 663 - if expr >/dev/null 2>&1 "$NIX_BUILD_CORES" : "^[0-9][0-9]*$"; then 664 - : 665 - else 666 - NIX_BUILD_CORES="1" 667 - fi 666 + NIX_BUILD_CORES="${NIX_BUILD_CORES:-1}" 667 + if ((NIX_BUILD_CORES <= 0)); then 668 + guess=$(nproc 2>/dev/null || true) 669 + ((NIX_BUILD_CORES = guess <= 0 ? 1 : guess)) 668 670 fi 669 671 export NIX_BUILD_CORES 670 672 671 673 672 674 # Prevent SSL libraries from using certificates in /etc/ssl, unless set explicitly. 673 675 # Leave it in impure shells for convenience. 674 - if [ -z "${NIX_SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then 676 + if [[ -z "${NIX_SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then 675 677 export NIX_SSL_CERT_FILE=/no-cert-file.crt 676 678 fi 677 679 # Another variant left for compatibility. 678 - if [ -z "${SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then 680 + if [[ -z "${SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then 679 681 export SSL_CERT_FILE=/no-cert-file.crt 680 682 fi 681 683 ··· 739 741 printf "%s" "${!var}" 740 742 } 741 743 744 + # put the content of a file in a variable 745 + # fail loudly if provided with a binary (containing null bytes) 742 746 consumeEntire() { 743 747 # read returns non-0 on EOF, so we want read to fail 744 - if IFS='' read -r -N 0 $1; then 748 + if IFS='' read -r -d '' $1 ; then 745 749 echo "consumeEntire(): ERROR: Input null bytes, won't process" >&2 746 750 return 1 747 751 fi ··· 1010 1014 configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" 1011 1015 fi 1012 1016 1013 - # Add --disable-dependency-tracking to speed up some builds. 1014 - if [ -z "${dontAddDisableDepTrack:-}" ]; then 1015 - if [ -f "$configureScript" ] && grep -q dependency-tracking "$configureScript"; then 1016 - configureFlags="--disable-dependency-tracking $configureFlags" 1017 + if [[ -f "$configureScript" ]]; then 1018 + # Add --disable-dependency-tracking to speed up some builds. 1019 + if [ -z "${dontAddDisableDepTrack:-}" ]; then 1020 + if grep -q dependency-tracking "$configureScript"; then 1021 + configureFlags="--disable-dependency-tracking $configureFlags" 1022 + fi 1017 1023 fi 1018 - fi 1019 1024 1020 - # By default, disable static builds. 1021 - if [ -z "${dontDisableStatic:-}" ]; then 1022 - if [ -f "$configureScript" ] && grep -q enable-static "$configureScript"; then 1023 - configureFlags="--disable-static $configureFlags" 1025 + # By default, disable static builds. 1026 + if [ -z "${dontDisableStatic:-}" ]; then 1027 + if grep -q enable-static "$configureScript"; then 1028 + configureFlags="--disable-static $configureFlags" 1029 + fi 1024 1030 fi 1025 1031 fi 1026 1032 ··· 1028 1034 # Old bash empty array hack 1029 1035 # shellcheck disable=SC2086 1030 1036 local flagsArray=( 1031 - $configureFlags ${configureFlagsArray+"${configureFlagsArray[@]}"} 1037 + $configureFlags "${configureFlagsArray[@]}" 1032 1038 ) 1033 1039 echoCmd 'configure flags' "${flagsArray[@]}" 1034 1040 # shellcheck disable=SC2086 ··· 1058 1064 local flagsArray=( 1059 1065 ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} 1060 1066 SHELL=$SHELL 1061 - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} 1062 - $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"} 1067 + $makeFlags "${makeFlagsArray[@]}" 1068 + $buildFlags "${buildFlagsArray[@]}" 1063 1069 ) 1064 1070 1065 1071 echoCmd 'build flags' "${flagsArray[@]}" ··· 1097 1103 local flagsArray=( 1098 1104 ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} 1099 1105 SHELL=$SHELL 1100 - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} 1101 - ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} 1106 + $makeFlags "${makeFlagsArray[@]}" 1107 + ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" 1102 1108 ${checkTarget} 1103 1109 ) 1104 1110 ··· 1123 1129 # shellcheck disable=SC2086 1124 1130 local flagsArray=( 1125 1131 SHELL=$SHELL 1126 - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} 1127 - $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} 1132 + $makeFlags "${makeFlagsArray[@]}" 1133 + $installFlags "${installFlagsArray[@]}" 1128 1134 ${installTargets:-install} 1129 1135 ) 1130 1136 ··· 1231 1237 local flagsArray=( 1232 1238 ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} 1233 1239 SHELL=$SHELL 1234 - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} 1235 - $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"} 1240 + $makeFlags "${makeFlagsArray[@]}" 1241 + $installCheckFlags "${installCheckFlagsArray[@]}" 1236 1242 ${installCheckTarget:-installcheck} 1237 1243 ) 1238 1244 ··· 1251 1257 # Old bash empty array hack 1252 1258 # shellcheck disable=SC2086 1253 1259 local flagsArray=( 1254 - $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist} 1260 + $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} 1255 1261 ) 1256 1262 1257 1263 echo 'dist flags: %q' "${flagsArray[@]}"
+9 -1
pkgs/tools/archivers/cpio/default.nix
··· 1 - { lib, stdenv, fetchurl }: 1 + { lib, stdenv, fetchurl, fetchpatch }: 2 2 3 3 let 4 4 version = "2.13"; ··· 10 10 url = "mirror://gnu/cpio/${name}.tar.bz2"; 11 11 sha256 = "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga"; 12 12 }; 13 + 14 + patches = [ 15 + (fetchpatch { 16 + name = "CVE-2021-38185.patch"; 17 + url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=dd96882877721703e19272fe25034560b794061b"; 18 + sha256 = "0vmr0qjwj2ldnzsvccl105ckwgx3ssvn9mp3f27ss0kiyigrzz32"; 19 + }) 20 + ]; 13 21 14 22 preConfigure = if stdenv.isCygwin then '' 15 23 sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
+2 -2
pkgs/tools/bootloaders/refind/default.nix
··· 14 14 15 15 stdenv.mkDerivation rec { 16 16 pname = "refind"; 17 - version = "0.13.1"; 17 + version = "0.13.2"; 18 18 19 19 src = fetchurl { 20 20 url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz"; 21 - sha256 = "1yjni0mr3rqrrk4ynwb8i0whpqhd56cck4mxd97qmxn7wbr826i9"; 21 + sha256 = "0w6990ggns4xsdmgj3aq527q15frrxfmxwa3m6igabd4ai498n6x"; 22 22 }; 23 23 24 24 patches = [
+2 -2
pkgs/tools/misc/hdf5/default.nix
··· 34 34 35 35 outputs = [ "out" "dev" ]; 36 36 37 - nativeBuildInputs = [ removeReferencesTo ]; 37 + nativeBuildInputs = [ removeReferencesTo ] 38 + ++ optional (gfortran != null) gfortran; 38 39 39 40 buildInputs = [] 40 - ++ optional (gfortran != null) gfortran 41 41 ++ optional (szip != null) szip 42 42 ++ optional javaSupport jdk; 43 43
+2 -2
pkgs/tools/networking/openssh/default.nix
··· 6 6 7 7 openssh = common rec { 8 8 pname = "openssh"; 9 - version = "8.6p1"; 9 + version = "8.7p1"; 10 10 11 11 src = fetchurl { 12 12 url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; 13 - sha256 = "1bnpivgk98h2f9afpp88jv6g9ps83vnpxd031n2jqxi12vdf9rn3"; 13 + sha256 = "090yxpi03pxxzb4ppx8g8hdpw7c4nf8p0avr6c7ybsaana5lp8vw"; 14 14 }; 15 15 16 16 extraPatches = [ ./ssh-keysign-8.5.patch ];
+2 -2
pkgs/tools/text/diffutils/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "diffutils"; 10 - version = "3.7"; 10 + version = "3.8"; 11 11 12 12 src = fetchurl { 13 13 url = "mirror://gnu/diffutils/diffutils-${version}.tar.xz"; 14 - sha256 = "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk"; 14 + sha256 = "sha256-pr3X0bMSZtEcT03mwbdI1GB6sCMa9RiPwlM9CuJDj+w="; 15 15 }; 16 16 17 17 outputs = [ "out" "info" ];
+17 -3
pkgs/tools/text/source-highlight/default.nix
··· 1 - { lib, stdenv, fetchurl, boost }: 1 + { lib, stdenv, fetchpatch, fetchurl, boost }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "source-highlight"; ··· 9 9 sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs"; 10 10 }; 11 11 12 + patches = [ 13 + # gcc-11 compat upstream patch 14 + (fetchpatch { 15 + url = "http://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4"; 16 + sha256 = "1wnj0jmkmrwjww7qk9dvfxh8h06jdn7mi8v2fvwh95b6x87z5l47"; 17 + excludes = [ "ChangeLog" ]; 18 + }) 19 + ]; 20 + 12 21 # source-highlight uses it's own binary to generate documentation. 13 22 # During cross-compilation, that binary was built for the target 14 23 # platform architecture, so it can't run on the build host. 15 - patchPhase = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' 24 + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' 16 25 substituteInPlace Makefile.in --replace "src doc tests" "src tests" 17 26 ''; 18 27 ··· 21 30 22 31 configureFlags = [ "--with-boost=${boost.out}" ]; 23 32 24 - enableParallelBuilding = false; 33 + doCheck = !stdenv.cc.isClang; 34 + 35 + enableParallelBuilding = true; 36 + # Upstream uses the same intermediate files in multiple tests, running 37 + # them in parallel by make will eventually break one or more tests. 38 + enableParallelChecking = false; 25 39 26 40 outputs = [ "out" "doc" "dev" ]; 27 41
+2
pkgs/top-level/aliases.nix
··· 66 66 badtouch = authoscope; # Project was renamed, added 20210626 67 67 bar-xft = lemonbar-xft; # added 2015-01-16 68 68 bashCompletion = bash-completion; # Added 2016-09-28 69 + bash_5 = bash; # added 2021-08-20 70 + bashInteractive_5 = bashInteractive; # added 2021-08-20 69 71 batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 70 72 bazaar = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 71 73 bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19
+17 -15
pkgs/top-level/all-packages.nix
··· 10742 10742 10743 10743 any-nix-shell = callPackage ../shells/any-nix-shell { }; 10744 10744 10745 - bash = lowPrio (callPackage ../shells/bash/4.4.nix { 10745 + bash_4 = lowPrio (callPackage ../shells/bash/4.4.nix { 10746 10746 binutils = stdenv.cc.bintools; 10747 10747 }); 10748 - bash_5 = lowPrio (callPackage ../shells/bash/5.1.nix { 10748 + bash = lowPrio (callPackage ../shells/bash/5.1.nix { 10749 10749 binutils = stdenv.cc.bintools; 10750 10750 }); 10751 - bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.1.nix { 10751 + # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed 10752 + bashInteractive = callPackage ../shells/bash/5.1.nix { 10752 10753 binutils = stdenv.cc.bintools; 10753 10754 interactive = true; 10754 10755 withDocs = true; 10755 - }); 10756 + }; 10756 10757 10757 - # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed 10758 - bashInteractive = callPackage ../shells/bash/4.4.nix { 10758 + bashInteractive_4 = lowPrio (callPackage ../shells/bash/4.4.nix { 10759 10759 binutils = stdenv.cc.bintools; 10760 10760 interactive = true; 10761 10761 withDocs = true; 10762 - }; 10762 + }); 10763 10763 10764 10764 bash-completion = callPackage ../shells/bash/bash-completion { }; 10765 10765 ··· 12360 12360 inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; 12361 12361 llvm_10 = llvmPackages_10.libllvm; 12362 12362 }; 12363 - rust_1_54 = callPackage ../development/compilers/rust/1_54.nix { 12363 + rust_1_55 = callPackage ../development/compilers/rust/1_55.nix { 12364 12364 inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; 12365 12365 llvm_12 = llvmPackages_12.libllvm; 12366 12366 }; 12367 - rust = rust_1_54; 12367 + rust = rust_1_55; 12368 12368 12369 12369 mrustc = callPackage ../development/compilers/mrustc { }; 12370 12370 mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; 12371 12371 mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; 12372 12372 12373 12373 rustPackages_1_45 = rust_1_45.packages.stable; 12374 - rustPackages_1_54 = rust_1_54.packages.stable; 12375 - rustPackages = rustPackages_1_54; 12374 + rustPackages_1_55 = rust_1_55.packages.stable; 12375 + rustPackages = rustPackages_1_55; 12376 12376 12377 12377 inherit (rustPackages) cargo clippy rustc rustPlatform; 12378 12378 ··· 18542 18542 python = python37; 18543 18543 }; 18544 18544 18545 - protobuf = protobuf3_17; 18545 + protobuf = protobuf3_18; 18546 18546 18547 + protobuf3_18 = callPackage ../development/libraries/protobuf/3.18.nix { }; 18547 18548 protobuf3_17 = callPackage ../development/libraries/protobuf/3.17.nix { }; 18548 18549 protobuf3_16 = callPackage ../development/libraries/protobuf/3.16.nix { }; 18549 18550 protobuf3_15 = callPackage ../development/libraries/protobuf/3.15.nix { }; ··· 19085 19086 19086 19087 srt = callPackage ../development/libraries/srt { }; 19087 19088 19088 - srtp = callPackage ../development/libraries/srtp { 19089 - libpcap = if stdenv.isLinux then libpcap else null; 19090 - }; 19089 + srtp = callPackage ../development/libraries/srtp { }; 19091 19090 19092 19091 stb = callPackage ../development/libraries/stb { }; 19093 19092 ··· 22020 22019 withCryptsetup = false; 22021 22020 withDocumentation = false; 22022 22021 withEfi = false; 22022 + withFido2 = false; 22023 22023 withHostnamed = false; 22024 22024 withHwdb = false; 22025 22025 withImportd = false; 22026 + withLibBPF = false; 22026 22027 withLocaled = false; 22027 22028 withLogind = false; 22028 22029 withMachined = false; ··· 22036 22037 withShellCompletions = false; 22037 22038 withTimedated = false; 22038 22039 withTimesyncd = false; 22040 + withTpm2Tss = false; 22039 22041 withUserDb = false; 22040 22042 glib = null; 22041 22043 libgcrypt = null;