diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d84c6a59538..63539525792 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -82,8 +82,8 @@ /pkgs/development/r-modules @peti # Ruby -/pkgs/development/interpreters/ruby @alyssais @zimbatm -/pkgs/development/ruby-modules @alyssais @zimbatm +/pkgs/development/interpreters/ruby @alyssais +/pkgs/development/ruby-modules @alyssais # Rust /pkgs/development/compilers/rust @Mic92 @LnL7 diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 05a23d26cf2..4911509212e 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -261,12 +261,7 @@ deoplete-fish = super.deoplete-fish.overrideAttrs(old: { Sometimes plugins require an override that must be changed when the plugin is updated. This can cause issues when Vim plugins are auto-updated but the associated override isn't updated. For these plugins, the override should be written so that it specifies all information required to install the plugin, and running `./update.py` doesn't change the derivation for the plugin. Manually updating the override is required to update these types of plugins. An example of such a plugin is `LanguageClient-neovim`. -To add a new plugin: - - 1. run `./update.py` and create a commit named "vimPlugins: Update", - 2. add the new plugin to [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names) and add overrides if required to [overrides.nix](/pkgs/misc/vim-plugins/overrides.nix), - 3. run `./update.py` again and create a commit named "vimPlugins.[name]: init at [version]" (where `name` and `version` can be found in [generated.nix](/pkgs/misc/vim-plugins/generated.nix)), and - 4. create a pull request. +To add a new plugin, run `./update.py --add "[owner]/[name]"`. **NOTE**: This script automatically commits to your git repository. Be sure to check out a fresh branch before running. ## Important repositories diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index 88ca5e2e3ce..7fa65ab1102 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -37,7 +37,7 @@ security updates. More up to date packages and modules are available via the Both `nixos-unstable` and `nixpkgs` follow the `master` branch of the Nixpkgs repository, although both do lag the `master` branch by generally -[a couple of days](https://howoldis.herokuapp.com/). Updates to a channel are +[a couple of days](https://status.nixos.org/). Updates to a channel are distributed as soon as all tests for that channel pass, e.g. [this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents) shows the status of tests for the `nixpkgs` channel. diff --git a/flake.nix b/flake.nix index a6828c98fb5..52fd2f82a37 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,7 @@ import ./nixos/lib/eval-config.nix (args // { modules = modules ++ [ { system.nixos.versionSuffix = - ".${lib.substring 0 8 self.lastModified}.${self.shortRev or "dirty"}"; + ".${lib.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}"; system.nixos.revision = lib.mkIf (self ? rev) self.rev; } ]; diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 72430522f7d..7d84c25de77 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -4,7 +4,7 @@ let inherit (builtins) head tail length; inherit (lib.trivial) and; - inherit (lib.strings) concatStringsSep; + inherit (lib.strings) concatStringsSep sanitizeDerivationName; inherit (lib.lists) fold concatMap concatLists; in @@ -310,7 +310,7 @@ rec { path' = builtins.storePath path; res = { type = "derivation"; - name = builtins.unsafeDiscardStringContext (builtins.substring 33 (-1) (baseNameOf path')); + name = sanitizeDerivationName (builtins.substring 33 (-1) (baseNameOf path')); outPath = path'; outputs = [ "out" ]; out = res; diff --git a/lib/licenses.nix b/lib/licenses.nix index e37eb57cff9..b63de0911bc 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -682,6 +682,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { # channel and NixOS images. }; + unicode-dfs-2016 = spdx { + spdxId = "Unicode-DFS-2016"; + fullName = "Unicode License Agreement - Data Files and Software (2016)"; + }; + unlicense = spdx { spdxId = "Unlicense"; fullName = "The Unlicense"; diff --git a/lib/strings.nix b/lib/strings.nix index 4f9509ffe7c..7ecd6b143ee 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -678,4 +678,36 @@ rec { => "1.0" */ fileContents = file: removeSuffix "\n" (builtins.readFile file); + + + /* Creates a valid derivation name from a potentially invalid one. + + Type: sanitizeDerivationName :: String -> String + + Example: + sanitizeDerivationName "../hello.bar # foo" + => "-hello.bar-foo" + sanitizeDerivationName "" + => "unknown" + sanitizeDerivationName pkgs.hello + => "-nix-store-2g75chlbpxlrqn15zlby2dfh8hr9qwbk-hello-2.10" + */ + sanitizeDerivationName = string: lib.pipe string [ + # Get rid of string context. This is safe under the assumption that the + # resulting string is only used as a derivation name + builtins.unsafeDiscardStringContext + # Strip all leading "." + (x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) + # Split out all invalid characters + # https://github.com/NixOS/nix/blob/2.3.2/src/libstore/store-api.cc#L85-L112 + # https://github.com/NixOS/nix/blob/2242be83c61788b9c0736a92bb0b5c7bbfc40803/nix-rust/src/store/path.rs#L100-L125 + (builtins.split "[^[:alnum:]+._?=-]+") + # Replace invalid character ranges with a "-" + (concatMapStrings (s: if lib.isList s then "-" else s)) + # Limit to 211 characters (minus 4 chars for ".drv") + (x: substring (lib.max (stringLength x - 207) 0) (-1) x) + # If the result is empty, replace it with "unknown" + (x: if stringLength x == 0 then "unknown" else x) + ]; + } diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 739c5d5fe15..36ddd186d7b 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -3,6 +3,23 @@ # if the resulting list is empty, all tests passed with import ../default.nix; +let + + testSanitizeDerivationName = { name, expected }: + let + drv = derivation { + name = strings.sanitizeDerivationName name; + builder = "x"; + system = "x"; + }; + in { + # Evaluate the derivation so an invalid name would be caught + expr = builtins.seq drv.drvPath drv.name; + inherit expected; + }; + +in + runTests { @@ -490,4 +507,29 @@ runTests { expected = "'-X' 'PUT' '--data' '{\"id\":0}' '--retry' '3' '--url' 'https://example.com/foo' '--url' 'https://example.com/bar' '--verbose'"; }; + + testSanitizeDerivationNameLeadingDots = testSanitizeDerivationName { + name = "..foo"; + expected = "foo"; + }; + + testSanitizeDerivationNameAscii = testSanitizeDerivationName { + name = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"; + expected = "-+--.-0123456789-=-?-ABCDEFGHIJKLMNOPQRSTUVWXYZ-_-abcdefghijklmnopqrstuvwxyz-"; + }; + + testSanitizeDerivationNameTooLong = testSanitizeDerivationName { + name = "This string is loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"; + expected = "loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"; + }; + + testSanitizeDerivationNameTooLongWithInvalid = testSanitizeDerivationName { + name = "Hello there aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&&&&&&&"; + expected = "there-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-"; + }; + + testSanitizeDerivationNameEmpty = testSanitizeDerivationName { + name = ""; + expected = "unknown"; + }; } diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 351ce32e936..bcebb66d883 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2839,6 +2839,12 @@ githubId = 12064730; name = "Alex Ivanov"; }; + gnxlxnxx = { + email = "gnxlxnxx@web.de"; + github = "gnxlxnxx"; + githubId = 25820499; + name = "Roman Kretschmer"; + }; goibhniu = { email = "cillian.deroiste@gmail.com"; github = "cillianderoiste"; @@ -3235,6 +3241,12 @@ fingerprint = "7311 2700 AB4F 4CDF C68C F6A5 79C3 C47D C652 EA54"; }]; }; + ivar = { + email = "ivar.scholten@protonmail.com"; + github = "IvarWithoutBones"; + githubId = 41924494; + Name = "Ivar"; + }; ivegotasthma = { email = "ivegotasthma@protonmail.com"; github = "ivegotasthma"; @@ -7336,6 +7348,12 @@ githubId = 378734; name = "TG ⊗ Θ"; }; + th0rgal = { + email = "thomas.marchand@tuta.io"; + github = "Th0rgal"; + githubId = 41830259; + name = "Thomas Marchand"; + }; thall = { email = "niclas.thall@gmail.com"; github = "thall"; diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 76b12af362f..606add95f30 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -757,6 +757,12 @@ auth required pam_succeed_if.so uid >= 1000 quiet + + + The TokuDB storage engine will be disabled in mariadb 10.5. It is recommended to switch + to RocksDB. See also TokuDB. + + @@ -888,6 +894,15 @@ auth required pam_succeed_if.so uid >= 1000 quiet mongodb has been updated to version 3.4.24. + + + Please note that mongodb has been relicensed under their own + + sspl-license. Since it's not entirely free and not OSI-approved, + it's listed as non-free. This means that Hydra doesn't provide prebuilt + mongodb-packages and needs to be built locally. + + diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index e5813d9a3ef..772b7d3add9 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -86,7 +86,7 @@ let optionsList = lib.sort optionLess optionsListDesc; # Convert the list of options into an XML file. - optionsXML = pkgs.writeText "options.xml" (builtins.toXML optionsList); + optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList); optionsNix = builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList); diff --git a/nixos/modules/config/vte.nix b/nixos/modules/config/vte.nix index d4a8c926fef..24d32a00fd4 100644 --- a/nixos/modules/config/vte.nix +++ b/nixos/modules/config/vte.nix @@ -16,6 +16,10 @@ in { + meta = { + maintainers = teams.gnome.members; + }; + options = { programs.bash.vteIntegration = mkOption { diff --git a/nixos/modules/config/xdg/autostart.nix b/nixos/modules/config/xdg/autostart.nix index 0ee94fed818..40984cb5ec5 100644 --- a/nixos/modules/config/xdg/autostart.nix +++ b/nixos/modules/config/xdg/autostart.nix @@ -2,19 +2,23 @@ with lib; { + meta = { + maintainers = teams.freedesktop.members; + }; + options = { xdg.autostart.enable = mkOption { type = types.bool; default = true; description = '' - Whether to install files to support the + Whether to install files to support the XDG Autostart specification. ''; }; }; config = mkIf config.xdg.autostart.enable { - environment.pathsToLink = [ + environment.pathsToLink = [ "/etc/xdg/autostart" ]; }; diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix index 4677ce090b0..c83fdc251ef 100644 --- a/nixos/modules/config/xdg/icons.nix +++ b/nixos/modules/config/xdg/icons.nix @@ -2,6 +2,10 @@ with lib; { + meta = { + maintainers = teams.freedesktop.members; + }; + options = { xdg.icons.enable = mkOption { type = types.bool; diff --git a/nixos/modules/config/xdg/menus.nix b/nixos/modules/config/xdg/menus.nix index c172692df5d..6735a7a5c43 100644 --- a/nixos/modules/config/xdg/menus.nix +++ b/nixos/modules/config/xdg/menus.nix @@ -2,19 +2,23 @@ with lib; { + meta = { + maintainers = teams.freedesktop.members; + }; + options = { xdg.menus.enable = mkOption { type = types.bool; default = true; description = '' - Whether to install files to support the + Whether to install files to support the XDG Desktop Menu specification. ''; }; }; config = mkIf config.xdg.menus.enable { - environment.pathsToLink = [ + environment.pathsToLink = [ "/share/applications" "/share/desktop-directories" "/etc/xdg/menus" diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index a5374c2b468..4cdb3f30994 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -2,6 +2,10 @@ with lib; { + meta = { + maintainers = teams.freedesktop.members; + }; + options = { xdg.mime.enable = mkOption { type = types.bool; diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 1330a08070c..3c7cd729c60 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -7,6 +7,10 @@ with lib; (mkRenamedOptionModule [ "services" "flatpak" "extraPortals" ] [ "xdg" "portal" "extraPortals" ]) ]; + meta = { + maintainers = teams.freedesktop.members; + }; + options.xdg.portal = { enable = mkEnableOption "xdg desktop integration"//{ diff --git a/nixos/modules/config/xdg/sounds.nix b/nixos/modules/config/xdg/sounds.nix index 14d6340fc33..0b94f550929 100644 --- a/nixos/modules/config/xdg/sounds.nix +++ b/nixos/modules/config/xdg/sounds.nix @@ -2,6 +2,10 @@ with lib; { + meta = { + maintainers = teams.freedesktop.members; + }; + options = { xdg.sounds.enable = mkOption { type = types.bool; diff --git a/nixos/modules/hardware/sensor/iio.nix b/nixos/modules/hardware/sensor/iio.nix index a8bc1880002..4c359c3b172 100644 --- a/nixos/modules/hardware/sensor/iio.nix +++ b/nixos/modules/hardware/sensor/iio.nix @@ -8,7 +8,12 @@ with lib; options = { hardware.sensor.iio = { enable = mkOption { - description = "Enable this option to support IIO sensors."; + description = '' + Enable this option to support IIO sensors. + + IIO sensors are used for orientation and ambient light + sensors on some mobile devices. + ''; type = types.bool; default = false; }; diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index a3d97619fc4..b6a21c369e5 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -75,5 +75,9 @@ in QT_IM_MODULE = "ibus"; XMODIFIERS = "@im=ibus"; }; + + xdg.portal.extraPortals = mkIf xdg.portal.enable [ + ibusPackage + ]; }; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7633f1ca0ad..c3d2bb85809 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -295,7 +295,6 @@ ./services/desktops/deepin/deepin.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix - ./services/desktops/pantheon/contractor.nix ./services/desktops/pantheon/files.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix @@ -396,7 +395,6 @@ ./services/mail/mailcatcher.nix ./services/mail/mailhog.nix ./services/mail/mailman.nix - ./services/mail/magic-wormhole-mailbox-server.nix ./services/mail/mlmmj.nix ./services/mail/offlineimap.nix ./services/mail/opendkim.nix @@ -645,6 +643,7 @@ ./services/networking/lldpd.nix ./services/networking/logmein-hamachi.nix ./services/networking/mailpile.nix + ./services/networking/magic-wormhole-mailbox-server.nix ./services/networking/matterbridge.nix ./services/networking/mjpg-streamer.nix ./services/networking/minidlna.nix @@ -655,6 +654,7 @@ ./services/networking/miredo.nix ./services/networking/mstpd.nix ./services/networking/mtprotoproxy.nix + ./services/networking/mullvad-vpn.nix ./services/networking/murmur.nix ./services/networking/mxisd.nix ./services/networking/namecoind.nix @@ -683,6 +683,7 @@ ./services/networking/ostinato.nix ./services/networking/owamp.nix ./services/networking/pdnsd.nix + ./services/networking/pixiecore.nix ./services/networking/polipo.nix ./services/networking/powerdns.nix ./services/networking/pdns-recursor.nix diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index f7b2f5c7fc1..da3de444768 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -14,12 +14,17 @@ with lib; nix.allowedUsers = mkDefault [ "@users" ]; + environment.memoryAllocator.provider = mkDefault "scudo"; + environment.variables.SCUDO_OPTIONS = mkDefault "ZeroContents=1"; + security.hideProcessInformation = mkDefault true; security.lockKernelModules = mkDefault true; security.allowUserNamespaces = mkDefault false; + nix.useSandbox = mkDefault false; + security.protectKernelImage = mkDefault true; security.allowSimultaneousMultithreading = mkDefault false; diff --git a/nixos/modules/programs/geary.nix b/nixos/modules/programs/geary.nix index 01803bc411e..5e441a75cb6 100644 --- a/nixos/modules/programs/geary.nix +++ b/nixos/modules/programs/geary.nix @@ -6,6 +6,10 @@ let cfg = config.programs.geary; in { + meta = { + maintainers = teams.gnome.members; + }; + options = { programs.geary.enable = mkEnableOption "Geary, a Mail client for GNOME 3"; }; diff --git a/nixos/modules/programs/gnome-disks.nix b/nixos/modules/programs/gnome-disks.nix index 1cf839a6ddb..80dc2983ea5 100644 --- a/nixos/modules/programs/gnome-disks.nix +++ b/nixos/modules/programs/gnome-disks.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + # Added 2019-08-09 imports = [ (mkRenamedOptionModule diff --git a/nixos/modules/programs/gnome-documents.nix b/nixos/modules/programs/gnome-documents.nix index bfa3d409ee3..9dd53483055 100644 --- a/nixos/modules/programs/gnome-documents.nix +++ b/nixos/modules/programs/gnome-documents.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + # Added 2019-08-09 imports = [ (mkRenamedOptionModule diff --git a/nixos/modules/programs/gnome-terminal.nix b/nixos/modules/programs/gnome-terminal.nix index 0036677a157..f2617e5bc03 100644 --- a/nixos/modules/programs/gnome-terminal.nix +++ b/nixos/modules/programs/gnome-terminal.nix @@ -12,6 +12,10 @@ in { + meta = { + maintainers = teams.gnome.members; + }; + # Added 2019-08-19 imports = [ (mkRenamedOptionModule @@ -20,9 +24,7 @@ in ]; options = { - programs.gnome-terminal.enable = mkEnableOption "GNOME Terminal"; - }; config = mkIf cfg.enable { diff --git a/nixos/modules/programs/nm-applet.nix b/nixos/modules/programs/nm-applet.nix index 1b806071c43..273a6dec59a 100644 --- a/nixos/modules/programs/nm-applet.nix +++ b/nixos/modules/programs/nm-applet.nix @@ -1,6 +1,10 @@ { config, lib, pkgs, ... }: { + meta = { + maintainers = lib.teams.freedesktop.members; + }; + options.programs.nm-applet.enable = lib.mkEnableOption "nm-applet"; config = lib.mkIf config.programs.nm-applet.enable { diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index 7729da27304..160dbddcd48 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -63,9 +63,11 @@ in { javaProperties = mkOption { type = types.attrs; default = { }; - example = { - "java.net.preferIPv4Stack" = "true"; - }; + example = literalExample '' + { + "java.net.preferIPv4Stack" = "true"; + } + ''; apply = attrs: { "activemq.base" = "${cfg.baseDir}"; "activemq.data" = "${cfg.baseDir}/data"; diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index a2eb80c55a8..be661b201f0 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -189,6 +189,7 @@ let in { meta.maintainers = with maintainers; [ dotlambda ]; + meta.doc = ./borgbackup.xml; ###### interface @@ -197,10 +198,11 @@ in { Deduplicating backups using BorgBackup. Adding a job will cause a borg-job-NAME wrapper to be added to your system path, so that you can perform maintenance easily. + See also the chapter about BorgBackup in the NixOS manual. ''; default = { }; example = literalExample '' - { + { # for a local backup rootBackup = { paths = "/"; exclude = [ "/nix" ]; @@ -213,6 +215,23 @@ in { startAt = "weekly"; }; } + { # Root backing each day up to a remote backup server. We assume that you have + # * created a password less key: ssh-keygen -N "" -t ed25519 -f /path/to/ssh_key + # best practices are: use -t ed25519, /path/to = /run/keys + # * the passphrase is in the file /run/keys/borgbackup_passphrase + # * you have initialized the repository manually + paths = [ "/etc" "/home" ]; + exclude = [ "/nix" "'**/.cache'" ]; + doInit = false; + repo = "user3@arep.repo.borgbase.com:repo"; + encryption = { + mode = "repokey-blake2"; + passCommand = "cat /path/to/passphrase"; + }; + environment = { BORG_RSH = "ssh -i /path/to/ssh_key"; }; + compression = "auto,lzma"; + startAt = "daily"; + }; ''; type = types.attrsOf (types.submodule (let globalConfig = config; in { name, config, ... }: { @@ -268,6 +287,8 @@ in { 7. If you do not want the backup to start automatically, use [ ]. + It will generate a systemd service borgbackup-job-NAME. + You may trigger it manually via systemctl restart borgbackup-job-NAME. ''; }; @@ -303,6 +324,10 @@ in { you to specify a or a . ''; + example = '' + encryption.mode = "repokey-blake2" ; + encryption.passphrase = "mySecretPassphrase" ; + ''; }; encryption.passCommand = mkOption { @@ -538,6 +563,7 @@ in { description = '' Serve BorgBackup repositories to given public SSH keys, restricting their access to the repository only. + See also the chapter about BorgBackup in the NixOS manual. Also, clients do not need to specify the absolute path when accessing the repository, i.e. user@machine:. is enough. (Note colon and dot.) ''; diff --git a/nixos/modules/services/backup/borgbackup.xml b/nixos/modules/services/backup/borgbackup.xml new file mode 100644 index 00000000000..bef7db608f8 --- /dev/null +++ b/nixos/modules/services/backup/borgbackup.xml @@ -0,0 +1,227 @@ + + BorgBackup + + Source: + modules/services/backup/borgbackup.nix + + + Upstream documentation: + + + + BorgBackup (short: Borg) + is a deduplicating backup program. Optionally, it supports compression and + authenticated encryption. + + + The main goal of Borg is to provide an efficient and secure way to backup + data. The data deduplication technique used makes Borg suitable for daily + backups since only changes are stored. The authenticated encryption technique + makes it suitable for backups to not fully trusted targets. + +
+ Configuring + + A complete list of options for the Borgbase module may be found + here. + +
+
+ Basic usage for a local backup + + + A very basic configuration for backing up to a locally accessible directory + is: + +{ + opt.services.borgbackup.jobs = { + { rootBackup = { + paths = "/"; + exclude = [ "/nix" "/path/to/local/repo" ]; + repo = "/path/to/local/repo"; + doInit = true; + encryption = { + mode = "repokey"; + passphrase = "secret"; + }; + compression = "auto,lzma"; + startAt = "weekly"; + }; + } + }; +} + + + + If you do not want the passphrase to be stored in the world-readable + Nix store, use passCommand. You find an example below. + + +
+
+ Create a borg backup server + You should use a different SSH key for each repository you write to, + because the specified keys are restricted to running borg serve and can only + access this single repository. You need the output of the generate pub file. + + + +# sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_my_borg_repo +# cat /run/keys/id_ed25519_my_borg_repo +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos + + + Add the following snippet to your NixOS configuration: + +{ + services.borgbackup.repos = { + my_borg_repo = { + authorizedKeys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos" + ] ; + path = "/var/lib/my_borg_repo" ; + }; + }; +} + +
+ +
+ Backup to the borg repository server + The following NixOS snippet creates an hourly backup to the service + (on the host nixos) as created in the section above. We assume + that you have stored a secret passphrasse in the file + /run/keys/borgbackup_passphrase, which should be only + accessible by root + + + +{ + services.borgbackup.jobs = { + backupToLocalServer = { + paths = [ "/etc/nixos" ]; + doInit = true; + repo = "borg@nixos:." ; + encryption = { + mode = "repokey-blake2"; + passCommand = "cat /run/keys/borgbackup_passphrase"; + }; + environment = { BORG_RSH = "ssh -i /run/keys/id_ed25519_my_borg_repo"; }; + compression = "auto,lzma"; + startAt = "hourly"; + }; + }; +}; + + The following few commands (run as root) let you test your backup. + +> nixos-rebuild switch +...restarting the following units: polkit.service +> systemctl restart borgbackup-job-backupToLocalServer +> sleep 10 +> systemctl restart borgbackup-job-backupToLocalServer +> export BORG_PASSPHRASE=topSecrect +> borg list --rsh='ssh -i /run/keys/id_ed25519_my_borg_repo' borg@nixos:. +nixos-backupToLocalServer-2020-03-30T21:46:17 Mon, 2020-03-30 21:46:19 [84feb97710954931ca384182f5f3cb90665f35cef214760abd7350fb064786ac] +nixos-backupToLocalServer-2020-03-30T21:46:30 Mon, 2020-03-30 21:46:32 [e77321694ecd160ca2228611747c6ad1be177d6e0d894538898de7a2621b6e68] + +
+ +
+ Backup to a hosting service + + + Several companies offer (paid) + hosting services for Borg repositories. + + + To backup your home directory to borgbase you have to: + + + + + Generate a SSH key without a password, to access the remote server. E.g. + + + sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_borgbase + + + + + Create the repository on the server by following the instructions for your + hosting server. + + + + + Initialize the repository on the server. Eg. + +sudo borg init --encryption=repokey-blake2 \ + -rsh "ssh -i /run/keys/id_ed25519_borgbase" \ + zzz2aaaaa@zzz2aaaaa.repo.borgbase.com:repo + + + +Add it to your NixOS configuration, e.g. + +{ + services.borgbackup.jobs = { + my_Remote_Backup = { + paths = [ "/" ]; + exclude = [ "/nix" "'**/.cache'" ]; + repo = "zzz2aaaaa@zzz2aaaaa.repo.borgbase.com:repo"; + encryption = { + mode = "repokey-blake2"; + passCommand = "cat /run/keys/borgbackup_passphrase"; + }; + BORG_RSH = "ssh -i /run/keys/id_ed25519_borgbase"; + compression = "auto,lzma"; + startAt = "daily"; + }; + }; +}} + + + +
+
+ Vorta backup client for the desktop + + Vorta is a backup client for macOS and Linux desktops. It integrates the + mighty BorgBackup with your desktop environment to protect your data from + disk failure, ransomware and theft. + + + It is available as a flatpak package. To enable it you must set the + following two configuration items. + + + +services.flatpak.enable = true ; +# next line is needed to avoid the Error +# Error deploying: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: +services.accounts-daemon.enable = true; + + + As a normal user you must first install, then run vorta using the + following commands: + +flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo +flatpak install flathub com.borgbase.Vorta +flatpak run --branch=stable --arch=x86_64 --command=vorta com.borgbase.Vorta + + After running flatpak install you can start Vorta also via + the KDE application menu. + + + Details about using Vorta can be found under https://vorta.borgbase.com + . + +
+ diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 53787a0182a..fff119c2cf0 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -138,7 +138,11 @@ in { }; })); default = {}; - example."pool/test".target = "root@target:pool/test"; + example = literalExample '' + { + "pool/test".target = "root@target:pool/test"; + } + ''; description = "Syncoid commands to run."; }; }; diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix index f0f5a6ecbfc..bfb73f68371 100644 --- a/nixos/modules/services/cluster/hadoop/default.nix +++ b/nixos/modules/services/cluster/hadoop/default.nix @@ -7,33 +7,41 @@ with lib; options.services.hadoop = { coreSite = mkOption { default = {}; - example = { - "fs.defaultFS" = "hdfs://localhost"; - }; + example = literalExample '' + { + "fs.defaultFS" = "hdfs://localhost"; + } + ''; description = "Hadoop core-site.xml definition"; }; hdfsSite = mkOption { default = {}; - example = { - "dfs.nameservices" = "namenode1"; - }; + example = literalExample '' + { + "dfs.nameservices" = "namenode1"; + } + ''; description = "Hadoop hdfs-site.xml definition"; }; mapredSite = mkOption { default = {}; - example = { - "mapreduce.map.cpu.vcores" = "1"; - }; + example = literalExample '' + { + "mapreduce.map.cpu.vcores" = "1"; + } + ''; description = "Hadoop mapred-site.xml definition"; }; yarnSite = mkOption { default = {}; - example = { - "yarn.resourcemanager.ha.id" = "resourcemanager1"; - }; + example = literalExample '' + { + "yarn.resourcemanager.ha.id" = "resourcemanager1"; + } + ''; description = "Hadoop yarn-site.xml definition"; }; diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index c17d89c387a..b0045409ae6 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -208,8 +208,12 @@ in description = "Buildkite agent user"; extraGroups = [ "keys" ]; isSystemUser = true; + group = "buildkite-agent-${name}"; }; }); + config.users.groups = mapAgents (name: cfg: { + "buildkite-agent-${name}" = {}; + }); config.systemd.services = mapAgents (name: cfg: { "buildkite-agent-${name}" = diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index 72d4a8249a3..07af4c937f0 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -7,12 +7,10 @@ - Source: - modules/services/databases/postgresql.nix + Source: modules/services/databases/postgresql.nix - Upstream documentation: - + Upstream documentation: @@ -23,18 +21,12 @@ Configuring - To enable PostgreSQL, add the following to your - configuration.nix: + To enable PostgreSQL, add the following to your configuration.nix: = true; = pkgs.postgresql_11; - Note that you are required to specify the desired version of PostgreSQL - (e.g. pkgs.postgresql_11). Since upgrading your - PostgreSQL version requires a database dump and reload (see below), NixOS - cannot provide a default value for - such as the most recent - release of PostgreSQL. + Note that you are required to specify the desired version of PostgreSQL (e.g. pkgs.postgresql_11). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for such as the most recent release of PostgreSQL. - By default, PostgreSQL stores its databases in - /var/lib/postgresql/$psqlSchema. You can override this using - , e.g. + By default, PostgreSQL stores its databases in /var/lib/postgresql/$psqlSchema. You can override this using , e.g. = "/data/postgresql"; @@ -63,25 +53,83 @@ Type "help" for help. Upgrading - FIXME: document dump/upgrade/load cycle. + Major PostgreSQL upgrade requires PostgreSQL downtime and a few imperative steps to be called. To simplify this process, use the following NixOS module: + + containers.temp-pg.config.services.postgresql = { + enable = true; + package = pkgs.postgresql_12; + ## set a custom new dataDir + # dataDir = "/some/data/dir"; + }; + environment.systemPackages = + let newpg = config.containers.temp-pg.config.services.postgresql; + in [ + (pkgs.writeScriptBin "upgrade-pg-cluster" '' + set -x + export OLDDATA="${config.services.postgresql.dataDir}" + export NEWDATA="${newpg.dataDir}" + export OLDBIN="${config.services.postgresql.package}/bin" + export NEWBIN="${newpg.package}/bin" + + install -d -m 0700 -o postgres -g postgres "$NEWDATA" + cd "$NEWDATA" + sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" + + systemctl stop postgresql # old one + + sudo -u postgres $NEWBIN/pg_upgrade \ + --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \ + --old-bindir $OLDBIN --new-bindir $NEWBIN \ + "$@" + '') + ]; + + + + The upgrade process is: + + + + + + Rebuild nixos configuration with the configuration above added to your configuration.nix. Alternatively, add that into separate file and reference it in imports list. + + + + + Login as root (sudo su -) + + + + + Run upgrade-pg-cluster. It will stop old postgresql, initialize new one and migrate old one to new one. You may supply arguments like --jobs 4 and --link to speedup migration process. See for details. + + + + + Change postgresql package in NixOS configuration to the one you were upgrading to, and change dataDir to the one you have migrated to. Rebuild NixOS. This should start new postgres using upgraded data directory. + + + + + After upgrade you may want to ANALYZE new db. + + +
Options - A complete list of options for the PostgreSQL module may be found - here. + A complete list of options for the PostgreSQL module may be found here.
Plugins - Plugins collection for each PostgreSQL version can be accessed with - .pkgs. For example, for - pkgs.postgresql_11 package, its plugin collection is - accessed by pkgs.postgresql_11.pkgs: + Plugins collection for each PostgreSQL version can be accessed with .pkgs. For example, for pkgs.postgresql_11 package, its plugin collection is accessed by pkgs.postgresql_11.pkgs: $ nix repl '<nixpkgs>' @@ -98,8 +146,9 @@ postgresql_11.pkgs.pg_partman postgresql_11.pkgs.pgroonga ... + - To add plugins via NixOS configuration, set services.postgresql.extraPlugins: + To add plugins via NixOS configuration, set services.postgresql.extraPlugins: = pkgs.postgresql_11; = with pkgs.postgresql_11.pkgs; [ @@ -108,10 +157,9 @@ postgresql_11.pkgs.pg_partman postgresql_11.pkgs.pgroonga ]; + - You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using - function .withPackages. For example, creating a custom - PostgreSQL package in an overlay can look like: + You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function .withPackages. For example, creating a custom PostgreSQL package in an overlay can look like: self: super: { postgresql_custom = self.postgresql_11.withPackages (ps: [ @@ -121,8 +169,9 @@ self: super: { } + - Here's a recipe on how to override a particular plugin through an overlay: + Here's a recipe on how to override a particular plugin through an overlay: self: super: { postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // { diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix index c48036a99e8..ae2ecb5ffeb 100644 --- a/nixos/modules/services/desktops/accountsservice.nix +++ b/nixos/modules/services/desktops/accountsservice.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.freedesktop.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/bamf.nix b/nixos/modules/services/desktops/bamf.nix index 0928ee81a64..4b35146d084 100644 --- a/nixos/modules/services/desktops/bamf.nix +++ b/nixos/modules/services/desktops/bamf.nix @@ -5,6 +5,10 @@ with lib; { + meta = { + maintainers = with maintainers; [ worldofpeace ]; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix index 8fa108c4f9d..492242e3296 100644 --- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix b/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix index 3d2b3ed85e3..3c7f217b18d 100644 --- a/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix +++ b/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix @@ -4,6 +4,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { services.gnome3.chrome-gnome-shell.enable = mkEnableOption '' diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix index 7e312a1b81e..bd62d16f61c 100644 --- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix +++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { @@ -16,7 +20,7 @@ with lib; type = types.bool; default = false; description = '' - Whether to enable Evolution Data Server, a collection of services for + Whether to enable Evolution Data Server, a collection of services for storing addressbooks and calendars. ''; }; diff --git a/nixos/modules/services/desktops/gnome3/glib-networking.nix b/nixos/modules/services/desktops/gnome3/glib-networking.nix index fcd58509d6f..7e667b6b1f0 100644 --- a/nixos/modules/services/desktops/gnome3/glib-networking.nix +++ b/nixos/modules/services/desktops/gnome3/glib-networking.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix index d715d52c2d0..c391ad9694c 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix @@ -44,6 +44,10 @@ in { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix index bf03a7aa78f..2916a3c82b3 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix index 748a025414a..3f9ced5e86b 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix index d406bf6f5e3..39d669e8b30 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix index 021f4f9534b..4fbf726e724 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix @@ -4,6 +4,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { services.gnome3.gnome-remote-desktop = { diff --git a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix index 2f83fd653bd..1c33ed064a1 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix @@ -12,6 +12,10 @@ in { + meta = { + maintainers = teams.gnome.members; + }; + imports = [ (mkRemovedOptionModule ["services" "gnome3" "gnome-settings-daemon" "package"] diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix index f8396287770..f2fe8b41a9e 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/rygel.nix b/nixos/modules/services/desktops/gnome3/rygel.nix index dfe4333a8ad..917a1d6541e 100644 --- a/nixos/modules/services/desktops/gnome3/rygel.nix +++ b/nixos/modules/services/desktops/gnome3/rygel.nix @@ -4,6 +4,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { services.gnome3.rygel = { diff --git a/nixos/modules/services/desktops/gnome3/sushi.nix b/nixos/modules/services/desktops/gnome3/sushi.nix index 7a4389038b2..83b17365d5d 100644 --- a/nixos/modules/services/desktops/gnome3/sushi.nix +++ b/nixos/modules/services/desktops/gnome3/sushi.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/tracker-miners.nix b/nixos/modules/services/desktops/gnome3/tracker-miners.nix index b390d8368c6..f2af4024927 100644 --- a/nixos/modules/services/desktops/gnome3/tracker-miners.nix +++ b/nixos/modules/services/desktops/gnome3/tracker-miners.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { @@ -25,7 +29,6 @@ with lib; }; - ###### implementation config = mkIf config.services.gnome3.tracker-miners.enable { diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome3/tracker.nix index 2e829274226..cd196e38553 100644 --- a/nixos/modules/services/desktops/gnome3/tracker.nix +++ b/nixos/modules/services/desktops/gnome3/tracker.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gvfs.nix b/nixos/modules/services/desktops/gvfs.nix index 1d002eac41d..250ea6d4575 100644 --- a/nixos/modules/services/desktops/gvfs.nix +++ b/nixos/modules/services/desktops/gvfs.nix @@ -12,6 +12,10 @@ in { + meta = { + maintainers = teams.gnome.members; + }; + # Added 2019-08-19 imports = [ (mkRenamedOptionModule diff --git a/nixos/modules/services/desktops/pantheon/contractor.nix b/nixos/modules/services/desktops/pantheon/contractor.nix deleted file mode 100644 index c76145191a7..00000000000 --- a/nixos/modules/services/desktops/pantheon/contractor.nix +++ /dev/null @@ -1,18 +0,0 @@ -# Contractor - -{ config, pkgs, lib, ... }: - -with lib; - -{ - - - ###### implementation - - config = mkIf config.services.pantheon.contractor.enable { - - - - }; - -} diff --git a/nixos/modules/services/desktops/pipewire.nix b/nixos/modules/services/desktops/pipewire.nix index 13f3d61e84c..5aee59cfdcc 100644 --- a/nixos/modules/services/desktops/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire.nix @@ -8,6 +8,11 @@ let packages = with pkgs; [ pipewire ]; in { + + meta = { + maintainers = teams.freedesktop.members; + }; + ###### interface options = { services.pipewire = { @@ -33,5 +38,4 @@ in { systemd.user.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; }; - meta.maintainers = with lib.maintainers; [ jtojnar ]; } diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixos/modules/services/desktops/telepathy.nix index f5401c18098..34596bf7818 100644 --- a/nixos/modules/services/desktops/telepathy.nix +++ b/nixos/modules/services/desktops/telepathy.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix index a833e99ff8c..a09079517f0 100644 --- a/nixos/modules/services/desktops/tumbler.nix +++ b/nixos/modules/services/desktops/tumbler.nix @@ -18,6 +18,10 @@ in "") ]; + meta = { + maintainers = with maintainers; [ worldofpeace ]; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/zeitgeist.nix b/nixos/modules/services/desktops/zeitgeist.nix index 20c82ccdd56..cf7dd5fe3a1 100644 --- a/nixos/modules/services/desktops/zeitgeist.nix +++ b/nixos/modules/services/desktops/zeitgeist.nix @@ -5,6 +5,11 @@ with lib; { + + meta = { + maintainers = with maintainers; [ worldofpeace ]; + }; + ###### interface options = { diff --git a/nixos/modules/services/mail/sympa.nix b/nixos/modules/services/mail/sympa.nix index c3ae9d4255b..0cad09927b2 100644 --- a/nixos/modules/services/mail/sympa.nix +++ b/nixos/modules/services/mail/sympa.nix @@ -25,8 +25,6 @@ let StateDirectory = "sympa"; ProtectHome = true; ProtectSystem = "full"; - ProtectKernelTunables = true; - ProtectKernelModules = true; ProtectControlGroups = true; }; @@ -415,7 +413,7 @@ in # force-copy static_content so it's up to date with package # set permissions for wwsympa which needs write access (...) "R ${dataDir}/static_content - - - - -" - "C ${dataDir}/static_content 0711 ${user} ${group} - ${pkg}/static_content" + "C ${dataDir}/static_content 0711 ${user} ${group} - ${pkg}/var/lib/sympa/static_content" "e ${dataDir}/static_content/* 0711 ${user} ${group} - -" "d /run/sympa 0755 ${user} ${group} - -" @@ -497,7 +495,7 @@ in -F ${toString cfg.web.fcgiProcs} \ -P /run/sympa/wwsympa.pid \ -s /run/sympa/wwsympa.socket \ - -- ${pkg}/bin/wwsympa.fcgi + -- ${pkg}/lib/sympa/cgi/wwsympa.fcgi ''; } // commonServiceConfig; @@ -518,7 +516,7 @@ in fastcgi_split_path_info ^(${loc})(.*)$; fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME ${pkg}/bin/wwsympa.fcgi; + fastcgi_param SCRIPT_FILENAME ${pkg}/lib/sympa/cgi/wwsympa.fcgi; ''; }) // { "/static-sympa/".alias = "${dataDir}/static_content/"; @@ -550,7 +548,7 @@ in args = [ "flags=hqRu" "user=${user}" - "argv=${pkg}/bin/queue" + "argv=${pkg}/libexec/queue" "\${nexthop}" ]; }; @@ -562,7 +560,7 @@ in args = [ "flags=hqRu" "user=${user}" - "argv=${pkg}/bin/bouncequeue" + "argv=${pkg}/libexec/bouncequeue" "\${nexthop}" ]; }; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 17c3582db0f..8203cb13e50 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -376,6 +376,59 @@ in If enabled (the default), checks that Nix can parse the generated nix.conf. ''; }; + + registry = mkOption { + type = types.attrsOf (types.submodule ( + let + inputAttrs = types.attrsOf (types.oneOf [types.str types.int types.bool types.package]); + in + { config, name, ... }: + { options = { + from = mkOption { + type = inputAttrs; + example = { type = "indirect"; id = "nixpkgs"; }; + description = "The flake reference to be rewritten."; + }; + to = mkOption { + type = inputAttrs; + example = { type = "github"; owner = "my-org"; repo = "my-nixpkgs"; }; + description = "The flake reference to which is to be rewritten."; + }; + flake = mkOption { + type = types.unspecified; + default = null; + example = literalExample "nixpkgs"; + description = '' + The flake input to which is to be rewritten. + ''; + }; + exact = mkOption { + type = types.bool; + default = true; + description = '' + Whether the reference needs to match exactly. If set, + a reference like nixpkgs does not + match with a reference like nixpkgs/nixos-20.03. + ''; + }; + }; + config = { + from = mkDefault { type = "indirect"; id = name; }; + to = mkIf (config.flake != null) + ({ type = "path"; + path = config.flake.outPath; + } // lib.filterAttrs + (n: v: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") + config.flake); + }; + } + )); + default = {}; + description = '' + A system-wide flake registry. + ''; + }; + }; }; @@ -390,6 +443,11 @@ in environment.etc."nix/nix.conf".source = nixConf; + environment.etc."nix/registry.json".text = builtins.toJSON { + version = 2; + flakes = mapAttrsToList (n: v: { inherit (v) from to exact; }) cfg.registry; + }; + # List of machines for distributed Nix builds in the format # expected by build-remote.pl. environment.etc."nix/machines" = diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix index 1dd869043f0..5422d4dd4e2 100644 --- a/nixos/modules/services/network-filesystems/netatalk.nix +++ b/nixos/modules/services/network-filesystems/netatalk.nix @@ -98,13 +98,14 @@ in Set of AFP volumes to export. See man apf.conf for more information. ''; - example = + example = literalExample '' { srv = { path = "/srv"; "read only" = true; "hosts allow" = "10.1.0.0/16 10.2.1.100 2001:0db8:1234::/48"; }; - }; + } + ''; }; extmap = mkOption { diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index b17ec3aa930..ccad64cfdb2 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -74,13 +74,14 @@ in See man rsyncd.conf for options. ''; type = types.attrsOf (types.attrsOf types.str); - example = + example = literalExample '' { srv = { path = "/srv"; "read only" = "yes"; comment = "Public rsync share."; }; - }; + } + ''; }; user = mkOption { diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index a3c22ce6948..a115590ccaa 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -189,7 +189,7 @@ in See man smb.conf for options. ''; type = types.attrsOf (types.attrsOf types.unspecified); - example = + example = literalExample '' { public = { path = "/srv/public"; "read only" = true; @@ -197,7 +197,8 @@ in "guest ok" = "yes"; comment = "Public samba share."; }; - }; + } + ''; }; }; diff --git a/nixos/modules/services/networking/3proxy.nix b/nixos/modules/services/networking/3proxy.nix index 26aa1667946..ae8a4958ca9 100644 --- a/nixos/modules/services/networking/3proxy.nix +++ b/nixos/modules/services/networking/3proxy.nix @@ -334,10 +334,12 @@ in { nsrecord = mkOption { type = types.attrsOf types.str; default = { }; - example = { - "files.local" = "192.168.1.12"; - "site.local" = "192.168.1.43"; - }; + example = literalExample '' + { + "files.local" = "192.168.1.12"; + "site.local" = "192.168.1.43"; + } + ''; description = "Adds static nsrecords."; }; }; diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index d123bca9321..d06032daecc 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -61,10 +61,12 @@ in { Table of {hostname: server} pairs to use as authoritative servers for hosts (and subhosts). If entry for @ is not specified predefined list of root servers is used. ''; - example = { - "@" = ["8.8.8.8" "8.8.4.4"]; - "example.com" = ["192.168.100.100"]; - }; + example = literalExample '' + { + "@" = ["8.8.8.8" "8.8.4.4"]; + "example.com" = ["192.168.100.100"]; + } + ''; }; forwardOnly = mkOption { diff --git a/nixos/modules/services/mail/magic-wormhole-mailbox-server.nix b/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix similarity index 100% rename from nixos/modules/services/mail/magic-wormhole-mailbox-server.nix rename to nixos/modules/services/networking/magic-wormhole-mailbox-server.nix diff --git a/nixos/modules/services/networking/mullvad-vpn.nix b/nixos/modules/services/networking/mullvad-vpn.nix new file mode 100644 index 00000000000..cc98414257c --- /dev/null +++ b/nixos/modules/services/networking/mullvad-vpn.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.mullvad-vpn; +in +with lib; +{ + options.services.mullvad-vpn.enable = mkOption { + type = types.bool; + default = false; + description = '' + This option enables Mullvad VPN daemon. + ''; + }; + + config = mkIf cfg.enable { + boot.kernelModules = [ "tun" ]; + + systemd.services.mullvad-daemon = { + description = "Mullvad VPN daemon"; + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + after = [ + "network-online.target" + "NetworkManager.service" + "systemd-resolved.service" + ]; + path = [ + pkgs.iproute + # Needed for ping + "/run/wrappers" + ]; + serviceConfig = { + StartLimitBurst = 5; + StartLimitIntervalSec = 20; + ExecStart = "${pkgs.mullvad-vpn}/bin/mullvad-daemon -v --disable-stdout-timestamps"; + Restart = "always"; + RestartSec = 1; + }; + }; + }; + + meta.maintainers = [ maintainers.xfix ]; +} diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix index e015f76f622..77e979a8a42 100644 --- a/nixos/modules/services/networking/ndppd.nix +++ b/nixos/modules/services/networking/ndppd.nix @@ -43,7 +43,7 @@ let timeout = mkOption { type = types.int; description = '' - Controls how long to wait for a Neighbor Advertisment Message before + Controls how long to wait for a Neighbor Advertisment Message before invalidating the entry, in milliseconds. ''; default = 500; @@ -51,7 +51,7 @@ let ttl = mkOption { type = types.int; description = '' - Controls how long a valid or invalid entry remains in the cache, in + Controls how long a valid or invalid entry remains in the cache, in milliseconds. ''; default = 30000; @@ -142,7 +142,11 @@ in { messages, and respond to them according to a set of rules. ''; default = {}; - example = { eth0.rules."1111::/64" = {}; }; + example = literalExample '' + { + eth0.rules."1111::/64" = {}; + } + ''; }; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index e817f295a44..6f24141b33c 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -131,6 +131,10 @@ let in { + meta = { + maintainers = teams.freedesktop.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/networking/pixiecore.nix b/nixos/modules/services/networking/pixiecore.nix new file mode 100644 index 00000000000..0e32f182e2a --- /dev/null +++ b/nixos/modules/services/networking/pixiecore.nix @@ -0,0 +1,134 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.pixiecore; +in +{ + meta.maintainers = with maintainers; [ bbigras danderson ]; + + options = { + services.pixiecore = { + enable = mkEnableOption "Pixiecore"; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports (67, 69 UDP and 4011, 'port', 'statusPort' TCP) in the firewall for Pixiecore. + ''; + }; + + mode = mkOption { + description = "Which mode to use"; + default = "boot"; + type = types.enum [ "api" "boot" ]; + }; + + debug = mkOption { + type = types.bool; + default = false; + description = "Log more things that aren't directly related to booting a recognized client"; + }; + + dhcpNoBind = mkOption { + type = types.bool; + default = false; + description = "Handle DHCP traffic without binding to the DHCP server port"; + }; + + kernel = mkOption { + type = types.str or types.path; + default = ""; + description = "Kernel path. Ignored unless mode is set to 'boot'"; + }; + + initrd = mkOption { + type = types.str or types.path; + default = ""; + description = "Initrd path. Ignored unless mode is set to 'boot'"; + }; + + cmdLine = mkOption { + type = types.str; + default = ""; + description = "Kernel commandline arguments. Ignored unless mode is set to 'boot'"; + }; + + listen = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "IPv4 address to listen on"; + }; + + port = mkOption { + type = types.port; + default = 80; + description = "Port to listen on for HTTP"; + }; + + statusPort = mkOption { + type = types.port; + default = 80; + description = "HTTP port for status information (can be the same as --port)"; + }; + + apiServer = mkOption { + type = types.str; + example = "localhost:8080"; + description = "host:port to connect to the API. Ignored unless mode is set to 'api'"; + }; + + extraArguments = mkOption { + type = types.listOf types.str; + default = []; + description = "Additional command line arguments to pass to Pixiecore"; + }; + }; + }; + + config = mkIf cfg.enable { + users.groups.pixiecore = {}; + users.users.pixiecore = { + description = "Pixiecore daemon user"; + group = "pixiecore"; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 4011 cfg.port cfg.statusPort ]; + allowedUDPPorts = [ 67 69 ]; + }; + + systemd.services.pixiecore = { + description = "Pixiecore server"; + after = [ "network.target"]; + wants = [ "network.target"]; + wantedBy = [ "multi-user.target"]; + serviceConfig = { + User = "pixiecore"; + Restart = "always"; + AmbientCapabilities = [ "cap_net_bind_service" ] ++ optional cfg.dhcpNoBind "cap_net_raw"; + ExecStart = + let + argString = + if cfg.mode == "boot" + then [ "boot" cfg.kernel ] + ++ optional (cfg.initrd != "") cfg.initrd + ++ optional (cfg.cmdLine != "") "--cmdline=${lib.escapeShellArg cfg.cmdLine}" + else [ "api" cfg.apiServer ]; + in + '' + ${pkgs.pixiecore}/bin/pixiecore \ + ${lib.escapeShellArgs argString} \ + ${optionalString cfg.debug "--debug"} \ + ${optionalString cfg.dhcpNoBind "--dhcp-no-bind"} \ + --listen-addr ${lib.escapeShellArg cfg.listen} \ + --port ${toString cfg.port} \ + --status-port ${toString cfg.statusPort} \ + ${escapeShellArgs cfg.extraArguments} + ''; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 4ff9c486059..13a1a897c5e 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -4,7 +4,7 @@ let inherit (builtins) toFile; inherit (lib) concatMapStringsSep concatStringsSep mapAttrsToList - mkIf mkEnableOption mkOption types; + mkIf mkEnableOption mkOption types literalExample; cfg = config.services.strongswan; @@ -79,19 +79,21 @@ in connections = mkOption { type = types.attrsOf (types.attrsOf types.str); default = {}; - example = { - "%default" = { - keyexchange = "ikev2"; - keyingtries = "1"; - }; - roadwarrior = { - auto = "add"; - leftcert = "/run/keys/moonCert.pem"; - leftid = "@moon.strongswan.org"; - leftsubnet = "10.1.0.0/16"; - right = "%any"; - }; - }; + example = literalExample '' + { + "%default" = { + keyexchange = "ikev2"; + keyingtries = "1"; + }; + roadwarrior = { + auto = "add"; + leftcert = "/run/keys/moonCert.pem"; + leftid = "@moon.strongswan.org"; + leftsubnet = "10.1.0.0/16"; + right = "%any"; + }; + } + ''; description = '' A set of connections and their options for the ‘conn xxx’ sections of the ipsec.conf file. diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 5b3eb6f04b4..e717d78feed 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -169,12 +169,14 @@ in { description = '' folders which should be shared by syncthing. ''; - example = { - "/home/user/sync" = { - id = "syncme"; - devices = [ "bigbox" ]; - }; - }; + example = literalExample '' + { + "/home/user/sync" = { + id = "syncme"; + devices = [ "bigbox" ]; + }; + } + ''; type = types.attrsOf (types.submodule ({ name, ... }: { options = { diff --git a/nixos/modules/services/networking/wg-quick.nix b/nixos/modules/services/networking/wg-quick.nix index b770d47d269..ff1bdeed9f4 100644 --- a/nixos/modules/services/networking/wg-quick.nix +++ b/nixos/modules/services/networking/wg-quick.nix @@ -302,7 +302,7 @@ in { ###### implementation config = mkIf (cfg.interfaces != {}) { - boot.extraModulePackages = [ kernel.wireguard ]; + boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard; environment.systemPackages = [ pkgs.wireguard-tools ]; # This is forced to false for now because the default "--validmark" rpfilter we apply on reverse path filtering # breaks the wg-quick routing because wireguard packets leave with a fwmark from wireguard. diff --git a/nixos/modules/services/web-apps/moinmoin.nix b/nixos/modules/services/web-apps/moinmoin.nix index 0fee64be0bb..dc7abce2a5c 100644 --- a/nixos/modules/services/web-apps/moinmoin.nix +++ b/nixos/modules/services/web-apps/moinmoin.nix @@ -299,5 +299,5 @@ in ]))); }; - meta.maintainers = with lib.maintainers; [ b42 ]; + meta.maintainers = with lib.maintainers; [ mmilata ]; } diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix index 830edac20ba..b4d653d2d77 100644 --- a/nixos/modules/services/web-apps/youtrack.nix +++ b/nixos/modules/services/web-apps/youtrack.nix @@ -46,9 +46,11 @@ in https://www.jetbrains.com/help/youtrack/standalone/YouTrack-Java-Start-Parameters.html for more information. ''; - example = { - "jetbrains.youtrack.overrideRootPassword" = "tortuga"; - }; + example = literalExample '' + { + "jetbrains.youtrack.overrideRootPassword" = "tortuga"; + } + ''; type = types.attrsOf types.str; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 41a364322ef..ac8e70c52bc 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -57,6 +57,10 @@ in { + meta = { + maintainers = teams.gnome.members; + }; + options = { services.gnome3 = { diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 4ff7b05ae9a..d39b4d64904 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -8,6 +8,10 @@ in { + meta = { + maintainers = with maintainers; [ worldofpeace ]; + }; + imports = [ # added 2019-08-18 # needed to preserve some semblance of UI familarity diff --git a/nixos/modules/services/x11/display-managers/account-service-util.nix b/nixos/modules/services/x11/display-managers/account-service-util.nix index 1dbe703b566..2b08c62d0ad 100644 --- a/nixos/modules/services/x11/display-managers/account-service-util.nix +++ b/nixos/modules/services/x11/display-managers/account-service-util.nix @@ -3,6 +3,7 @@ , gobject-introspection , python3 , wrapGAppsHook +, lib }: python3.pkgs.buildPythonApplication { @@ -36,4 +37,8 @@ python3.pkgs.buildPythonApplication { cp $src $out/bin/set-session chmod +x $out/bin/set-session ''; + + meta = with lib; { + maintainers = with maintainers; [ worldofpeace ]; + }; } diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 428ca191fd8..2a7a19e7695 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -54,14 +54,6 @@ let exec &> >(tee ~/.xsession-errors) ''} - # Start PulseAudio if enabled. - ${optionalString (config.hardware.pulseaudio.enable) '' - # Publish access credentials in the root window. - if ${config.hardware.pulseaudio.package.out}/bin/pulseaudio --dump-modules | grep module-x11-publish &> /dev/null; then - ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" - fi - ''} - # Tell systemd about our $DISPLAY and $XAUTHORITY. # This is needed by the ssh-agent unit. # diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index e0ac47bb766..9b4cca56d7f 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -38,6 +38,10 @@ in { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index 77c94114e6d..087c6b9c38a 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -10,6 +10,10 @@ let in { + meta = { + maintainers = with maintainers; [ worldofpeace ]; + }; + options = { services.xserver.displayManager.lightdm.greeters.pantheon = { diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index cb7b5f95958..479548863b4 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -69,6 +69,10 @@ let in { + meta = { + maintainers = with maintainers; [ worldofpeace ]; + }; + # Note: the order in which lightdm greeter modules are imported # here determines the default: later modules (if enable) are # preferred. diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 07225ee88ff..43347161a84 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -433,6 +433,7 @@ in services.zfs.zed.settings = { ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail"; + PATH = lib.makeBinPath [ packages.zfsUser pkgs.utillinux pkgs.gawk pkgs.gnused pkgs.gnugrep pkgs.coreutils pkgs.curl ]; }; environment.etc = genAttrs diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 02de5801da2..dad211ef55b 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -609,9 +609,11 @@ in bindMounts = mkOption { type = with types; loaOf (submodule bindMountOpts); default = {}; - example = { "/home" = { hostPath = "/home/alice"; - isReadOnly = false; }; - }; + example = literalExample '' + { "/home" = { hostPath = "/home/alice"; + isReadOnly = false; }; + } + ''; description = '' diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index 5407a62339f..6a38f5ca531 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -51,6 +51,8 @@ let hashed-mirrors = connect-timeout = 1 ''; + # save some memory + documentation.enable = false; }; # /etc/nixos/configuration.nix for the vm configFile = pkgs.writeText "configuration.nix" '' diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index cd1783ff685..799cefc7819 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,5 +1,5 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, vlc -, qtbase, qtmultimedia, qtsvg, qttools +{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +, qtbase, qtsvg, qttools # Cantata doesn't build with cdparanoia enabled so we disable that # default for now until I (or someone else) figure it out. @@ -9,12 +9,14 @@ , withMusicbrainz ? false, libmusicbrainz5 , withTaglib ? true, taglib, taglib_extras +, withHttpStream ? true, qtmultimedia , withReplaygain ? true, ffmpeg, speex, mpg123 , withMtp ? true, libmtp , withOnlineServices ? true , withDevices ? true, udisks2 , withDynamic ? true , withHttpServer ? true +, withLibVlc ? false, vlc , withStreams ? true }: @@ -26,6 +28,7 @@ assert withMtp -> withTaglib; assert withMusicbrainz -> withCdda && withTaglib; assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; +assert withLibVlc -> withHttpStream; let version = "2.4.1"; @@ -45,15 +48,17 @@ in mkDerivation { sha256 = "0ix7xp352bziwz31mw79y7wxxmdn6060p8ry2px243ni1lz1qx1c"; }; - buildInputs = [ vlc qtbase qtmultimedia qtsvg ] + buildInputs = [ qtbase qtsvg ] ++ lib.optionals withTaglib [ taglib taglib_extras ] ++ lib.optionals withReplaygain [ ffmpeg speex mpg123 ] + ++ lib.optional withHttpStream qtmultimedia ++ lib.optional withCdda cdparanoia ++ lib.optional withCddb libcddb ++ lib.optional withLame lame ++ lib.optional withMtp libmtp ++ lib.optional withMusicbrainz libmusicbrainz5 - ++ lib.optional withUdisks udisks2; + ++ lib.optional withUdisks udisks2 + ++ lib.optional withLibVlc vlc; nativeBuildInputs = [ cmake pkgconfig qttools ]; @@ -62,6 +67,7 @@ in mkDerivation { cmakeFlags = lib.flatten [ (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) + (fstat withHttpStream "HTTP_STREAM_PLAYBACK") (fstat withCdda "CDPARANOIA") (fstat withCddb "CDDB") (fstat withLame "LAME") @@ -71,6 +77,7 @@ in mkDerivation { (fstat withDynamic "DYNAMIC") (fstat withDevices "DEVICES_SUPPORT") (fstat withHttpServer "HTTP_SERVER") + (fstat withLibVlc "LIBVLC") (fstat withStreams "STREAMS") (fstat withUdisks "UDISKS2") "-DENABLE_HTTPS_SUPPORT=ON" diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 5bebf1c667c..e80239553f1 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.09"; + version = "1.15"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "18my7fywaf66rq8phsly8lglxzpglran8rj27fvwgpni8098ic7d"; + sha256 = "19xgdaij71gpvq216zjlp60zmfdl2a8kf8sc3bpk8a4d4xh4n151"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index ddb4646ba54..d0f88170980 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.2.23"; + version = "1.2.32"; format = "other"; doCheck = false; @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "059z7ri5qwkmfh2kvv8rq5wp80mz75423wc5hnm33wb9sgdd5x47"; + sha256 = "03x6qihd349pq5lmgahb77sys60g16v5v6qkdlzf8k88451k8p7n"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 0d8fd8e2637..4e7b1235b40 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -2,13 +2,15 @@ , withALSA ? true, alsaLib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null +, withMPRIS ? false, dbus ? null }: let features = [ "cursive/pancurses-backend" ] ++ lib.optional withALSA "alsa_backend" ++ lib.optional withPulseAudio "pulseaudio_backend" - ++ lib.optional withPortAudio "portaudio_backend"; + ++ lib.optional withPortAudio "portaudio_backend" + ++ lib.optional withMPRIS "mpris"; in rustPlatform.buildRustPackage rec { pname = "ncspot"; @@ -30,7 +32,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl ] ++ lib.optional withALSA alsaLib ++ lib.optional withPulseAudio libpulseaudio - ++ lib.optional withPortAudio portaudio; + ++ lib.optional withPortAudio portaudio + ++ lib.optional withMPRIS dbus; doCheck = false; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index b241f750d03..5830e1eefb8 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,7 +1,15 @@ -{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 }: +{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 +, enablePlayback ? true +, gst_all_1 +}: let pythonPackages = python3Packages; + pyqt5 = if enablePlayback then + pythonPackages.pyqt5_with_qtmultimedia + else + pythonPackages.pyqt5 + ; in pythonPackages.buildPythonApplication rec { pname = "picard"; version = "2.3.1"; @@ -13,7 +21,16 @@ in pythonPackages.buildPythonApplication rec { sha256 = "0xalg4dvaqb396h4s6gzxnplgv1lcvsczmmrlhyrj0kfj10amhsj"; }; - nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; + nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] + ++ stdenv.lib.optionals (pyqt5.multimediaEnabled) [ + qt5.qtmultimedia.bin + gst_all_1.gstreamer + gst_all_1.gst-vaapi + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + ] + ; propagatedBuildInputs = with pythonPackages; [ pyqt5 @@ -27,10 +44,14 @@ in pythonPackages.buildPythonApplication rec { substituteInPlace setup.cfg --replace "‘" "'" ''; - installPhase = '' - python setup.py install --prefix="$out" - wrapQtApp $out/bin/picard - ''; + # In order to spare double wrapping, we use: + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + '' + + stdenv.lib.optionalString (pyqt5.multimediaEnabled) '' + makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + '' + ; meta = with stdenv.lib; { homepage = "https://picard.musicbrainz.org/"; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index f659d20f463..2f21e3ea56b 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.06"; + version = "1.07"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "00zifwiprd3i60z4pf4471jxbc33vh9p30ib0lnzwpgjz5pnxqnr"; + sha256 = "0g2bp9n05ng2fvqw86pb941zamcqnfz1l066wvh5j3av1w22khi8"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 00c5af4422d..82dd0223bc8 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -46,13 +46,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.7.1"; + version = "4.7.2"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1r1hk5zp2cgrwyqkvp8kg2dkbihdyx3ydzhmirkwya8jag9pwadd"; + sha256 = "1yga25da5bpg12zkikp6dn4wqhn9f7r10awvjzfcz8s6w9xlz6rx"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 1fb4078696b..afc5b40f9db 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.21.1"; + version = "0.21.3"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1aswgmzqk3vhxhp5k0m0awk22lf5ayaqg2cmlqy12jvfmpka9lrj"; + sha256 = "1pzdgghbsss2qjfgl42lvkbs5yc5q6jnzqnp24lljmrh341g2zn4"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index d8660967a4e..980b485b956 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.11"; + version = "1.9.12"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0xhkdxn5ajzi05252is5whqank81xy94jp1l5z2a44rajv8rh9vs"; + sha256 = "143imiphyzk3009cfnqj7q013pb1wva13zq63byfj3d204b58cg6"; }; - modSha256 = "0jcj0knkhyndndyv1j9xhgbg5psagvyd27ailna3x9ikjlb8f7gg"; + modSha256 = "15a8if5gx361nrqgv201jy8saq1ir1g18rpqzdmavg4ic75si5x1"; subPackages = [ "cmd/abigen" diff --git a/pkgs/applications/blockchains/tessera.nix b/pkgs/applications/blockchains/tessera.nix index 84f7925d218..ef9ddebd53e 100644 --- a/pkgs/applications/blockchains/tessera.nix +++ b/pkgs/applications/blockchains/tessera.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tessera"; - version = "0.10.2"; + version = "0.10.4"; src = fetchurl { url = "https://oss.sonatype.org/service/local/repositories/releases/content/com/jpmorgan/quorum/${pname}-app/${version}/${pname}-app-${version}-app.jar"; - sha256 = "1zn8w7q0q5man0407kb82lw4mlvyiy9whq2f6izf2b5415f9s0m4"; + sha256 = "1sqj0mc80922yavx9hlwnl1kpmavpza2g2aycz1qd0zv0s31z9wj"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 9a476ada214..b10ef9513da 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,9 +8,9 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.6.1.0"; # "Android Studio 3.6.1" - build = "192.6241897"; - sha256Hash = "1mwzk18224bl8hbw9cdxwzgj5cfain4y70q64cpj4p0snffxqm77"; + version = "3.6.2.0"; # "Android Studio 3.6.2" + build = "192.6308749"; + sha256Hash = "04r4iwlmns1lf3wfd32cqmndbdz9rf7hfbi5r6qmvpi8j83fghvr"; }; betaVersion = { version = "4.0.0.12"; # "Android Studio 4.0 Beta 3" diff --git a/pkgs/applications/editors/uberwriter/default.nix b/pkgs/applications/editors/apostrophe/default.nix similarity index 73% rename from pkgs/applications/editors/uberwriter/default.nix rename to pkgs/applications/editors/apostrophe/default.nix index 48ebc79e705..623f86a61c2 100644 --- a/pkgs/applications/editors/uberwriter/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, cmake +{ stdenv, fetchFromGitLab, meson, ninja, cmake , wrapGAppsHook, pkgconfig, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive @@ -10,14 +10,15 @@ let texliveDist = texlive.combined.scheme-medium; in stdenv.mkDerivation rec { - pname = "uberwriter"; - version = "unstable-2020-01-24"; + pname = "apostrophe"; + version = "unstable-2020-03-29"; - src = fetchFromGitHub { - owner = pname; + src = fetchFromGitLab { + owner = "somas"; repo = pname; - rev = "0647b413407eb8789a25c353602c4ac979dc342a"; - sha256 = "19z52fpbf0p7dzx7q0r5pk3nn0c8z69g1hv6db0cqp61cqv5z95q"; + domain = "gitlab.gnome.org"; + rev = "219fa8976e3b8a6f0cea15cfefe4e336423f2bdb"; + sha256 = "192n5qs3x6rx62mqxd6wajwm453pns8kjyz5v3xc891an6bm1kqx"; }; nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils @@ -30,10 +31,10 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs --build build-aux/meson_post_install.py - substituteInPlace uberwriter/config.py --replace "/usr/share/uberwriter" "$out/share/uberwriter" + substituteInPlace ${pname}/config.py --replace "/usr/share/${pname}" "$out/share/${pname}" # get rid of unused distributed dependencies - rm -r uberwriter/{pylocales,pressagio} + rm -r ${pname}/pylocales ''; preFixup = '' @@ -46,7 +47,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://uberwriter.github.io/uberwriter/; + homepage = "https://gitlab.gnome.org/somas/apostrophe"; description = "A distraction free Markdown editor for GNU/Linux"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix new file mode 100644 index 00000000000..9e9766f04e8 --- /dev/null +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, + qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml, qtquick1, libGLU }: + +stdenv.mkDerivation rec { + name = "qxmledit-${version}" ; + version = "0.9.15" ; + src = fetchFromGitHub ( stdenv.lib.importJSON ./qxmledit.json ) ; + nativeBuildInputs = [ qmake ] ; + buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml qtquick1 libGLU ] ; + qmakeFlags = [ "CONFIG+=release" ] ; + outputs = [ "out" "doc" ] ; + + preConfigure = '' + export QXMLEDIT_INST_DATA_DIR="$out/share/data" + export QXMLEDIT_INST_TRANSLATIONS_DIR="$out/share/i18n" + export QXMLEDIT_INST_INCLUDE_DIR="$out/include" + export QXMLEDIT_INST_DIR="$out/bin" + export QXMLEDIT_INST_LIB_DIR="$out/lib" + export QXMLEDIT_INST_DOC_DIR="$doc" + ''; + + meta = with stdenv.lib; { + description = "Simple XML editor based on qt libraries" ; + homepage = https://sourceforge.net/projects/qxmledit; + license = licenses.lgpl2; + platforms = platforms.all; + } ; +} diff --git a/pkgs/applications/editors/qxmledit/qxmledit.json b/pkgs/applications/editors/qxmledit/qxmledit.json new file mode 100644 index 00000000000..3b50532d6a0 --- /dev/null +++ b/pkgs/applications/editors/qxmledit/qxmledit.json @@ -0,0 +1,6 @@ +{ + "owner": "lbellonda", + "repo": "qxmledit", + "rev": "6136dca50ceb3b4447c91a7a18dcf84785ea11d1", + "sha256": "1wcnphalwf0a5gz9r44jgk8wcv1w2qipbwjkbzkra2kxanxns834" +} \ No newline at end of file diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix index d5549c52592..d0347bcb37c 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/applications/editors/texworks/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "texworks"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "TeXworks"; repo = "texworks"; rev = "release-${version}"; - sha256 = "0d7f23c6c1wj4aii4h5w9piv01qfb69zrd79dvxwydrk99i8gnl4"; + sha256 = "1lw1p4iyzxypvjhnav11g6rwf6gx7kyzwy2iprvv8zzpqcdkjp2z"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index a573c518b5d..abd4a55c92b 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -25,7 +25,7 @@ in comment = "Code Editing. Redefined."; genericName = "Text Editor"; exec = executableName; - icon = "@out@/share/pixmaps/code.png"; + icon = "code"; startupNotify = "true"; categories = "Utility;TextEditor;Development;IDE;"; mimeType = "text/plain;inode/directory;"; @@ -37,7 +37,7 @@ in [Desktop Action new-empty-window] Name=New Empty Window Exec=${executableName} --new-window %F - Icon=@out@/share/pixmaps/code.png + Icon=code ''; }; @@ -47,7 +47,7 @@ in comment = "Code Editing. Redefined."; genericName = "Text Editor"; exec = executableName + " --open-url %U"; - icon = "@out@/share/pixmaps/code.png"; + icon = "code"; startupNotify = "true"; categories = "Utility;TextEditor;Development;IDE;"; mimeType = "x-scheme-handler/vscode;"; @@ -83,10 +83,8 @@ in ln -s $out/lib/vscode/bin/${executableName} $out/bin mkdir -p $out/share/applications - substitute $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop \ - --subst-var out - substitute $urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop $out/share/applications/${executableName}-url-handler.desktop \ - --subst-var out + ln -s $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop + ln -s $urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop $out/share/applications/${executableName}-url-handler.desktop mkdir -p $out/share/pixmaps cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 967cd45946f..306bb115ef4 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -19,6 +19,8 @@ in # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update + # Please backport all compatible updates to the stable release. + # This is important for the extension ecosystem. version = "1.43.0"; pname = "vscode"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index bffe73ec4f6..ae40a0187de 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -25,6 +25,8 @@ in # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update + # Please backport all compatible updates to the stable release. + # This is important for the extension ecosystem. version = "1.43.0"; pname = "vscodium"; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index b51db1e945f..4a6526fe9c6 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -59,7 +59,10 @@ stdenv.mkDerivation rec { gnome3.adwaita-icon-theme gsettings-desktop-schemas gst_all_1.gst-plugins-base - gst_all_1.gstreamer + (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly gtk3 json-glib lcms2 diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 424c759b56c..3f6dc9ef181 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/release-service/19.12.1/src ) +WGET_ARGS=( http://download.kde.org/stable/release-service/19.12.3/src ) diff --git a/pkgs/applications/kde/ffmpeg-path.patch b/pkgs/applications/kde/ffmpeg-path.patch new file mode 100644 index 00000000000..a0cef882f59 --- /dev/null +++ b/pkgs/applications/kde/ffmpeg-path.patch @@ -0,0 +1,25 @@ +diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg +index 5edad5ae7..d35347a40 100644 +--- a/src/kdenlivesettings.kcfg ++++ b/src/kdenlivesettings.kcfg +@@ -403,17 +403,17 @@ + + + +- ++ @ffmpeg@/bin/ffmpeg + + + + +- ++ @ffmpeg@/bin/ffplay + + + + +- ++ @ffmpeg@/bin/ffprobe + + + diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index b7c691e9594..95496f90e04 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -70,14 +70,24 @@ mkDerivation { kpurpose kdeclarative ]; - patches = [ ./mlt-path.patch ]; + # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it + # doesn't find them. See: + # https://github.com/NixOS/nixpkgs/issues/83885 + patches = [ ./mlt-path.patch ./ffmpeg-path.patch ]; inherit mlt; + ffmpeg = ffmpeg-full; postPatch = # Module Qt5::Concurrent must be included in `find_package` before it is used. '' sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|' substituteAllInPlace src/kdenlivesettings.kcfg ''; + # Frei0r path needs to be set too or Kdenlive will complain. See: + # https://github.com/NixOS/nixpkgs/issues/83885 + # https://github.com/NixOS/nixpkgs/issues/29614#issuecomment-488849325 + qtWrapperArgs = [ + "--set FREI0R_PATH ${frei0r}/lib/frei0r-1" + ]; meta = { license = with lib.licenses; [ gpl2Plus ]; }; diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 60cf49fa05e..dc6eb0f09e8 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1731 +4,1731 @@ { akonadi = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-19.12.1.tar.xz"; - sha256 = "991680be1b57a5335690341ab2a681fc7d8e77a4951673021f0662f3005856a3"; - name = "akonadi-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-19.12.3.tar.xz"; + sha256 = "e41714d81ecbb629aaa0b267e0c32a4b1d83c6a45cf3f37d52232003b4c0f325"; + name = "akonadi-19.12.3.tar.xz"; }; }; akonadi-calendar = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-calendar-19.12.1.tar.xz"; - sha256 = "4bec3252bd1a32874a22b28dcb82a2aed533b31e1955ca68803ddf076dbbd5be"; - name = "akonadi-calendar-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-calendar-19.12.3.tar.xz"; + sha256 = "c58d18153ef711a79962ba907e44338a0ddd62968e0a6c50486bba09a6e2a446"; + name = "akonadi-calendar-19.12.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-calendar-tools-19.12.1.tar.xz"; - sha256 = "0650e12b2155b08cf70cc4620f9ea3868bad66affc4668775cd050539eacbec9"; - name = "akonadi-calendar-tools-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-calendar-tools-19.12.3.tar.xz"; + sha256 = "ad2c23cf188228dc697d39e2120b56ce445bbea3eb46721794cd6344aa7e94ba"; + name = "akonadi-calendar-tools-19.12.3.tar.xz"; }; }; akonadiconsole = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadiconsole-19.12.1.tar.xz"; - sha256 = "e6a755875b9ef9db4f022888b77bd011a5edf2c21667074b971d15818659dd5b"; - name = "akonadiconsole-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadiconsole-19.12.3.tar.xz"; + sha256 = "0dedcccfcfd7e6ad9a5af0aa61ce05f26cbb625d8bf6b6d210ac6e3c5813487f"; + name = "akonadiconsole-19.12.3.tar.xz"; }; }; akonadi-contacts = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-contacts-19.12.1.tar.xz"; - sha256 = "0fbca91b3251d57291629e441ecf5cdd9b71a56f74f05f6c55a428402d3b4c91"; - name = "akonadi-contacts-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-contacts-19.12.3.tar.xz"; + sha256 = "b0baed9edb8c05b6d9b8db84239cd83a334d8f1d14d4aa8027dc1139a543eadf"; + name = "akonadi-contacts-19.12.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-import-wizard-19.12.1.tar.xz"; - sha256 = "a58d29407eebd9ce895d38b121cb034f92c81b85afd1b8da9c70cc3d7dc29b3d"; - name = "akonadi-import-wizard-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-import-wizard-19.12.3.tar.xz"; + sha256 = "2c1491e4f5994ed0d317a27cc717184a86f7d92c4b44f8bd056e147e80bee8c5"; + name = "akonadi-import-wizard-19.12.3.tar.xz"; }; }; akonadi-mime = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-mime-19.12.1.tar.xz"; - sha256 = "9ca3794a36e31a5dd759b741e91420f4910f05b0d726f6e803d365b8ab058f5b"; - name = "akonadi-mime-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-mime-19.12.3.tar.xz"; + sha256 = "13bdf9a233a183d5aeee1be0991617fca6d73ffd35bc14ca0d18714149f04392"; + name = "akonadi-mime-19.12.3.tar.xz"; }; }; akonadi-notes = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-notes-19.12.1.tar.xz"; - sha256 = "cf8059cb14eca880c09fc83285576b4d03a8edf0799cebdf42d59084bb6904ca"; - name = "akonadi-notes-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-notes-19.12.3.tar.xz"; + sha256 = "a34c2420190925b985b0629d7d2d19be04443cfeeaf284229666338e039e56e2"; + name = "akonadi-notes-19.12.3.tar.xz"; }; }; akonadi-search = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-search-19.12.1.tar.xz"; - sha256 = "78a0feaa41d4b474a2e90c74230bc5196349e1c4e72ad46fe341a1cb6e51a5b8"; - name = "akonadi-search-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-search-19.12.3.tar.xz"; + sha256 = "60072a36f6c817d009a8476bad2e80c4131b14358e03b4889a03aa42340ed041"; + name = "akonadi-search-19.12.3.tar.xz"; }; }; akregator = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akregator-19.12.1.tar.xz"; - sha256 = "e6f00777059e5b9fe2458a7e4248a59652f08d836518bf0395aaf2ed77ef4d52"; - name = "akregator-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akregator-19.12.3.tar.xz"; + sha256 = "63db0f6c75bffe9235122201445d151f4eaa7061d2a8df4eb924bca1a4600f68"; + name = "akregator-19.12.3.tar.xz"; }; }; analitza = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/analitza-19.12.1.tar.xz"; - sha256 = "0c6c4ee1b4546ab84eb9503220ca0aa09f80cdd7cea3b89201db1d5aac2c4ce5"; - name = "analitza-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/analitza-19.12.3.tar.xz"; + sha256 = "47ca3acaf2d2f52e91cd2253742ab97d9b07abc3fef0d632bfc36d253dbf161b"; + name = "analitza-19.12.3.tar.xz"; }; }; ark = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ark-19.12.1.tar.xz"; - sha256 = "37b9dfc0b6005ebd0f2757ecce940568839e8a5d73b3bcbc1931ce4eccbb9d0c"; - name = "ark-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ark-19.12.3.tar.xz"; + sha256 = "78594029729c197fc90321850696f1bd189b40d8d7fbc9faf51ad6b2ab744a07"; + name = "ark-19.12.3.tar.xz"; }; }; artikulate = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/artikulate-19.12.1.tar.xz"; - sha256 = "407f72193c7c4ec3f8ac7fa93889803f2ec6523aebb59bdf9a9210e9fac0ee7d"; - name = "artikulate-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/artikulate-19.12.3.tar.xz"; + sha256 = "c27a5cb98a8e2975638fe74683a73f92c160ce133b133878844062dd99ffded6"; + name = "artikulate-19.12.3.tar.xz"; }; }; audiocd-kio = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/audiocd-kio-19.12.1.tar.xz"; - sha256 = "3b4433bbbdd56bbafcf0418eaebb655b8fd4e03a4c29489112394393f3dc3815"; - name = "audiocd-kio-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/audiocd-kio-19.12.3.tar.xz"; + sha256 = "b920170ae816f29a61a6f6b25df68c9125a5d4d9fec225feee45e46317d64d42"; + name = "audiocd-kio-19.12.3.tar.xz"; }; }; baloo-widgets = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/baloo-widgets-19.12.1.tar.xz"; - sha256 = "a9fb3a136267bb0089192f7bc523903bd304e528160d9f653ccd052b4a8c110c"; - name = "baloo-widgets-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/baloo-widgets-19.12.3.tar.xz"; + sha256 = "236c0bb0bcb345f4ce5f07d591bded6221383bc7b190b42b96999893390cd8a5"; + name = "baloo-widgets-19.12.3.tar.xz"; }; }; blinken = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/blinken-19.12.1.tar.xz"; - sha256 = "4a1f7c782dc236d963bc1de11b7dcbc79012d47e3e6cc5ce692ca91ecb788388"; - name = "blinken-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/blinken-19.12.3.tar.xz"; + sha256 = "06ef385ab73d99fa3f1925a6f2ef522f691d04cd594777f5d9fa52a5f2e45a94"; + name = "blinken-19.12.3.tar.xz"; }; }; bomber = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/bomber-19.12.1.tar.xz"; - sha256 = "f0007dae42d6586ab6c9da5775c835fb515cbf180698a1453a90efd2ba8f2795"; - name = "bomber-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/bomber-19.12.3.tar.xz"; + sha256 = "ea4926fe08c62ac5da28c3bb480a6986e51f7a77e3245d1dc1603c38617da4b0"; + name = "bomber-19.12.3.tar.xz"; }; }; bovo = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/bovo-19.12.1.tar.xz"; - sha256 = "54cee2f71e9736057187c8121313b9c73f6cadd0fa463ea2a29cf0e86969d5ae"; - name = "bovo-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/bovo-19.12.3.tar.xz"; + sha256 = "ac67aff75c1e8e0d1a1a8142ae94431e4f39565f411287f57c2778f8820316af"; + name = "bovo-19.12.3.tar.xz"; }; }; calendarsupport = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/calendarsupport-19.12.1.tar.xz"; - sha256 = "6f5e3282ff385044061320b7ccb4bef80a1848fa890afcbd12e16bd2524a4189"; - name = "calendarsupport-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/calendarsupport-19.12.3.tar.xz"; + sha256 = "ecbd194b5aa39284d33f7f2ddca75175f8699efee1bfbd5000ea10076567bae8"; + name = "calendarsupport-19.12.3.tar.xz"; }; }; cantor = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/cantor-19.12.1.tar.xz"; - sha256 = "509ebe0bc173124d28e29483effa07985eef24cdd989e5e4e1fc233632cdf568"; - name = "cantor-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/cantor-19.12.3.tar.xz"; + sha256 = "8347160f18993f53c857ec0d418dfebbc533878ad9f480047646d121e4e644cb"; + name = "cantor-19.12.3.tar.xz"; }; }; cervisia = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/cervisia-19.12.1.tar.xz"; - sha256 = "2a7d32ac0c1460c135397cedec177db8eb99117b53ec2c9652763b0e90184188"; - name = "cervisia-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/cervisia-19.12.3.tar.xz"; + sha256 = "733a90f521cd79157f6d02eeb28376bc703239800473e8cf366611dd4f3342a6"; + name = "cervisia-19.12.3.tar.xz"; }; }; dolphin = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/dolphin-19.12.1.tar.xz"; - sha256 = "492b4ca71e33373c7000aad5c7daf6e04d7ad537e1fde8a73d2c3db15858e8c8"; - name = "dolphin-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/dolphin-19.12.3.tar.xz"; + sha256 = "ba16f4d5be5ccc3c135a913f2e3c7dd3b7a492cfc9ec9ae518f714fcd7c2ab47"; + name = "dolphin-19.12.3.tar.xz"; }; }; dolphin-plugins = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/dolphin-plugins-19.12.1.tar.xz"; - sha256 = "9392571a7004c08aac02dcc6453f58b6d0de4716b7cd61776f78d9b1783c60e0"; - name = "dolphin-plugins-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/dolphin-plugins-19.12.3.tar.xz"; + sha256 = "7dbd5c0fe4281c46df789f86f468c4ea32949285055cae4652bab3de59acdfd3"; + name = "dolphin-plugins-19.12.3.tar.xz"; }; }; dragon = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/dragon-19.12.1.tar.xz"; - sha256 = "a804ae2089c0e96700e91d90ba2100d9a42a81a128a3fdbb037ed94c31f380cd"; - name = "dragon-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/dragon-19.12.3.tar.xz"; + sha256 = "c5b09b2bd37f4e86f8412d3b950331d330257ba53278b1a569f36bf3fbf560ee"; + name = "dragon-19.12.3.tar.xz"; }; }; elisa = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/elisa-19.12.1.tar.xz"; - sha256 = "4929da2ebe68a3dc0d22a809a7b2a84493aa6f072e16515bd557ddaac51fd8fa"; - name = "elisa-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/elisa-19.12.3.tar.xz"; + sha256 = "28ad795c1d993969d49ab71514129589a71ee6fe8a2de785e22f17f5af7c3d32"; + name = "elisa-19.12.3.tar.xz"; }; }; eventviews = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/eventviews-19.12.1.tar.xz"; - sha256 = "5eb73fb2c541a6b073ad231a28abe6affc0cad92f5fd4d36a4b58aba8a46193c"; - name = "eventviews-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/eventviews-19.12.3.tar.xz"; + sha256 = "e2ac6a77c6bdee008229a2b03262ac5602e0cabfd325a92df58be63aaa7db662"; + name = "eventviews-19.12.3.tar.xz"; }; }; ffmpegthumbs = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ffmpegthumbs-19.12.1.tar.xz"; - sha256 = "5f7853788c07d409bc2dd2fd7c9afab4cd847f3d2dc6db4dc30cfd78e762bdbd"; - name = "ffmpegthumbs-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ffmpegthumbs-19.12.3.tar.xz"; + sha256 = "cc4a1c3b4768dc674d210294a9957d622448cbe9cdaf713c1cb40bff3a79260e"; + name = "ffmpegthumbs-19.12.3.tar.xz"; }; }; filelight = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/filelight-19.12.1.tar.xz"; - sha256 = "29806a4149b3fb60f81372d56c184d0e2f861816639a0a21b85cd7af314f860b"; - name = "filelight-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/filelight-19.12.3.tar.xz"; + sha256 = "9ea78509f932cd2bd553d934e2af75c25d0b65d85d2b0ab4a007ac5929b2d3b5"; + name = "filelight-19.12.3.tar.xz"; }; }; granatier = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/granatier-19.12.1.tar.xz"; - sha256 = "98051d292dd5a3ba3f873e8bc2bed6cdae291c9516b9cb21a64703b3135baa7f"; - name = "granatier-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/granatier-19.12.3.tar.xz"; + sha256 = "aa2e410e4eeae74f3902028069955017a31a922dff98b81850f20743f7b54c95"; + name = "granatier-19.12.3.tar.xz"; }; }; grantlee-editor = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/grantlee-editor-19.12.1.tar.xz"; - sha256 = "63a2571369aff6cc648b064bcbc32227eede19475cad8937cfc454984423ea0c"; - name = "grantlee-editor-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/grantlee-editor-19.12.3.tar.xz"; + sha256 = "5df3e5ce7933290f9f6423bdbcb0ff5614a1a4b6fda250a37bd3ed57647f8a3c"; + name = "grantlee-editor-19.12.3.tar.xz"; }; }; grantleetheme = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/grantleetheme-19.12.1.tar.xz"; - sha256 = "f23aaf86ff8c630a2f3498b3eebcd6533b01ee806dcf4130df7dd55e3b890ddd"; - name = "grantleetheme-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/grantleetheme-19.12.3.tar.xz"; + sha256 = "cc0ce448c9d8396dcadea2a43089feca8e1074572df42752f70dd176676f29f9"; + name = "grantleetheme-19.12.3.tar.xz"; }; }; gwenview = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/gwenview-19.12.1.tar.xz"; - sha256 = "ed36590a0193fbe22f08c1a026e58f86a3067f516b3a894f29b72aa229967c84"; - name = "gwenview-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/gwenview-19.12.3.tar.xz"; + sha256 = "b453cd55b7409bf8e4446a1b714dc66e73a0376d2da65b184b82f786767164e7"; + name = "gwenview-19.12.3.tar.xz"; }; }; incidenceeditor = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/incidenceeditor-19.12.1.tar.xz"; - sha256 = "1f1345db2e518bfe9405df5fa441ece3af1093cbc75066673d252a0760262484"; - name = "incidenceeditor-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/incidenceeditor-19.12.3.tar.xz"; + sha256 = "c608a95f6d09433b378f5df0243eff77be3738fb56f99ab439774f2cad5908a6"; + name = "incidenceeditor-19.12.3.tar.xz"; }; }; juk = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/juk-19.12.1.tar.xz"; - sha256 = "de1d9f3581f791ea050700b467dce4b38d9ec2dc20884b495826e479d3245edf"; - name = "juk-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/juk-19.12.3.tar.xz"; + sha256 = "4bc4210d223afc23cb6edc9262eceee038ecc6243a550698e676230168943611"; + name = "juk-19.12.3.tar.xz"; }; }; k3b = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/k3b-19.12.1.tar.xz"; - sha256 = "59def9d9c9e14de52a14d58a22c15173d98086d9a156a3a463b9607dc7be602d"; - name = "k3b-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/k3b-19.12.3.tar.xz"; + sha256 = "832c314d528ed21971d9d9d26c1c4d6c61323c9b3b01787d710541e3651575a5"; + name = "k3b-19.12.3.tar.xz"; }; }; kaccounts-integration = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kaccounts-integration-19.12.1.tar.xz"; - sha256 = "0dda504f51b86207180aceb00d86d42cb16c7ebe81c60ca1ed6bf8fa20699127"; - name = "kaccounts-integration-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kaccounts-integration-19.12.3.tar.xz"; + sha256 = "452b95113de5fb0d19a13ef75e229ee07b0e92cc1e7a17e9a2dc7879121d9d33"; + name = "kaccounts-integration-19.12.3.tar.xz"; }; }; kaccounts-providers = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kaccounts-providers-19.12.1.tar.xz"; - sha256 = "abcd1fa9f63248f3ce7f9c98d940b124ff5c70c1a3381a6cfad6ce7012b23c69"; - name = "kaccounts-providers-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kaccounts-providers-19.12.3.tar.xz"; + sha256 = "8774e9a8113e4aba593afeff655e38f6259c78e7dbaf1d95ea00235be880f3dd"; + name = "kaccounts-providers-19.12.3.tar.xz"; }; }; kaddressbook = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kaddressbook-19.12.1.tar.xz"; - sha256 = "32e19973015151ac32fe7ae1f0a17e82e2834ce69ba052f31e8d197930f0be5c"; - name = "kaddressbook-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kaddressbook-19.12.3.tar.xz"; + sha256 = "1dede421e6fef2b1abc7d36dd1855cef43cc82de909a432cd38cff42d4168fba"; + name = "kaddressbook-19.12.3.tar.xz"; }; }; kajongg = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kajongg-19.12.1.tar.xz"; - sha256 = "2f0944ea23cefb07187e0c176ae0a12cbba1b591aefeab9be9a59d5cab9e7a59"; - name = "kajongg-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kajongg-19.12.3.tar.xz"; + sha256 = "23e2b1be670b48bdd027e4e7a57e86a94b322afe6d37d8492c3d17689decfae5"; + name = "kajongg-19.12.3.tar.xz"; }; }; kalarm = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kalarm-19.12.1.tar.xz"; - sha256 = "06a8d9544d1107ac3f2e8c4c2e9604055706dcb6b7f3b0267f0d4cb45f1caf35"; - name = "kalarm-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kalarm-19.12.3.tar.xz"; + sha256 = "526ab8884752c15622233db8b72e88d0c22a7a1bd265763d850b6e18e32de417"; + name = "kalarm-19.12.3.tar.xz"; }; }; kalarmcal = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kalarmcal-19.12.1.tar.xz"; - sha256 = "18644d5cbc61b414675de66dd25d9a1dd30b0e93851f6223292f052d30a365e6"; - name = "kalarmcal-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kalarmcal-19.12.3.tar.xz"; + sha256 = "0ec5188f1164d91de702639ab2f85a713889feef48fc02dfe7385c945d06aa60"; + name = "kalarmcal-19.12.3.tar.xz"; }; }; kalgebra = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kalgebra-19.12.1.tar.xz"; - sha256 = "49d623186800eb8f6fbb91eb43fb14dff78e112624c9cda6b331d494d610b16a"; - name = "kalgebra-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kalgebra-19.12.3.tar.xz"; + sha256 = "ac865dded31b61c438ddb9db721543b8facba79c9b39365750b4bebfe2645640"; + name = "kalgebra-19.12.3.tar.xz"; }; }; kalzium = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kalzium-19.12.1.tar.xz"; - sha256 = "f50cc18d94ce9a1aaedcbee3a5dccc2cc6723ac8ec151a0ae0ff60009a7c6943"; - name = "kalzium-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kalzium-19.12.3.tar.xz"; + sha256 = "e44f359d1343c30cf1993a3970a3e610d0d5782f92a6b331b035cf4fef104195"; + name = "kalzium-19.12.3.tar.xz"; }; }; kamera = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kamera-19.12.1.tar.xz"; - sha256 = "831d7b3d7ffdc73b03116b564fb1a23c651d468cae97c1c31791f6df1a8890ac"; - name = "kamera-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kamera-19.12.3.tar.xz"; + sha256 = "22e19527bf9748cdc298be4c3fa2cb0a3b8b337da3a3a804c9d6066d7f3e1110"; + name = "kamera-19.12.3.tar.xz"; }; }; kamoso = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kamoso-19.12.1.tar.xz"; - sha256 = "c1776bf7f8eafd9f4c501aabc0df30035a0f1d40951e525312aa257e67cf74a7"; - name = "kamoso-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kamoso-19.12.3.tar.xz"; + sha256 = "9ae14c4c80cdbbf2ce2e92db5e9c814fbd685e81aa5c319aac5477649fc39fe4"; + name = "kamoso-19.12.3.tar.xz"; }; }; kanagram = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kanagram-19.12.1.tar.xz"; - sha256 = "2127eada150ee3f023948b637890aa93d602874fd6c037c4bd031886a12a2fdc"; - name = "kanagram-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kanagram-19.12.3.tar.xz"; + sha256 = "441cae90d3b70dbef40bebbcf1325fa06e0df174a3f961b4b117a5fa1b40d6e3"; + name = "kanagram-19.12.3.tar.xz"; }; }; kapman = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kapman-19.12.1.tar.xz"; - sha256 = "cd5bef40c51bc6ef635adab501acd2a40c2291c989c4ba3ef6e34a1cbebe4c49"; - name = "kapman-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kapman-19.12.3.tar.xz"; + sha256 = "3c81e3395ce2b2ea0937b09c0836cb58b8a941c2b7e2a27bd9741b2a9be1c1dd"; + name = "kapman-19.12.3.tar.xz"; }; }; kapptemplate = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kapptemplate-19.12.1.tar.xz"; - sha256 = "b2fc583125aae1968c0342063a6cfcea2dbeff21e0ef505a021b689ed3a34085"; - name = "kapptemplate-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kapptemplate-19.12.3.tar.xz"; + sha256 = "5bef4e4fb74da3102cba6672584195962514ee3f53fb369b48d492d6ce7255ad"; + name = "kapptemplate-19.12.3.tar.xz"; }; }; kate = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kate-19.12.1.tar.xz"; - sha256 = "9d2401907e5b163d5af0af5b4d28383896ef709bcde7f6ee2234e1a3adc28a47"; - name = "kate-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kate-19.12.3.tar.xz"; + sha256 = "f60b52e5a6a78920ac703a458f1eaf0ced02ffcd8b5f2d49de9a48674eeb007c"; + name = "kate-19.12.3.tar.xz"; }; }; katomic = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/katomic-19.12.1.tar.xz"; - sha256 = "bc51424757434e905b5b611a6fa634147e533e375922c03f896a093fa61e57a3"; - name = "katomic-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/katomic-19.12.3.tar.xz"; + sha256 = "d7ed527e2546e94cb091e433a2e61618301152704c48e1f003e1f8e60b4f0cbd"; + name = "katomic-19.12.3.tar.xz"; }; }; kbackup = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kbackup-19.12.1.tar.xz"; - sha256 = "1b30c142576d823043d4e78fa37592e8df79b5e13ea7a980d336b25c1093ecf8"; - name = "kbackup-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kbackup-19.12.3.tar.xz"; + sha256 = "1761009f9cd854d3fb4f98eb24b5ee7f3c42c4541f7cfb2ff1589786c86bdc99"; + name = "kbackup-19.12.3.tar.xz"; }; }; kblackbox = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kblackbox-19.12.1.tar.xz"; - sha256 = "57901d6bf56228691b6c6436ca2f60e62542854e80f9c4fda7a60362a216e1ed"; - name = "kblackbox-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kblackbox-19.12.3.tar.xz"; + sha256 = "dffb910a5d429dfc231b7d2185119430856d26af2c027d34c551a6d664ae49c6"; + name = "kblackbox-19.12.3.tar.xz"; }; }; kblocks = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kblocks-19.12.1.tar.xz"; - sha256 = "1077477910d1dfff60f1abad7b1cf937daf1f3e3a5e8b18407b7e2809b2fc3d9"; - name = "kblocks-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kblocks-19.12.3.tar.xz"; + sha256 = "5bc5cb14b91c9b230563388b4d935211975bae34ed36cb0479cbf25bc3b652fb"; + name = "kblocks-19.12.3.tar.xz"; }; }; kblog = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kblog-19.12.1.tar.xz"; - sha256 = "6385ecfc024cf554a55e2840c3faf6b9e6ee81eb3536d5632899d32aecd54b9f"; - name = "kblog-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kblog-19.12.3.tar.xz"; + sha256 = "3fba584c4c217c5b5b3be52752f8f3c371fb877fe3b730a48711028fedc6b3d4"; + name = "kblog-19.12.3.tar.xz"; }; }; kbounce = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kbounce-19.12.1.tar.xz"; - sha256 = "e9e1df6f2f57e102d95707b82b0aa582f9f1a6c3e395660b5faa33ef953e7fb3"; - name = "kbounce-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kbounce-19.12.3.tar.xz"; + sha256 = "d1b7ac99e54070e1e28a3449e8773691e90625c9f881cf94352ef752700197d0"; + name = "kbounce-19.12.3.tar.xz"; }; }; kbreakout = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kbreakout-19.12.1.tar.xz"; - sha256 = "17475a5aa80f494876fb3b91d32df4c447417e79f4dd60d46f594cfab03f489f"; - name = "kbreakout-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kbreakout-19.12.3.tar.xz"; + sha256 = "ca662c9f2c6765f5f8b07bd4cc2e2aa0a43b69fec6428c3deda2cfad0ab675fa"; + name = "kbreakout-19.12.3.tar.xz"; }; }; kbruch = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kbruch-19.12.1.tar.xz"; - sha256 = "94f9951c0ee3b4aea6d649f971f2d946d462b916a76e4e76ddafa809ce7e5550"; - name = "kbruch-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kbruch-19.12.3.tar.xz"; + sha256 = "522ddae0b2ec640e70c717a9fe0d6a95aef1ed3fe2acbca4b93a99a309abd559"; + name = "kbruch-19.12.3.tar.xz"; }; }; kcachegrind = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kcachegrind-19.12.1.tar.xz"; - sha256 = "210e04441519c47d103871e52d98351abc41a04b9385c577a7839eec31a2f400"; - name = "kcachegrind-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kcachegrind-19.12.3.tar.xz"; + sha256 = "a30b70bac32f2b33c3c90b8c17754cfbf7d293c9eff0d573747eca2b45353b41"; + name = "kcachegrind-19.12.3.tar.xz"; }; }; kcalc = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kcalc-19.12.1.tar.xz"; - sha256 = "51630cd5c6d7ebbf35fb91419acfe9b2d2719ebfcdc2fff8358dbfaa2cecda57"; - name = "kcalc-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kcalc-19.12.3.tar.xz"; + sha256 = "bbda4fc074e1ea748e95840aa79c51fdf0a1943ebb63ce6c7b68c197831258bd"; + name = "kcalc-19.12.3.tar.xz"; }; }; kcalutils = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kcalutils-19.12.1.tar.xz"; - sha256 = "0298e92d84d9f4b612ea1a27abee1368bc624af2bc5bc4b5eb1053a27575ea04"; - name = "kcalutils-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kcalutils-19.12.3.tar.xz"; + sha256 = "00da1f331110a63c3d3c2c96394ead3d282f582d73fa925065560a50807fb7ff"; + name = "kcalutils-19.12.3.tar.xz"; }; }; kcharselect = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kcharselect-19.12.1.tar.xz"; - sha256 = "5f23458974d6fa66c49d434937e7a7a31cc94e46616db866b35316025bb84b0c"; - name = "kcharselect-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kcharselect-19.12.3.tar.xz"; + sha256 = "9be6ac607148b0815bd985075fbb97d44561fdd6a955b60f0afc728f9cbd978b"; + name = "kcharselect-19.12.3.tar.xz"; }; }; kcolorchooser = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kcolorchooser-19.12.1.tar.xz"; - sha256 = "713d1151f45382d8a889187ebb02f8e73ffbf28ac8abea0e03626888711d2c22"; - name = "kcolorchooser-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kcolorchooser-19.12.3.tar.xz"; + sha256 = "cb0395c1b4f953fd51129cfe5088702ec261f84cc045f889e22c13e81793744a"; + name = "kcolorchooser-19.12.3.tar.xz"; }; }; kcron = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kcron-19.12.1.tar.xz"; - sha256 = "8c7d5fa24349b9ff7c4927579876ef84895398d8cde6122804d7104a4f4d5963"; - name = "kcron-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kcron-19.12.3.tar.xz"; + sha256 = "22d07834e8431d0fcc756a0e7d92d4e8993008766bf336254f8650c9455c9ab0"; + name = "kcron-19.12.3.tar.xz"; }; }; kdav = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdav-19.12.1.tar.xz"; - sha256 = "5059a295f3ecd9046da6f5ecadab596b3e47c75c5090650a1d6cd1f86a8b7498"; - name = "kdav-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdav-19.12.3.tar.xz"; + sha256 = "7a0ed47378e064536b26dfdfcf7abcdb8dd2ec253a7bbcef7962b701d368872a"; + name = "kdav-19.12.3.tar.xz"; }; }; kdebugsettings = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdebugsettings-19.12.1.tar.xz"; - sha256 = "2730430123e6198131acbabb5d02800981082f7249f0d9b9001b5313b2d45f35"; - name = "kdebugsettings-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdebugsettings-19.12.3.tar.xz"; + sha256 = "ad18d13dd0943a3651ec4729441899b103bd2dc743a4a373ce7bd14fb38dd3e0"; + name = "kdebugsettings-19.12.3.tar.xz"; }; }; kde-dev-scripts = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kde-dev-scripts-19.12.1.tar.xz"; - sha256 = "c2965dee649abea0791774ae264230dbe673af07eb0bd85bf3e8c7c6a739cea5"; - name = "kde-dev-scripts-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kde-dev-scripts-19.12.3.tar.xz"; + sha256 = "94c0ba9de369dd6af14dcea505616025bf06599618a6c7557861aa9fb89ea628"; + name = "kde-dev-scripts-19.12.3.tar.xz"; }; }; kde-dev-utils = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kde-dev-utils-19.12.1.tar.xz"; - sha256 = "94f983c9b49ed3bc59b20849b23e7c26b64b7b303fbd86147c4bc823f87cda7d"; - name = "kde-dev-utils-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kde-dev-utils-19.12.3.tar.xz"; + sha256 = "772ec425865082b8be3650cf0af10ad943f38096036227cab22405b32c4e1fae"; + name = "kde-dev-utils-19.12.3.tar.xz"; }; }; kdeedu-data = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdeedu-data-19.12.1.tar.xz"; - sha256 = "d140f048e1ca8bd777b4a431904b3313a86446a5fd04e1f9c4e1fb4641a09b15"; - name = "kdeedu-data-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdeedu-data-19.12.3.tar.xz"; + sha256 = "76fd5c0efaf339bcfc5ac9f131bac8889cff1df2dd3452ea7dd507b8d9e2645b"; + name = "kdeedu-data-19.12.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdegraphics-mobipocket-19.12.1.tar.xz"; - sha256 = "546d11af89e97831cc09868051142d4180e9621cc537c2941272b42a85e71c6a"; - name = "kdegraphics-mobipocket-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdegraphics-mobipocket-19.12.3.tar.xz"; + sha256 = "c459f9f04cf98cdc88a6763da8880f418e0c33b3cbd1d06b9a7347ebb470d835"; + name = "kdegraphics-mobipocket-19.12.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdegraphics-thumbnailers-19.12.1.tar.xz"; - sha256 = "a91335c11637a351d3ea8798f5519ac5596d655aec92266e46ed2a1bab46a299"; - name = "kdegraphics-thumbnailers-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdegraphics-thumbnailers-19.12.3.tar.xz"; + sha256 = "92a045ac0e9ca57ea27760df3cca0203f29ba435574e9d837d0c1069b8e88f72"; + name = "kdegraphics-thumbnailers-19.12.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdenetwork-filesharing-19.12.1.tar.xz"; - sha256 = "823e31424998e96084eeb909dfb7ee6a8e8e6d33b5d2a57ada7d583350967684"; - name = "kdenetwork-filesharing-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdenetwork-filesharing-19.12.3.tar.xz"; + sha256 = "8cc75f47ef8038cd7ee75974056cd48022816ab42c76cb6bd2c35a3619445180"; + name = "kdenetwork-filesharing-19.12.3.tar.xz"; }; }; kdenlive = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdenlive-19.12.1.tar.xz"; - sha256 = "fccf34a4660ce8a78ceefe8a4b9dd93d104f6871976d991ceec769366627dc77"; - name = "kdenlive-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdenlive-19.12.3.tar.xz"; + sha256 = "cebcb8f019bc0fc719ef54d00507dc1281758e3c8c69ea2f93f99feda777bc64"; + name = "kdenlive-19.12.3.tar.xz"; }; }; kdepim-addons = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdepim-addons-19.12.1.tar.xz"; - sha256 = "091e3fd007ad54cd1dcd4e2d51c4ac883a2d9e365ca78592aa91a37835c4dcf5"; - name = "kdepim-addons-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdepim-addons-19.12.3.tar.xz"; + sha256 = "f33bc70ac54ab56eea7bd8ca4c0ac98d9612acc4ddc9ce989d06b99f04f62c19"; + name = "kdepim-addons-19.12.3.tar.xz"; }; }; kdepim-apps-libs = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdepim-apps-libs-19.12.1.tar.xz"; - sha256 = "4ff633c98cd128f2409cb78c193dd72f1078ae29eba8db3e304248a019e17e43"; - name = "kdepim-apps-libs-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdepim-apps-libs-19.12.3.tar.xz"; + sha256 = "e133cf76364f6b244338eafd39845a9f392eb9b55c43446541acbcb24a6f4796"; + name = "kdepim-apps-libs-19.12.3.tar.xz"; }; }; kdepim-runtime = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdepim-runtime-19.12.1.tar.xz"; - sha256 = "31b1fe9778723079048d0fe1750028fd3f5f5b467ee10dcfa7fab37202a6ca39"; - name = "kdepim-runtime-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdepim-runtime-19.12.3.tar.xz"; + sha256 = "dabf7da1ad35dfaa3531639a8964b61dbd7094ec0a9b3d62f50fa24a22f5db13"; + name = "kdepim-runtime-19.12.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdesdk-kioslaves-19.12.1.tar.xz"; - sha256 = "e8e8f02e019bad7983cdc5cddbd435ccf676fd804ee7f960653acdda5676abb2"; - name = "kdesdk-kioslaves-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdesdk-kioslaves-19.12.3.tar.xz"; + sha256 = "8b075bff545883aba24fee1763d0cdc64bf9444ae865f0623a33fc1ca295d254"; + name = "kdesdk-kioslaves-19.12.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdesdk-thumbnailers-19.12.1.tar.xz"; - sha256 = "77f64ddb075407f781cf2d658af760840f9427cc171e8ec15805f47105da0e56"; - name = "kdesdk-thumbnailers-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdesdk-thumbnailers-19.12.3.tar.xz"; + sha256 = "b304843045f93e91e0aeeeacf968018dc192ea71ed9977be3d9cfc4e149edcde"; + name = "kdesdk-thumbnailers-19.12.3.tar.xz"; }; }; kdf = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdf-19.12.1.tar.xz"; - sha256 = "bf5c96e5a78e0465e9b91617ffff0c37f04e896dc059d70962bbdd943c6c1c04"; - name = "kdf-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdf-19.12.3.tar.xz"; + sha256 = "257e07e27376f45eaa1bfb1b3055c7f10759ca7ec185aa7572dc60317c8119bd"; + name = "kdf-19.12.3.tar.xz"; }; }; kdialog = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdialog-19.12.1.tar.xz"; - sha256 = "2a13d1957089e4a0307681786b9b5467b5df777311afd4598dd1cb69b4e070f6"; - name = "kdialog-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdialog-19.12.3.tar.xz"; + sha256 = "e6f9a7a6b7c2f18795070bf9466dd6256568b02683d955ef3253432216594d00"; + name = "kdialog-19.12.3.tar.xz"; }; }; kdiamond = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdiamond-19.12.1.tar.xz"; - sha256 = "4f7770138d16bb7b91920b7f3c7024a89ef35dc330a2ac929a2fa5d4ee12b982"; - name = "kdiamond-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdiamond-19.12.3.tar.xz"; + sha256 = "95dfd2fd3daa59a58d128c35b95b609117438efdb5d60110414ab7aff5fe3e7c"; + name = "kdiamond-19.12.3.tar.xz"; }; }; keditbookmarks = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/keditbookmarks-19.12.1.tar.xz"; - sha256 = "11a950d53bc6e0b50d62a3ced2b74eaaa85c595b845ca8f2dcfa65e69d407fb0"; - name = "keditbookmarks-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/keditbookmarks-19.12.3.tar.xz"; + sha256 = "1c5efb63eb0a714942677eb03f91ae0bbd10731eace5471ea12ae9d3296b6b05"; + name = "keditbookmarks-19.12.3.tar.xz"; }; }; kfind = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kfind-19.12.1.tar.xz"; - sha256 = "e9f5defa7796bbb54208b28af1fa76333a38e743d7febb8dd14739cf00d376eb"; - name = "kfind-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kfind-19.12.3.tar.xz"; + sha256 = "b3738d6e3f26fffbfcc204d946e165ae0727d9f460cb2065ceb221b4872019b1"; + name = "kfind-19.12.3.tar.xz"; }; }; kfloppy = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kfloppy-19.12.1.tar.xz"; - sha256 = "77581323d16f8666fefca3372c91567dfe5233c0f92c79ead11b2253aee64e2c"; - name = "kfloppy-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kfloppy-19.12.3.tar.xz"; + sha256 = "7f384f9197d5066a5db978a9551665ae9a90b1f3afd1937f800ab61e376d3723"; + name = "kfloppy-19.12.3.tar.xz"; }; }; kfourinline = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kfourinline-19.12.1.tar.xz"; - sha256 = "76e31b59f1b31ddb755def377324d5fa5b5a4835f1f537a30632a028bf671a3e"; - name = "kfourinline-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kfourinline-19.12.3.tar.xz"; + sha256 = "1d2f4fdbf427e2ce86a0519ee61a70df0675f039cebd658cd75bd27af4fe69f6"; + name = "kfourinline-19.12.3.tar.xz"; }; }; kgeography = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kgeography-19.12.1.tar.xz"; - sha256 = "47f809fdb6da503c0b00f5d2052f9def3af0964ace45325e683227a1971c3a1b"; - name = "kgeography-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kgeography-19.12.3.tar.xz"; + sha256 = "3947ca1f50910d77f85c630b49128a085fed4230c7919e09281bc1765529a533"; + name = "kgeography-19.12.3.tar.xz"; }; }; kget = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kget-19.12.1.tar.xz"; - sha256 = "33b043857b3d1c55d877d1c3af2bcc46feefe15019b7af40a9951c16e288658c"; - name = "kget-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kget-19.12.3.tar.xz"; + sha256 = "a4b1d8fb94617c80a557c27ae58a14131bda4476340c136262e5bf8f51d918d9"; + name = "kget-19.12.3.tar.xz"; }; }; kgoldrunner = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kgoldrunner-19.12.1.tar.xz"; - sha256 = "1f2044656732ab7a72117139576201ca1701666d525c93b726473d4cd9aed29c"; - name = "kgoldrunner-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kgoldrunner-19.12.3.tar.xz"; + sha256 = "5808d797fb9df178526b3ea462bc902ca36b5926ef7c51233816ba3da6bc0bdd"; + name = "kgoldrunner-19.12.3.tar.xz"; }; }; kgpg = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kgpg-19.12.1.tar.xz"; - sha256 = "e64dc85f303e45b8a7ef635525f6834c4fd2db36c5131fdb231fa11f7237fdb5"; - name = "kgpg-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kgpg-19.12.3.tar.xz"; + sha256 = "53e5726a1ccf34a70090ac0bbf2effb6f1f9f9b3d0164a5beead982a24c97e38"; + name = "kgpg-19.12.3.tar.xz"; }; }; khangman = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/khangman-19.12.1.tar.xz"; - sha256 = "42fa9d9a9a72fe4b14127b12d5b662d66c00c1899eeefba6102be95136333def"; - name = "khangman-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/khangman-19.12.3.tar.xz"; + sha256 = "55286b318ec2c2d8b7e63f4063fc0e39a8ff81c0a9d3f06c9879f141c94762a8"; + name = "khangman-19.12.3.tar.xz"; }; }; khelpcenter = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/khelpcenter-19.12.1.tar.xz"; - sha256 = "cd38f6b719f4f6228e3a7f94fc63f16020e86382ca402179ae767f2f0b846466"; - name = "khelpcenter-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/khelpcenter-19.12.3.tar.xz"; + sha256 = "526c89e46cace9e8afb4e748f9bbf0d105472a4cc4a6d8bb821e8b9b88ab0f73"; + name = "khelpcenter-19.12.3.tar.xz"; }; }; kidentitymanagement = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kidentitymanagement-19.12.1.tar.xz"; - sha256 = "7df38592610e0ed74c55baf6670331d07b2df0c98484d5f8cf8f135b6d229702"; - name = "kidentitymanagement-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kidentitymanagement-19.12.3.tar.xz"; + sha256 = "254bfc3a60df7bc1960fa1e6d5b7733f6aa5ed7772c1097d9a8cfcdda2704516"; + name = "kidentitymanagement-19.12.3.tar.xz"; }; }; kig = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kig-19.12.1.tar.xz"; - sha256 = "507d89cddc0e128ab398ce0f551af22af0ba1583a4419574296cfefb96d944ee"; - name = "kig-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kig-19.12.3.tar.xz"; + sha256 = "1ae2c3024cdd14e476ff15b730f4ebe9b279477b67cc4cc89606755c7d3beef3"; + name = "kig-19.12.3.tar.xz"; }; }; kigo = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kigo-19.12.1.tar.xz"; - sha256 = "235df9bca39b02dac6648b408d71f7b0978604f8389ea7ef5aa8e0be87fbcf9d"; - name = "kigo-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kigo-19.12.3.tar.xz"; + sha256 = "ee18b8563c49e3e01924ea76cd8c6ec376482c2100e0fac7cdfd14b5899592d5"; + name = "kigo-19.12.3.tar.xz"; }; }; killbots = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/killbots-19.12.1.tar.xz"; - sha256 = "3d524028e7df412e4306daf4e7b1aca803d26b65985fa429c98db10cffff010f"; - name = "killbots-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/killbots-19.12.3.tar.xz"; + sha256 = "3c5dc7e1f27036d2584f6ee58bf3bbffd9e56a467f30a8e2eab9e1bda1e7d4a3"; + name = "killbots-19.12.3.tar.xz"; }; }; kimagemapeditor = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kimagemapeditor-19.12.1.tar.xz"; - sha256 = "9869f3a060dc44f2fad0646fa9c0f1c2924d68c3cc3de5147170456f27a39e77"; - name = "kimagemapeditor-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kimagemapeditor-19.12.3.tar.xz"; + sha256 = "1aee6521974bde5151744d92823f6b405ee4a8bd2dfe3c538324a209e18c6b35"; + name = "kimagemapeditor-19.12.3.tar.xz"; }; }; kimap = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kimap-19.12.1.tar.xz"; - sha256 = "898e1f3b233b3631ffc74859d54bf402d36f0c5bae7f792e97d3fa5116d8bd0e"; - name = "kimap-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kimap-19.12.3.tar.xz"; + sha256 = "5c3b3cdf928754f9919030d865a2cdad0ad342c82c436afef660d018f85de4d2"; + name = "kimap-19.12.3.tar.xz"; }; }; kio-extras = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kio-extras-19.12.1.tar.xz"; - sha256 = "79b3735510c3c8da9b3e019ee5a54b115f85bb8d89f1c04dbbf16dde3007e7b6"; - name = "kio-extras-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kio-extras-19.12.3.tar.xz"; + sha256 = "413cb21479fedf1421a6e2585b4df813c3a3fadaa77c248a9f810021f58cea4b"; + name = "kio-extras-19.12.3.tar.xz"; }; }; kipi-plugins = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kipi-plugins-19.12.1.tar.xz"; - sha256 = "bcd27ab29b491f13116a156e403126d04ffbaa352b581eca7fb0904e13c5dabe"; - name = "kipi-plugins-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kipi-plugins-19.12.3.tar.xz"; + sha256 = "16997bd6fbb59c194c2997732c870e33bbacd3d7346546af9a255db3330ec5ac"; + name = "kipi-plugins-19.12.3.tar.xz"; }; }; kirigami-gallery = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kirigami-gallery-19.12.1.tar.xz"; - sha256 = "de7f9d739feeac481223c7992179cb3cfaa2aabca1097b0d3597c5c9d737cb19"; - name = "kirigami-gallery-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kirigami-gallery-19.12.3.tar.xz"; + sha256 = "17febaeb77e0dfc6f591dd285fd7f538466572f2f2e3253461c41f92d6cb05fe"; + name = "kirigami-gallery-19.12.3.tar.xz"; }; }; kiriki = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kiriki-19.12.1.tar.xz"; - sha256 = "f3079b53ed45ec46def7a95b336d441dba18151cc77c88ef8ce2d02fcf1d6375"; - name = "kiriki-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kiriki-19.12.3.tar.xz"; + sha256 = "abbaa49f9b47286f9afbe7c968eb6fbfeecb4be84ed4b2ce7514a3ed1e92b2d5"; + name = "kiriki-19.12.3.tar.xz"; }; }; kiten = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kiten-19.12.1.tar.xz"; - sha256 = "abee050c05b54fae25562237b91a14156dabcb26ea142c714b5ec9e1907f54f3"; - name = "kiten-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kiten-19.12.3.tar.xz"; + sha256 = "663739a8b252cb95a38294c6f7d675c833daaa81f2654f5cabd8e512fd353560"; + name = "kiten-19.12.3.tar.xz"; }; }; kitinerary = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kitinerary-19.12.1.tar.xz"; - sha256 = "6497469e9966c9c21c2810a1f21c2633b89e54dafb74d5689aa24382e3824926"; - name = "kitinerary-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kitinerary-19.12.3.tar.xz"; + sha256 = "4188efe8672091cbdaa4f757f5d8b94a30b1373dceafc076b01330602d5086e2"; + name = "kitinerary-19.12.3.tar.xz"; }; }; kjumpingcube = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kjumpingcube-19.12.1.tar.xz"; - sha256 = "3e4abd57d14dccc9b39669eebdab578fc865464b8a4309c3ab8103002edc2ff0"; - name = "kjumpingcube-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kjumpingcube-19.12.3.tar.xz"; + sha256 = "b969111cb884efc9ad8ef585066ca33d7168bb045c93a3f18668173a11d29ea2"; + name = "kjumpingcube-19.12.3.tar.xz"; }; }; kldap = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kldap-19.12.1.tar.xz"; - sha256 = "5595f840c2b97e96f265ffd91fb007f4beb198aaf67a0dbfd941108acbcb9aa3"; - name = "kldap-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kldap-19.12.3.tar.xz"; + sha256 = "49f1ad32ae10b7f997c77f3a8db0776b972b93f9e18873b77baabf0db05cd5d4"; + name = "kldap-19.12.3.tar.xz"; }; }; kleopatra = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kleopatra-19.12.1.tar.xz"; - sha256 = "94ee94031696dd5d79d7a0ca00a2e51b4569466689e8a76c129deae645af08f4"; - name = "kleopatra-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kleopatra-19.12.3.tar.xz"; + sha256 = "04edf29e42088b2bccdfe36b9b7170c38acd7816657673da5393244b73773098"; + name = "kleopatra-19.12.3.tar.xz"; }; }; klettres = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/klettres-19.12.1.tar.xz"; - sha256 = "4f103d85918d40e0a3ffc451bf3862c45b37b8bd2453e6ee7d21d4c738967c36"; - name = "klettres-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/klettres-19.12.3.tar.xz"; + sha256 = "f2a1bbb002954a80045780de24f494154214b8add53a5c01a8783cbeb26d26c7"; + name = "klettres-19.12.3.tar.xz"; }; }; klickety = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/klickety-19.12.1.tar.xz"; - sha256 = "66cba17839023b6fe563a461da8f52a3c8a2bd4949195da2d63d780547f2e159"; - name = "klickety-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/klickety-19.12.3.tar.xz"; + sha256 = "351e421ecca5fc80955ed614453c81d8b790200185db16f56be1e0ca9325ad39"; + name = "klickety-19.12.3.tar.xz"; }; }; klines = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/klines-19.12.1.tar.xz"; - sha256 = "111c4e607c4ba434a8ff593e45ba669c78e6c1fbf9e4d77d0fc5d611e733604e"; - name = "klines-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/klines-19.12.3.tar.xz"; + sha256 = "8d11894d0a02de20090e52ef697a5a3c00e902213c018a82c94ca0985e92350a"; + name = "klines-19.12.3.tar.xz"; }; }; kmag = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmag-19.12.1.tar.xz"; - sha256 = "59e5a59407894976574acf78e7248fd0609ce6ee222c60388a99e5576ac2061f"; - name = "kmag-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmag-19.12.3.tar.xz"; + sha256 = "d1e8bbc8006cd2cfcb345e30aac73350562bff98b69b0333ad49726cdce81e7e"; + name = "kmag-19.12.3.tar.xz"; }; }; kmahjongg = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmahjongg-19.12.1.tar.xz"; - sha256 = "e157f2e603c03128fb99ac4d0b4bc3ab2002a60960c780a3907e35bb8aee9bd3"; - name = "kmahjongg-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmahjongg-19.12.3.tar.xz"; + sha256 = "41a07f74cc4e3bf05f6a57a380d4e093b0303528cb703369981b262a0b1787c8"; + name = "kmahjongg-19.12.3.tar.xz"; }; }; kmail = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmail-19.12.1.tar.xz"; - sha256 = "a8fa4a604f8f88b91beebf0f3f9bb0ac7c040671bd75ab4478d8087a21cde40c"; - name = "kmail-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmail-19.12.3.tar.xz"; + sha256 = "7f70e5270960e474b15631a36110e13fdf7238d6fd9f1b3fdb6d8c145b6529ba"; + name = "kmail-19.12.3.tar.xz"; }; }; kmail-account-wizard = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmail-account-wizard-19.12.1.tar.xz"; - sha256 = "e7cbda3946b19d01f5c3a722d2c104b7be072ab411f80437a25b8200d73e7cfa"; - name = "kmail-account-wizard-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmail-account-wizard-19.12.3.tar.xz"; + sha256 = "4199e8c73456bf31b829596919ca481c3a95e59dee7c9bfb2e680311d0354ff0"; + name = "kmail-account-wizard-19.12.3.tar.xz"; }; }; kmailtransport = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmailtransport-19.12.1.tar.xz"; - sha256 = "1a46563c441a7d09e6cc2bf98a628b724944193e0df88607d5d867f4fa65c1a4"; - name = "kmailtransport-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmailtransport-19.12.3.tar.xz"; + sha256 = "077b3dba7c02dde9693c003ab7039f3b2a530e3b1aecfcf187313db5226e8953"; + name = "kmailtransport-19.12.3.tar.xz"; }; }; kmbox = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmbox-19.12.1.tar.xz"; - sha256 = "7442fd3a421a917a3f27e47259a7da7e08ff6191290a0e9e67c67005c82c606a"; - name = "kmbox-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmbox-19.12.3.tar.xz"; + sha256 = "de69683abb42c5c24ccb4f034e067f50c94d5a10c53f359b0e6ad4b75a70b376"; + name = "kmbox-19.12.3.tar.xz"; }; }; kmime = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmime-19.12.1.tar.xz"; - sha256 = "4d6db5d59b239b884bf8811f3ea616520ab1f69224a809cef3f79023b2563085"; - name = "kmime-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmime-19.12.3.tar.xz"; + sha256 = "5ed20ad77000c60ba5723aaa22149fca3a3956f930d63e70984f0a17b9339300"; + name = "kmime-19.12.3.tar.xz"; }; }; kmines = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmines-19.12.1.tar.xz"; - sha256 = "8f921aa4bda7397c0fa6265ba07a6ce68190174864d0ee16ee575be806b49539"; - name = "kmines-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmines-19.12.3.tar.xz"; + sha256 = "05d8004f2e560bf2c9e32a3ca1988b3848b99bfb9cc96307c1ac2b703c202dad"; + name = "kmines-19.12.3.tar.xz"; }; }; kmix = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmix-19.12.1.tar.xz"; - sha256 = "97fff89e4a102351d01265a9659c5664b030b9b4f27fa021b997fe7ab8801ad6"; - name = "kmix-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmix-19.12.3.tar.xz"; + sha256 = "a4c637383e988ffa21b9c48c72ef6d8855fe207c852d0679011337a331ccfc5c"; + name = "kmix-19.12.3.tar.xz"; }; }; kmousetool = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmousetool-19.12.1.tar.xz"; - sha256 = "d056fd05ffb900f65670e3a77dc8a0c08fbc02d86f4fba1b34dd8f6b5f60c3e5"; - name = "kmousetool-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmousetool-19.12.3.tar.xz"; + sha256 = "3741aff20c778bb704c76df7ff005da36ef6c41b07fca35f257ba440741b8413"; + name = "kmousetool-19.12.3.tar.xz"; }; }; kmouth = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmouth-19.12.1.tar.xz"; - sha256 = "da46e472a05920225c3ae0caba21279dc817b7c8e77ae981b1ad6cf2083a49ad"; - name = "kmouth-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmouth-19.12.3.tar.xz"; + sha256 = "424dd4cf81cd43e47630ada0f2a9e47be8106b31ebf2e5c8c1077e55e3a8113f"; + name = "kmouth-19.12.3.tar.xz"; }; }; kmplot = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmplot-19.12.1.tar.xz"; - sha256 = "b82d9f9d4f3d3447e9125b42918819fe8effd5658d9a385da79e81e12f7466cf"; - name = "kmplot-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmplot-19.12.3.tar.xz"; + sha256 = "2743e3a472ccf40281f5afd9c6110dde6fb9bc437e8e291beba484d405d8152e"; + name = "kmplot-19.12.3.tar.xz"; }; }; knavalbattle = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/knavalbattle-19.12.1.tar.xz"; - sha256 = "1cc2c7fec2e2edc634cb1f83cf7e433522b0bc7d76c04cbcde66bb486a832856"; - name = "knavalbattle-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/knavalbattle-19.12.3.tar.xz"; + sha256 = "59875e10b0f2b06c2d3165f2f2457113f04550215947c8296ce1dcaf385ee37f"; + name = "knavalbattle-19.12.3.tar.xz"; }; }; knetwalk = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/knetwalk-19.12.1.tar.xz"; - sha256 = "95725a45c56956a2b8e8e2db36b6baedfc0271af0d6e3541d6143342e6f41ca5"; - name = "knetwalk-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/knetwalk-19.12.3.tar.xz"; + sha256 = "24cb7cfa4143b2ab1bcaf38a6698cd01252201238c6561bc711e0673366642ae"; + name = "knetwalk-19.12.3.tar.xz"; }; }; knights = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/knights-19.12.1.tar.xz"; - sha256 = "60ce0d76eb13c95ba81b0f2dfe5bd3e80ed2226319e4ef97150c3240f428d355"; - name = "knights-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/knights-19.12.3.tar.xz"; + sha256 = "4796654dcaff355b4f1097260748cfe04812ff926acc7ca0f037711875dd1512"; + name = "knights-19.12.3.tar.xz"; }; }; knotes = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/knotes-19.12.1.tar.xz"; - sha256 = "e89f22ee1a918553be5241e167bd038797391502cb98c5f260c96b25017dd235"; - name = "knotes-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/knotes-19.12.3.tar.xz"; + sha256 = "b27846609dfac1ffcb3ac5e7165b7557231b096f6a84206da956c37233aed7b0"; + name = "knotes-19.12.3.tar.xz"; }; }; kolf = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kolf-19.12.1.tar.xz"; - sha256 = "78c5e74d61f8c19b31d4d08781d12a87bc6101d0105081e0c15f4506e36ef6f5"; - name = "kolf-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kolf-19.12.3.tar.xz"; + sha256 = "2ba1f781d7d98ca0b10231e4f963b27d043c726f44da662b6c77105da4f9cffc"; + name = "kolf-19.12.3.tar.xz"; }; }; kollision = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kollision-19.12.1.tar.xz"; - sha256 = "a48515f63c0dbcc890aa9c01e344ea5bcb123e587459879796acc39a16243c09"; - name = "kollision-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kollision-19.12.3.tar.xz"; + sha256 = "ce0bb077e8db8a959f965d463bb25bac02c91585b422af6c9249ad8a8f25eaab"; + name = "kollision-19.12.3.tar.xz"; }; }; kolourpaint = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kolourpaint-19.12.1.tar.xz"; - sha256 = "a2db2312ddf79024358309da8b70cb2b9979d208372ce5f0960f662b8aab2518"; - name = "kolourpaint-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kolourpaint-19.12.3.tar.xz"; + sha256 = "7c134da2feb75a87bfda6b4265ef705868a9be03d70a828111a2869ca0b517b1"; + name = "kolourpaint-19.12.3.tar.xz"; }; }; kompare = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kompare-19.12.1.tar.xz"; - sha256 = "c2eede65a85d59067caf6161606c3de4f18ec6b5e824cb1da9e6b3a8f1b7a92d"; - name = "kompare-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kompare-19.12.3.tar.xz"; + sha256 = "b89b266b6f648500627d2e70df29b73248c7b7d7d5e7c1bbcaddaedf072f6f1a"; + name = "kompare-19.12.3.tar.xz"; }; }; konqueror = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/konqueror-19.12.1.tar.xz"; - sha256 = "20da57d7dd141e2c45345457ca90be26af28c2078224eb461dff9f9589889a09"; - name = "konqueror-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/konqueror-19.12.3.tar.xz"; + sha256 = "0f2b31a1dae1740839232bd646bf22d7cb57e34995584b9a96271ebcb0da7f0e"; + name = "konqueror-19.12.3.tar.xz"; }; }; konquest = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/konquest-19.12.1.tar.xz"; - sha256 = "178e42f76115f8e8b47494ea7732fb76a692debe714590c06d84f7071930b65a"; - name = "konquest-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/konquest-19.12.3.tar.xz"; + sha256 = "e23732a7d78382c73fca0d31afb3ed85614ee4b4bfe2f07647a13582fa0811a5"; + name = "konquest-19.12.3.tar.xz"; }; }; konsole = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/konsole-19.12.1.tar.xz"; - sha256 = "39797ed81c5ace12fd90f4a6e65c25d33db8e4385ab2baad2bd6a3b2db0ef075"; - name = "konsole-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/konsole-19.12.3.tar.xz"; + sha256 = "0bde8eb6365c53e96489d0ceb05baa0bb0385ee865492622033164a4c4bfccdc"; + name = "konsole-19.12.3.tar.xz"; }; }; kontact = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kontact-19.12.1.tar.xz"; - sha256 = "e9f7911154953d58be962bd392baf7d9c310e9e665adb0c875ed5a50dcfe5e01"; - name = "kontact-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kontact-19.12.3.tar.xz"; + sha256 = "8dbd01f73c181f7b44df5dfffac1cf33c36b36149294fd854403bada9ef33052"; + name = "kontact-19.12.3.tar.xz"; }; }; kontactinterface = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kontactinterface-19.12.1.tar.xz"; - sha256 = "a88b782b495d662920fd5f51c287c472c107c577af92431b4470787a78866b2c"; - name = "kontactinterface-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kontactinterface-19.12.3.tar.xz"; + sha256 = "1a0392cbeb6833f4834c86f202ff06e5b6069d12100bffe37de6427f0531af89"; + name = "kontactinterface-19.12.3.tar.xz"; }; }; kopete = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kopete-19.12.1.tar.xz"; - sha256 = "eca3610cc9607c27620c7c23f9bb54bdd80d2fb295adaf6636506597fc0b848d"; - name = "kopete-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kopete-19.12.3.tar.xz"; + sha256 = "8d58fb0c9dd8b651bfc996e6928f7ccdad8e21cba39ffd0e54d46f7145fa7b27"; + name = "kopete-19.12.3.tar.xz"; }; }; korganizer = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/korganizer-19.12.1.tar.xz"; - sha256 = "8bd84dfdca4f4738152c19d336b8c516f0c79fd888f0361005bc5d6359eeb117"; - name = "korganizer-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/korganizer-19.12.3.tar.xz"; + sha256 = "ea0a970aa510d5cdbbf80e974049fa3e7591e02c9ec2c4206137c49266df1acb"; + name = "korganizer-19.12.3.tar.xz"; }; }; kpat = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kpat-19.12.1.tar.xz"; - sha256 = "cb72a256a2a6a34bd8ee05e09b28f0eedee6643f24f793c5f67a9465040c30c3"; - name = "kpat-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kpat-19.12.3.tar.xz"; + sha256 = "00b823b1b204b68e0c8671e5ddfe5f96abe8c9fcfb1efa9b7f70191cfa5384e1"; + name = "kpat-19.12.3.tar.xz"; }; }; kpimtextedit = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kpimtextedit-19.12.1.tar.xz"; - sha256 = "253ded44f3ccb7de1a0a8879e45cc361c14dda2924619aeb04f4286c917f5475"; - name = "kpimtextedit-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kpimtextedit-19.12.3.tar.xz"; + sha256 = "64be03d7a8d4b9ece40c0065a23113023c2b3320dc57068fe00f6c4bc72537d5"; + name = "kpimtextedit-19.12.3.tar.xz"; }; }; kpkpass = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kpkpass-19.12.1.tar.xz"; - sha256 = "b5a079dc1c102c52e29c1d0da3e5a1e51bf9e0a666bb82d6b783f1b55eaa7ada"; - name = "kpkpass-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kpkpass-19.12.3.tar.xz"; + sha256 = "45723989170e86c6739c8a377c54b3ba7456a8dc3ed6cf52eef884074c2df189"; + name = "kpkpass-19.12.3.tar.xz"; }; }; kqtquickcharts = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kqtquickcharts-19.12.1.tar.xz"; - sha256 = "641f5c993e627dd6d0778066016d20196b7502e34ab793fcf17dd6b226d08ae8"; - name = "kqtquickcharts-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kqtquickcharts-19.12.3.tar.xz"; + sha256 = "94669a7add0cef9a1c0969a92ece8e60a67fbb0ff32826cc49ce87bd890c976c"; + name = "kqtquickcharts-19.12.3.tar.xz"; }; }; krdc = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/krdc-19.12.1.tar.xz"; - sha256 = "b3d9b9c43bfe5801d807be08172ca4c773ff6fc2d846cf5b2456c3360ca21824"; - name = "krdc-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/krdc-19.12.3.tar.xz"; + sha256 = "12602912abbc22e061067b6b5048d37a7cbdaaf99d203829d3f52fdf7319acce"; + name = "krdc-19.12.3.tar.xz"; }; }; kreversi = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kreversi-19.12.1.tar.xz"; - sha256 = "b81e6544ba23b0869329d734618b3bc4408b585d550985338e6d90bf2d3a17f3"; - name = "kreversi-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kreversi-19.12.3.tar.xz"; + sha256 = "6bfe3a2faa7c0d08fb689b75341bfd5881d66bc865445573b2f4dbb316a751e8"; + name = "kreversi-19.12.3.tar.xz"; }; }; krfb = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/krfb-19.12.1.tar.xz"; - sha256 = "7f25790480ac3a8db8a8bd847d80937a0ab763f6c5c12fa2ce704c4b24810287"; - name = "krfb-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/krfb-19.12.3.tar.xz"; + sha256 = "cb88997dc7b15b992d1de5c5cabaeccb37122e20823501ac29140875259782ee"; + name = "krfb-19.12.3.tar.xz"; }; }; kross-interpreters = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kross-interpreters-19.12.1.tar.xz"; - sha256 = "c5ec40971befd1d214d80c8c2ced3e30aaadfd2d4000ea782751f769783f8130"; - name = "kross-interpreters-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kross-interpreters-19.12.3.tar.xz"; + sha256 = "2b4060494901a68ca1d07e0c345cc0814e11fb84e9f48014a7231021e4377487"; + name = "kross-interpreters-19.12.3.tar.xz"; }; }; kruler = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kruler-19.12.1.tar.xz"; - sha256 = "0ecbc70561c0d973866c4bd27333a5ddc904b748fb3a64f66b6b06040b30d34a"; - name = "kruler-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kruler-19.12.3.tar.xz"; + sha256 = "803a0d31bbb5bfbfa057b13a7f6bbf7630dcc1816a0d41ea13cc4592bdacaa47"; + name = "kruler-19.12.3.tar.xz"; }; }; kshisen = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kshisen-19.12.1.tar.xz"; - sha256 = "a361dfc41595640287dd5b800921859ff17a45f7360e5e2fc6f520cc0e421afa"; - name = "kshisen-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kshisen-19.12.3.tar.xz"; + sha256 = "f6ce353725d71ce65269b1b7b3d118cb8555cd065db0d3b17fe4696d87c10601"; + name = "kshisen-19.12.3.tar.xz"; }; }; ksirk = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ksirk-19.12.1.tar.xz"; - sha256 = "4f71e4ef3b4d2041edd48537f4b475cb505fc54e45b39b81a08c82d4eec7cc8e"; - name = "ksirk-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ksirk-19.12.3.tar.xz"; + sha256 = "6387d7a6320e644157f10b94474ca715e7ad7fd15cdf7156a8e7d94bff019dcb"; + name = "ksirk-19.12.3.tar.xz"; }; }; ksmtp = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ksmtp-19.12.1.tar.xz"; - sha256 = "6c7d6ce91d65d7430cb31fb4a1fd44a600a5a459b3956807ee3180b5822dbac0"; - name = "ksmtp-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ksmtp-19.12.3.tar.xz"; + sha256 = "1fd69f494afee91c11667ddbba43bc6cc316b51acf5894fe4c3a2631f53fae27"; + name = "ksmtp-19.12.3.tar.xz"; }; }; ksnakeduel = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ksnakeduel-19.12.1.tar.xz"; - sha256 = "73e9c55cce88a6e5d00683c73382ee82db64bfe788c14c3a4eda8decf382188f"; - name = "ksnakeduel-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ksnakeduel-19.12.3.tar.xz"; + sha256 = "8db1dece78571f3e6933f8edcd693c3ceb1035acff780547a72c98b9f7decb87"; + name = "ksnakeduel-19.12.3.tar.xz"; }; }; kspaceduel = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kspaceduel-19.12.1.tar.xz"; - sha256 = "0bc1f1c12bcfc9e5c778918fb9fa644f5c7ec5c3e687c015d45a7c5c31a27834"; - name = "kspaceduel-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kspaceduel-19.12.3.tar.xz"; + sha256 = "a9b5dc498b3695b59ae8925cc572cfc521ccadc8532756fa95ac876a7423c444"; + name = "kspaceduel-19.12.3.tar.xz"; }; }; ksquares = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ksquares-19.12.1.tar.xz"; - sha256 = "955225b9fadbda464bdaf1b59c95c3d12310f84484a296968737e9fb87b37b46"; - name = "ksquares-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ksquares-19.12.3.tar.xz"; + sha256 = "45a922e4d85835cc655de560b6fd9be87d8cabc74eadbdecda3f17ba53ac92af"; + name = "ksquares-19.12.3.tar.xz"; }; }; ksudoku = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ksudoku-19.12.1.tar.xz"; - sha256 = "4dd72a5b0bb0c951508bbe2c60ce280efcd0414899e025a2ca4d92336576ec2a"; - name = "ksudoku-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ksudoku-19.12.3.tar.xz"; + sha256 = "1cf36e762f31464b0640a88c739dfbb39b10129cace7fb5b74093ec607dea06c"; + name = "ksudoku-19.12.3.tar.xz"; }; }; ksystemlog = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ksystemlog-19.12.1.tar.xz"; - sha256 = "497496ca7451cd34f193ba11fe3100479515a89a34f0437ca2f508a48e68e895"; - name = "ksystemlog-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ksystemlog-19.12.3.tar.xz"; + sha256 = "8225b1308ace76ebbf9bb805a2b6fae9bf8a425d0b09518645234c1b2df522dc"; + name = "ksystemlog-19.12.3.tar.xz"; }; }; kteatime = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kteatime-19.12.1.tar.xz"; - sha256 = "49a0531b64e93ceb29548a7f75da755e75afda001fce2e6ba906372456b5dc17"; - name = "kteatime-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kteatime-19.12.3.tar.xz"; + sha256 = "0ab5fb6e33583e6d627b8f9dfaba5ce59e2b363e8045dfc66a4f65236d56542f"; + name = "kteatime-19.12.3.tar.xz"; }; }; ktimer = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktimer-19.12.1.tar.xz"; - sha256 = "0c5fac1baddfa3144b8930f3d42b78a3eb8681d642a3c3339c903ad2cb30a2ba"; - name = "ktimer-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktimer-19.12.3.tar.xz"; + sha256 = "921af876a176a4731a74b5e9e76d751853043ec4f4857301b39a5c680246557c"; + name = "ktimer-19.12.3.tar.xz"; }; }; ktnef = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktnef-19.12.1.tar.xz"; - sha256 = "2fce576e517e6ae9001ade6f07a51fcfa899a6569bc4b8c3948827adfc0af20c"; - name = "ktnef-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktnef-19.12.3.tar.xz"; + sha256 = "3537515b432e5da00d401046e94e0098fa54c071246cb0e357e3d8f47296ed3c"; + name = "ktnef-19.12.3.tar.xz"; }; }; ktouch = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktouch-19.12.1.tar.xz"; - sha256 = "64b8a025f82b951c69c3be7aa7d3c23f14ccef9ed5e900776eb01462cff9a99f"; - name = "ktouch-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktouch-19.12.3.tar.xz"; + sha256 = "522fb081da5877717d577493fdaeeecbfe3d8d773e5d7fc83ecced008744ef0e"; + name = "ktouch-19.12.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-accounts-kcm-19.12.1.tar.xz"; - sha256 = "1ae81e4b7bae97d9d18c1fdc9e7083cc810b39d58dff5755dc9d78bd62551577"; - name = "ktp-accounts-kcm-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-accounts-kcm-19.12.3.tar.xz"; + sha256 = "ae5ae5004ecbf34596711a56e069d480c952de5ea784f5e90c391750439aff51"; + name = "ktp-accounts-kcm-19.12.3.tar.xz"; }; }; ktp-approver = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-approver-19.12.1.tar.xz"; - sha256 = "502a63f13db44fc8a28f64e37c43839b8da22086bf858dc9c492476d9ba14b50"; - name = "ktp-approver-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-approver-19.12.3.tar.xz"; + sha256 = "af4f6d247b6332745f6b6dfacef74eb2ea0f7bbea9398080fc7b57e5953fdfbd"; + name = "ktp-approver-19.12.3.tar.xz"; }; }; ktp-auth-handler = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-auth-handler-19.12.1.tar.xz"; - sha256 = "109583d4800d293fe11eeaa553d72643f2a3709c0d078a6e842f2e4b228d93e0"; - name = "ktp-auth-handler-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-auth-handler-19.12.3.tar.xz"; + sha256 = "40822e78879d97c3cc1d16f44f7d3b581980c4e249a273d7471b291adf3b9225"; + name = "ktp-auth-handler-19.12.3.tar.xz"; }; }; ktp-call-ui = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-call-ui-19.12.1.tar.xz"; - sha256 = "adb3025f8f878fd4a56ce125bd51c155f26b02661b9365b6321fb456153b0c55"; - name = "ktp-call-ui-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-call-ui-19.12.3.tar.xz"; + sha256 = "96b1dd64b0f87228d76f12b6cad3677afeb4c44d6f18645c3001555506573fb1"; + name = "ktp-call-ui-19.12.3.tar.xz"; }; }; ktp-common-internals = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-common-internals-19.12.1.tar.xz"; - sha256 = "4a1f189c1393164fba710e63b0e8f1aae6f22a5faacea0d86544e3e4a471603a"; - name = "ktp-common-internals-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-common-internals-19.12.3.tar.xz"; + sha256 = "48cde7fc4f2f0d39999f70699867044e0f85e06769a0824aac49c572fb1af5a4"; + name = "ktp-common-internals-19.12.3.tar.xz"; }; }; ktp-contact-list = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-contact-list-19.12.1.tar.xz"; - sha256 = "c293fa90899d496c4e29b9c9986a3864e06ef22dabbd4583123abbc232f4fe25"; - name = "ktp-contact-list-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-contact-list-19.12.3.tar.xz"; + sha256 = "093544e84ca12169966837be5f01d339ddc59e5f031d78e68ddf7be4dd890efd"; + name = "ktp-contact-list-19.12.3.tar.xz"; }; }; ktp-contact-runner = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-contact-runner-19.12.1.tar.xz"; - sha256 = "a86d8a67f3d8f3d741c6c4548a58cbdff384e8bd5ed5cd1d82db65456240ac0f"; - name = "ktp-contact-runner-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-contact-runner-19.12.3.tar.xz"; + sha256 = "50646e8670449d6f6a9b107e36f18174b5ec37052a7b4f471617f4f53fecc96b"; + name = "ktp-contact-runner-19.12.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-desktop-applets-19.12.1.tar.xz"; - sha256 = "63f1a0df6a392f41a54fda8c4896754c2687ba34968cf5bbc0ac84a37c1a1741"; - name = "ktp-desktop-applets-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-desktop-applets-19.12.3.tar.xz"; + sha256 = "4ab8f04537345db8e41ed9f8ff7a6a2f3135e3539382cef97d1a7e9f0eddb54e"; + name = "ktp-desktop-applets-19.12.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-filetransfer-handler-19.12.1.tar.xz"; - sha256 = "208aab8c78f4b7f38e331802a63fa10d00a65c115900c72c7a710b799ea56034"; - name = "ktp-filetransfer-handler-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-filetransfer-handler-19.12.3.tar.xz"; + sha256 = "b2e81fec33b51628d9d88707b6bd844c69eb2c9bfb00cb0b45759a4fd9769b03"; + name = "ktp-filetransfer-handler-19.12.3.tar.xz"; }; }; ktp-kded-module = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-kded-module-19.12.1.tar.xz"; - sha256 = "274f97c6874eeb2af14b937ed20430d2ac2e1a769890a70da8d477ac33ed6082"; - name = "ktp-kded-module-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-kded-module-19.12.3.tar.xz"; + sha256 = "6bb0c05683812738e254c88d39936565966096a7156111565d8a64a59c55ef0d"; + name = "ktp-kded-module-19.12.3.tar.xz"; }; }; ktp-send-file = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-send-file-19.12.1.tar.xz"; - sha256 = "5652e40e02ac191ad6e8df276a5faf8805000760261d495f3f4424416da3b977"; - name = "ktp-send-file-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-send-file-19.12.3.tar.xz"; + sha256 = "566d9dccc0c2fa7c23c95051c25543d3aabe76065ddff7dff9d8a37683d2022b"; + name = "ktp-send-file-19.12.3.tar.xz"; }; }; ktp-text-ui = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-text-ui-19.12.1.tar.xz"; - sha256 = "226efc09343bb9218c461858747a1bc084ad8291fbbcc9f49eb888acfe2039c6"; - name = "ktp-text-ui-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-text-ui-19.12.3.tar.xz"; + sha256 = "b8ad9a224ae300c0412874d0877fdc8e050869d3a8f60a4051a0919a8749c50f"; + name = "ktp-text-ui-19.12.3.tar.xz"; }; }; ktuberling = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktuberling-19.12.1.tar.xz"; - sha256 = "4c0d594ef72bd2dda5d42daf0f8b430319cbea6d28ba5c9725895b1221cdaace"; - name = "ktuberling-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktuberling-19.12.3.tar.xz"; + sha256 = "c4d74d18173d5761f7e6f8adf6178713a726c671aaa2eda4e6c77115484e9e55"; + name = "ktuberling-19.12.3.tar.xz"; }; }; kturtle = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kturtle-19.12.1.tar.xz"; - sha256 = "de10ea1ee142aea6fba8dee0d27d2e431aa806c6d7be4f5b5727cba8984e8d51"; - name = "kturtle-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kturtle-19.12.3.tar.xz"; + sha256 = "6958a88c484261919cd89cb1f0d163b0c5d5f1e28b10b3b4e3b6b9e82e379ef1"; + name = "kturtle-19.12.3.tar.xz"; }; }; kubrick = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kubrick-19.12.1.tar.xz"; - sha256 = "485e7e4a30b01cb2661c640214bdc71a3e0a8b61a9071c64ffbbe75e2270af3c"; - name = "kubrick-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kubrick-19.12.3.tar.xz"; + sha256 = "8fc0a0e68d255481c6efb3f4ff894c5e376367b29958c4738bd72d3f4b1ff557"; + name = "kubrick-19.12.3.tar.xz"; }; }; kwalletmanager = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kwalletmanager-19.12.1.tar.xz"; - sha256 = "b2370fbf559a3b8e8551daedada9c97d07041388dc74f8bd1286c64ab18b936b"; - name = "kwalletmanager-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kwalletmanager-19.12.3.tar.xz"; + sha256 = "247c7f80a54babd21a13e6b9386370b72ec12bdf928c08a7e8a647ccca53e393"; + name = "kwalletmanager-19.12.3.tar.xz"; }; }; kwave = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kwave-19.12.1.tar.xz"; - sha256 = "e6c336644c00a457b37820fc87668dd9b8a448d8abf84cda267b6e5cd01e0645"; - name = "kwave-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kwave-19.12.3.tar.xz"; + sha256 = "3c90115d4702dbe46767e2404c952d84533137fa558b787b87ff95ed61f6930d"; + name = "kwave-19.12.3.tar.xz"; }; }; kwordquiz = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kwordquiz-19.12.1.tar.xz"; - sha256 = "8ee204de56fe2bf33e11d19b9c0c21d7e3dcf26bf550f9dffa79b22a3082659f"; - name = "kwordquiz-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kwordquiz-19.12.3.tar.xz"; + sha256 = "6965a3b3c171c3f62aeecf4ccdddde14d23062ab914b1860822546a5770b80fc"; + name = "kwordquiz-19.12.3.tar.xz"; }; }; libgravatar = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libgravatar-19.12.1.tar.xz"; - sha256 = "84525db5f24c04cfa2bb44376a3bd64368e9d9478a160cf862c695052f3fc254"; - name = "libgravatar-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libgravatar-19.12.3.tar.xz"; + sha256 = "70ea306f48aede9f8f327eaa74ea5ce5761e5dfe67f2da50d3242c0f312edc86"; + name = "libgravatar-19.12.3.tar.xz"; }; }; libkcddb = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkcddb-19.12.1.tar.xz"; - sha256 = "50c139aaa14a5f27b3818cec7ec6ede4b764d461b6547651b61e4edd295afe6f"; - name = "libkcddb-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkcddb-19.12.3.tar.xz"; + sha256 = "69cbaf03adba24c0cabf957ee4149c4fa86d403eb6b8a07f7f80eb17be49e892"; + name = "libkcddb-19.12.3.tar.xz"; }; }; libkcompactdisc = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkcompactdisc-19.12.1.tar.xz"; - sha256 = "95b14098b24a86094b01b357e36ae135fb6c85c838e8735c843d27b101cc2bd9"; - name = "libkcompactdisc-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkcompactdisc-19.12.3.tar.xz"; + sha256 = "74aac7dcac84c60a7962f23e7bcc6eb693048fd96ca21015441a87487baa9d1c"; + name = "libkcompactdisc-19.12.3.tar.xz"; }; }; libkdcraw = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkdcraw-19.12.1.tar.xz"; - sha256 = "bbdd5b1b9b40780b5f2be567d9ba0ab163fe7dcc7121070b788106e0fe966c1e"; - name = "libkdcraw-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkdcraw-19.12.3.tar.xz"; + sha256 = "9454aed707ee311dbfb921f8d45fba11710ffc01f48d65f64585d12c2580116f"; + name = "libkdcraw-19.12.3.tar.xz"; }; }; libkdegames = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkdegames-19.12.1.tar.xz"; - sha256 = "317513544e08d03b2381bdb4c0bcd24c844dd8af7ccc4896569dd05933061d9c"; - name = "libkdegames-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkdegames-19.12.3.tar.xz"; + sha256 = "39cf5039b7fe11688028df026252c9cd4424546817b5bb635af2558f71ba6b20"; + name = "libkdegames-19.12.3.tar.xz"; }; }; libkdepim = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkdepim-19.12.1.tar.xz"; - sha256 = "1d626a959a0f9fcb24c4e01c553126d40314c789db9bc80d6b52f2bb75e233cd"; - name = "libkdepim-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkdepim-19.12.3.tar.xz"; + sha256 = "911e7d174240d4c056472549dbd1f3da4467a57c765f3cb34fbac32943f38dbb"; + name = "libkdepim-19.12.3.tar.xz"; }; }; libkeduvocdocument = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkeduvocdocument-19.12.1.tar.xz"; - sha256 = "a0e3921dab9d892d5efcddfbca548f230b508fc81ab4d7735c7610a710791816"; - name = "libkeduvocdocument-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkeduvocdocument-19.12.3.tar.xz"; + sha256 = "31594d30e03890507b25d676981164fd64258e69c6b264b85939118377eda964"; + name = "libkeduvocdocument-19.12.3.tar.xz"; }; }; libkexiv2 = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkexiv2-19.12.1.tar.xz"; - sha256 = "53b9a4ecda0f76df1a5b9f7b8184b85e847838cf97e4ad3036a6c5bb719993e5"; - name = "libkexiv2-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkexiv2-19.12.3.tar.xz"; + sha256 = "f5d0947f6b1ca0583d569990dc6f68bb01d8f7756a38bcc40b1e54f7814e4d4d"; + name = "libkexiv2-19.12.3.tar.xz"; }; }; libkgapi = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkgapi-19.12.1.tar.xz"; - sha256 = "8bfa16ab76b0042e2a0b827cf251b1155c0e693db39ffcb2805613d3393389cf"; - name = "libkgapi-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkgapi-19.12.3.tar.xz"; + sha256 = "f52923c382272b47782348fbadb32902fbcd4652f4100875a745ba57033cf48a"; + name = "libkgapi-19.12.3.tar.xz"; }; }; libkgeomap = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkgeomap-19.12.1.tar.xz"; - sha256 = "68c9c5b91e77a4b4a07ca646d58e8e890975825f8f851d850c95dacb7a1d90d2"; - name = "libkgeomap-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkgeomap-19.12.3.tar.xz"; + sha256 = "eb604deffe78cdcd4a8c7d888416246d0a17f2e3b7d80d6959e1412f03ab2755"; + name = "libkgeomap-19.12.3.tar.xz"; }; }; libkipi = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkipi-19.12.1.tar.xz"; - sha256 = "79f0a994b348467353425aea60dc4f4234c9a259cffcb55ac60d8c195bd0122c"; - name = "libkipi-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkipi-19.12.3.tar.xz"; + sha256 = "3a57d07cd4fe8e118558d807242bf483fa2aac1bcf3dcdc29139636c2b280786"; + name = "libkipi-19.12.3.tar.xz"; }; }; libkleo = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkleo-19.12.1.tar.xz"; - sha256 = "8e9b78fbeb861370ab81f98150ff9ea8afc960293ae8324fedd0b877302994a7"; - name = "libkleo-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkleo-19.12.3.tar.xz"; + sha256 = "1e715442a0c52ca561316abdce9662082f52ad9f3101ea01435a90984989a057"; + name = "libkleo-19.12.3.tar.xz"; }; }; libkmahjongg = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkmahjongg-19.12.1.tar.xz"; - sha256 = "e6a107a32c01c654a2372fda984724b4acd59dbc2902f3f9c7a7d9e14587639c"; - name = "libkmahjongg-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkmahjongg-19.12.3.tar.xz"; + sha256 = "f8ea23952a576e6081052d10e9c967bebe5db017ad62775183f91236158cc19f"; + name = "libkmahjongg-19.12.3.tar.xz"; }; }; libkomparediff2 = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkomparediff2-19.12.1.tar.xz"; - sha256 = "319d61742f7603a60d781151cd717291c5cb976ff0f2895df9d167526cfb0b4a"; - name = "libkomparediff2-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkomparediff2-19.12.3.tar.xz"; + sha256 = "aadc6e420e24bdebe203d4dfc76f5c23c8529be70ac057d89b516ab57b165094"; + name = "libkomparediff2-19.12.3.tar.xz"; }; }; libksane = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libksane-19.12.1.tar.xz"; - sha256 = "5a5998996848e83c80589c8ed0b1a6c1fa48bb61686288d199d831ac810e1603"; - name = "libksane-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libksane-19.12.3.tar.xz"; + sha256 = "0aab855b8414041c37ddfbb9f0732272206af1c0844376f1370b9d2a907af71d"; + name = "libksane-19.12.3.tar.xz"; }; }; libksieve = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libksieve-19.12.1.tar.xz"; - sha256 = "6c3d49e2ce4d8e6b7c1b4328aa6065a01c7711223dd4f3b9db3a542f9fc0a84c"; - name = "libksieve-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libksieve-19.12.3.tar.xz"; + sha256 = "990e6a15e7e88120bf6c744fe6f1ac78184d6470318005f24634a70219f45002"; + name = "libksieve-19.12.3.tar.xz"; }; }; lokalize = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/lokalize-19.12.1.tar.xz"; - sha256 = "ee29cff9a513d68cde72e6ace0f893de77be5cb3fe56b4b6e0d1fa5b808b424c"; - name = "lokalize-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/lokalize-19.12.3.tar.xz"; + sha256 = "8015c994e974fd51c1c7f5903a005bbbc25f094656bdd44cd5e8675cd69cea92"; + name = "lokalize-19.12.3.tar.xz"; }; }; lskat = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/lskat-19.12.1.tar.xz"; - sha256 = "0aa36c4cc554b708f7334b32362831537ea52db81b8480b80ffac5c27a041e8f"; - name = "lskat-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/lskat-19.12.3.tar.xz"; + sha256 = "5f13417ba9f6831a5f48c220a5c67a8d73787715b8b4aa433e6e356b7ac58776"; + name = "lskat-19.12.3.tar.xz"; }; }; mailcommon = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/mailcommon-19.12.1.tar.xz"; - sha256 = "160135049bc2e4984f14022af793a9ac05bf488faa6f9eb7bd86a094de1c9bfe"; - name = "mailcommon-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/mailcommon-19.12.3.tar.xz"; + sha256 = "d3999d290505b20aecbb4b14bec5af4d6a7db72d1f26f7a40b4aff231588c7e5"; + name = "mailcommon-19.12.3.tar.xz"; }; }; mailimporter = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/mailimporter-19.12.1.tar.xz"; - sha256 = "c1a042560438d6f6195a1f64355515489b74a44c1d2f5f547ced6785439215f1"; - name = "mailimporter-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/mailimporter-19.12.3.tar.xz"; + sha256 = "b81e8a5794aee24aa611c1a1912f93a308ce56c429ad4a72afe308e6b554c4a7"; + name = "mailimporter-19.12.3.tar.xz"; }; }; marble = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/marble-19.12.1.tar.xz"; - sha256 = "46ec0dcab4773ccfb843ae52881ae833b038a00b7690977a2e721099264dc8dd"; - name = "marble-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/marble-19.12.3.tar.xz"; + sha256 = "73a2c5234f8a1728e2a97499166e7bbf8dfb2f48d10fe8cff96380631d064627"; + name = "marble-19.12.3.tar.xz"; }; }; mbox-importer = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/mbox-importer-19.12.1.tar.xz"; - sha256 = "04dd6220192095d0f7befb368b9d96a321acac7af43b3575faf25ae89d17b5f4"; - name = "mbox-importer-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/mbox-importer-19.12.3.tar.xz"; + sha256 = "62fb1490517e0a49bf823946c8b747062cb970dbe00281d459adda73596f0046"; + name = "mbox-importer-19.12.3.tar.xz"; }; }; messagelib = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/messagelib-19.12.1.tar.xz"; - sha256 = "d2514ac31f78235340353701f735a15f69d99374a55566ec7702a3a5ddd23d05"; - name = "messagelib-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/messagelib-19.12.3.tar.xz"; + sha256 = "5e776d5ea7b0cbb246b03cf2bfc84a65a959e7433a7f80b77a5f67cfa7c23ccb"; + name = "messagelib-19.12.3.tar.xz"; }; }; minuet = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/minuet-19.12.1.tar.xz"; - sha256 = "735b340f9f0d6ee09c2c6aa76061282da6bd921f8b77683c53311731a77edff1"; - name = "minuet-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/minuet-19.12.3.tar.xz"; + sha256 = "740a3704004336f08c0fde148257c1562254b4e706704ec7eb2149fb3d7b6b9b"; + name = "minuet-19.12.3.tar.xz"; }; }; okular = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/okular-19.12.1.tar.xz"; - sha256 = "485044127c6bbe0d4c71f1518da15050957c06b8fe36633462367d15d684d4bd"; - name = "okular-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/okular-19.12.3.tar.xz"; + sha256 = "c5de22cc4292e3b7adae3f6ef6566dcba33a1dd5995fb0b968ea3e705a4c04e0"; + name = "okular-19.12.3.tar.xz"; }; }; palapeli = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/palapeli-19.12.1.tar.xz"; - sha256 = "ea4d9dd576066a610444680f3e8686f242bc8be9222020423acab52ec98a185f"; - name = "palapeli-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/palapeli-19.12.3.tar.xz"; + sha256 = "6989bbc94ed955f6990d40bccbc0c38768898bf2ccb8163c45119517340b723d"; + name = "palapeli-19.12.3.tar.xz"; }; }; parley = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/parley-19.12.1.tar.xz"; - sha256 = "54b91178a9bd1ff9c1817bd0df69a3a4bb9e4f3488f052034dd45e729f1325b6"; - name = "parley-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/parley-19.12.3.tar.xz"; + sha256 = "ebf9fdec981abca988d83d8a77e921e7ce871eb010b6cf4ea9065ee6d45f5089"; + name = "parley-19.12.3.tar.xz"; }; }; picmi = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/picmi-19.12.1.tar.xz"; - sha256 = "5428ef9add8dd9479f319b8c08fbfefca9ee34fbf503bee1c55b04ecf82ae9f9"; - name = "picmi-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/picmi-19.12.3.tar.xz"; + sha256 = "04a69125fc76b1fcd58d873452e4a4e642ee9ee672cdb7656214d8cd854fc178"; + name = "picmi-19.12.3.tar.xz"; }; }; pimcommon = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/pimcommon-19.12.1.tar.xz"; - sha256 = "d3058407ec578a32df82eb83eb7631d2904e75d6d345ed61dac0f3744840ebf5"; - name = "pimcommon-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/pimcommon-19.12.3.tar.xz"; + sha256 = "443e2915eb42a4f56f1ddf47785ceeceb4ca1e0384ff48bc93fc4a7756392766"; + name = "pimcommon-19.12.3.tar.xz"; }; }; pim-data-exporter = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/pim-data-exporter-19.12.1.tar.xz"; - sha256 = "3f650c1c221826079d7c739e4070e295a7a1b1156f75e8e3100b06f878efed12"; - name = "pim-data-exporter-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/pim-data-exporter-19.12.3.tar.xz"; + sha256 = "8e9961fcc4f1ed0305d589e3a417f8924657d89d798a77c53956d73f6bf19938"; + name = "pim-data-exporter-19.12.3.tar.xz"; }; }; pim-sieve-editor = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/pim-sieve-editor-19.12.1.tar.xz"; - sha256 = "3fdca7147c581dce4a014dc2d30bd7e6616c0559654cf9fee68e9292fd6ef037"; - name = "pim-sieve-editor-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/pim-sieve-editor-19.12.3.tar.xz"; + sha256 = "641ea56304df079a80e098fb253c173b63266990856f8795af093c144c3883ae"; + name = "pim-sieve-editor-19.12.3.tar.xz"; }; }; poxml = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/poxml-19.12.1.tar.xz"; - sha256 = "f02aa4d1f7de8fb38921fe73076b3e905185979d9b75ff6345efaca8aad0ebb9"; - name = "poxml-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/poxml-19.12.3.tar.xz"; + sha256 = "190178290ce18fe3a684c22d650843f3008a6e31ebbab8fff25491c58b21e276"; + name = "poxml-19.12.3.tar.xz"; }; }; print-manager = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/print-manager-19.12.1.tar.xz"; - sha256 = "76336be7da80a7494e2e5d5c9ab431047672a98630c7d61f916aa4b9edc35776"; - name = "print-manager-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/print-manager-19.12.3.tar.xz"; + sha256 = "74c13802a65136539b4542fec10fb248149a3324e8060e947a8f305ce665269a"; + name = "print-manager-19.12.3.tar.xz"; }; }; rocs = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/rocs-19.12.1.tar.xz"; - sha256 = "cc9ff080b05bd6c48ee438c968917d8eb6f6eccb45ca70b45c5e53dce396bb45"; - name = "rocs-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/rocs-19.12.3.tar.xz"; + sha256 = "f834e69e676913e364162906b79da5a75a6043f4a5c8506954d1630abda45e3c"; + name = "rocs-19.12.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/signon-kwallet-extension-19.12.1.tar.xz"; - sha256 = "a98397cc15733b9c1010f022a8d6bcf7727c4065ba6ae662273ba97864836bbe"; - name = "signon-kwallet-extension-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/signon-kwallet-extension-19.12.3.tar.xz"; + sha256 = "46199be023bad630b769b14c2c0a63feff2949da944c76780b1ebd9a50ee3daa"; + name = "signon-kwallet-extension-19.12.3.tar.xz"; }; }; spectacle = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/spectacle-19.12.1.tar.xz"; - sha256 = "140f388c531043eeefff8d639eb468d1ed33397925021c6809c0c8a799bb25c9"; - name = "spectacle-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/spectacle-19.12.3.tar.xz"; + sha256 = "443f114dab1fb50e7e12a046fdf06c0456bf99a3abdf09dce05605fdf7d3de81"; + name = "spectacle-19.12.3.tar.xz"; }; }; step = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/step-19.12.1.tar.xz"; - sha256 = "f171c58b567bb29ed50109b341e53dc00116e814c90f51aa7a6e405326982907"; - name = "step-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/step-19.12.3.tar.xz"; + sha256 = "0eb62c87553769e009daa02406b1d95742c946bdffe0d22327776ec558e7584b"; + name = "step-19.12.3.tar.xz"; }; }; svgpart = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/svgpart-19.12.1.tar.xz"; - sha256 = "6083457999121ead13b6c267211a78ea04c925d6f9f7447b31677c0b49f6898b"; - name = "svgpart-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/svgpart-19.12.3.tar.xz"; + sha256 = "942d877a516d8407ef2782d7c6869ab688274fee6cde9b23ab1061bcbddf2cc9"; + name = "svgpart-19.12.3.tar.xz"; }; }; sweeper = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/sweeper-19.12.1.tar.xz"; - sha256 = "50b1464c08b738f4af4c78b4edc291ce93877a52831b810cd12c8ca6a4df0cf9"; - name = "sweeper-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/sweeper-19.12.3.tar.xz"; + sha256 = "cf89cfba61c9eeda9b4e7921c21a23e7d9a110b134ab6fbd127c37d036bd0517"; + name = "sweeper-19.12.3.tar.xz"; }; }; umbrello = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/umbrello-19.12.1.tar.xz"; - sha256 = "077a1b5a3dfe15d37f03ee97ca5b40a1b8e7e0f2305df2f16a966861cc79e0d6"; - name = "umbrello-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/umbrello-19.12.3.tar.xz"; + sha256 = "b2f769c7bd1cc259170b62c68d2dca05b4a143dd1048dbb507cf2bbb3020a193"; + name = "umbrello-19.12.3.tar.xz"; }; }; yakuake = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/yakuake-19.12.1.tar.xz"; - sha256 = "abff4f358f41f544b2e12c340a74d92482241b1b95906b14add7810384602e42"; - name = "yakuake-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/yakuake-19.12.3.tar.xz"; + sha256 = "0e4f16eaf155750b0c35f1f8f1a625909f386f3359b9f23bf4e7c2f9045384e3"; + name = "yakuake-19.12.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/zeroconf-ioslave-19.12.1.tar.xz"; - sha256 = "39641a186de9d0704a58063a8a37cfb3a405ff6bd9957c7d09efec3bec4dfc60"; - name = "zeroconf-ioslave-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/zeroconf-ioslave-19.12.3.tar.xz"; + sha256 = "c9b2146030a9845b8164f5784d1c6fcc198b6cfe0e23f6a91edf78d093e4368f"; + name = "zeroconf-ioslave-19.12.3.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index e29a8ebfd19..bc3f846ad6c 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -166,6 +166,7 @@ mkDerivation rec { disallowedReferences = [ podofo.dev ]; calibreDesktopItem = makeDesktopItem { + fileValidation = false; # fails before substitution name = "calibre-gui"; desktopName = "calibre"; exec = "@out@/bin/calibre --detach %F"; @@ -212,6 +213,7 @@ mkDerivation rec { }; ebookEditDesktopItem = makeDesktopItem { + fileValidation = false; # fails before substitution name = "calibre-edit-book"; desktopName = "Edit E-book"; genericName = "E-book Editor"; @@ -224,6 +226,7 @@ mkDerivation rec { }; ebookViewerDesktopItem = makeDesktopItem { + fileValidation = false; # fails before substitution name = "calibre-ebook-viewer"; desktopName = "E-book Viewer"; genericName = "E-book Viewer"; diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 129516a4498..82d6272aadc 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,20 +1,41 @@ -{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool }: +{ fetchFromGitHub, fetchpatch, stdenv +, autoreconfHook, intltool, pkgconfig +, gtk3, xdotool, which, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "clipit"; - version = "1.4.2"; + version = "1.4.4"; - src = fetchurl { - url = "https://github.com/downloads/shantzu/ClipIt/${pname}-${version}.tar.gz"; - sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva"; + src = fetchFromGitHub { + owner = "shantzu"; + repo = "ClipIt"; + rev = "v${version}"; + sha256 = "05xi29v2y0rvb33fmvrz7r9j4l858qj7ngwd7dp4pzpkkaybjln0"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk2 xdotool ]; + patches = [ + # gtk3 support, can be removed in the next release + (fetchpatch { + url = "https://github.com/CristianHenzel/ClipIt/commit/22e012c7d406436e1785b6dd3c4c138b25f68431.patch"; + sha256 = "0la4gc324dzxpx6nk2lqg5fmjgjpm2pyvzwddmfz1il8hqvrqg3j"; + }) + ]; + + preConfigure = '' + intltoolize --copy --force --automake + ''; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook intltool ]; + configureFlags = [ "--with-gtk3" ]; + buildInputs = [ gtk3 ]; + + gappsWrapperArgs = [ + "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ xdotool which ]}" + ]; meta = with stdenv.lib; { description = "Lightweight GTK Clipboard Manager"; - homepage = "http://clipit.rspwn.com"; + inherit (src.meta) homepage; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/fusee-interfacee-tk/default.nix b/pkgs/applications/misc/fusee-interfacee-tk/default.nix index d74b6565ba3..91a7b0ed37f 100644 --- a/pkgs/applications/misc/fusee-interfacee-tk/default.nix +++ b/pkgs/applications/misc/fusee-interfacee-tk/default.nix @@ -3,13 +3,13 @@ let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]); in stdenv.mkDerivation rec { pname = "fusee-interfacee-tk"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "nh-server"; repo = pname; rev = "V${version}"; - sha256 = "0ycsxv71b5yvkcawxmcnmywxfvn8fdg1lyq71xdw7qrskxv5fgq7"; + sha256 = "0ngwbwsj999flprv14xvhk7lp51nprrvcnlbnbk6y4qx5casm5md"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 907a198ee3d..eeb76091aa8 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.25"; + version = "7.27"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0lml3hz2zxljl9j5wnh7bn9bj8k9v3wf6bk3g77x9nnarsmw0fcx"; + sha256 = "1yillax9npmz912c6qa6yijrqrbm1gaz2h69v2ab9fb127qv4anj"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix new file mode 100644 index 00000000000..9df4c59717c --- /dev/null +++ b/pkgs/applications/misc/kondo/default.nix @@ -0,0 +1,22 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "kondo"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "tbillington"; + repo = pname; + rev = "v${version}"; + sha256 = "1rrg0xfm3vn5jh861r4ismrga673g7v6qnzl2v1haflgjhvdazwd"; + }; + + cargoSha256 = "1y7g8gw9hsm997d6i99c3dj2gb8y8cgws5001n85f9bpnlvvmf9y"; + + meta = with stdenv.lib; { + description = "Save disk space by cleaning unneeded files from software projects"; + homepage = "https://github.com/tbillington/kondo"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index e9dba4bcf46..e4f797766e0 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -2,40 +2,41 @@ , pkgconfig , autoconf, automake, intltool, gettext , gtk, vte - , flavour ? "stable" }: assert lib.assertOneOf "flavour" flavour [ "stable" "git" ]; let + pname = "lilyterm"; stuff = if flavour == "stable" then rec { version = "0.9.9.4"; src = fetchurl { - url = "https://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"; + url = "https://lilyterm.luna.com.tw/file/${pname}-${version}.tar.gz"; sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp"; }; } else { - version = "2017-01-06"; + version = "2019-07-25"; src = fetchFromGitHub { owner = "Tetralet"; - repo = "lilyterm"; - rev = "20cce75d34fd24901c9828469d4881968183c389"; - sha256 = "0am0y65674rfqy69q4qz8izb8cq0isylr4w5ychi40jxyp68rkv2"; + repo = pname; + rev = "faf1254f46049edfb1fd6e9191e78b1b23b9c51d"; + sha256 = "054450gk237c62b677365bcwrijr63gd9xm8pv68br371wdzylz7"; }; }; in -stdenv.mkDerivation { - pname = "lilyterm"; +with stdenv.lib; +stdenv.mkDerivation rec { + inherit pname; inherit (stuff) src version; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake intltool gettext gtk vte ]; + nativeBuildInputs = [ pkgconfig autoconf automake intltool gettext ]; + buildInputs = [ gtk vte ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 53d6e398cf0..f20d5ccdc4a 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "opentx"; - version = "2.3.5"; + version = "2.3.7"; src = fetchFromGitHub { owner = "opentx"; repo = "opentx"; - rev = version; - sha256 = "18iv3c74y9fpp1045s2l7l2dqfn9riyagrwmfwp2mmf2ccsrwz2g"; + rev = "release/${version}"; + sha256 = "1wl3bk7s8h20dfys1hblzxc0br9zlwhcqlghgsbn81ki0xb6jmkf"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 4199e198c53..da7e501b271 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "sequeler"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; rev = "v${version}"; - sha256 = "16vc3v9qls9fxg9h8fsi67z68s4acl5hj14gbcrnqm7mf3kmk3aw"; + sha256 = "0ki8dganj6hmvg5qwdlc3y0a4pdmx7454np790yf5wnqb6ixb6gv"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext wrapGAppsHook python3 desktop-file-utils ]; @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { editor with language recognition, and visualize SELECT results in a Gtk.Grid Widget. ''; - homepage = https://github.com/Alecaddd/sequeler; + homepage = "https://github.com/Alecaddd/sequeler"; license = licenses.gpl3; maintainers = [ maintainers.etu ] ++ pantheon.maintainers; platforms = platforms.linux; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 7ec72eae6fa..195437250a1 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.15.0"; + version = "1.15.1"; sha256 = { - x86_64-linux = "08h3g2rw75k63ssd62c6jrb2dy9sz85y5jpfj5np64dvw70a1811"; + x86_64-linux = "1q1y5favj2ny0l2iq53vq39ns68zfr2z1plskxdg2d93jarvcr8x"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 645ed7433b3..90645c41d25 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchFromGitHub, cmake, openssl +{ stdenv, lib, fetchFromGitHub, cmake, openssl, qttools , ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver , xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, avahi-compat , withGUI ? true, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "synergy"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "symless"; @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl + ] ++ lib.optionals withGUI [ + qttools ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Carbon Cocoa CoreServices ScreenSaver ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index cb0ee20f555..798f1708ae7 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.19"; + version = "1.20"; src = fetchurl { url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}.0_amd64.deb"; - sha256 = "1w0l7k7wmbhwzv71cffsir0q7zg9m0617fmyvd4a01b6flpxrpfx"; + sha256 = "0w885xqy1304cp6b0jll5lvm6b1zd1ciqjl97d2hkdi8c9gv3bqx"; }; desktopItem = makeDesktopItem { name = "Todoist"; exec = "todoist"; desktopName = "Todoist"; - categories = "Utility;Productivity"; + categories = "Utility"; }; nativeBuildInputs = [ makeWrapper dpkg ]; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index f12f96871c0..12780ca73a1 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0j184s82bnnhrpm7vdsqg7i3xfm2wqz8jmwqxjkfw87ifgvaha5d"; + sha256 = "0pybj2h844x9vncwdcaymihyd1mwdnxxpnzpq0p29ra0cwmsxcgr"; }; - modSha256 = "14qbjv8rnidfqxzqhli7jyj4573s0swwypdj11mpykcrzk9by8xk"; + modSha256 = "00xvhajag25kfkizi2spv4ady3h06as43rnbjzfbv7z1mln844y4"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 252d9dd87c6..a205b402bc8 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "5.7.0"; + version = "5.10.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "14mqfjwff7mj3xckz4wkxlmqm6a0ci1bz0zj1h045ac8hfvw5k4k"; + sha256 = "06nxhrb5vnlq3sxybiyzdpbv6ah1zam7r07s1c31sv37znlb77d5"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 53d6e145dbf..167fe072ee5 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -140,8 +140,6 @@ let ./patches/no-build-timestamps.patch ./patches/widevine-79.patch ./patches/dont-use-ANGLE-by-default.patch - # fix race condition in the interaction with pulseaudio - ./patches/webrtc-pulse.patch # Unfortunately, chromium regularly breaks on major updates and # then needs various patches backported in order to be compiled with GCC. # Good sources for such patches and other hints: @@ -151,6 +149,9 @@ let # # ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ] # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) + ] ++ optionals (versionRange "80" "82.0.4076.0") [ + # fix race condition in the interaction with pulseaudio + (githubPatch "704dc99bd05a94eb61202e6127df94ddfd571e85" "0nzwzfwliwl0959j35l0gn94sbsnkghs3dh1b9ka278gi7q4648z") ] ++ optionals (useVaapi) [ # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi ./patches/vaapi-fix.patch @@ -291,6 +292,11 @@ let runHook postConfigure ''; + # Don't spam warnings about unknown warning options. This is useful because + # our Clang is always older than Chromium's and the build logs have a size + # of approx. 25 MB without this option (and this saves e.g. 66 %). + NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; + buildPhase = let # Build paralelism: on Hydra the build was frequently running into memory # exhaustion, and even other users might be running into similar issues. diff --git a/pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch b/pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch deleted file mode 100644 index cf24e270419..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 704dc99bd05a94eb61202e6127df94ddfd571e85 Mon Sep 17 00:00:00 2001 -From: Dale Curtis -Date: Mon, 02 Mar 2020 22:12:22 +0000 -Subject: [PATCH] Hold PulseAudio mainloop lock while querying input device info. - -a22cc23955cb3d58b7525c5103314226b3ce0137 moved this section out of -UpdateNativeAudioHardwareInfo(), but forgot to bring the lock along. - -R=guidou - -Bug: 1043040 -Change-Id: I5b17a2cf0ad55d61c0811db1dae7045af4a91370 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2083814 -Commit-Queue: Dale Curtis -Commit-Queue: Guido Urdaneta -Reviewed-by: Guido Urdaneta -Auto-Submit: Dale Curtis -Cr-Commit-Position: refs/heads/master@{#746115} ---- - -diff --git a/media/audio/pulse/audio_manager_pulse.cc b/media/audio/pulse/audio_manager_pulse.cc -index 90e9317..829846f 100644 ---- a/media/audio/pulse/audio_manager_pulse.cc -+++ b/media/audio/pulse/audio_manager_pulse.cc -@@ -104,22 +104,27 @@ - - AudioParameters AudioManagerPulse::GetInputStreamParameters( - const std::string& device_id) { -- int user_buffer_size = GetUserBufferSize(); -- int buffer_size = -- user_buffer_size ? user_buffer_size : kDefaultInputBufferSize; -- - UpdateNativeAudioHardwareInfo(); -- auto* operation = pa_context_get_source_info_by_name( -- input_context_, default_source_name_.c_str(), DefaultSourceInfoCallback, -- this); -- WaitForOperationCompletion(input_mainloop_, operation, input_context_); -+ -+ { -+ AutoPulseLock auto_lock(input_mainloop_); -+ auto* operation = pa_context_get_source_info_by_name( -+ input_context_, default_source_name_.c_str(), DefaultSourceInfoCallback, -+ this); -+ WaitForOperationCompletion(input_mainloop_, operation, input_context_); -+ } - - // We don't want to accidentally open a monitor device, so return invalid -- // parameters for those. -+ // parameters for those. Note: The value of |default_source_is_monitor_| -+ // depends on the the call to pa_context_get_source_info_by_name() above. - if (device_id == AudioDeviceDescription::kDefaultDeviceId && - default_source_is_monitor_) { - return AudioParameters(); - } -+ -+ const int user_buffer_size = GetUserBufferSize(); -+ const int buffer_size = -+ user_buffer_size ? user_buffer_size : kDefaultInputBufferSize; - return AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, - CHANNEL_LAYOUT_STEREO, - native_input_sample_rate_ ? native_input_sample_rate_ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 0e939f2fd21..7b44919043a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "177hv5jkgpcbi6khk7j883rf3rzzkjmi8cqqpzckaiw7pcwsvyvd"; - sha256bin64 = "0sicz51d2l3gj70mfpyh5idwarjl19pba5lc6ahznxxqsrjfp80r"; - version = "81.0.4044.69"; + sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; + sha256bin64 = "1y70kmfz9nv507b0zdda7zfk2ac9qh9m2gq00aphdmzd0al7skj8"; + version = "81.0.4044.92"; }; dev = { - sha256 = "0s0072rmg287iijh6wwm9i5a5fsh96qm6nhd13xwbxrvj6pldb7n"; - sha256bin64 = "0l5ljjz0s5x9727syq4gs5xshl9vs8apvw6xw8il0xy5qax32g85"; - version = "82.0.4083.0"; + sha256 = "1rydvjmv62zj95sf0fgsyipqz2hphbxm60y8q0813wq9ym35d4yy"; + sha256bin64 = "1m6740lw7xjjp1lplwp9ii4d3l7dfa9jrv5bysm4ar5pb9kywrai"; + version = "83.0.4100.3"; }; stable = { - sha256 = "07icl3hgg1wjkmz88lbpjf6ll4xyi64spki1nmsy6899jgkxvgjh"; - sha256bin64 = "0qgp6hv4qj04v6pzfx9ggjvcl1vi6ljjc3cpi4hfr67p4jab40ji"; - version = "80.0.3987.149"; + sha256 = "0ikk4cgz3jgjhyncsvlqvlc03y7jywjpa6v34fwsjxs88flyzpdn"; + sha256bin64 = "1ks0i6vdxbmixnfz2b128yf9hsk5pm9x2j17nm3xg3245k0z22xr"; + version = "80.0.3987.163"; }; } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index e129542d530..16996dff391 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.11.1811.49-1"; + version = "2.11.1811.51-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0xn23jmh8pqp1hc0q6nysc8x9xgpypzqr4wz2rzqyald4asxj60v"; + sha256 = "1a0qqkizidvaxvk9j9rqca1jxw17i1rkj83rz2ki3f09hnfssxn8"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index ee7c4ab9cbd..1318ff003de 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.102.0"; in +let version = "0.106.3"; in buildGoModule { pname = "helmfile"; @@ -10,12 +10,12 @@ buildGoModule { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0v7mhsnhswiqd62wrmkcpzsg9nfi6wvkh9danngs5rqjiz1zffhy"; + sha256 = "0pwkkgdcj9vx6nk574iaqwn074qfpgqd1c44d3kr3xdbac89yfyf"; }; goPackagePath = "github.com/roboll/helmfile"; - modSha256 = "0s7j7jbgr8gdc0s9dnl6zjwkpywqj05xyb7mkcank54kgrz0g5vq"; + modSha256 = "1yv2b44qac0rms66v0qg13wsga0di6hwxa4dh2l0b1xvaf75ysay"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 99326a20bfa..1cf76e1cff3 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,25 +2,23 @@ buildGoModule rec { pname = "k9s"; - version = "0.17.7"; - # rev is the release commit, mainly for version command output - rev = "8fedc42304ce33df314664eb0c4ac73be59065af"; + version = "0.18.1"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "0bqx1ckk89vzmk6fmqmv03cbdvw0agwrqzywzw35b4n0di37x0nv"; + sha256 = "0a5x4yamvx2qlwngfvainbhplwp0hqwgvdqlj2jbrbz4hfhr1l59"; }; buildFlagsArray = '' -ldflags= -s -w -X github.com/derailed/k9s/cmd.version=${version} - -X github.com/derailed/k9s/cmd.commit=${rev} + -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - modSha256 = "06m4xgl29zx6zpqx630m9cm52wmljms9cvly5f4pqdb4zicq7n86"; + modSha256 = "0wpf6iyq6p3a8azdkn17gdp01wq9khyzr1bab6qgvsnsnhnjzcky"; meta = with stdenv.lib; { description = "Kubernetes CLI To Manage Your Clusters In Style."; diff --git a/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch b/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch deleted file mode 100644 index ae407727b9d..00000000000 --- a/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b0ab95b9664916618ebf5fe637b1bc4de4ba9a6e Mon Sep 17 00:00:00 2001 -From: "Wael M. Nasreddine" -Date: Wed, 14 Aug 2019 23:07:51 -0700 -Subject: [PATCH] fix the hash of gomodules.xyz/jsonpatch/v2 - ---- - go.sum | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/go.sum b/go.sum -index 6bb130b4d9b..b3f48a85d4a 100644 ---- a/go.sum -+++ b/go.sum -@@ -452,7 +452,7 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138 h1:H3uGjxCR/6Ds0Mjgyp7LMK8 - golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= - golang.org/x/tools v0.0.0-20190404132500-923d25813098 h1:MtqjsZmyGRgMmLUgxnmMJ6RYdvd2ib8ipiayHhqSxs4= - golang.org/x/tools v0.0.0-20190404132500-923d25813098/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= --gomodules.xyz/jsonpatch/v2 v2.0.0 h1:lHNQverf0+Gm1TbSbVIDWVXOhZ2FpZopxRqpr2uIjs4= -+gomodules.xyz/jsonpatch/v2 v2.0.0 h1:OyHbl+7IOECpPKfVK42oFr6N7+Y2dR+Jsb/IiDV3hOo= - gomodules.xyz/jsonpatch/v2 v2.0.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= - google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= - google.golang.org/api v0.0.0-20181021000519-a2651947f503/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix index 1c802802c09..0b2f798d35b 100644 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -2,56 +2,51 @@ buildGoModule rec { pname = "prow-unstable"; - version = "2019-08-14"; - rev = "35a7744f5737bbc1c4e1256a9c9c5ad135c650e4"; + version = "2020-04-01"; + rev = "32e3b5ce7695fb622381421653db436cb57b47c5"; src = fetchFromGitHub { inherit rev; owner = "kubernetes"; repo = "test-infra"; - sha256 = "07kdlzrj59xyaa73vlx4s50fpg0brrkb0h0cyjgx81a0hsc7s03k"; + sha256 = "0mc3ynmbf3kidibdy8k3v3xjlvmxl8w7zm1z2m0skmhd0y4bpmk4"; }; - patches = [ - # https://github.com/kubernetes/test-infra/pull/13918 - ./13918-fix-go-sum.patch - ]; - - modSha256 = "06q1zvhm78k64aj475k1xl38h7nk83mysd0bja0wknja048ymgsq"; + modSha256 = "1xajdg10a27icc7g1y3ym4pkgg64rp4afybbjlhbg3k3whir9xa1"; subPackages = [ - "./prow/cmd/admission" - "./prow/cmd/artifact-uploader" - "./prow/cmd/branchprotector" - "./prow/cmd/build" - "./prow/cmd/checkconfig" - "./prow/cmd/clonerefs" - "./prow/cmd/config-bootstrapper" - "./prow/cmd/crier" - "./prow/cmd/deck" - "./prow/cmd/entrypoint" - "./prow/cmd/gcsupload" - "./prow/cmd/gerrit" - "./prow/cmd/hook" - "./prow/cmd/horologium" - "./prow/cmd/initupload" - "./prow/cmd/jenkins-operator" - "./prow/cmd/mkbuild-cluster" - "./prow/cmd/mkpj" - "./prow/cmd/mkpod" - "./prow/cmd/peribolos" - "./prow/cmd/phaino" - "./prow/cmd/phony" - "./prow/cmd/pipeline" - "./prow/cmd/plank" - "./prow/cmd/sidecar" - "./prow/cmd/sinker" - "./prow/cmd/status-reconciler" - "./prow/cmd/sub" - "./prow/cmd/tackle" - "./prow/cmd/tide" - "./prow/cmd/tot" + "prow/cmd/admission" + "prow/cmd/branchprotector" + "prow/cmd/checkconfig" + "prow/cmd/clonerefs" + "prow/cmd/cm2kc" + "prow/cmd/config-bootstrapper" + "prow/cmd/crier" + "prow/cmd/deck" + "prow/cmd/entrypoint" + "prow/cmd/exporter" + "prow/cmd/gcsupload" + "prow/cmd/gerrit" + "prow/cmd/hook" + "prow/cmd/horologium" + "prow/cmd/initupload" + "prow/cmd/jenkins-operator" + "prow/cmd/mkbuild-cluster" + "prow/cmd/mkpj" + "prow/cmd/mkpod" + "prow/cmd/peribolos" + "prow/cmd/phaino" + "prow/cmd/phony" + "prow/cmd/pipeline" + "prow/cmd/plank" + "prow/cmd/sidecar" + "prow/cmd/sinker" + "prow/cmd/status-reconciler" + "prow/cmd/sub" + "prow/cmd/tackle" + "prow/cmd/tide" + "prow/cmd/tot" ]; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 4a8b2a2e664..53b421ec552 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.10.5"; + version = "0.11.0"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "0j0ybbv4ix864scmghy1lvr3rs2fbj49cva6x48kbwli4y447758"; + sha256 = "0krdfaha19wzi10rh0wfhki5nknbd5mndaxhrq7y9m840xy43d6d"; }; - modSha256 = "165zqmannlylkzaz9gkmcrlyx8rfhz70ahzhiks4ycgq1qxr0av9"; + modSha256 = "1wb15vrkb4ryvrjp68ygmadnf78s354106ya210pnmsbb53rbhaz"; meta = with lib; { description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index b78ab3f6dda..d07b6321cb2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -1,5 +1,13 @@ # Generated with ./update-all { + aci = + { + owner = "terraform-providers"; + repo = "terraform-provider-aci"; + rev = "v0.1.8"; + version = "0.1.8"; + sha256 = "14hya00ygz0khljjxwvkp6wbrbsavh2n8f26s2mjakph2havb8a3"; + }; acme = { owner = "terraform-providers"; @@ -8,17 +16,25 @@ version = "1.5.0"; sha256 = "1h53bgflchavnn4laf801d920bsgqqg0ph4slnf7y1fpb0mz5vdv"; }; + akamai = + { + owner = "terraform-providers"; + repo = "terraform-provider-akamai"; + rev = "v0.5.0"; + version = "0.5.0"; + sha256 = "18l1ik10pn4aq0911sqnfjw9a5zxrm0qbsgynvf5vxc02zds13n5"; + }; alicloud = { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - rev = "v1.70.1"; - version = "1.70.1"; - sha256 = "19bhnnw5gh4pqap8y23v57lyk27z7fw1wb4p0faj860kdf2zpq4j"; + rev = "v1.77.0"; + version = "1.77.0"; + sha256 = "0g8i8dmxzgkzylh2hh4fa9nq6x8bmxqaz0ly0f0cijb82lcbc3qf"; }; archive = { - owner = "terraform-providers"; + owner = "hashicorp"; repo = "terraform-provider-archive"; rev = "v1.3.0"; version = "1.3.0"; @@ -32,37 +48,53 @@ version = "1.1.0"; sha256 = "1akl9fzgm5qv01vz18xjzyqjnlxw699qq4x8vr96j16l1zf10h99"; }; - atlas = + auth0 = { owner = "terraform-providers"; - repo = "terraform-provider-atlas"; - rev = "v0.1.1"; - version = "0.1.1"; - sha256 = "0k73vv14vnjl5qm33w54s5zzi0mmk1kn2zs3qkfq71aqi9ml7d14"; + repo = "terraform-provider-auth0"; + rev = "v0.8.1"; + version = "0.8.1"; + sha256 = "0hfmbw76p99xa9jz2sjss56p4wzqqhnf9l9gqgyamywfrdd2bn57"; + }; + aviatrix = + { + owner = "terraform-providers"; + repo = "terraform-provider-aviatrix"; + rev = "v2.12.0"; + version = "2.12.0"; + sha256 = "01n3cqb5k8gd0cll3nqbdmnx3mi0scm57j0xpzhxnif14kpj15g6"; + }; + avi = + { + owner = "terraform-providers"; + repo = "terraform-provider-avi"; + rev = "v0.2.1"; + version = "0.2.1"; + sha256 = "1pyknx5maq1qxm4i2y69iz9c2ym3q3n0fd4hbwxcl83n39cb5iy6"; }; aws = { owner = "terraform-providers"; repo = "terraform-provider-aws"; - rev = "v2.45.0"; - version = "2.45.0"; - sha256 = "0416f32wy88zyagnwcf2flh1rh7i118b9h5qn8fwrm3sv43p3blm"; + rev = "v2.55.0"; + version = "2.55.0"; + sha256 = "0pxmwdy5cin0navva1nf3l02yrqqbg01xcq3hf8w0ch8fgr8mr25"; }; azuread = { owner = "terraform-providers"; repo = "terraform-provider-azuread"; - rev = "v0.7.0"; - version = "0.7.0"; - sha256 = "1a7w31dvjz5498445ia4m5gd1js3k7ghz6qqfq51f2n86iafs0xq"; + rev = "v0.8.0"; + version = "0.8.0"; + sha256 = "0vljhjbizxh5s8f2ki7yn6hzf5xbn5swhxmq9wpxmg7jw5z0k6ha"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - rev = "v1.41.0"; - version = "1.41.0"; - sha256 = "0ma291m9d452wavjr3lgyik01r8napmwz91bbnbfzp1j48hhqc4h"; + rev = "v2.3.0"; + version = "2.3.0"; + sha256 = "195r6l0ddpjmmf947c1k5v0vdscnhsg2ilp6x7pna418pnx84y2d"; }; azurestack = { @@ -72,21 +104,29 @@ version = "0.9.0"; sha256 = "1msm7jwzry0vmas3l68h6p0migrsm6d18zpxcncv197m8xbvg324"; }; + baiducloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-baiducloud"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "1va0b9vqfcv2nrqh8jwf80ylyl1x826jhb7h4ghnf18c144qm0i1"; + }; bigip = { owner = "terraform-providers"; repo = "terraform-provider-bigip"; - rev = "v1.1.1"; - version = "1.1.1"; - sha256 = "15rx25fbvdmgvg5n0qnq1hyfnr7l4nx8igdb4107g41fp73bxg32"; + rev = "v1.12"; + version = "1.12"; + sha256 = "0yjv0xldplx7jfld1izzc7i93bzwdqrjjzymq02isy2xyfh8by35"; }; bitbucket = { owner = "terraform-providers"; repo = "terraform-provider-bitbucket"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "06bjagbgpgfphwym015wl00wx6qf7lsdig0fhpxqaykvlkn3sg49"; + rev = "v1.2.0"; + version = "1.2.0"; + sha256 = "11n4wpvmaab164g6k077n9dbdbhd5lwl7pxpha5492ks468nd95b"; }; brightbox = { @@ -96,6 +136,14 @@ version = "1.2.0"; sha256 = "0s1b2k58r2kmjrdqrkw2dlfpby79i81gml9rpa10y372bwq314zd"; }; + checkpoint = + { + owner = "terraform-providers"; + repo = "terraform-provider-checkpoint"; + rev = "v1.0.1"; + version = "1.0.1"; + sha256 = "1z2m8lbnplcfaij1xnclyhl4zlchx6bmvrc2fr4hwfzc58m9v7ra"; + }; chef = { owner = "terraform-providers"; @@ -104,13 +152,21 @@ version = "0.2.0"; sha256 = "0ihn4706fflmf0585w22l7arzxsa9biq4cgh8nlhlp5y0zy934ns"; }; - circonus = + cherryservers = { owner = "terraform-providers"; - repo = "terraform-provider-circonus"; - rev = "v0.5.0"; - version = "0.5.0"; - sha256 = "0m6xbmgbismsmxnh79xb9p3mvy9aqdwvmsvifpxsbd73lki232mc"; + repo = "terraform-provider-cherryservers"; + rev = "v1.0.0"; + version = "1.0.0"; + sha256 = "1z6ai6q8aw38kiy8x13rp0dsvb4jk40cv8pk5c069q15m4jab8lh"; + }; + ciscoasa = + { + owner = "terraform-providers"; + repo = "terraform-provider-ciscoasa"; + rev = "v1.2.0"; + version = "1.2.0"; + sha256 = "033pgy42qwjpmjyzylpml7sfzd6dvvybs56cid1f6sm4ykmxbal7"; }; clc = { @@ -124,9 +180,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - rev = "v2.3.0"; - version = "2.3.0"; - sha256 = "031xb0g1g74gc44nadbgrfn59hzjr5q0s98lgxrglsdm5mfgzdfr"; + rev = "v2.5.0"; + version = "2.5.0"; + sha256 = "1dqxn2iwbidmfb0850sicwqh4yp6ynarkl36lnr8nqw9lasvqr5a"; }; cloudscale = { @@ -156,25 +212,25 @@ { owner = "terraform-providers"; repo = "terraform-provider-consul"; - rev = "v2.6.1"; - version = "2.6.1"; - sha256 = "17lgfanz3by7wfrgqbwbsbxs46mrr8a1iyqkj38qc8xg0m6pg97v"; + rev = "v2.7.0"; + version = "2.7.0"; + sha256 = "11c54waq7w34l79ak4kizjkmh8zjca5ygh9yib691hdmxsx2cifj"; }; datadog = { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - rev = "v2.6.0"; - version = "2.6.0"; - sha256 = "05ijf01sxdxrxc3ii68ha8b6x8pz025kfa51i91q42ldhf3kqhsz"; + rev = "v2.7.0"; + version = "2.7.0"; + sha256 = "0cq11cjcm2nlszqhsrj425mk8dp0h5ljrrn7jplrbffp8g6wvadd"; }; digitalocean = { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - rev = "v1.12.0"; - version = "1.12.0"; - sha256 = "137p8q30pv28h5gfqag0i44dxbc1dbq239gnzbb4hkzgsqgrb9gp"; + rev = "v1.15.1"; + version = "1.15.1"; + sha256 = "0nld6lgz5vy8n4s0y0wpssrslp866rha2znli6pd5sw1nvi6yg0z"; }; dme = { @@ -184,29 +240,37 @@ version = "0.1.0"; sha256 = "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv"; }; - dns = + dnsimple = { owner = "terraform-providers"; + repo = "terraform-provider-dnsimple"; + rev = "v0.3.0"; + version = "0.3.0"; + sha256 = "1m38whc6jx5mccaisnbnkawwlz1bxvy991rqy6h9xb10zyvqar62"; + }; + dns = + { + owner = "hashicorp"; repo = "terraform-provider-dns"; rev = "v2.2.0"; version = "2.2.0"; sha256 = "11xdxj6hfclaq9glbh14nihmrsk220crm9ld8bdv77w0bppmrrch"; }; - dnsimple = - { - owner = "terraform-providers"; - repo = "terraform-provider-dnsimple"; - rev = "v0.2.0"; - version = "0.2.0"; - sha256 = "0jj82fffqaz7gramj5d4avx7vka6w190yz4r9q7628qh8ih2pfhz"; - }; docker = { owner = "terraform-providers"; repo = "terraform-provider-docker"; - rev = "v2.6.0"; - version = "2.6.0"; - sha256 = "12qq7m75yxfczik78klqaimrzhp70m2vk5q0h3v8b2dwvvynj0dg"; + rev = "v2.7.0"; + version = "2.7.0"; + sha256 = "0pl515xjnic7mhfvqbml1z1win5mrhjdqb84jhd5n09j39lb24gx"; + }; + dome9 = + { + owner = "terraform-providers"; + repo = "terraform-provider-dome9"; + rev = "v1.17.0"; + version = "1.17.0"; + sha256 = "123phc71rnb25lv9glybadhmr3pdsrbzl7xm6mj8j213a78qdmn5"; }; dyn = { @@ -216,9 +280,17 @@ version = "1.2.0"; sha256 = "1a3kxmbib2y0nl7gnxknbhsflj5kfknxnm3gjxxrb2h5d2kvqy48"; }; - external = + exoscale = { owner = "terraform-providers"; + repo = "terraform-provider-exoscale"; + rev = "v0.16.1"; + version = "0.16.1"; + sha256 = "0gs39nx12ws0ikal9zyqkyfiljbxbw0pj7llj9xsq96s7crvy6xr"; + }; + external = + { + owner = "hashicorp"; repo = "terraform-provider-external"; rev = "v1.2.0"; version = "1.2.0"; @@ -228,25 +300,41 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - rev = "v0.12.1"; - version = "0.12.1"; - sha256 = "1bczp7rdbpmycbky9ijirfix2capw0hjai4c7w5hmm4wda5spwb1"; + rev = "v0.13.0"; + version = "0.13.0"; + sha256 = "0mcjmk21fil4q98p8v3qln7s2fqbdkjv1pvba0cf9v9d101dhhi9"; }; flexibleengine = { owner = "terraform-providers"; repo = "terraform-provider-flexibleengine"; - rev = "v1.10.0"; - version = "1.10.0"; - sha256 = "1ys1dd7knfk3hic6ph4gi7qsf75s2m5mxkil16p3f9ywvfxpzq8w"; + rev = "v1.11.1"; + version = "1.11.1"; + sha256 = "12kgnq2ydwi2n29y0dc7r251zrnq8kkskiq8p5ypsrm23j3jm6dw"; + }; + fortios = + { + owner = "terraform-providers"; + repo = "terraform-provider-fortios"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "0m006ah351f2ih7zvd3pnpga4d8mh42i4m8af4wflhvyzkw50xnf"; + }; + genymotion = + { + owner = "terraform-providers"; + repo = "terraform-provider-genymotion"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "02jpr3cm7rrf810c69sr6lcxzvxpnf7icc5z80gnvg67wwfg4ph4"; }; github = { owner = "terraform-providers"; repo = "terraform-provider-github"; - rev = "v2.3.0"; - version = "2.3.0"; - sha256 = "02fd6rq25ms9lpjqn4n1wy13i2mnl9lvczpgjqlz69yj2aiwyw34"; + rev = "v2.5.1"; + version = "2.5.1"; + sha256 = "1lqnwq5gsz34n6zzwajxrh0i1cbyicl4zxakr4fch7makri2fqwg"; }; gitlab = { @@ -256,21 +344,21 @@ version = "2.5.0"; sha256 = "1g7girhjks6p7rcs82p2zd8clp6kdfn6d1synlmfwiw6d3496fvf"; }; - google = - { - owner = "terraform-providers"; - repo = "terraform-provider-google"; - rev = "v3.5.0"; - version = "3.5.0"; - sha256 = "09mlic67940bnq5f8a7magn27k2jm8hvq3z0zh2cv6a9gdpg821i"; - }; google-beta = { owner = "terraform-providers"; repo = "terraform-provider-google-beta"; - rev = "v3.5.0"; - version = "3.5.0"; - sha256 = "1qkfvvidvb2j76x095vprj2vm272lig38a8rbxsir2kkvkmnzv5l"; + rev = "v3.15.0"; + version = "3.15.0"; + sha256 = "1xncw82y48dcc464v2gzfmr94l3kgh9x2rlmpmmy6g4mihiwh38b"; + }; + google = + { + owner = "terraform-providers"; + repo = "terraform-provider-google"; + rev = "v3.15.0"; + version = "3.15.0"; + sha256 = "0vw7sndy441xn34kiv2k9hq9p9g649amh7bk91rf0f5p8cmyll1c"; }; grafana = { @@ -280,61 +368,77 @@ version = "1.5.0"; sha256 = "0zy3bqgpxymp2zygaxzllk1ysdankwxa1sy1djfgr4fs2nlggkwi"; }; + gridscale = + { + owner = "terraform-providers"; + repo = "terraform-provider-gridscale"; + rev = "v1.5.0"; + version = "1.5.0"; + sha256 = "05nzia9sa555k07gkhyyckdgn9n6a50w8l3id69rjq1jjh0pngd7"; + }; hcloud = { owner = "terraform-providers"; repo = "terraform-provider-hcloud"; - rev = "v1.15.0"; - version = "1.15.0"; - sha256 = "0l554mf6s248j0453b4r5pafshcvhn2smk4pp23y9kq5g1xd0xmd"; + rev = "v1.16.0"; + version = "1.16.0"; + sha256 = "09v2bg4ffyh4ibz449dygxgd7mvjgh4b2r242l3cwi7pzn66imrz"; }; hedvig = { owner = "terraform-providers"; repo = "terraform-provider-hedvig"; - rev = "v1.0.5"; - version = "1.0.5"; - sha256 = "0dic4kqjwi3s8pss1pmgixnr7xi503gl5i7pcx66fam5y5ar92v5"; + rev = "v1.1.1"; + version = "1.1.1"; + sha256 = "1gd26jm9frn52hy2vm5sv003lbai5sjgdign6akhjmw5sdsmfr05"; }; helm = { owner = "terraform-providers"; repo = "terraform-provider-helm"; - rev = "v0.10.4"; - version = "0.10.4"; - sha256 = "0xl0wgh1j6yhymadqvlj21qddxfzaxk3d5wpzskfmhfk732795rc"; + rev = "v1.1.1"; + version = "1.1.1"; + sha256 = "0sna0xaibdh1aw3lxs1r2hidw95lxkpm4fqdw0hzmdqxwdmg4b40"; }; heroku = { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - rev = "v2.2.1"; - version = "2.2.1"; - sha256 = "145kfm4asca0ksprb076mjdhs5ahrlrad8cqz8spxra5fa3j46sq"; + rev = "v2.3.0"; + version = "2.3.0"; + sha256 = "1lv3l54fw6rgj2ixkz2dvaf3djj3slhrm0nlbza5c7zjb945igfq"; }; http = { - owner = "terraform-providers"; + owner = "hashicorp"; repo = "terraform-provider-http"; - rev = "v1.1.1"; - version = "1.1.1"; - sha256 = "0ah4wi9gm5m7z0wyy6vn3baz2iw2sq7ah7q0lb9srwr887aai3x0"; + rev = "v1.2.0"; + version = "1.2.0"; + sha256 = "0q8ichbqrq62q1j0rc7sdz1jzfwg2l9v4ac9jqf6y485dblhmwqd"; + }; + huaweicloudstack = + { + owner = "terraform-providers"; + repo = "terraform-provider-huaweicloudstack"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "1zzf7jbvdlccfbb4cmw2k3mlfj4hh0lv59zahq2zy8afiajsb68i"; }; huaweicloud = { owner = "terraform-providers"; repo = "terraform-provider-huaweicloud"; - rev = "v1.12.0"; - version = "1.12.0"; - sha256 = "1wcr1d9y6bnwjh6b0a49i566wyn0d8bjnxnpgmd4s6wmr9sc4l0b"; + rev = "v1.13.0"; + version = "1.13.0"; + sha256 = "1caix3lycqnd856z6c3zp9mmq3vr7rblwhhbkwn4rrcld8sv285j"; }; icinga2 = { owner = "terraform-providers"; repo = "terraform-provider-icinga2"; - rev = "v0.2.0"; - version = "0.2.0"; - sha256 = "02ladn2w75k35vn8llj3zh9hbpnnnvpm47c9f29zshfs04acwbq0"; + rev = "v0.3.0"; + version = "0.3.0"; + sha256 = "0xwjxb84glhp9viqykziwanj696w2prq4r7k0565k0w3qiaz440v"; }; ignition = { @@ -344,6 +448,14 @@ version = "1.2.1"; sha256 = "0wd29iw0a5w7ykgs9m1mmi0bw5z9dl4z640qyz64x8rlh5hl1wql"; }; + incapsula = + { + owner = "terraform-providers"; + repo = "terraform-provider-incapsula"; + rev = "v2.1.0"; + version = "2.1.0"; + sha256 = "12zw2m7j52rszfawywbiv9rgv976h1w6bp98012qn45d4ap2kvzy"; + }; influxdb = { owner = "terraform-providers"; @@ -352,13 +464,29 @@ version = "1.3.0"; sha256 = "19af40g8hgz2rdz6523v0fs71ww7qdlf2mh5j9vb7pfzriqwa5k9"; }; + jdcloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-jdcloud"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "04vz0m3z9rfw2hp0h3jhn625r2v37b319krznvhqylqzksv39dzf"; + }; kubernetes = { owner = "terraform-providers"; repo = "terraform-provider-kubernetes"; - rev = "v1.10.0"; - version = "1.10.0"; - sha256 = "04hd9n9jm72fi81cmdz0yf374fg52r8yinsxy0ag29rd3r2l1k81"; + rev = "v1.11.1"; + version = "1.11.1"; + sha256 = "13m0g52i2z4s58grk22rv0yqbrfszfbxxhwisb5mi7cma4cp7506"; + }; + launchdarkly = + { + owner = "terraform-providers"; + repo = "terraform-provider-launchdarkly"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "1gj0srv8shn6qg109y1g42dx8dybkp3qrjn412bvs6f063ggk0zs"; }; librato = { @@ -372,13 +500,13 @@ { owner = "terraform-providers"; repo = "terraform-provider-linode"; - rev = "v1.9.1"; - version = "1.9.1"; - sha256 = "10f7nij91fhgf1808r6rv3l13nz7p37mcln5p3nfvhsxskss3vxn"; + rev = "v1.9.2"; + version = "1.9.2"; + sha256 = "1nrk8fi0fwkcm4csrppjwv7vd2ilpbj01dywak696nj8b15w176q"; }; local = { - owner = "terraform-providers"; + owner = "hashicorp"; repo = "terraform-provider-local"; rev = "v1.4.0"; version = "1.4.0"; @@ -396,9 +524,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-logicmonitor"; - rev = "v1.2.1"; - version = "1.2.1"; - sha256 = "1fcv5g92l6xr4x69h9rg48zazjr99wrz9mkmr122fyq9s7kdd98y"; + rev = "v1.3.0"; + version = "1.3.0"; + sha256 = "00d8qx95cxaif636dyh935nv9nn6lmb1ybxy7n4myy9g80y50ap1"; }; mailgun = { @@ -408,6 +536,30 @@ version = "0.4.1"; sha256 = "1l76pg4hmww9zg2n4rkhm5dwjh42fxri6d41ih1bf670krkxwsmz"; }; + matchbox = + { + owner = "poseidon"; + repo = "terraform-provider-matchbox"; + rev = "v0.3.0"; + version = "0.3.0"; + sha256 = "1nq7k8qa7rv8xyryjigwpwcwvj1sw85c4j46rkfdv70b6js25jz3"; + }; + metalcloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-metalcloud"; + rev = "v2.2.0"; + version = "2.2.0"; + sha256 = "0xii9gk96srzi9y4pbvlx2cvwypll4igvk89f9qrg18qrw72ags3"; + }; + mongodbatlas = + { + owner = "terraform-providers"; + repo = "terraform-provider-mongodbatlas"; + rev = "v0.4.2"; + version = "0.4.2"; + sha256 = "0cb8dh7bwz9yzyhz8v9j6ksi4dgmmz8d1qpm7234rj36ccirnjmz"; + }; mysql = { owner = "terraform-providers"; @@ -416,49 +568,65 @@ version = "1.9.0"; sha256 = "14gxxki3jhncv3s2x828ns2vgmf2xxzigdyp9b54mbkw5rnv1k2g"; }; + ncloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-ncloud"; + rev = "v1.2.0"; + version = "1.2.0"; + sha256 = "1h2fr0ss58dr3ypqj6kw90iyji6s83sz2i85vhs5z2adjbk7h8va"; + }; netlify = { owner = "terraform-providers"; repo = "terraform-provider-netlify"; - rev = "v0.3.0"; - version = "0.3.0"; - sha256 = "0mmbli6d3fbpyvvdfsg32f1w83g8ga3x21b36rgmx3mn156r7yij"; + rev = "v0.4.0"; + version = "0.4.0"; + sha256 = "07xds84k2vgpvn2cy3id7hmzg57sz2603zs4msn3ysxmi28lmqyg"; }; newrelic = { owner = "terraform-providers"; repo = "terraform-provider-newrelic"; - rev = "v1.12.1"; - version = "1.12.1"; - sha256 = "17xdwhiyzfjxirvjwwl5jnan84i3zd930zch8l4jx04946vjzsc5"; + rev = "v1.16.0"; + version = "1.16.0"; + sha256 = "0ddfffyrw28syg0y2q9j7xh4k2sjb8l40167rwgz19w39p1caffv"; + }; + nixos = + { + owner = "tweag"; + repo = "terraform-provider-nixos"; + rev = "v0.0.1"; + version = "0.0.1"; + sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf"; }; nomad = { owner = "terraform-providers"; repo = "terraform-provider-nomad"; - rev = "v1.4.2"; - version = "1.4.2"; - sha256 = "0h0snkzqdi4g5lp78f5pq98x6556ldwgkg9p9jkmrg04y7928w5v"; + rev = "v1.4.4"; + version = "1.4.4"; + sha256 = "05029s8h8vx7pl0y3d9cd5nlww3483caxhwkbrmk0vs7zdgxk8ns"; }; ns1 = { owner = "terraform-providers"; repo = "terraform-provider-ns1"; - rev = "v1.6.4"; - version = "1.6.4"; - sha256 = "08wg5qlqj7id5gfwxckjyx1ypfkiq919vjzq8qsdayg9sr9dpf5i"; + rev = "v1.8.0"; + version = "1.8.0"; + sha256 = "1h1pqrj11wdi0fnrrh2mkwahi59jl2vd8affy4acx7kny4n92s49"; }; nsxt = { owner = "terraform-providers"; repo = "terraform-provider-nsxt"; - rev = "v1.1.2"; - version = "1.1.2"; - sha256 = "1hnxivad7371j363sp3460mfzl5alb3dhxsbp0qwfl5mzvriwrbl"; + rev = "v2.0.0"; + version = "2.0.0"; + sha256 = "0fka793r0c06sz8vlxk0z7vbm6kab5xzk39r5pznkq34004r17sl"; }; null = { - owner = "terraform-providers"; + owner = "hashicorp"; repo = "terraform-provider-null"; rev = "v2.1.2"; version = "2.1.2"; @@ -476,9 +644,25 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - rev = "v3.59.0-rc1"; - version = "3.59.0-rc1"; - sha256 = "1pgl95rmxk9h9whbkfgpzpbvvkhnm3223flqk73w673ylgrxss49"; + rev = "v3.69.0"; + version = "3.69.0"; + sha256 = "17vndv6bpa9ajs7llnf64bb482b15virbv311d3ds5lrva4vvrv8"; + }; + oktaasa = + { + owner = "terraform-providers"; + repo = "terraform-provider-oktaasa"; + rev = "v1.0.0"; + version = "1.0.0"; + sha256 = "093d5r8dz8gryk8qp5var2qrrgkvs1gwgw3zqpxry9xc5cpn30w0"; + }; + okta = + { + owner = "terraform-providers"; + repo = "terraform-provider-okta"; + rev = "v3.1.1"; + version = "3.1.1"; + sha256 = "1hky6hqrfyl2gj1lykb7gazj9awjgsxhc028558whm5rysx2wpsr"; }; oneandone = { @@ -496,29 +680,37 @@ version = "1.3.7"; sha256 = "01g09w8mqfp1d8phplsdj0vz63q5bgq9fqwy2kp4vrnwb70dq52w"; }; + opennebula = + { + owner = "terraform-providers"; + repo = "terraform-provider-opennebula"; + rev = "v0.1.1"; + version = "0.1.1"; + sha256 = "048cqd89fz5xpji1w8ylg75nbzzcx1c5n89y1k0ra8d3g2208yb2"; + }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - rev = "v1.25.0"; - version = "1.25.0"; - sha256 = "1yqc7nhmzlcq48csn23ma3fv6yb6cmkqqrxv63jjg6bxb7nyyqxd"; + rev = "v1.26.0"; + version = "1.26.0"; + sha256 = "1vsvzs8112vbi0x99yg6niw0wr55p09x7cg85qwjd0r42gpfdfq2"; }; opentelekomcloud = { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - rev = "v1.15.0"; - version = "1.15.0"; - sha256 = "080lzs40m3vny5bmg4vhsy7qz884c44ysmh325hi6s3v76dv4jxg"; + rev = "v1.16.0"; + version = "1.16.0"; + sha256 = "1bxkh8qnm1mw37wi4rxf29q8lksp864124nwbyn14fwb4h6m1yj4"; }; opsgenie = { owner = "terraform-providers"; repo = "terraform-provider-opsgenie"; - rev = "v0.2.7"; - version = "0.2.7"; - sha256 = "0yylf5iv1dba9naqys65l5whym3q0bwpn98dwxr0lyj0skr8nz7r"; + rev = "v0.2.9"; + version = "0.2.9"; + sha256 = "13y6awnm9j5qzq1bcmhg7ngzvx43h2dw9wmzdfi1xcpmv1ldvwpi"; }; oraclepaas = { @@ -532,25 +724,25 @@ { owner = "terraform-providers"; repo = "terraform-provider-ovh"; - rev = "v0.6.0"; - version = "0.6.0"; - sha256 = "0hj029q9j2751hnay0rh0c8yxgmv2wd6xjwi12gkj6k6rmpgqfdh"; + rev = "v0.7.0"; + version = "0.7.0"; + sha256 = "167msjsl8xh8zy7lrxvkq2h98xpvxpsjzlil8lcxqmz8qq8a0q5f"; }; packet = { owner = "terraform-providers"; repo = "terraform-provider-packet"; - rev = "v2.7.3"; - version = "2.7.3"; - sha256 = "1dd9fa416crh5y61qyaj2l0jhn1kh0ndkzqdw3lsxjqdhcqppbns"; + rev = "v2.8.0"; + version = "2.8.0"; + sha256 = "1qnjla347hll0fav0ngnifblk6slbmh1klnm7k9jv327jmv92hz5"; }; pagerduty = { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - rev = "v1.4.1"; - version = "1.4.1"; - sha256 = "0dmafnlziyczad907isjqzsn1fyjzc8pdigp3m6114bbnca0ry5k"; + rev = "v1.5.1"; + version = "1.5.1"; + sha256 = "12n12sx1qxckqklcaphzr0j9bcwzrl6p8qzdc3d2csiqccqrpdas"; }; panos = { @@ -560,13 +752,21 @@ version = "1.6.2"; sha256 = "1qy6jynv61zhvq16s8jkwjhxz7r65cmk9k37ahh07pbhdx707mz5"; }; + pass = + { + owner = "camptocamp"; + repo = "terraform-provider-pass"; + rev = "1.2.1"; + version = "1.2.1"; + sha256 = "1hf5mvgz5ycp7shiy8px205d9kwswfjmclg7mlh9a55bkraffahk"; + }; postgresql = { owner = "terraform-providers"; repo = "terraform-provider-postgresql"; - rev = "v1.4.0"; - version = "1.4.0"; - sha256 = "162j6dyrbc9r4ipj6igj64wm6r65l4vb0dlwczfhlksix3qzr3kx"; + rev = "v1.5.0"; + version = "1.5.0"; + sha256 = "1c9vn1jpfan04iidzn030q21bz3xabrd5pdhlbblblf558ykn4q0"; }; powerdns = { @@ -584,13 +784,29 @@ version = "1.4.4"; sha256 = "0pzcl3pdhaykihvv1v38zrv607mydchvkzrzhwcakgmdkp3vq54i"; }; + pureport = + { + owner = "terraform-providers"; + repo = "terraform-provider-pureport"; + rev = "v1.1.8"; + version = "1.1.8"; + sha256 = "02vmqwjz5m5hj4zghwicjp27dxvc4qsiwj4gjsi66w6djdqnh4h1"; + }; rabbitmq = { owner = "terraform-providers"; repo = "terraform-provider-rabbitmq"; - rev = "v1.2.0"; - version = "1.2.0"; - sha256 = "1lhra8dvfyi6gn4s8mjd3lkkj6bz8y7xjhw1ki2kl5vpfw79d4l9"; + rev = "v1.3.0"; + version = "1.3.0"; + sha256 = "1adkbfm0p7a9i1i53bdmb34g5871rklgqkx7kzmwmk4fvv89n6g8"; + }; + rancher2 = + { + owner = "terraform-providers"; + repo = "terraform-provider-rancher2"; + rev = "v1.8.1"; + version = "1.8.1"; + sha256 = "15pvz1sd1x932yxdp7d679vax3dw56bfhp3422vxqsgmdgscwg1s"; }; rancher = { @@ -602,7 +818,7 @@ }; random = { - owner = "terraform-providers"; + owner = "hashicorp"; repo = "terraform-provider-random"; rev = "v2.2.1"; version = "2.2.1"; @@ -636,25 +852,49 @@ { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - rev = "v1.13.0"; - version = "1.13.0"; - sha256 = "085wv59cfsaac2373gn783lknzp4qmgnrgi2yl1g27znm4b940i7"; + rev = "v1.14.0"; + version = "1.14.0"; + sha256 = "0j428pinwyyldg1jhlkad32213z98q3891yv906d6n7jg2bk5m6a"; + }; + secret = + { + owner = "tweag"; + repo = "terraform-provider-secret"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "09gv0fpsrxzgna0xrhrdk8d4va9s0gvdbz596r306qxb4mip4w3r"; + }; + segment = + { + owner = "ajbosco"; + repo = "terraform-provider-segment"; + rev = "v0.2.0"; + version = "0.2.0"; + sha256 = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz"; }; selectel = { owner = "terraform-providers"; repo = "terraform-provider-selectel"; - rev = "v3.0.0"; - version = "3.0.0"; - sha256 = "0fr97j85inaqvdqmlfk3xcq73zvncn001nsd03pp2ws30qqa8p7r"; + rev = "v3.1.0"; + version = "3.1.0"; + sha256 = "1ajhnjlx4bf91z04cp8245j3h2h9c30ajf934zr29jvwli0y3piw"; + }; + signalfx = + { + owner = "terraform-providers"; + repo = "terraform-provider-signalfx"; + rev = "v4.18.6"; + version = "4.18.6"; + sha256 = "1xjajkvkcksz0dnawjb3hv14ysp140g0vdj5warshafz8hjbys17"; }; skytap = { owner = "terraform-providers"; repo = "terraform-provider-skytap"; - rev = "v0.13.0"; - version = "0.13.0"; - sha256 = "1why3ipi5a7whf18z87f97lbzdj020hfp8gxpgzl0nwpzpwkhdz3"; + rev = "v0.14.0"; + version = "0.14.0"; + sha256 = "01cscykfw5qilf5rlvh7y2l3bqbv8f180ssqw7zqzyr9p4m6511l"; }; softlayer = { @@ -668,9 +908,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-spotinst"; - rev = "v1.13.4"; - version = "1.13.4"; - sha256 = "063lhm065y6qh9b2k11qjnqyfg5zrx6wa3bqrm7d1dqcha1i6d9f"; + rev = "v1.14.3"; + version = "1.14.3"; + sha256 = "06brm0bvr13f31km55y8bp4z1xj3imfi11k7l5nirjp73cbvcpmg"; + }; + stackpath = + { + owner = "terraform-providers"; + repo = "terraform-provider-stackpath"; + rev = "v1.3.0"; + version = "1.3.0"; + sha256 = "0gsr903v6fngaxm2r5h53g9yc3jpx2zccqq07rhzm9jbsfb6rlzn"; }; statuscake = { @@ -690,7 +938,7 @@ }; template = { - owner = "terraform-providers"; + owner = "hashicorp"; repo = "terraform-provider-template"; rev = "v2.1.2"; version = "2.1.2"; @@ -700,9 +948,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-tencentcloud"; - rev = "v1.30.1"; - version = "1.30.1"; - sha256 = "0gy7c3w217yzysv9hyrsw3q452g0iba9z72iijyfwcqm79gw3208"; + rev = "v1.30.7"; + version = "1.30.7"; + sha256 = "0d7byng63sxbgn8f5r92lkcaqvq3r0plm619h63f47h6z6z8xarc"; }; terraform = { @@ -716,13 +964,13 @@ { owner = "terraform-providers"; repo = "terraform-provider-tfe"; - rev = "v0.11.4"; - version = "0.11.4"; - sha256 = "0ls5736cwshj3z1wgpbcma6bml9p45k5g7hm530bmqdxsamxfj1m"; + rev = "v0.15.1"; + version = "0.15.1"; + sha256 = "0372yjifsr4kvbc36hzhzf6ajlg6wy1r2x94p67m7rgr2fw061n2"; }; tls = { - owner = "terraform-providers"; + owner = "hashicorp"; repo = "terraform-provider-tls"; rev = "v2.1.1"; version = "2.1.1"; @@ -740,9 +988,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-ucloud"; - rev = "v1.15.1"; - version = "1.15.1"; - sha256 = "1djlpjig8y6x149r6f21x7y3p49fjvrxx7pbs2fpsyv437zff9vj"; + rev = "v1.17.0"; + version = "1.17.0"; + sha256 = "0dpy3bkrm20sk4zpkikas5c8ygl0zf9v6cnd34iblw1m41f44n7v"; }; ultradns = { @@ -756,57 +1004,57 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - rev = "v2.7.1"; - version = "2.7.1"; - sha256 = "1lvpgdyi8qk1bvz9i1wml22mmm5ga8kf413xmpj966wvxqsgw6z5"; + rev = "v2.9.0"; + version = "2.9.0"; + sha256 = "0a1jkwxz45qcbnd91im0xz948k197zal78n6y45bwcbqnil32yiy"; }; vcd = { owner = "terraform-providers"; repo = "terraform-provider-vcd"; - rev = "v2.6.0"; - version = "2.6.0"; - sha256 = "0f7c5l05h0xcq51yaqpx1v3lg4wmysszayysvcspipiwzrhx5cmg"; + rev = "v2.7.0"; + version = "2.7.0"; + sha256 = "0bh8hqxpy6722q1v9cnpvn8fqwh5llzz1aavrbsib5brgjc8vqmy"; + }; + venafi = + { + owner = "terraform-providers"; + repo = "terraform-provider-venafi"; + rev = "v0.9.2"; + version = "0.9.2"; + sha256 = "06nk5c7lxs8fc04sz97lc3yk1zk1b9phkzw6fj9fnmpgaak87bj9"; + }; + vra7 = + { + owner = "terraform-providers"; + repo = "terraform-provider-vra7"; + rev = "v0.5.0"; + version = "0.5.0"; + sha256 = "123yskwgzp771nx03sg49vwi5ph3zf2ajf06s7msj0blvz6wan4v"; }; vsphere = { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - rev = "v1.15.0"; - version = "1.15.0"; - sha256 = "1hxzxkqphm00gp0d1s32xn0knxgf5vg05nq68ba3q27wpx4ipanl"; + rev = "v1.17.0"; + version = "1.17.0"; + sha256 = "16fglpfy8grlifaa1d1ymvjys7wh39m6py8h45g1xgs1jyfkz00s"; }; - yandex = + vthunder = { owner = "terraform-providers"; - repo = "terraform-provider-yandex"; - rev = "v0.28.0"; - version = "0.28.0"; - sha256 = "1ml96cqjvxzapb76fpblgl6ak15idv3jj5wcs9ix0dr6i2fdfwpc"; + repo = "terraform-provider-vthunder"; + rev = "v0.1.0"; + version = "0.1.0"; + sha256 = "1mw55g0kjgp300p6y4s8wc91fgfxjm0cbszfzgbc8ca4b00j8cc2"; }; - segment = + vultr = { - owner = "ajbosco"; - repo = "terraform-provider-segment"; - rev = "v0.2.0"; - version = "0.2.0"; - sha256 = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz"; - }; - pass = - { - owner = "camptocamp"; - repo = "terraform-provider-pass"; - rev = "1.2.1"; - version = "1.2.1"; - sha256 = "1hf5mvgz5ycp7shiy8px205d9kwswfjmclg7mlh9a55bkraffahk"; - }; - matchbox = - { - owner = "poseidon"; - repo = "terraform-provider-matchbox"; - rev = "v0.3.0"; - version = "0.3.0"; - sha256 = "1nq7k8qa7rv8xyryjigwpwcwvj1sw85c4j46rkfdv70b6js25jz3"; + owner = "terraform-providers"; + repo = "terraform-provider-vultr"; + rev = "v1.1.4"; + version = "1.1.4"; + sha256 = "14anp7b759yyh78ickas52amads2lmwg85h8i0ikln7qhrhl42d7"; }; wavefront = { @@ -816,20 +1064,12 @@ version = "2.1.1"; sha256 = "0cbs74kd820i8f13a9jfbwh2y5zmmx3c2mp07qy7m0xx3m78jksn"; }; - nixos = + yandex = { - owner = "tweag"; - repo = "terraform-provider-nixos"; - rev = "v0.0.1"; - version = "0.0.1"; - sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf"; - }; - secret = - { - owner = "tweag"; - repo = "terraform-provider-secret"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "09gv0fpsrxzgna0xrhrdk8d4va9s0gvdbz596r306qxb4mip4w3r"; + owner = "terraform-providers"; + repo = "terraform-provider-yandex"; + rev = "v0.35.0"; + version = "0.35.0"; + sha256 = "10zj5s0zdgh54rlczyvkq292v9xj1ivvn2k9ml65l6j3h0axlgxv"; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 4e7a2c6964c..c3c44160c1b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -15,18 +15,126 @@ let src = fetchFromGitHub { inherit owner repo rev sha256; }; - - # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. postBuild = "mv go/bin/${repo}{,_v${version}}"; }; -in - { + + # Google is now using the vendored go modules, which works a bit differently + # and is not 100% compatible with the pre-modules vendored folders. + # + # Instead of switching to goModules which requires a goModSha256, patch the + # goPackage derivation so it can install the top-level. + patchGoModVendor = drv: + drv.overrideAttrs (attrs: { + buildFlags = "-mod=vendor"; + + # override configurePhase to not move the source into GOPATH + configurePhase = '' + export GOPATH=$NIX_BUILD_TOP/go:$GOPATH + export GOCACHE=$TMPDIR/go-cache + export GO111MODULE=on + ''; + + # just build and install into $GOPATH/bin + buildPhase = '' + go install -mod=vendor -v -p 16 . + ''; + + # don't run the tests, they are broken in this setup + doCheck = false; + }); + + # These providers are managed with the ./update-all script + automated-providers = lib.mapAttrs (_: toDrv) list; + + # These are the providers that don't fall in line with the default model + special-providers = { + # Override the google providers + google = patchGoModVendor automated-providers.google; + google-beta = patchGoModVendor automated-providers.google-beta; + + # providers that were moved to the `hashicorp` organization, + # but haven't updated their references yet: + + # https://github.com/hashicorp/terraform-provider-archive/pull/67 + archive = automated-providers.archive.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-archive hashicorp/terraform-provider-archive + substituteInPlace main.go --replace terraform-providers/terraform-provider-archive hashicorp/terraform-provider-archive + ''; + }); + + # https://github.com/hashicorp/terraform-provider-dns/pull/101 + dns = automated-providers.dns.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-dns hashicorp/terraform-provider-dns + substituteInPlace main.go --replace terraform-providers/terraform-provider-dns hashicorp/terraform-provider-dns + ''; + }); + + # https://github.com/hashicorp/terraform-provider-external/pull/41 + external = automated-providers.external.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-external hashicorp/terraform-provider-external + substituteInPlace main.go --replace terraform-providers/terraform-provider-external hashicorp/terraform-provider-external + ''; + }); + + # https://github.com/hashicorp/terraform-provider-http/pull/40 + http = automated-providers.http.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-http hashicorp/terraform-provider-http + substituteInPlace main.go --replace terraform-providers/terraform-provider-http hashicorp/terraform-provider-http + ''; + }); + + # https://github.com/hashicorp/terraform-provider-local/pull/40 + local = automated-providers.local.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-local hashicorp/terraform-provider-local + substituteInPlace main.go --replace terraform-providers/terraform-provider-local hashicorp/terraform-provider-local + ''; + }); + + # https://github.com/hashicorp/terraform-provider-null/pull/43 + null = automated-providers.null.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-null hashicorp/terraform-provider-null + substituteInPlace main.go --replace terraform-providers/terraform-provider-null hashicorp/terraform-provider-null + ''; + }); + + # https://github.com/hashicorp/terraform-provider-random/pull/107 + random = automated-providers.random.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-random hashicorp/terraform-provider-random + substituteInPlace main.go --replace terraform-providers/terraform-provider-random hashicorp/terraform-provider-random + ''; + }); + + # https://github.com/hashicorp/terraform-provider-template/pull/79 + template = automated-providers.template.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-template hashicorp/terraform-provider-template + substituteInPlace main.go --replace terraform-providers/terraform-provider-template hashicorp/terraform-provider-template + ''; + }); + + # https://github.com/hashicorp/terraform-provider-tls/pull/71 + tls = automated-providers.tls.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-tls hashicorp/terraform-provider-tls + substituteInPlace main.go --replace terraform-providers/terraform-provider-tls hashicorp/terraform-provider-tls + ''; + }); + elasticsearch = callPackage ./elasticsearch {}; gandi = callPackage ./gandi {}; ibm = callPackage ./ibm {}; libvirt = callPackage ./libvirt {}; lxd = callPackage ./lxd {}; ansible = callPackage ./ansible {}; - } // lib.mapAttrs (n: v: toDrv v) list + }; +in + automated-providers // special-providers diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt deleted file mode 100644 index bdde6600678..00000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt +++ /dev/null @@ -1,18 +0,0 @@ -# lines starting with a # are comments - -# The accepted format (double escape all grep expresssions): -# [grep-expression] [grep-v-expression] - include all repositories in the organisation. -# grep-expression: filter repo matching the expression -# grep-v-expression: filter repo not matching the expression -# / - include only the named repository. - -# include all terraform-providers -terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\) - -# include providers from individual repos -ajbosco/terraform-provider-segment -camptocamp/terraform-provider-pass -poseidon/terraform-provider-matchbox -spaceapegames/terraform-provider-wavefront -tweag/terraform-provider-nixos -tweag/terraform-provider-secret diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all b/pkgs/applications/networking/cluster/terraform-providers/update-all index 893a6b1c7d7..89ed5a94f2a 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all @@ -1,6 +1,7 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p bash coreutils curl jq nix +#! nix-shell -i bash -p bash coreutils jq nix gitAndTools.hub # vim: ft=sh sw=2 et +# shellcheck shell=bash # # This scripts scans the github terraform-providers repo for new releases, # generates the corresponding nix code and finally generates an index of @@ -10,37 +11,53 @@ set -euo pipefail # the maximum number of attempts before giving up inside of GET and prefetch_github readonly maxAttempts=30 -GET() { - local url=$1 - local retry=1 - echo "fetching $url" >&2 - while ! curl -#fL -u "$GITHUB_AUTH" "$url"; do - echo "The curl command has failed. Attempt $retry/${maxAttempts}" >&2 - if [[ "${retry}" -eq "${maxAttempts}" ]]; then - exit 1 - fi - retry=$(( retry + 1 )) - sleep 5 - done -} - -get_org_repos() { +get_tf_providers_org() { + # returns all terraform providers in a given organization, and their the + # latest tags, in the format + # $org/$repo $rev local org=$1 - local page=1 - GET "https://api.github.com/orgs/$org/repos?per_page=100" | jq -r '.[].name' + hub api --paginate graphql -f query=" + query(\$endCursor: String) { + repositoryOwner(login: \"${org}\") { + repositories(first: 100, after: \$endCursor) { + nodes { + nameWithOwner + name + refs(first: 1, refPrefix: \"refs/tags/\", orderBy: {field: TAG_COMMIT_DATE, direction: DESC}) { + nodes { + name + } + } + } + pageInfo { + hasNextPage + endCursor + } + } + } + }" | \ + jq -r '.data.repositoryOwner.repositories.nodes[] | select(.name | startswith("terraform-provider-")) | select((.refs.nodes | length) > 0) | .nameWithOwner + " " + .refs.nodes[0].name' + # filter the result with jq: + # - repos need to start with `teraform-provider-` + # - they need to have at least one tag + # for each of the remaining repos, assemble a string $org/$repo $rev } -get_repo_tags() { +get_latest_repo_tag() { + # of a given repo and owner, retrieve the latest tag local owner=$1 local repo=$2 - GET "https://api.github.com/repos/$owner/$repo/git/refs/tags?per_page=100" | \ + hub api --paginate "https://api.github.com/repos/$owner/$repo/git/refs/tags" | \ jq -r '.[].ref' | \ grep -v 'v\.' | \ cut -d '/' -f 3- | \ - sort --version-sort + sort --version-sort | \ + tail -1 } prefetch_github() { + # of a given owner, repo and rev, fetch the tarball and return the output of + # `nix-prefetch-url` local owner=$1 local repo=$2 local rev=$3 @@ -59,7 +76,7 @@ echo_entry() { local owner=$1 local repo=$2 local rev=$3 - local version=$(echo $3 | sed 's/^v//') + local version=${rev#v} local sha256=$4 cat <> data.nix } @@ -93,50 +110,63 @@ add_repo() { cd "$(dirname "$0")" -if [[ -z "${GITHUB_AUTH:-}" ]]; then - cat <<'HELP' -Missing the GITHUB_AUTH env. This is required to work around the 60 request -per hour rate-limit. +# individual repos to fetch +slugs=( + ajbosco/terraform-provider-segment + camptocamp/terraform-provider-pass + poseidon/terraform-provider-matchbox + spaceapegames/terraform-provider-wavefront + tweag/terraform-provider-nixos + tweag/terraform-provider-secret +) -Go to https://github.com/settings/tokens and create a new token with the -"public_repo" scope. - -Then `export GITHUB_AUTH=:` and run this script again. -HELP - exit 1 -fi +# a list of providers to ignore +blacklist=( + terraform-providers/terraform-provider-azure-classic + terraform-providers/terraform-provider-cidr + terraform-providers/terraform-provider-circonus + terraform-providers/terraform-provider-cloudinit + terraform-providers/terraform-provider-quorum + hashicorp/terraform-provider-time + terraform-providers/terraform-provider-vmc +) cat <
data.nix # Generated with ./update-all { HEADER -while read line; do - IFS=' ' read -r -a fields <<< "$line" - if [[ "${#fields[@]}" -eq 0 ]]; then - continue - fi +# assemble list of terraform providers +providers=$(get_tf_providers_org "terraform-providers") +providers=$(echo "$providers";get_tf_providers_org "hashicorp") - if [[ "${fields[0]}" = *"/"* ]]; then - org="$(echo "${fields[0]}" | cut -d/ -f1)" - repo="$(echo "${fields[0]}" | cut -d/ -f2)" - add_repo "${org}" "${repo}" - else - org="${fields[0]}" - repos=$(get_org_repos "$org") - if [[ "${#fields[@]}" -ge 2 ]] && [[ -n "${fields[1]}" ]]; then - repos="$( echo "${repos[@]}" | grep "${fields[1]}" )" - fi - if [[ "${#fields[@]}" -eq 3 ]] && [[ -n "${fields[2]}" ]]; then - repos="$( echo "${repos[@]}" | grep -v "${fields[2]}" )" - fi - repos="$( echo "${repos[@]}" | sort )" +# add terraform-providers from slugs +for slug in "${slugs[@]}"; do + # retrieve latest tag + org=${slug%/*} + repo=${slug#*/} + rev=$(get_latest_repo_tag "$org" "$repo") - for repo in $repos; do - add_repo "$org" "$repo" - done - fi -done < <(grep -v '^#\|^$' providers.txt) + # add to list + providers=$(echo "$providers";echo "$org/$repo $rev") +done + +# filter out all providers on the blacklist +for repo in "${blacklist[@]}"; do + providers=$(echo "$providers" | grep -v "^${repo} ") +done + +# sort results alphabetically by repo name +providers=$(echo "$providers" | sort -t "/" --key=2) + +# render list +IFS=$'\n' +for provider in $providers; do + org=$(echo "$provider" | cut -d " " -f 1 | cut -d "/" -f1) + repo=$(echo "$provider" | cut -d " " -f 1 | cut -d "/" -f2) + rev=$(echo "$provider" | cut -d " " -f 2) + add_provider "${org}" "${repo}" "${rev}" +done cat <