diff options
22 files changed, 413 insertions, 1071 deletions
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix deleted file mode 100644 index 054c8c74a76b1..0000000000000 --- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix +++ /dev/null @@ -1,160 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - # A dummy /etc/nixos/configuration.nix in the booted CD that - # rebuilds the CD's configuration (and allows the configuration to - # be modified, of course, providing a true live CD). Problem is - # that we don't really know how the CD was built - the Nix - # expression language doesn't allow us to query the expression being - # evaluated. So we'll just hope for the best. - dummyConfiguration = pkgs.writeText "configuration.nix" - '' - { config, pkgs, ... }: - - { # Add your own options below, e.g.: - # services.openssh.enable = true; - nixpkgs.config.platform = pkgs.platforms.fuloong2f_n32; - } - ''; - - - pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l; - - # A clue for the kernel loading - kernelParams = pkgs.writeText "kernel-params.txt" '' - Kernel Parameters: - init=/boot/init ${toString config.boot.kernelParams} - ''; - - # System wide nixpkgs config - nixpkgsUserConfig = pkgs.writeText "config.nix" '' - pkgs: - { - platform = pkgs.platforms.fuloong2f_n32; - } - ''; - -in - -{ - imports = [ ./system-tarball.nix ]; - - # Disable some other stuff we don't need. - security.sudo.enable = false; - - # Include only the en_US locale. This saves 75 MiB or so compared to - # the full glibcLocales package. - i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"]; - - # Include some utilities that are useful for installing or repairing - # the system. - environment.systemPackages = - [ pkgs.w3m # needed for the manual anyway - pkgs.testdisk # useful for repairing boot problems - pkgs.ms-sys # for writing Microsoft boot sectors / MBRs - pkgs.parted - pkgs.ddrescue - pkgs.ccrypt - pkgs.cryptsetup # needed for dm-crypt volumes - - # Some networking tools. - pkgs.sshfs-fuse - pkgs.socat - pkgs.screen - pkgs.wpa_supplicant # !!! should use the wpa module - - # Hardware-related tools. - pkgs.sdparm - pkgs.hdparm - pkgs.dmraid - - # Tools to create / manipulate filesystems. - pkgs.ntfsprogs # for resizing NTFS partitions - pkgs.btrfs-progs - pkgs.jfsutils - - # Some compression/archiver tools. - pkgs.unzip - pkgs.zip - pkgs.xz - pkgs.dar # disk archiver - - # Some editors. - pkgs.nvi - pkgs.bvi # binary editor - pkgs.joe - ]; - - # The initrd has to contain any module that might be necessary for - # mounting the CD/DVD. - boot.initrd.availableKernelModules = - [ "vfat" "reiserfs" ]; - - boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10; - boot.kernelParams = [ "console=tty1" ]; - - boot.postBootCommands = - '' - mkdir -p /mnt - - cp ${dummyConfiguration} /etc/nixos/configuration.nix - ''; - - # Some more help text. - services.getty.helpLine = - '' - - Log in as "root" with an empty password. ${ - if config.services.xserver.enable then - "Type `start xserver' to start\nthe graphical user interface." - else "" - } - ''; - - # Include the firmware for various wireless cards. - networking.enableRalinkFirmware = true; - networking.enableIntel2200BGFirmware = true; - - # To speed up further installation of packages, include the complete stdenv - # in the Nix store of the tarball. - tarball.storeContents = pkgs2storeContents [ pkgs.stdenv ] - ++ [ - { - object = config.system.build.bootStage2; - symlink = "/boot/init"; - } - { - object = config.system.build.toplevel; - symlink = "/boot/system"; - } - ]; - - tarball.contents = [ - { source = kernelParams; - target = "/kernelparams.txt"; - } - { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile; - target = "/boot/" + config.system.boot.loader.kernelFile; - } - { source = nixpkgsUserConfig; - target = "/root/.nixpkgs/config.nix"; - } - ]; - - # Allow sshd to be started manually through "start sshd". It should - # not be started by default on the installation CD because the - # default root password is empty. - services.openssh.enable = true; - systemd.services.openssh.wantedBy = lib.mkOverride 50 []; - - boot.loader.grub.enable = false; - boot.loader.generationsDir.enable = false; - system.boot.loader.kernelFile = "vmlinux"; - - nixpkgs.config = { - platform = pkgs.platforms.fuloong2f_n32; - }; -} diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt b/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt deleted file mode 100644 index 887bf60d0fbe4..0000000000000 --- a/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt +++ /dev/null @@ -1,89 +0,0 @@ -Let all the files in the system tarball sit in a directory served by NFS (the -NFS root) like this in exportfs: - /home/pcroot 192.168.1.0/24(rw,no_root_squash,no_all_squash) - -Run "exportfs -a" after editing /etc/exportfs, for the nfs server to be aware -of the changes. - -Use a tftp server serving the root of boot/ (from the system tarball). - -In order to have PXE boot, use the boot/dhcpd.conf-example file for your dhcpd -server, as it will point your PXE clients to pxelinux.0 from the tftp server. -Adapt the configuration to your network. - -Adapt the pxelinux configuration (boot/pxelinux.cfg/default) to set the path to -your nfrroot. If you use ip=dhcp in the kernel, the nfs server ip will be taken -from dhcp and so you don't have to specify it. - -The linux in bzImage includes network drivers for some usual cards. - - -QEMU Testing ---------------- - -You can test qemu pxe boot without having a DHCP server adapted, but having -nfsroot, like this: - qemu-system-x86_64 -tftp /home/pcroot/boot -net nic -net user,bootfile=pxelinux.0 -boot n - -I don't know how to use NFS through the qemu '-net user' though. - - -QEMU Testing with NFS root and bridged network -------------------------------------------------- - -This allows testing with qemu as any other host in your LAN. - -Testing with the real dhcpd server requires setting up a bridge and having a -tap device. - tunctl -t tap0 - brctl addbr br0 - brctl addif br0 eth0 - brctl addif tap0 eth0 - ifconfig eth0 0.0.0.0 up - ifconfig tap0 0.0.0.0 up - ifconfig br0 up # With your ip configuration - -Then you can run qemu: - qemu-system-x86_64 -boot n -net tap,ifname=tap0,script=no -net nic,model=e1000 - - -Using the system-tarball-pc in a chroot --------------------------------------------------- - -Installation: - mkdir nixos-chroot && cd nixos-chroot - tar xf your-system-tarball.tar.xz - mkdir sys dev proc tmp root var run - mount --bind /sys sys - mount --bind /dev dev - mount --bind /proc proc - -Activate the system: look for a directory in nix/store similar to: - "/nix/store/y0d1lcj9fppli0hl3x0m0ba5g1ndjv2j-nixos-feb97bx-53f008" -Having found it, activate that nixos system *twice*: - chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate - chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate - -This runs a 'hostname' command. Restore your old hostname with: - hostname OLDHOSTNAME - -Copy your system resolv.conf to the /etc/resolv.conf inside the chroot: - cp /etc/resolv.conf etc - -Then you can get an interactive shell in the nixos chroot. '*' means -to run inside the chroot interactive shell - chroot . /bin/sh -* source /etc/profile - -Populate the nix database: that should be done in the init script if you -had booted this nixos. Run: -* `grep local-cmds run/current-system/init` - -Then you can proceed normally subscribing to a nixos channel: - nix-channel --add https://nixos.org/channels/nixos-unstable - nix-channel --update - -Testing: - nix-env -i hello - which hello - hello diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix deleted file mode 100644 index 674fb6c8a33c5..0000000000000 --- a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix +++ /dev/null @@ -1,163 +0,0 @@ -# This module contains the basic configuration for building a NixOS -# tarball, that can directly boot, maybe using PXE or unpacking on a fs. - -{ config, lib, pkgs, ... }: - -with lib; - -let - - pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l; - - # For PXE kernel loading - pxeconfig = pkgs.writeText "pxeconfig-default" '' - default menu.c32 - prompt 0 - - label bootlocal - menu default - localboot 0 - timeout 80 - TOTALTIMEOUT 9000 - - label nixos - MENU LABEL ^NixOS using nfsroot - KERNEL bzImage - append ip=dhcp nfsroot=/home/pcroot init=${config.system.build.toplevel}/init rw - - # I don't know how to make this boot with nfsroot (using the initrd) - label nixos_initrd - MENU LABEL NixOS booting the poor ^initrd. - KERNEL bzImage - append initrd=initrd ip=dhcp nfsroot=/home/pcroot init=${config.system.build.toplevel}/init rw - - label memtest - MENU LABEL ^${pkgs.memtest86.name} - KERNEL memtest - ''; - - dhcpdExampleConfig = pkgs.writeText "dhcpd.conf-example" '' - # Example configuration for booting PXE. - allow booting; - allow bootp; - - # Adapt this to your network configuration. - option domain-name "local"; - option subnet-mask 255.255.255.0; - option broadcast-address 192.168.1.255; - option domain-name-servers 192.168.1.1; - option routers 192.168.1.1; - - # PXE-specific configuration directives... - # Some BIOS don't accept slashes for paths inside the tftp servers, - # and will report Access Violation if they see slashes. - filename "pxelinux.0"; - # For the TFTP and NFS root server. Set the IP of your server. - next-server 192.168.1.34; - - subnet 192.168.1.0 netmask 255.255.255.0 { - range 192.168.1.50 192.168.1.55; - } - ''; - - readme = ./system-tarball-pc-readme.txt; - -in - -{ - imports = - [ ./system-tarball.nix - - # Profiles of this basic installation. - ../../profiles/all-hardware.nix - ../../profiles/base.nix - ../../profiles/installation-device.nix - ]; - - # To speed up further installation of packages, include the complete stdenv - # in the Nix store of the tarball. - tarball.storeContents = pkgs2storeContents [ pkgs.stdenv ]; - - tarball.contents = - [ { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile; - target = "/boot/" + config.system.boot.loader.kernelFile; - } - { source = "${pkgs.syslinux}/share/syslinux/pxelinux.0"; - target = "/boot/pxelinux.0"; - } - { source = "${pkgs.syslinux}/share/syslinux/menu.c32"; - target = "/boot/menu.c32"; - } - { source = pxeconfig; - target = "/boot/pxelinux.cfg/default"; - } - { source = readme; - target = "/readme.txt"; - } - { source = dhcpdExampleConfig; - target = "/boot/dhcpd.conf-example"; - } - { source = "${pkgs.memtest86}/memtest.bin"; - # We can't leave '.bin', because pxelinux interprets this specially, - # and it would not load the image fine. - # http://forum.canardpc.com/threads/46464-0104-when-launched-via-pxe - target = "/boot/memtest"; - } - ]; - - # Allow sshd to be started manually through "start sshd". It should - # not be started by default on the installation CD because the - # default root password is empty. - services.openssh.enable = true; - systemd.services.openssh.wantedBy = lib.mkOverride 50 []; - - # To be able to use the systemTarball to catch troubles. - boot.crashDump = { - enable = true; - kernelPackages = pkgs.linuxKernel.packages.linux_3_4; - }; - - # No grub for the tarball. - boot.loader.grub.enable = false; - - /* fake entry, just to have a happy stage-1. Users - may boot without having stage-1 though */ - fileSystems.fake = - { mountPoint = "/"; - device = "/dev/something"; - }; - - nixpkgs.config = { - packageOverrides = p: { - linux_3_4 = p.linux_3_4.override { - extraConfig = '' - # Enable drivers in kernel for most NICs. - E1000 y - # E1000E y - # ATH5K y - 8139TOO y - NE2K_PCI y - ATL1 y - ATL1E y - ATL1C y - VORTEX y - VIA_RHINE y - R8169 y - - # Enable nfs root boot - UNIX y # http://www.linux-mips.org/archives/linux-mips/2006-11/msg00113.html - IP_PNP y - IP_PNP_DHCP y - FSCACHE y - NFS_FS y - NFS_FSCACHE y - ROOT_NFS y - - # Enable devtmpfs - DEVTMPFS y - DEVTMPFS_MOUNT y - ''; - }; - }; - }; -} diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix deleted file mode 100644 index 329bd329dc15f..0000000000000 --- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ /dev/null @@ -1,172 +0,0 @@ -# This module contains the basic configuration for building a NixOS -# tarball for the sheevaplug. - -{ config, lib, pkgs, ... }: - -with lib; - -let - - # A dummy /etc/nixos/configuration.nix in the booted CD that - # rebuilds the CD's configuration (and allows the configuration to - # be modified, of course, providing a true live CD). Problem is - # that we don't really know how the CD was built - the Nix - # expression language doesn't allow us to query the expression being - # evaluated. So we'll just hope for the best. - dummyConfiguration = pkgs.writeText "configuration.nix" - '' - { config, pkgs, ... }: - - { - # Add your own options below and run "nixos-rebuild switch". - # E.g., - # services.openssh.enable = true; - } - ''; - - - pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l; - - # A clue for the kernel loading - kernelParams = pkgs.writeText "kernel-params.txt" '' - Kernel Parameters: - init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} - ''; - - -in - -{ - imports = [ ./system-tarball.nix ]; - - # Disable some other stuff we don't need. - security.sudo.enable = false; - - # Include only the en_US locale. This saves 75 MiB or so compared to - # the full glibcLocales package. - i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"]; - - # Include some utilities that are useful for installing or repairing - # the system. - environment.systemPackages = - [ pkgs.w3m # needed for the manual anyway - pkgs.ddrescue - pkgs.ccrypt - pkgs.cryptsetup # needed for dm-crypt volumes - - # Some networking tools. - pkgs.sshfs-fuse - pkgs.socat - pkgs.screen - pkgs.wpa_supplicant # !!! should use the wpa module - - # Hardware-related tools. - pkgs.sdparm - pkgs.hdparm - pkgs.dmraid - - # Tools to create / manipulate filesystems. - pkgs.btrfs-progs - - # Some compression/archiver tools. - pkgs.unzip - pkgs.zip - pkgs.xz - pkgs.dar # disk archiver - - # Some editors. - pkgs.nvi - pkgs.bvi # binary editor - pkgs.joe - ]; - - boot.loader.grub.enable = false; - boot.loader.generationsDir.enable = false; - system.boot.loader.kernelFile = "uImage"; - - boot.initrd.availableKernelModules = - [ "mvsdio" "reiserfs" "ext3" "ums-cypress" "rtc_mv" "ext4" ]; - - boot.postBootCommands = lib.mkIf (!boot.initrd.systemd.enable) - '' - mkdir -p /mnt - - cp ${dummyConfiguration} /etc/nixos/configuration.nix - ''; - - boot.initrd.extraUtilsCommands = lib.mkIf (!boot.initrd.systemd.enable) - '' - copy_bin_and_libs ${pkgs.util-linux}/sbin/hwclock - ''; - - boot.initrd.postDeviceCommands = lib.mkIf (!boot.initrd.systemd.enable) - '' - hwclock -s - ''; - - boot.kernelParams = - [ - "selinux=0" - "console=tty1" - # "console=ttyS0,115200n8" # serial console - ]; - - boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_4; - - boot.supportedFilesystems = [ "reiserfs" ]; - - /* fake entry, just to have a happy stage-1. Users - may boot without having stage-1 though */ - fileSystems.fake = - { mountPoint = "/"; - device = "/dev/something"; - }; - - services.getty = { - # Some more help text. - helpLine = '' - Log in as "root" with an empty password. ${ - if config.services.xserver.enable then - "Type `start xserver' to start\nthe graphical user interface." - else "" - } - ''; - }; - - # Setting vesa, we don't get the nvidia driver, which can't work in arm. - services.xserver.videoDrivers = [ "vesa" ]; - - documentation.nixos.enable = false; - - # Include the firmware for various wireless cards. - networking.enableRalinkFirmware = true; - networking.enableIntel2200BGFirmware = true; - - # To speed up further installation of packages, include the complete stdenv - # in the Nix store of the tarball. - tarball.storeContents = pkgs2storeContents [ pkgs.stdenv ]; - tarball.contents = [ - { source = kernelParams; - target = "/kernelparams.txt"; - } - { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile; - target = "/boot/" + config.system.boot.loader.kernelFile; - } - { source = pkgs.ubootSheevaplug; - target = "/boot/uboot"; - } - ]; - - # Allow sshd to be started manually through "start sshd". It should - # not be started by default on the installation CD because the - # default root password is empty. - services.openssh.enable = true; - systemd.services.openssh.wantedBy = lib.mkOverride 50 []; - - # cpufrequtils fails to build on non-pc - powerManagement.enable = false; - - nixpkgs.config = { - platform = pkgs.platforms.sheevaplug; - }; -} diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix deleted file mode 100644 index 362c555cc53e8..0000000000000 --- a/nixos/modules/installer/cd-dvd/system-tarball.nix +++ /dev/null @@ -1,93 +0,0 @@ -# This module creates a bootable ISO image containing the given NixOS -# configuration. The derivation for the ISO image will be placed in -# config.system.build.tarball. - -{ config, lib, pkgs, ... }: - -with lib; - -let - - versionFile = pkgs.writeText "nixos-label" config.system.nixos.label; - -in - -{ - options = { - tarball.contents = mkOption { - example = literalExpression '' - [ { source = pkgs.memtest86 + "/memtest.bin"; - target = "boot/memtest.bin"; - } - ] - ''; - description = '' - This option lists files to be copied to fixed locations in the - generated ISO image. - ''; - }; - - tarball.storeContents = mkOption { - example = literalExpression "[ pkgs.stdenv ]"; - description = '' - This option lists additional derivations to be included in the - Nix store in the generated ISO image. - ''; - }; - - }; - - config = { - - # In stage 1 of the boot, mount the CD/DVD as the root FS by label - # so that we don't need to know its device. - fileSystems = { }; - - # boot.initrd.availableKernelModules = [ "mvsdio" "reiserfs" "ext3" "ext4" ]; - - # boot.initrd.kernelModules = [ "rtc_mv" ]; - - # Closures to be copied to the Nix store on the CD, namely the init - # script and the top-level system configuration directory. - tarball.storeContents = - [ { object = config.system.build.toplevel; - symlink = "/run/current-system"; - } - ]; - - # Individual files to be included on the CD, outside of the Nix - # store on the CD. - tarball.contents = - [ { source = config.system.build.initialRamdisk + "/" + config.system.boot.loader.initrdFile; - target = "/boot/" + config.system.boot.loader.initrdFile; - } - { source = versionFile; - target = "/nixos-version.txt"; - } - ]; - - # Create the tarball - system.build.tarball = import ../../../lib/make-system-tarball.nix { - inherit (pkgs) stdenv closureInfo pixz; - - inherit (config.tarball) contents storeContents; - }; - - boot.postBootCommands = - '' - # After booting, register the contents of the Nix store on the - # CD in the Nix database in the tmpfs. - if [ -f /nix-path-registration ]; then - ${config.nix.package.out}/bin/nix-store --load-db < /nix-path-registration && - rm /nix-path-registration - fi - - # nixos-rebuild also requires a "system" profile and an - # /etc/NIXOS tag. - touch /etc/NIXOS - ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system - ''; - - }; - -} diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index 2b8c6f2e308bf..b262313577f10 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -299,7 +299,7 @@ in # https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= # If the empty string is assigned to this option, the list of commands to start is reset, prior assignments of this option will have no effect. ExecStart = [ "" "${cfg.package}/bin/caddy run --config ${cfg.configFile} --adapter ${cfg.adapter} ${optionalString cfg.resume "--resume"}" ]; - ExecReload = [ "" "${cfg.package}/bin/caddy reload --config ${cfg.configFile} --adapter ${cfg.adapter}" ]; + ExecReload = [ "" "${cfg.package}/bin/caddy reload --config ${cfg.configFile} --adapter ${cfg.adapter} --force" ]; ExecStartPre = "${cfg.package}/bin/caddy validate --config ${cfg.configFile} --adapter ${cfg.adapter}"; User = cfg.user; diff --git a/nixos/release.nix b/nixos/release.nix index 543ab5b7d8a54..f533aebf34c17 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -318,39 +318,12 @@ in rec { "mkdir $out; ln -s $toplevel $out/dummy"); - # Provide a tarball that can be unpacked into an SD card, and easily - # boot that system from uboot (like for the sheevaplug). - # The pc variant helps preparing the expression for the system tarball - # in a machine faster than the sheevpalug - /* - system_tarball_pc = forAllSystems (system: makeSystemTarball { - module = ./modules/installer/cd-dvd/system-tarball-pc.nix; - inherit system; - }); - */ - # Provide container tarball for lxc, libvirt-lxc, docker-lxc, ... containerTarball = forAllSystems (system: makeSystemTarball { module = ./modules/virtualisation/lxc-container.nix; inherit system; }); - /* - system_tarball_fuloong2f = - assert builtins.currentSystem == "mips64-linux"; - makeSystemTarball { - module = ./modules/installer/cd-dvd/system-tarball-fuloong2f.nix; - system = "mips64-linux"; - }; - - system_tarball_sheevaplug = - assert builtins.currentSystem == "armv5tel-linux"; - makeSystemTarball { - module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix; - system = "armv5tel-linux"; - }; - */ - tests = allTests; /* Build a bunch of typical closures so that Hydra can keep track of diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 464ad345b3a32..e89af8de6b621 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildGoModule -, buildGo118Module +, buildGo117Module , fetchFromGitHub , callPackage , config @@ -18,7 +18,7 @@ let , rev , version , sha256 - , vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */ + , vendorSha256 , deleteVendor ? false , proxyVendor ? false , mkProviderGoModule ? buildGoModule @@ -59,13 +59,22 @@ let # These are the providers that don't fall in line with the default model special-providers = { - brightbox = automated-providers.brightbox.override { mkProviderGoModule = buildGo118Module; }; - hcloud = automated-providers.hcloud.override { mkProviderGoModule = buildGo118Module; }; - # mkisofs needed to create ISOs holding cloud-init data, - # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 + # go-module vendor fails with 1.18 + buildkite = automated-providers.buildkite.override { mkProviderGoModule = buildGo117Module; }; + # go-module vendor fails with 1.18 + checkly = automated-providers.checkly.override { mkProviderGoModule = buildGo117Module; }; + # mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); - linode = automated-providers.linode.override { mkProviderGoModule = buildGo118Module; }; - utils = automated-providers.utils.override { mkProviderGoModule = buildGo118Module; }; + # fails to build on x86_64-darwin with 1.18 + lxd = automated-providers.lxd.override { mkProviderGoModule = buildGo117Module; }; + # fails to build on x86_64-darwin with 1.18 + netlify = automated-providers.netlify.override { mkProviderGoModule = buildGo117Module; }; + # fails to build on x86_64-darwin with 1.18 + pass = automated-providers.pass.override { mkProviderGoModule = buildGo117Module; }; + # fails to build on x86_64-darwin with 1.18 + skytap = automated-providers.skytap.override { mkProviderGoModule = buildGo117Module; }; + # fails to build on x86_64-{darwin,linux} with 1.18 + tencentcloud = automated-providers.tencentcloud.override { mkProviderGoModule = buildGo117Module; }; }; # Put all the providers we not longer support in this list. diff --git a/pkgs/applications/video/kodi/addons/invidious/default.nix b/pkgs/applications/video/kodi/addons/invidious/default.nix new file mode 100644 index 0000000000000..c2885ba03a0a1 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/invidious/default.nix @@ -0,0 +1,32 @@ +{ lib, buildKodiAddon, fetchpatch, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: + +buildKodiAddon rec { + pname = "invidious"; + namespace = "plugin.video.invidious"; + version = "0.1.0+matrix.1"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-4z2/YTso5KV6JHS/DOXll2lKOoVnW1i5MnpmV6ESXbM="; + }; + + propagatedBuildInputs = [ + requests + inputstream-adaptive + inputstreamhelper + ]; + + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.invidious"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/TheAssassin/kodi-invidious-plugin"; + description = "A privacy-friendly way of watching YouTube content"; + license = licenses.mit; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index e742a5c4f9769..d839e142cf6be 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.95/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.96/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index 83a7cc2546d35..cf118beaabce7 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchpatch, + mkDerivation, extra-cmake-modules, kdoctools, kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, @@ -9,14 +9,6 @@ mkDerivation { pname = "plasma-framework"; - patches = [ - # FIXME: remove on kf5.96 - (fetchpatch { - name = "fix-thumbnails-task-manager.patch"; - url = "https://invent.kde.org/frameworks/plasma-framework/-/commit/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch"; - sha256 = "sha256-0162bi3J5bl5BmmUSrhxxy8MpLtSXkdHGK8wMcS5BB8="; - }) - ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 297d9a80e4b7d..d707ffdf0d3e8 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/attica-5.95.0.tar.xz"; - sha256 = "0g3kbjjvdfry23d6ss79bc1k2f6wijy9n3ymxyq7blmr5cyzjq6n"; - name = "attica-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/attica-5.96.0.tar.xz"; + sha256 = "1xlg2sbfd45p9dw0sprpk0fancasp4idxacsf5xksf2ddn2crzp7"; + name = "attica-5.96.0.tar.xz"; }; }; baloo = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/baloo-5.95.0.tar.xz"; - sha256 = "1zg2s4r74mamfl5dj97yg6c6hah3n5snq4wafy0j9w8y4lmajhcd"; - name = "baloo-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/baloo-5.96.0.tar.xz"; + sha256 = "1icpxmmxhvgdr6zxpz0wybc82nyy595cmr09067i82kh7v5dj66l"; + name = "baloo-5.96.0.tar.xz"; }; }; bluez-qt = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/bluez-qt-5.95.0.tar.xz"; - sha256 = "051prfbbzrisr9g0dh9rd5js02w36ddl95v7ak1pv64kzp1dybi3"; - name = "bluez-qt-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/bluez-qt-5.96.0.tar.xz"; + sha256 = "0yc7mq9bnanp5dfv43vp8wpqw5l8qh4aahqpi9sid7jmd6sbywl2"; + name = "bluez-qt-5.96.0.tar.xz"; }; }; breeze-icons = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/breeze-icons-5.95.0.tar.xz"; - sha256 = "0bx9680pz1ffnzrm2bmcsdb61scdc4hg3h94s6zb3wgcanvpqiqs"; - name = "breeze-icons-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/breeze-icons-5.96.0.tar.xz"; + sha256 = "1ij723qy6xfkys8a9vp2ll2z2yp7667hfw559gi8cxn825hjx823"; + name = "breeze-icons-5.96.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/extra-cmake-modules-5.95.0.tar.xz"; - sha256 = "0nmdj6n7hsxz88s4w1qqbbd7b1031l79fdvqiqz3an19v44j787z"; - name = "extra-cmake-modules-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/extra-cmake-modules-5.96.0.tar.xz"; + sha256 = "1ngxjvf584zgfb93s5sbr5f5nyw0sqc5i0jlbcgbrjg2n83l9ddx"; + name = "extra-cmake-modules-5.96.0.tar.xz"; }; }; frameworkintegration = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/frameworkintegration-5.95.0.tar.xz"; - sha256 = "04dzy1acjgjrsryjq05lwrhph25fi363qg09gc45q0zy38zwbi55"; - name = "frameworkintegration-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/frameworkintegration-5.96.0.tar.xz"; + sha256 = "19piq6h51qh64nbkqnpy6jg91vbl67vg2sh4hlwzsb2lcrmwxgk9"; + name = "frameworkintegration-5.96.0.tar.xz"; }; }; kactivities = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kactivities-5.95.0.tar.xz"; - sha256 = "1mxlmwy1radgklm4mh7rm309v6j7bw1kwfms5jmmv08anrlj5hg3"; - name = "kactivities-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kactivities-5.96.0.tar.xz"; + sha256 = "0g16k3v6i20rc6h0js4pk00d6yg236bs0kxj88q21d5c934hbksk"; + name = "kactivities-5.96.0.tar.xz"; }; }; kactivities-stats = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kactivities-stats-5.95.0.tar.xz"; - sha256 = "0lyad8rh0d4dxcm4azg4i60mdlcfi3hsgdpss9lgzcqhnama6mjj"; - name = "kactivities-stats-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kactivities-stats-5.96.0.tar.xz"; + sha256 = "0lfanv55b7zx5s0a7gh4r41w9yb641j1zjjcvdjfrj7pdh52576s"; + name = "kactivities-stats-5.96.0.tar.xz"; }; }; kapidox = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kapidox-5.95.0.tar.xz"; - sha256 = "0f0q0f705adrfhzpq0fkgxqhx6qs8dd0fwsfj0f6764kf2w0xxz5"; - name = "kapidox-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kapidox-5.96.0.tar.xz"; + sha256 = "1w5h4xwscix0yjn8d0rcjd7hlmrnbmkjg20diqjabb5wcxsrjiwi"; + name = "kapidox-5.96.0.tar.xz"; }; }; karchive = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/karchive-5.95.0.tar.xz"; - sha256 = "0jfmrndpkg6axci65y89y13y9iczc1wwp0va47m5210xpwhcx30y"; - name = "karchive-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/karchive-5.96.0.tar.xz"; + sha256 = "1bra1q225xhh8dilwmzc0jgnj5m3dmi4nkz4y8f42si97b4xxxf5"; + name = "karchive-5.96.0.tar.xz"; }; }; kauth = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kauth-5.95.0.tar.xz"; - sha256 = "0fjgffdw7r637sv5h37h5k8kd128p8bxfrwwgpjdhl9gzkrvc5iy"; - name = "kauth-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kauth-5.96.0.tar.xz"; + sha256 = "1hi36504bbr0266wl08kqiq61xysl3dw3kpgjfbgx169m0m3gmx9"; + name = "kauth-5.96.0.tar.xz"; }; }; kbookmarks = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kbookmarks-5.95.0.tar.xz"; - sha256 = "1w2m7bjkn6c1d0jn936qbidkkq80flvzp5jvv8sbxbnr6v3rmykp"; - name = "kbookmarks-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kbookmarks-5.96.0.tar.xz"; + sha256 = "131yng8wmxrnf3x1i6gg60q3rrya19yk4jnzi5ylafvaw7q2r8b4"; + name = "kbookmarks-5.96.0.tar.xz"; }; }; kcalendarcore = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kcalendarcore-5.95.0.tar.xz"; - sha256 = "10194vpkw19by7cl5r6fcj9vv241n1s6xpm15pqgalhgznj6qskq"; - name = "kcalendarcore-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kcalendarcore-5.96.0.tar.xz"; + sha256 = "181yif830v4gg7nw9s15pvgfm98rmm6xwi2xxy3nxg7nkp14vs5k"; + name = "kcalendarcore-5.96.0.tar.xz"; }; }; kcmutils = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kcmutils-5.95.0.tar.xz"; - sha256 = "0m0b7ymh8xix4psa0l58g7g53b7clzma5chr5bjvwc22fxxhbp8r"; - name = "kcmutils-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kcmutils-5.96.0.tar.xz"; + sha256 = "0vff93kja9dq8rf1aapxpfgjxsinm75f5nydxqcihskp8girz0c8"; + name = "kcmutils-5.96.0.tar.xz"; }; }; kcodecs = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kcodecs-5.95.0.tar.xz"; - sha256 = "0d4mnfqzixqd91n3cfhis3ppzp9kxfkhgp7v5h6miaknc5ib0yz2"; - name = "kcodecs-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kcodecs-5.96.0.tar.xz"; + sha256 = "05266wjxmzf3qpb2xwlm40cr9h266l5r9dqww81m8bq856pf8ivi"; + name = "kcodecs-5.96.0.tar.xz"; }; }; kcompletion = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kcompletion-5.95.0.tar.xz"; - sha256 = "1wi8zbjcklc1yzljwpy32lla4jhv0w4vylv93nygqjdcp414kb4f"; - name = "kcompletion-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kcompletion-5.96.0.tar.xz"; + sha256 = "1jmrd2mfz27qfn6dq1mk6bcqlagmifbf9vnayi1mkqa9jsj4dwdj"; + name = "kcompletion-5.96.0.tar.xz"; }; }; kconfig = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kconfig-5.95.0.tar.xz"; - sha256 = "1w9icxfbxa6wkjlc6qs6lj00gjid797s6k20x09blgc7lhqgccpx"; - name = "kconfig-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kconfig-5.96.0.tar.xz"; + sha256 = "1xa8xxm2x9783fqb26wyvg1mp6ybjikngznqdhsk9slhaca73yhz"; + name = "kconfig-5.96.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kconfigwidgets-5.95.0.tar.xz"; - sha256 = "0llx74g252d4w2j6qdyxwgbkkbsjcm5z5mghz0cx1vpn2hgz7drb"; - name = "kconfigwidgets-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kconfigwidgets-5.96.0.tar.xz"; + sha256 = "045j6gkp5sf1lc12zwlkr1dz0fd89yrg5b31j4ybk3dyc8jz90hl"; + name = "kconfigwidgets-5.96.0.tar.xz"; }; }; kcontacts = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kcontacts-5.95.0.tar.xz"; - sha256 = "1jad89h7yhp0ba7w43s6m6fzcclsfc6dmzqmj1zi52jlllh37mqh"; - name = "kcontacts-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kcontacts-5.96.0.tar.xz"; + sha256 = "075mw7clqf7qycngly21q3m0js3g8pcgqc2x3alp28f4zq3c8m21"; + name = "kcontacts-5.96.0.tar.xz"; }; }; kcoreaddons = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kcoreaddons-5.95.0.tar.xz"; - sha256 = "04rwqw5b8lspnbvfxl995shdrmm6dqlglk2vc2gh03ykcpj7pkwg"; - name = "kcoreaddons-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kcoreaddons-5.96.0.tar.xz"; + sha256 = "1n5mzj02si8allg907l6vn77c2i95qdgfvn48gsqgalwlyd4q6nj"; + name = "kcoreaddons-5.96.0.tar.xz"; }; }; kcrash = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kcrash-5.95.0.tar.xz"; - sha256 = "1y7rs59h61zsasdas2r5y8q3r1vblvymykzihw0wjf6qnzx8pz74"; - name = "kcrash-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kcrash-5.96.0.tar.xz"; + sha256 = "05sw3lh4lw5jgl7gvxvpyl6nims9j4b1hjsn365fa2p48qmsx6v5"; + name = "kcrash-5.96.0.tar.xz"; }; }; kdav = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kdav-5.95.0.tar.xz"; - sha256 = "09sg4h1vjsy0ncvaq4wb4m66l71ndx9rh3wrsa3273pp4lyvszbm"; - name = "kdav-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kdav-5.96.0.tar.xz"; + sha256 = "1zqib8km4fg9aj4gmhx4hm7n7bbrz62l41qb48nz1pc3qia2x1wl"; + name = "kdav-5.96.0.tar.xz"; }; }; kdbusaddons = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kdbusaddons-5.95.0.tar.xz"; - sha256 = "0qx4h365isw8vkbn632gfw39b81gjczvd6ldcwfdfj9ldgwxxzz7"; - name = "kdbusaddons-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kdbusaddons-5.96.0.tar.xz"; + sha256 = "1y0fd0a1nwgchsk3vx8hvvkw96f0l0533g57xakq4j4xkvxd8l3y"; + name = "kdbusaddons-5.96.0.tar.xz"; }; }; kdeclarative = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kdeclarative-5.95.0.tar.xz"; - sha256 = "1qm0nnxmnldla8z7wz4sjl5bd5bqgql29qbm982gsbyx1z4c9l64"; - name = "kdeclarative-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kdeclarative-5.96.0.tar.xz"; + sha256 = "1x4r231g0l5im4ala21m5fz5q6nixbx0z6lfia5zjinzlp7x5534"; + name = "kdeclarative-5.96.0.tar.xz"; }; }; kded = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kded-5.95.0.tar.xz"; - sha256 = "0hdfx8yl66sck6j339q9417s2yvcpr5r27klgw4phz89hca8h6wr"; - name = "kded-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kded-5.96.0.tar.xz"; + sha256 = "0x40yvcx2gjb4pngyk2vfrn3z7dbyvksbj1h3ck04fyyma8z3gb3"; + name = "kded-5.96.0.tar.xz"; }; }; kdelibs4support = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/portingAids/kdelibs4support-5.95.0.tar.xz"; - sha256 = "0pnm8hw96f2jvcy5fjd2pr8x52d8zmzvm0f4wjb5hcq5jf55596n"; - name = "kdelibs4support-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/portingAids/kdelibs4support-5.96.0.tar.xz"; + sha256 = "18f99g1g1z1mrkgq3l8kgxjxi60a632p0sg8d46r67b9n008w9m7"; + name = "kdelibs4support-5.96.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/portingAids/kdesignerplugin-5.95.0.tar.xz"; - sha256 = "1zz1jl2cdxs5jwl21hr89c5wgnpdn1wf0ww5hkss4mmgssr32pgw"; - name = "kdesignerplugin-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/portingAids/kdesignerplugin-5.96.0.tar.xz"; + sha256 = "0cddad1rdi06l28iiwizfds78dplbvv7j40vphww0ix7cmsh3rh9"; + name = "kdesignerplugin-5.96.0.tar.xz"; }; }; kdesu = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kdesu-5.95.0.tar.xz"; - sha256 = "1b63rsb21pjxy0zd2gxarbrm5xsvf8mbf4fnja7ghadck43jnx1f"; - name = "kdesu-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kdesu-5.96.0.tar.xz"; + sha256 = "1wjjjwpfjr7sx10x0236zqjx3jrw6mz60724s5qg269dwfbpahvj"; + name = "kdesu-5.96.0.tar.xz"; }; }; kdewebkit = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/portingAids/kdewebkit-5.95.0.tar.xz"; - sha256 = "0b6ykwdb52zvgmcs79drgk8i44gib2si80x6p0sc9adpbk1nwqgj"; - name = "kdewebkit-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/portingAids/kdewebkit-5.96.0.tar.xz"; + sha256 = "0l8nnar4s84igxih5w0fhwd9nvccp7zm53jy2gk6lfbj6gqarfbf"; + name = "kdewebkit-5.96.0.tar.xz"; }; }; kdnssd = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kdnssd-5.95.0.tar.xz"; - sha256 = "10v8w1c7sskf5x956qbfwvca55qwk48jcaa2gv7wrb19bj0dms67"; - name = "kdnssd-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kdnssd-5.96.0.tar.xz"; + sha256 = "1d3jq64gyj3bc3sf46gnpbmjrm809hva47z7fkwkk9i2lmnmy70w"; + name = "kdnssd-5.96.0.tar.xz"; }; }; kdoctools = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kdoctools-5.95.0.tar.xz"; - sha256 = "10isqvlhfqlhl8w46hhn7nmy8yhdi30z99pks8qm75pp3grx0mkg"; - name = "kdoctools-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kdoctools-5.96.0.tar.xz"; + sha256 = "04nk87dbmnf9840401s40mxlsfh9is1l1mqky9xi5mcghbp0308b"; + name = "kdoctools-5.96.0.tar.xz"; }; }; kemoticons = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kemoticons-5.95.0.tar.xz"; - sha256 = "0wpl0bd3xd613wyhl11b2gvrh9dkwvl32ik64hzjmq9c7xik3a1n"; - name = "kemoticons-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kemoticons-5.96.0.tar.xz"; + sha256 = "03b5axwvd6ayw1kbl1jv6h04cihp1y1pa835gs3m1qx2ivgj7f75"; + name = "kemoticons-5.96.0.tar.xz"; }; }; kfilemetadata = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kfilemetadata-5.95.0.tar.xz"; - sha256 = "018120fygj482capdbl6p30i31b1lhc7zcvdi6l200lcv5n0anvy"; - name = "kfilemetadata-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kfilemetadata-5.96.0.tar.xz"; + sha256 = "0sh3malq6007fp5m4hica20ha8z5abqzq5ifcmrpm8zqmm5aa2bq"; + name = "kfilemetadata-5.96.0.tar.xz"; }; }; kglobalaccel = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kglobalaccel-5.95.0.tar.xz"; - sha256 = "1jq4b6ln7ch6dkj9ki30pn3aga6q0kbzrmw3xv1xwdy1r931xjlk"; - name = "kglobalaccel-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kglobalaccel-5.96.0.tar.xz"; + sha256 = "1sx4fmy8xy22im0i3dw0xdmxrgw2jhnk2wsfy2xw74dsj3adg2iq"; + name = "kglobalaccel-5.96.0.tar.xz"; }; }; kguiaddons = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kguiaddons-5.95.0.tar.xz"; - sha256 = "037j1vn151xp76ylrd690fwavf49nqs3f6jy2zq658n4jyxskwn7"; - name = "kguiaddons-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kguiaddons-5.96.0.tar.xz"; + sha256 = "028kn9lcvzv8f8b17a3clki7013dmhhcp1l9svvf6hydv97vkfbv"; + name = "kguiaddons-5.96.0.tar.xz"; }; }; kholidays = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kholidays-5.95.0.tar.xz"; - sha256 = "01zdl4l0gnzl4fvxbgzqygffnliy1ldnzf3rf931if7pqpcyffak"; - name = "kholidays-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kholidays-5.96.0.tar.xz"; + sha256 = "0rcd8k2x1w6jszxj18pkzimn5q4v2k7zs9x1pfwszn7xl59b3n4k"; + name = "kholidays-5.96.0.tar.xz"; }; }; khtml = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/portingAids/khtml-5.95.0.tar.xz"; - sha256 = "01iyrgx322wi2sqlcfkij95yxgv54q1mbpxiv3m814xx85iqljsk"; - name = "khtml-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/portingAids/khtml-5.96.0.tar.xz"; + sha256 = "0lc933z4568962xj7grzy44aj97h76s5vvv1cnj351dzwr5qahpx"; + name = "khtml-5.96.0.tar.xz"; }; }; ki18n = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/ki18n-5.95.0.tar.xz"; - sha256 = "0va28798xj1xk0agggxc8g96kd1ygigfsi438ni4qb54d7fpxmsx"; - name = "ki18n-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/ki18n-5.96.0.tar.xz"; + sha256 = "1jry8bdjgxkcqln7awkj3k8996lh76vya2mf5kwpyxagk6vmr0gy"; + name = "ki18n-5.96.0.tar.xz"; }; }; kiconthemes = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kiconthemes-5.95.0.tar.xz"; - sha256 = "1sy34s7vf915vwnighvfvzdlzk58vwc5pkhjry9hncvkw5wlmrnd"; - name = "kiconthemes-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kiconthemes-5.96.0.tar.xz"; + sha256 = "0w9m956xfpfxp7a63a5v2y10lb9zp2gqfjyfvq3ksxfl961g4hsg"; + name = "kiconthemes-5.96.0.tar.xz"; }; }; kidletime = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kidletime-5.95.0.tar.xz"; - sha256 = "05wjx19lgwnf5mbw9vx34mf0a2wfg3vkrkv96f5a9hir58j0q3ds"; - name = "kidletime-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kidletime-5.96.0.tar.xz"; + sha256 = "13piv607n9hmlbd7kkhl7b1wcxj1jq2b5386c6pxrz5caxjwgnmd"; + name = "kidletime-5.96.0.tar.xz"; }; }; kimageformats = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kimageformats-5.95.0.tar.xz"; - sha256 = "1zmqvgl768lyysszq8pc00a2m1ipdbra5a2rhmn250n610b02yi5"; - name = "kimageformats-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kimageformats-5.96.0.tar.xz"; + sha256 = "0dbl2varirp5f1bd8173jlhmkc3ql16yg0d6w04nc56hy973bkm5"; + name = "kimageformats-5.96.0.tar.xz"; }; }; kinit = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kinit-5.95.0.tar.xz"; - sha256 = "0yzhkfj724lc25cab97lywsshm0180kcmgw1991zzbhikjnyfnyc"; - name = "kinit-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kinit-5.96.0.tar.xz"; + sha256 = "1y7x80icm2jv9c8917481w1hs1vm2rvvvnc9drw4q7vrjzfx73dq"; + name = "kinit-5.96.0.tar.xz"; }; }; kio = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kio-5.95.0.tar.xz"; - sha256 = "11vnwcfb65a8x2hrb0xp89bvljgapjzm5vffy6q4j4pcbbgz1iwp"; - name = "kio-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kio-5.96.0.tar.xz"; + sha256 = "0xmvgq7cp1kkicmngxjj4cmijaah91jmfqdzzxziphq1rl23k64m"; + name = "kio-5.96.0.tar.xz"; }; }; kirigami2 = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kirigami2-5.95.0.tar.xz"; - sha256 = "078fm14y9k0nsdxkci7k25l11zd2zd6r6nbhfmsfhn6hb4dbz77g"; - name = "kirigami2-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kirigami2-5.96.0.tar.xz"; + sha256 = "12ir4q9njl60b242j9raj1xsjs0cizsk7bixwb1hssfn6fzpzqkv"; + name = "kirigami2-5.96.0.tar.xz"; }; }; kitemmodels = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kitemmodels-5.95.0.tar.xz"; - sha256 = "1mr2dd7aj1vi1nkm8c93adyj51ins2kynmp0dsh8gzbf0sh338bm"; - name = "kitemmodels-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kitemmodels-5.96.0.tar.xz"; + sha256 = "1j6kffvgbd07zzzv0kab8mbwa69fmw4b8jczd0wzvmp56idsfc2v"; + name = "kitemmodels-5.96.0.tar.xz"; }; }; kitemviews = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kitemviews-5.95.0.tar.xz"; - sha256 = "1zi2vchnxjy9spxg0405lg5616sf4j6c847zckmh66w6vxq41nvj"; - name = "kitemviews-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kitemviews-5.96.0.tar.xz"; + sha256 = "1wr62z6jwlg40m8kl9bpiyzkyjmsqx0fhgwc01192k58nl2696lb"; + name = "kitemviews-5.96.0.tar.xz"; }; }; kjobwidgets = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kjobwidgets-5.95.0.tar.xz"; - sha256 = "0v8l46wjmkcy1ifbfc3w05qahy5lnpjrhyxziszbs05wc3yglprf"; - name = "kjobwidgets-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kjobwidgets-5.96.0.tar.xz"; + sha256 = "1w1h9vnlq1j72812558cl5dlq7f80nnh5i30qmkpbvv49xhhq2dl"; + name = "kjobwidgets-5.96.0.tar.xz"; }; }; kjs = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/portingAids/kjs-5.95.0.tar.xz"; - sha256 = "1g2yg4p32q0s7rdx98ig7hk11f0awn14xzwid0xfi64wvdfz65ss"; - name = "kjs-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/portingAids/kjs-5.96.0.tar.xz"; + sha256 = "0jhfjjpv5hzbib3p30ngn6ic023fnrvnr8jrbjdzyacjywj69vvp"; + name = "kjs-5.96.0.tar.xz"; }; }; kjsembed = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/portingAids/kjsembed-5.95.0.tar.xz"; - sha256 = "1cbvfvp6dnbgh14156gpcl9fds8dxbkxcn9svhkfha4157zwq7xb"; - name = "kjsembed-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/portingAids/kjsembed-5.96.0.tar.xz"; + sha256 = "1z8h0n4v1qgs2lsxflrzhdfb91jna3y2dxal1qz7i3szjvrf63h0"; + name = "kjsembed-5.96.0.tar.xz"; }; }; kmediaplayer = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/portingAids/kmediaplayer-5.95.0.tar.xz"; - sha256 = "1qxh43qamvcr6wzhj2rnlhvdyp6hkyx98iwbygsr46g41nhc7ygv"; - name = "kmediaplayer-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/portingAids/kmediaplayer-5.96.0.tar.xz"; + sha256 = "0qqlah4zi0b7b6yb4009kkjqw7fkp1lgvp2mcpxs8vbbshs3376c"; + name = "kmediaplayer-5.96.0.tar.xz"; }; }; knewstuff = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/knewstuff-5.95.0.tar.xz"; - sha256 = "0px9di3973bm8vjnikfjhqlfwsj5q4phidzc0s23x941nrv3d0gq"; - name = "knewstuff-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/knewstuff-5.96.0.tar.xz"; + sha256 = "0kls40wlqkqirfjhf8kn83saxwahlh4rkm7iypqd81h93gi81fgc"; + name = "knewstuff-5.96.0.tar.xz"; }; }; knotifications = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/knotifications-5.95.0.tar.xz"; - sha256 = "0hl1q0rz5g35vzxczaf5lap5pj9h7a8s706220s7b6z89mi8c95x"; - name = "knotifications-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/knotifications-5.96.0.tar.xz"; + sha256 = "11fbqylchzvm0pfw8bvy03px5zcg4jbch39vzcvnl6si7vikm4qj"; + name = "knotifications-5.96.0.tar.xz"; }; }; knotifyconfig = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/knotifyconfig-5.95.0.tar.xz"; - sha256 = "1s1npl1h22b2pp2r43f0h2jmlrgrlf2sf33zc3acxhalvg9zwgkd"; - name = "knotifyconfig-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/knotifyconfig-5.96.0.tar.xz"; + sha256 = "09bcw47zp6rsnk7f83gkmlpylg428a7phn7bbi9mpkdpzc6zvfd2"; + name = "knotifyconfig-5.96.0.tar.xz"; }; }; kpackage = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kpackage-5.95.0.tar.xz"; - sha256 = "0pv0zyazf0bawj8wh4jz3m7kny84vana5a6w0s1ff4z2igqib11z"; - name = "kpackage-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kpackage-5.96.0.tar.xz"; + sha256 = "0gsxizpqa47apbvchga3f0w86v4jh8z1vyf0kifipz17fay4ws8d"; + name = "kpackage-5.96.0.tar.xz"; }; }; kparts = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kparts-5.95.0.tar.xz"; - sha256 = "097zr2mn2l5rlgv6alhs1gyrig2vzvsgzikv6dspdhh4f3ydz962"; - name = "kparts-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kparts-5.96.0.tar.xz"; + sha256 = "0b68kyi7l3ndw798sll2hrzf6qq6w875n48sc11q6882xilzinh2"; + name = "kparts-5.96.0.tar.xz"; }; }; kpeople = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kpeople-5.95.0.tar.xz"; - sha256 = "0002yhlzvwmhmdcnx48xc5q577r9yxq5jv978avx7axl4fmxjzi9"; - name = "kpeople-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kpeople-5.96.0.tar.xz"; + sha256 = "0q3c0ghxa9km5xcq6h0cwa7swfd18h491jpfafy4qgq3nwp0115b"; + name = "kpeople-5.96.0.tar.xz"; }; }; kplotting = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kplotting-5.95.0.tar.xz"; - sha256 = "0jyip5s2razcg8rfg4li3a14bisqbfzh1x6zc2z90vg8cgihqjny"; - name = "kplotting-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kplotting-5.96.0.tar.xz"; + sha256 = "1yqx260r3dzcinp8s685yzp5f2ihc0s1csckb9zv7z1bzljkn3h9"; + name = "kplotting-5.96.0.tar.xz"; }; }; kpty = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kpty-5.95.0.tar.xz"; - sha256 = "0pjzb7n8y3frp3b88caqhrnzfckkrgq1rq0j1n298ym78pjq077n"; - name = "kpty-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kpty-5.96.0.tar.xz"; + sha256 = "15swvv6qhvc654wyvxzbjbnzrd2vwn0mr4lby1x6x5f4c9br0cip"; + name = "kpty-5.96.0.tar.xz"; }; }; kquickcharts = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kquickcharts-5.95.0.tar.xz"; - sha256 = "09fkhxm3vx488xiiqm9wg7vwcqyj7k54rxrgk8pc2gjbg2af22bs"; - name = "kquickcharts-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kquickcharts-5.96.0.tar.xz"; + sha256 = "1sd9mfxk72xfa1kz77s7z312scfm0vwvvgmyi4pypb9cs7d9dq3j"; + name = "kquickcharts-5.96.0.tar.xz"; }; }; kross = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/portingAids/kross-5.95.0.tar.xz"; - sha256 = "05brnf4dy8vrrqsv1394g26wr593857zf808pjr3mj97pkbgszjm"; - name = "kross-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/portingAids/kross-5.96.0.tar.xz"; + sha256 = "03dvg2jh9587kcp2f9nir727z0qvkcywrgxfi1p1hxq1bx6y8fm2"; + name = "kross-5.96.0.tar.xz"; }; }; krunner = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/krunner-5.95.0.tar.xz"; - sha256 = "0w0nc0a0i6bbgsp1l6iky6lixhyyzgq1p8rxas72dbrjbs541lb0"; - name = "krunner-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/krunner-5.96.0.tar.xz"; + sha256 = "0wd2nmhw9mb09mm88cnkmirwgxdnvkrkyjvaiqh9k74xqsggnplk"; + name = "krunner-5.96.0.tar.xz"; }; }; kservice = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kservice-5.95.0.tar.xz"; - sha256 = "1rh48ij8vh72q7v9dlawgqb4kwvdgj8xl45hpn9dfx43h2iyjwfw"; - name = "kservice-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kservice-5.96.0.tar.xz"; + sha256 = "1zg3a35my8ba5ikmlg9s3wc9r0s5a2x0rggiiv9znhfi3snvi6gd"; + name = "kservice-5.96.0.tar.xz"; }; }; ktexteditor = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/ktexteditor-5.95.0.tar.xz"; - sha256 = "0yrykpangay6jb74hbr6i6m0v88dshy078qxd2myvj4gx8xbdrfm"; - name = "ktexteditor-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/ktexteditor-5.96.0.tar.xz"; + sha256 = "071jx26ycyk31bh167cq5fwx8xkr4ldjg8zlhn9dh7wa3rjpp183"; + name = "ktexteditor-5.96.0.tar.xz"; }; }; ktextwidgets = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/ktextwidgets-5.95.0.tar.xz"; - sha256 = "0vjyq80nn8g4xxsq6d3z5lphl2ikg64jbl5c59q5vsnkkg4j534x"; - name = "ktextwidgets-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/ktextwidgets-5.96.0.tar.xz"; + sha256 = "1vab4qmqq9268bwzx6xia2bcz8rdmiwlgjkbkk8nci2pnmhjrzpj"; + name = "ktextwidgets-5.96.0.tar.xz"; }; }; kunitconversion = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kunitconversion-5.95.0.tar.xz"; - sha256 = "079ljkgmx5nkhs29rinbrld4scy2k69fjnbia2jfwijy0slac00g"; - name = "kunitconversion-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kunitconversion-5.96.0.tar.xz"; + sha256 = "1qls3319gwn1nzaq04wrqjhbchk0s0pfx97m4za63yzvapvym73g"; + name = "kunitconversion-5.96.0.tar.xz"; }; }; kwallet = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kwallet-5.95.0.tar.xz"; - sha256 = "1gk55ny4zxhwq78gn8da4zwcjxvwf5z9y7dipiam0ybkwjz2pkrd"; - name = "kwallet-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kwallet-5.96.0.tar.xz"; + sha256 = "0rj610c7i66fbv1x0i0sfn9mac8fkqir4vwgaq1ad5i9ca36h1jq"; + name = "kwallet-5.96.0.tar.xz"; }; }; kwayland = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kwayland-5.95.0.tar.xz"; - sha256 = "0ba71k97qp5czg4d07pp75gfrkp5rgmvd2y9vv7n6mhfrgqsd3rb"; - name = "kwayland-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kwayland-5.96.0.tar.xz"; + sha256 = "0dcnsiippwxvwvf1gvp75lx97c4nydzn3x1l8lfy86w9lfslw7zb"; + name = "kwayland-5.96.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kwidgetsaddons-5.95.0.tar.xz"; - sha256 = "0b3i47p6495pz9nph85qliscbxsrpq76s9a37bkb8nv1wf3nyyw3"; - name = "kwidgetsaddons-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kwidgetsaddons-5.96.0.tar.xz"; + sha256 = "1igbkrn8qaalan0lyn8r2gqv5v3rwbmb3xv3w26yw77vwp0n789r"; + name = "kwidgetsaddons-5.96.0.tar.xz"; }; }; kwindowsystem = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kwindowsystem-5.95.0.tar.xz"; - sha256 = "1wxvhi8jwvnvgg5pyj6q6gqs24akzmjdw76g57qcfgq95a9byszi"; - name = "kwindowsystem-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kwindowsystem-5.96.0.tar.xz"; + sha256 = "1ilb3zl3mlndfrqz6gi28x6qqqs45l65d0wmy3lk07lppcw3wxzx"; + name = "kwindowsystem-5.96.0.tar.xz"; }; }; kxmlgui = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/kxmlgui-5.95.0.tar.xz"; - sha256 = "16rk1fb8n0ay3g305qmjfhrv6zq7fbilq02386wwgdczg98x8r8h"; - name = "kxmlgui-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/kxmlgui-5.96.0.tar.xz"; + sha256 = "1hiz2fgwpc4mgh2zzir0qi18pjsc3052lf888rc1pgql90faxb1k"; + name = "kxmlgui-5.96.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/portingAids/kxmlrpcclient-5.95.0.tar.xz"; - sha256 = "1ldykbr4x582k43b8bh01zzxbdfzyz2ckpqd9hpq9iab4njlh6gw"; - name = "kxmlrpcclient-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/portingAids/kxmlrpcclient-5.96.0.tar.xz"; + sha256 = "1jrmrzcvnnw7q7pxgfpcz8608jmxqxf89habmgwv71b8kjz3vgaw"; + name = "kxmlrpcclient-5.96.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/modemmanager-qt-5.95.0.tar.xz"; - sha256 = "0n9majjny43gic3s73v317wxyfzicf1j2cd7ly7fb1wpm5l9684x"; - name = "modemmanager-qt-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/modemmanager-qt-5.96.0.tar.xz"; + sha256 = "1rbiqh1sj328cy7flz9pw6vbvgiy3vyv6xp3fk4xv91sxviz1mhd"; + name = "modemmanager-qt-5.96.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/networkmanager-qt-5.95.0.tar.xz"; - sha256 = "0wkk6kblbvazplfr7wwzb552jv3560ng80wp56kihnagxkhch491"; - name = "networkmanager-qt-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/networkmanager-qt-5.96.0.tar.xz"; + sha256 = "1gyvgy0wl00asg9bkhjgvqnz32xmazvazcarh3p0640jy2fjrzfz"; + name = "networkmanager-qt-5.96.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/oxygen-icons5-5.95.0.tar.xz"; - sha256 = "1993sy7a4zvw5nbzjc9ii67f9wsba683szi39rl3gl6iy17i3lrd"; - name = "oxygen-icons5-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/oxygen-icons5-5.96.0.tar.xz"; + sha256 = "1f3fj6zr5iygb3s6f8vq2ayy749gxlx5j9h6v2zmkbf4m96sfmq5"; + name = "oxygen-icons5-5.96.0.tar.xz"; }; }; plasma-framework = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/plasma-framework-5.95.0.tar.xz"; - sha256 = "0px54bymfvwl9cyd31vgnmn1h87w1fwzqmdis3hv4q2yk2anqnsz"; - name = "plasma-framework-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/plasma-framework-5.96.0.tar.xz"; + sha256 = "14myvv70pixygb20c136sk7prv5f5dca53fgc74dk6c28hwyldh2"; + name = "plasma-framework-5.96.0.tar.xz"; }; }; prison = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/prison-5.95.0.tar.xz"; - sha256 = "0i3gczd1qmxd80m4pra3fgzg1q7xvv6kfmf7c9a24misc02vwvb1"; - name = "prison-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/prison-5.96.0.tar.xz"; + sha256 = "1kzl8rbyj9ik83p1qb8jl32vr06vkzzvr1hpasj50sg3ajq8a9xs"; + name = "prison-5.96.0.tar.xz"; }; }; purpose = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/purpose-5.95.0.tar.xz"; - sha256 = "002py7c162991p40hsyiqpafd6zfd5amr2b9khw0bkf72ckj0936"; - name = "purpose-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/purpose-5.96.0.tar.xz"; + sha256 = "0gji3dsccbii1gm83dpwry02cqmjrimhj8gnkb6nzvzrnq5xfh3r"; + name = "purpose-5.96.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/qqc2-desktop-style-5.95.0.tar.xz"; - sha256 = "04vkwbdlm141zgm46y1h2ypkf5w8lcbj6xbbmrkii6crv8g88ass"; - name = "qqc2-desktop-style-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/qqc2-desktop-style-5.96.0.tar.xz"; + sha256 = "0ff9vd34wss9na2m3gzm8wc2bwq0flda6bv6yqygv5iallw2lz88"; + name = "qqc2-desktop-style-5.96.0.tar.xz"; }; }; solid = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/solid-5.95.0.tar.xz"; - sha256 = "0vind63kb4kl4741fy0h9rcj7579w80csmkz4ldiik50gl8hjjjc"; - name = "solid-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/solid-5.96.0.tar.xz"; + sha256 = "0j64glc1g7mwy2ysaj09w5f7sd2992h91ncknk9gpfsrxhpm814i"; + name = "solid-5.96.0.tar.xz"; }; }; sonnet = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/sonnet-5.95.0.tar.xz"; - sha256 = "18praj54sgnmsgqhmwp0w2jvs78k5i9j831dxfjnrzmc2ncgn1aw"; - name = "sonnet-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/sonnet-5.96.0.tar.xz"; + sha256 = "0i0gksdkfyl8hfbqgrgklqanbvfm3h9gjnv42p2qq40b0zjj0sh4"; + name = "sonnet-5.96.0.tar.xz"; }; }; syndication = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/syndication-5.95.0.tar.xz"; - sha256 = "0dh8hikdfd7xdvp3rqi453v10gxq0sf5z3hzb0xsgx1y402z9mfc"; - name = "syndication-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/syndication-5.96.0.tar.xz"; + sha256 = "1q60dznlkbncqqgjnp3lq3x0f6r7wvz141ajkymmxlgfq3wdpcd4"; + name = "syndication-5.96.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/syntax-highlighting-5.95.0.tar.xz"; - sha256 = "00j88xgya0xcwrg1n0kzp5ba2f3ppp8whw66fzpksahzfvcwm71x"; - name = "syntax-highlighting-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/syntax-highlighting-5.96.0.tar.xz"; + sha256 = "176prghxfrb7i68jacmq9vkl7j9arsn6gnkzyc2hlkph35js3zqs"; + name = "syntax-highlighting-5.96.0.tar.xz"; }; }; threadweaver = { - version = "5.95.0"; + version = "5.96.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.95/threadweaver-5.95.0.tar.xz"; - sha256 = "0gnxy97az0jy88rl2ly5f858yzwml9la1hkln9nvh8c7q2girc5s"; - name = "threadweaver-5.95.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.96/threadweaver-5.96.0.tar.xz"; + sha256 = "0ljjnbwmc2zz4q0q1njqny43cj6xdf976vrvijcsqdsril5wzdbq"; + name = "threadweaver-5.96.0.tar.xz"; }; }; } diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 9ddbc92125f27..6a7495041f7a5 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.3.2"; + version = "4.3.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "sha256-RXIFfd4eeRLaDPe6+8jhIN2TI1yz/uDfnvWT95euaIo="; + sha256 = "sha256-+0H7Ojy5/K0EllNTSvGLNIZlglcMh76r9XHxFMUwrrY="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 2e35def271025..56026e10fe0b2 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.6.0"; + version = "5.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-zsTSz2RHtr4LqqPCkvHcaAw7RvfkHTNDm83OS+SgMUU="; + sha256 = "sha256-POYD4w0iBAdaN2L4cpLJz1aCE9J0Iob//VN94/5lJLw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index a051087bdd2f9..229c2b68f62b3 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "4.0.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hRY1cJFakbq6pU2TKql+eVWvKtNDzVIQkE5BbRW5n5A="; + sha256 = "sha256-oYM+OAYjQ8aNAryg0Cthj14BsxMFnOtz38XdUQZZolk="; }; - cargoSha256 = "sha256-VwB02FfoAKL0fEvpvpxfkAR6PcWZFK/d5aVOtUq7f10="; + cargoSha256 = "sha256-TDGiqC9eNIJfLTc1R3nvE84rAsVE8jtTaeQbVNMeVgg="; outputs = [ "out" "man" ]; diff --git a/pkgs/servers/invidious/default.nix b/pkgs/servers/invidious/default.nix index adcd694bad946..087683b5785c7 100644 --- a/pkgs/servers/invidious/default.nix +++ b/pkgs/servers/invidious/default.nix @@ -21,6 +21,7 @@ crystal.buildCrystalPackage rec { src = fetchFromGitHub { owner = "iv-org"; repo = pname; + fetchSubmodules = true; inherit (versions.invidious) rev sha256; }; diff --git a/pkgs/servers/invidious/update.sh b/pkgs/servers/invidious/update.sh index bf43fbb4b3653..4810534cd2981 100755 --- a/pkgs/servers/invidious/update.sh +++ b/pkgs/servers/invidious/update.sh @@ -60,7 +60,7 @@ info "Running scripts/fetch-player-dependencies.cr..." git -C "$git_dir" reset --hard "$new_rev" (cd "$git_dir" && crystal run scripts/fetch-player-dependencies.cr -- --minified) rm -f "$git_dir/assets/videojs/.gitignore" -videojs_new_sha256=$(nix hash-path --type sha256 --base32 "$git_dir/assets/videojs") +videojs_new_sha256=$(nix-hash --type sha256 --base32 "$git_dir/assets/videojs") json_set '.videojs.sha256' "$videojs_new_sha256" if git -C "$git_dir" diff-tree --quiet "${old_rev}..${new_rev}" -- 'shard.lock'; then diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 40f8bb04182a8..0f7c1431f0ed4 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "ca27e096f3249533cc7a9b123a8a8378f3312bb7", - "sha256": "0xjdzxnw6b5lk8pr82sjj60wfzxqkyamh0gpf2wxby52jvlbdcka", - "version": "unstable-2022-05-11" + "rev": "cbcf31a4f98706ea675cafb7509b37dc2b0ceace", + "sha256": "sha256-RliUNAOsU3ewyUl8hz4hvtlk7ztexW9Bl/N1vKLc6Dg=", + "version": "unstable-2022-07-10" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 08617255a23f7..0fe8734d4ca7f 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -24,13 +24,13 @@ , features ? ([ "sinks" "sources" "transforms" "vrl-cli" ] # the second feature flag is passed to the rdkafka dependency # building on linux fails without this feature flag (both x86_64 and AArch64) - ++ lib.optionals enableKafka [ "rdkafka/gssapi-vendored" ] + ++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ] ++ lib.optional stdenv.targetPlatform.isUnix "unix") }: let pname = "vector"; - version = "0.22.3"; + version = "0.23.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -39,10 +39,10 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-62oPttkdahTeMsd9lpd9/tc95kluVJuWxzP94i+gWhA="; + sha256 = "sha256-Y1RysuCWvdbqckW54r1uH/K9YTuAZk8T4M3HRGFm0EM="; }; - cargoSha256 = "sha256-WWX47pbva7ZmPR6hBstJ5VqOwu3mkhhsHK3LHHqQjDE="; + cargoSha256 = "sha256-VBmJfRCwSv3t5DPzVj92ajGYk5Ju8xqr4v7IDU17498="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34f47973d92f8..847a1ad4dc0e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35224,7 +35224,9 @@ with pkgs; terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( - callPackage ../applications/networking/cluster/terraform-providers { } + callPackage ../applications/networking/cluster/terraform-providers { + buildGoModule = buildGo118Module; + } ); terraforming = callPackage ../applications/networking/cluster/terraforming { }; diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 88d3aea46cbe3..11dd5270e63d8 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -58,6 +58,8 @@ let self = rec { iagl = callPackage ../applications/video/kodi/addons/iagl { }; + invidious = callPackage ../applications/video/kodi/addons/invidious { }; + libretro = callPackage ../applications/video/kodi/addons/libretro { }; libretro-genplus = callPackage ../applications/video/kodi/addons/libretro-genplus { inherit genesis-plus-gx; }; diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix index 28f8cf3329774..e2b81b20c5b08 100644 --- a/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -19,6 +19,14 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } exit 1 fi + # Make sure that no paths collide on case-preserving or case-insensitive filesysytems. + conflictingPaths=$(find $src | awk '{ print $1 " " tolower($1) }' | sort -k2 | uniq -D -f 1 | cut -d ' ' -f 1) + if [[ -n $conflictingPaths ]]; then + echo "Files in nixpkgs must not vary only by case" + echo "The offending paths: $conflictingPaths" + exit 1 + fi + src2=$TMPDIR/foo cp -rd $src $src2 |