diff options
101 files changed, 2203 insertions, 1266 deletions
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 7e5cff8ff60..ec418c56335 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -141,6 +141,24 @@ In these cases, it's recommended to override the `buildPhase`/`installPhase`/`ch Otherwise, some steps may fail because of the modified directory structure of `target/`. +### Building a crate with an absent or out-of-date Cargo.lock file + +`buildRustPackage` needs a `Cargo.lock` file to get all dependencies in the +source code in a reproducible way. If it is missing or out-of-date one can use +the `cargoPatches` attribute to update or add it. + +``` +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + (...) + cargoPatches = [ + # a patch file to add/update Cargo.lock in the source code + ./add-Cargo.lock.patch + ]; +} +``` + ## Compiling Rust crates using Nix instead of Cargo ### Simple operation diff --git a/lib/minver.nix b/lib/minver.nix index fee6b65a244..86391bcd69e 100644 --- a/lib/minver.nix +++ b/lib/minver.nix @@ -1,2 +1,2 @@ # Expose the minimum required version for evaluating Nixpkgs -"2.0" +"2.2" diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b500f03c61f..97123feaafc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7062,6 +7062,12 @@ githubId = 1588288; name = "Shahrukh Khan"; }; + shamilton = { + email = "sgn.hamilton@protonmail.com"; + github = "SCOTT-HAMILTON"; + githubId = 24496705; + name = "Scott Hamilton"; + }; shanemikel = { email = "shanepearlman@pm.me"; github = "shanemikel"; diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index c65be35bea5..ae55f77b0cc 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -446,6 +446,20 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; recommended to only use lower-case characters. </para> </listitem> + <listitem> + <para> + The GRUB specific option <option>boot.loader.grub.extraInitrd</option> + has been replaced with the generic option + <option>boot.initrd.secrets</option>. This option creates a secondary + initrd from the specified files, rather than using a manually created + initrd file. + + Due to an existing bug with <option>boot.loader.grub.extraInitrd</option>, + it is not possible to directly boot an older generation that used that + option. It is still possible to rollback to that generation if the required + initrd file has not been deleted. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 4100ec89701..cba357171d7 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -8,8 +8,7 @@ with lib; let requiredPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg) - [ config.nix.package - pkgs.acl + [ pkgs.acl pkgs.attr pkgs.bashInteractive # bash with ncurses support pkgs.bzip2 @@ -33,7 +32,6 @@ let pkgs.nano pkgs.ncurses pkgs.netcat - pkgs.nix-info config.programs.ssh.package pkgs.perl pkgs.procps diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e8c4a4c14cf..978d33e7585 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -806,7 +806,6 @@ ./services/security/torsocks.nix ./services/security/usbguard.nix ./services/security/vault.nix - ./services/system/cgmanager.nix ./services/system/cloud-init.nix ./services/system/dbus.nix ./services/system/earlyoom.nix diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index be964ce7f3f..1b3254b54a5 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -238,9 +238,6 @@ in "/share/bash-completion" ]; - environment.systemPackages = optional cfg.enableCompletion - pkgs.nix-bash-completions; - environment.shells = [ "/run/current-system/sw/bin/bash" "/run/current-system/sw/bin/sh" diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 7776c648af8..c91febdb710 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -24,6 +24,7 @@ with lib; (mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed") (mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed") (mkRemovedOptionModule [ "services" "beegfs" ] "The BeeGFS module has been removed") + (mkRemovedOptionModule ["services" "cgmanager" "enable"] "cgmanager was deprecated by lxc and therefore removed from nixpkgs.") (mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed") (mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed") (mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed") diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index e3da3092d45..0185f490b0c 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -16,7 +16,7 @@ let factory = util.BuildFactory() c = BuildmasterConfig = dict( workers = [${concatStringsSep "," cfg.workers}], - protocols = { 'pb': {'port': ${toString cfg.bpPort} } }, + protocols = { 'pb': {'port': ${toString cfg.pbPort} } }, title = '${escapeStr cfg.title}', titleURL = '${escapeStr cfg.titleUrl}', buildbotURL = '${escapeStr cfg.buildbotUrl}', @@ -155,10 +155,20 @@ in { description = "Specifies the Buildbot directory."; }; - bpPort = mkOption { + pbPort = mkOption { default = 9989; - type = types.int; - description = "Port where the master will listen to Buildbot Worker."; + type = types.either types.str types.int; + example = "'tcp:9990:interface=127.0.0.1'"; + description = '' + The buildmaster will listen on a TCP port of your choosing + for connections from workers. + It can also use this port for connections from remote Change Sources, + status clients, and debug tools. + This port should be visible to the outside world, and you’ll need to tell + your worker admins about your choice. + If put in (single) quotes, this can also be used as a connection string, + as defined in the <link xlink:href="https://twistedmatrix.com/documents/current/core/howto/endpoints.html">ConnectionStrings guide</link>. + ''; }; listenAddress = mkOption { @@ -264,5 +274,9 @@ in { }; }; + imports = [ + (mkRenamedOptionModule [ "services" "buildbot-master" "bpPort" ] [ "services" "buildbot-master" "pbPort" ]) + ]; + meta.maintainers = with lib.maintainers; [ nand0p mic92 ]; } diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 7b2bbf89a44..1ada131bd7b 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -43,6 +43,9 @@ let [gitlab-shell] dir = "${cfg.packages.gitlab-shell}" + secret_file = "${cfg.statePath}/gitlab_shell_secret" + gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}" + http_settings = { self_signed_cert = false } ${concatStringsSep "\n" (attrValues (mapAttrs (k: v: '' [[storage]] diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 2577cb78e96..0b3d7f3f03c 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -442,6 +442,12 @@ in nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; nix.binaryCaches = [ "https://cache.nixos.org/" ]; + environment.systemPackages = + [ nix + pkgs.nix-info + ] + ++ optional (config.programs.bash.enableCompletion && !versionAtLeast nixVersion "2.4pre") pkgs.nix-bash-completions; + environment.etc."nix/nix.conf".source = nixConf; environment.etc."nix/registry.json".text = builtins.toJSON { diff --git a/nixos/modules/services/system/cgmanager.nix b/nixos/modules/services/system/cgmanager.nix deleted file mode 100644 index d3d57aa7692..00000000000 --- a/nixos/modules/services/system/cgmanager.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.cgmanager; -in { - meta.maintainers = [ maintainers.mic92 ]; - - ###### interface - options.services.cgmanager.enable = mkEnableOption "cgmanager"; - - ###### implementation - config = mkIf cfg.enable { - systemd.services.cgmanager = { - wantedBy = [ "multi-user.target" ]; - description = "Cgroup management daemon"; - restartIfChanged = false; - serviceConfig = { - ExecStart = "${pkgs.cgmanager}/bin/cgmanager -m name=systemd"; - KillMode = "process"; - Restart = "on-failure"; - }; - }; - }; -} diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index c775632a4aa..67e8bf6fd65 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -60,7 +60,7 @@ let inherit (efi) canTouchEfiVariables; inherit (cfg) version extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber - extraEntriesBeforeNixOS extraPrepareConfig extraInitrd configurationLimit copyKernels + extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios gfxpayloadEfi gfxpayloadBios; path = with pkgs; makeBinPath ( [ coreutils gnused gnugrep findutils diffutils btrfs-progs utillinux mdadm ] @@ -292,19 +292,6 @@ in ''; }; - extraInitrd = mkOption { - type = types.nullOr types.path; - default = null; - example = "/boot/extra_initramfs.gz"; - description = '' - The path to a second initramfs to be supplied to the kernel. - This ramfs will not be copied to the store, so that it can - contain secrets such as LUKS keyfiles or ssh keys. - This implies that rolling back to a previous configuration - won't rollback the state of this file. - ''; - }; - useOSProber = mkOption { default = false; type = types.bool; @@ -608,6 +595,8 @@ in { path = "/boot"; inherit (cfg) devices; inherit (efi) efiSysMountPoint; } ]; + boot.loader.supportsInitrdSecrets = true; + system.build.installBootLoader = let install-grub-pl = pkgs.substituteAll { @@ -705,6 +694,24 @@ in (mkRenamedOptionModule [ "boot" "grubDevice" ] [ "boot" "loader" "grub" "device" ]) (mkRenamedOptionModule [ "boot" "bootMount" ] [ "boot" "loader" "grub" "bootDevice" ]) (mkRenamedOptionModule [ "boot" "grubSplashImage" ] [ "boot" "loader" "grub" "splashImage" ]) + (mkRemovedOptionModule [ "boot" "loader" "grub" "extraInitrd" ] '' + This option has been replaced with the bootloader agnostic + boot.initrd.secrets option. To migrate to the initrd secrets system, + extract the extraInitrd archive into your main filesystem: + + # zcat /boot/extra_initramfs.gz | cpio -idvmD /etc/secrets/initrd + /path/to/secret1 + /path/to/secret2 + + then replace boot.loader.grub.extraInitrd with boot.initrd.secrets: + + boot.initrd.secrets = { + "/path/to/secret1" = "/etc/secrets/initrd/path/to/secret1"; + "/path/to/secret2" = "/etc/secrets/initrd/path/to/secret2"; + }; + + See the boot.initrd.secrets option documentation for more information. + '') ]; } diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 8df18cbd901..e469b18abd0 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -49,7 +49,6 @@ my $extraPrepareConfig = get("extraPrepareConfig"); my $extraPerEntryConfig = get("extraPerEntryConfig"); my $extraEntries = get("extraEntries"); my $extraEntriesBeforeNixOS = get("extraEntriesBeforeNixOS") eq "true"; -my $extraInitrd = get("extraInitrd"); my $splashImage = get("splashImage"); my $splashMode = get("splashMode"); my $backgroundColor = get("backgroundColor"); @@ -232,13 +231,6 @@ my $grubStore; if ($copyKernels == 0) { $grubStore = GrubFs($storePath); } -my $extraInitrdPath; -if ($extraInitrd) { - if (! -f $extraInitrd) { - print STDERR "Warning: the specified extraInitrd " . $extraInitrd . " doesn't exist. Your system won't boot without it.\n"; - } - $extraInitrdPath = GrubFs($extraInitrd); -} # Generate the header. my $conf .= "# Automatically generated. DO NOT EDIT THIS FILE!\n"; @@ -363,9 +355,30 @@ sub addEntry { my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel")); my $initrd = copyToKernelsDir(Cwd::abs_path("$path/initrd")); - if ($extraInitrd) { - $initrd .= " " .$extraInitrdPath->path; + + # Include second initrd with secrets + if (-e -x "$path/append-initrd-secrets") { + my $initrdName = basename($initrd); + my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets"; + + mkpath(dirname($initrdSecretsPath), 0, 0755); + my $oldUmask = umask; + # Make sure initrd is not world readable (won't work if /boot is FAT) + umask 0137; + my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX"); + system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets\n"; + # Check whether any secrets were actually added + if (-e $initrdSecretsPathTemp && ! -z _) { + rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place\n"; + $copied{$initrdSecretsPath} = 1; + $initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets"; + } else { + unlink $initrdSecretsPathTemp; + rmdir dirname($initrdSecretsPathTemp); + } + umask $oldUmask; } + my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef; # FIXME: $confName @@ -388,9 +401,6 @@ sub addEntry { if ($copyKernels == 0) { $conf .= $grubStore->search . "\n"; } - if ($extraInitrd) { - $conf .= $extraInitrdPath->search . "\n"; - } $conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig; $conf .= " multiboot $xen $xenParams\n" if $xen; $conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n"; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index dfd158e2d75..9bf3228d1ad 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -517,8 +517,7 @@ in }; boot.initrd.secrets = mkOption - { internal = true; - default = {}; + { default = {}; type = types.attrsOf (types.nullOr types.path); description = '' diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix index d236ce94632..50e1c76e9fd 100644 --- a/nixos/tests/mysql/mysql.nix +++ b/nixos/tests/mysql/mysql.nix @@ -5,20 +5,34 @@ import ./../make-test-python.nix ({ pkgs, ...} : { }; nodes = { - mysql = + mysql57 = { pkgs, ... }: { + users.users.testuser = { }; + users.users.testuser2 = { }; services.mysql.enable = true; services.mysql.initialDatabases = [ - { name = "testdb"; schema = ./testdb.sql; } - { name = "empty_testdb"; } + { name = "testdb3"; schema = ./testdb.sql; } ]; # note that using pkgs.writeText here is generally not a good idea, # as it will store the password in world-readable /nix/store ;) services.mysql.initialScript = pkgs.writeText "mysql-init.sql" '' - CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123'; + CREATE USER 'testuser3'@'localhost' IDENTIFIED BY 'secure'; + GRANT ALL PRIVILEGES ON testdb3.* TO 'testuser3'@'localhost'; ''; + services.mysql.ensureDatabases = [ "testdb" "testdb2" ]; + services.mysql.ensureUsers = [{ + name = "testuser"; + ensurePermissions = { + "testdb.*" = "ALL PRIVILEGES"; + }; + } { + name = "testuser2"; + ensurePermissions = { + "testdb2.*" = "ALL PRIVILEGES"; + }; + }]; services.mysql.package = pkgs.mysql57; }; @@ -30,16 +44,30 @@ import ./../make-test-python.nix ({ pkgs, ...} : { # Kernel panic - not syncing: Out of memory: compulsory panic_on_oom is enabled virtualisation.memorySize = 1024; + users.users.testuser = { }; + users.users.testuser2 = { }; services.mysql.enable = true; services.mysql.initialDatabases = [ - { name = "testdb"; schema = ./testdb.sql; } - { name = "empty_testdb"; } + { name = "testdb3"; schema = ./testdb.sql; } ]; # note that using pkgs.writeText here is generally not a good idea, # as it will store the password in world-readable /nix/store ;) services.mysql.initialScript = pkgs.writeText "mysql-init.sql" '' - CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123'; + CREATE USER 'testuser3'@'localhost' IDENTIFIED BY 'secure'; + GRANT ALL PRIVILEGES ON testdb3.* TO 'testuser3'@'localhost'; ''; + services.mysql.ensureDatabases = [ "testdb" "testdb2" ]; + services.mysql.ensureUsers = [{ + name = "testuser"; + ensurePermissions = { + "testdb.*" = "ALL PRIVILEGES"; + }; + } { + name = "testuser2"; + ensurePermissions = { + "testdb2.*" = "ALL PRIVILEGES"; + }; + }]; services.mysql.package = pkgs.mysql80; }; @@ -81,17 +109,49 @@ import ./../make-test-python.nix ({ pkgs, ...} : { testScript = '' start_all() - mysql.wait_for_unit("mysql") - mysql.succeed("echo 'use empty_testdb;' | mysql -u root") - mysql.succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4") - # ';' acts as no-op, just check whether login succeeds with the user created from the initialScript - mysql.succeed("echo ';' | mysql -u passworduser --password=password123") + mysql57.wait_for_unit("mysql") + mysql57.succeed( + "echo 'use testdb; create table tests (test_id INT, PRIMARY KEY (test_id));' | sudo -u testuser mysql -u testuser" + ) + mysql57.succeed( + "echo 'use testdb; insert into tests values (41);' | sudo -u testuser mysql -u testuser" + ) + # Ensure testuser2 is not able to insert into testdb as mysql testuser2 + mysql57.fail( + "echo 'use testdb; insert into tests values (22);' | sudo -u testuser2 mysql -u testuser2" + ) + # Ensure testuser2 is not able to authenticate as mysql testuser + mysql57.fail( + "echo 'use testdb; insert into tests values (22);' | sudo -u testuser2 mysql -u testuser" + ) + mysql57.succeed( + "echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 41" + ) + mysql57.succeed( + "echo 'use testdb3; select * from tests;' | mysql -u testuser3 --password=secure -N | grep 4" + ) mysql80.wait_for_unit("mysql") - mysql80.succeed("echo 'use empty_testdb;' | mysql -u root") - mysql80.succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4") - # ';' acts as no-op, just check whether login succeeds with the user created from the initialScript - mysql80.succeed("echo ';' | mysql -u passworduser --password=password123") + mysql80.succeed( + "echo 'use testdb; create table tests (test_id INT, PRIMARY KEY (test_id));' | sudo -u testuser mysql -u testuser" + ) + mysql80.succeed( + "echo 'use testdb; insert into tests values (41);' | sudo -u testuser mysql -u testuser" + ) + # Ensure testuser2 is not able to insert into testdb as mysql testuser2 + mysql80.fail( + "echo 'use testdb; insert into tests values (22);' | sudo -u testuser2 mysql -u testuser2" + ) + # Ensure testuser2 is not able to authenticate as mysql testuser + mysql80.fail( + "echo 'use testdb; insert into tests values (22);' | sudo -u testuser2 mysql -u testuser" + ) + mysql80.succeed( + "echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 41" + ) + mysql80.succeed( + "echo 'use testdb3; select * from tests;' | mysql -u testuser3 --password=secure -N | grep 4" + ) mariadb.wait_for_unit("mysql") mariadb.succeed( diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index 5dcd1f6fb78..c30b52782ef 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -70,6 +70,6 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop" ln -sT "${vscode}/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop" makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${lib.optionalString (vscodeExtensions != []) '' - --add-flags "--extensions-dir ${combinedExtensionsDrv}" + --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/vscode/extensions" ''} '' diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index eb087c42ce0..657caeca8b3 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,7 +1,7 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, xercesc, ode -, eigen, qtbase, qttools, qtwebkit, opencascade-occt, gts, hdf5, vtk, medfile -, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU -, makeWrapper, pkgconfig, mpi ? null }: +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, +xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook, +opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, +gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: assert mpi != null; @@ -18,8 +18,16 @@ in mkDerivation rec { sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s"; }; - nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ]; - buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts + nativeBuildInputs = [ + cmake + ninja + pkgconfig + pythonPackages.pyside2-tools + wrapQtAppsHook + ]; + + buildInputs = [ + cmake coin3d xercesc ode eigen opencascade-occt gts zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile libGLU libXmu qtbase qttools qtwebkit ] ++ (with pythonPackages; [ diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index f68de80b701..89d09703ddc 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: let pname = "josm"; - version = "16239"; + version = "16538"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "041n81mnd587043f8wwjv8ckbx0hlsqf3pc7hzbns1y89xdghms1"; + sha256 = "07hzwcjnfbl3s8l0m6japln0clm6wjm1zd3r1pd47b1dvclnyv28"; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip"; - sha256 = "1nlw1rvwdfp1hhsxyjli8pylm0hb7k62sa0nqvgyiw54dz78n00c"; + sha256 = "1y0ssrwfqnmcvxwjfa3gdc3m9a952n8l3pdx0zmmaqwws4kak2a2"; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "1qqk4bal84wnb66jym6qrdi10ypzvdzihd4jk5rnyfl3wm5qafbi"; + sha256 = "0ybjca6dhnbwl3xqwrc91c444fzs1zrlnz7qr3l79s1vll9r4qd1"; }; }; in diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix index c3d26077443..85749af0a56 100644 --- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix @@ -1,14 +1,14 @@ { stdenv, buildEnv, fetchzip, mono }: let - version = "0.10.1"; + version = "0.12.0"; drv = stdenv.mkDerivation { pname = "keeagent"; inherit version; src = fetchzip { - url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip"; - sha256 = "0j7az6l9wcr8z66mfplkxwydd4bgz2p2vd69xncf0nxlfb0lshh7"; + url = "https://lechnology.com/wp-content/uploads/2020/05/KeeAgent_v0.12.0.zip"; + sha256 = "0fcfbj3yikiv3dmp69236h9r3c416amdq849kn131w1129gb68xd"; stripRoot = false; }; diff --git a/pkgs/applications/misc/keepass/fix-paths.patch b/pkgs/applications/misc/keepass/fix-paths.patch index 0a99f506b94..5ff36a21c00 100644 --- a/pkgs/applications/misc/keepass/fix-paths.patch +++ b/pkgs/applications/misc/keepass/fix-paths.patch @@ -56,24 +56,6 @@ diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Uni index ab49ee2..7f6c50f 100644 --- a/KeePass/Util/ClipboardUtil.Unix.cs +++ b/KeePass/Util/ClipboardUtil.Unix.cs -@@ -42,7 +42,7 @@ namespace KeePass.Util - // string strGtk = GtkGetString(); - // if(strGtk != null) return strGtk; - -- return (NativeLib.RunConsoleApp("pbpaste", "-pboard general") ?? -+ return (NativeLib.RunConsoleApp("@pbpaste@", "-pboard general") ?? - string.Empty); - } - -@@ -50,7 +50,7 @@ namespace KeePass.Util - { - // if(GtkSetString(str)) return; - -- NativeLib.RunConsoleApp("pbcopy", "-pboard general", str); -+ NativeLib.RunConsoleApp("@pbcopy@", "-pboard general", str); - } - - private static string GetStringU() @@ -62,7 +62,7 @@ namespace KeePass.Util // "-out -selection clipboard"); // if(str != null) return str; diff --git a/pkgs/applications/misc/keepass/keepass-plugins-load.patch b/pkgs/applications/misc/keepass/keepass-plugins-load.patch index ca52e7ef191..e6a6bff8dad 100644 --- a/pkgs/applications/misc/keepass/keepass-plugins-load.patch +++ b/pkgs/applications/misc/keepass/keepass-plugins-load.patch @@ -1 +1 @@ -+ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {}); ++ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", System.IO.SearchOption.TopDirectoryOnly, new string[] {}); diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/applications/misc/keepass/keepass-plugins.patch index 9a7e3fe9983..891be1ffa31 100644 --- a/pkgs/applications/misc/keepass/keepass-plugins.patch +++ b/pkgs/applications/misc/keepass/keepass-plugins.patch @@ -11,7 +11,7 @@ diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs index 347eaf5..b92e1e2 100644 --- a/KeePass/Forms/MainForm.cs +++ b/KeePass/Forms/MainForm.cs -@@ -440,7 +440,7 @@ namespace KeePass.Forms +@@ -440,7 +440,$OUTPUT_LC$ @@ namespace KeePass.Forms ToolStripItemCollection tsicT = m_ctxTray.Items; ToolStripItem tsiPrevT = m_ctxTrayOptions; diff --git a/pkgs/applications/misc/ksmoothdock/default.nix b/pkgs/applications/misc/ksmoothdock/default.nix new file mode 100644 index 00000000000..9538329bf9b --- /dev/null +++ b/pkgs/applications/misc/ksmoothdock/default.nix @@ -0,0 +1,43 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, fetchpatch +, cmake +, extra-cmake-modules +, kactivities +, qtbase +}: + +mkDerivation rec { + pname = "KSmoothDock"; + version = "6.2"; + + src = fetchFromGitHub { + owner = "dangvd"; + repo = "ksmoothdock"; + rev = "v${version}"; + sha256 = "182x47cymgnp5xisa0xx93hmd5wrfigy8zccrr23p4r9hp8xbnam"; + }; + + patches = [ + # Fixed hard coded installation path to use CMAKE_INSTALL_BINDIR and CMAKE_INSTALL_PREFIX instead + (fetchpatch { + url = "https://github.com/dangvd/ksmoothdock/commit/00799bef8a1c1fe61ef9274866267d9fe9194041.patch"; + sha256 = "1nmb7gf1ggzicxz8k4fd67xhwjy404myqzjpgjym66wqxm0arni4"; + }) + ]; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + + buildInputs = [ kactivities qtbase ]; + + cmakeDir = "../src"; + + meta = with lib; { + description = "A cool desktop panel for KDE Plasma 5"; + license = licenses.mit; + homepage = "https://dangvd.github.io/ksmoothdock/"; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index 29dc6f54e6c..ca05facaa48 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "overmind"; - version = "2.0.3"; + version = "2.1.1"; goPackagePath = "github.com/DarthSim/overmind"; nativeBuildInputs = [ makeWrapper ]; @@ -15,9 +15,11 @@ buildGoPackage rec { owner = "DarthSim"; repo = pname; rev = "v${version}"; - sha256 = "0c551c240lqxdjg0jj01rh2fyhwls02k5lczlxacj05prp1plz9p"; + sha256 = "0akqn8s1mgk5q00gzh3ymq7nrnkyi6avyaxxvbxnjyq9bxsqz327"; }; + goDeps = ./deps.nix; + meta = with lib; { homepage = "https://github.com/DarthSim/overmind"; description = "Process manager for Procfile-based applications and tmux"; diff --git a/pkgs/applications/misc/overmind/deps.nix b/pkgs/applications/misc/overmind/deps.nix new file mode 100644 index 00000000000..afcc8d9726f --- /dev/null +++ b/pkgs/applications/misc/overmind/deps.nix @@ -0,0 +1,147 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/DarthSim/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/DarthSim/godotenv"; + rev = "v1.3.1"; + sha256 = "0fb9nl5qrnv7f9w0pgg00ak34afw9kjgcql0l38z22faz2bhgl1q"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "f79a8a8ca69d"; + sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "2bc1f35cddc0"; + sha256 = "1pvrbrvmrf4mx0fxbfaphbzgqgwn8v6lkfk2vyrs0znxrs1xyc5r"; + }; + } + { + goPackagePath = "github.com/matoous/go-nanoid"; + fetch = { + type = "git"; + url = "https://github.com/matoous/go-nanoid"; + rev = "eab626deece6"; + sha256 = "1a82lclk56y7c44jg7wn5vq733dmn0g20r5yqbchrxnpfl75dw89"; + }; + } + { + goPackagePath = "github.com/pkg/term"; + fetch = { + type = "git"; + url = "https://github.com/pkg/term"; + rev = "aa71e9d9e942"; + sha256 = "1gyxnj4jq3z2k4gjwwlz8hn56c1ys8jvafdd61nd6qs8jwp6iqp3"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v2.0.1"; + sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; + }; + } + { + goPackagePath = "github.com/sevlyar/go-daemon"; + fetch = { + type = "git"; + url = "https://github.com/sevlyar/go-daemon"; + rev = "v0.1.5"; + sha256 = "1y3gnxaifykcjcbzx91lz9bc93b95w3xj4rjxjbii26pm3j7gqyk"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v1.22.2"; + sha256 = "10mcnvi5qmn00vpyk6si8gjka7p654wr9hac4zc9w5h3ickhvbdc"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "88737f569e3a"; + sha256 = "02vkqfd6kc28zm6lffagw8nr78sayv6jabfgk9dcifl7826vi3k7"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "81d4e9dc473e"; + sha256 = "0074zjpkhclz5qbgjv0zmdwy6hmf5k2ri5yagnm6i12ahxaa48dr"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/urfave/cli.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/urfave/cli.v1"; + rev = "v1.20.0"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } +] diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index b22a35bc54f..4593e30f2fa 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.9.1"; + version = "28.9.3"; src = fetchgit { url = "https://github.com/MoonchildProductions/Pale-Moon.git"; rev = "${version}_Release"; - sha256 = "1772by9r9l1l0wmj4hs89r3zyckcbrq1krb09bn3pxvjjywzvkfl"; + sha256 = "1f8vfjyihlr2l79mkfgdcvwjnh261n6imkps310x9x3977jiq2wr"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 959b99e68f6..d7a2ccc5ed6 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-desktop", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.6.2", + "version": "1.6.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -14,6 +14,7 @@ "scripts": { "mkdirs": "mkdirp packages deploys", "fetch": "yarn run mkdirs && node scripts/fetch-package.js", + "asar-webapp": "asar p webapp webapp.asar", "start": "electron .", "lint": "eslint src/ scripts/ hak/", "build:native": "yarn run hak", @@ -47,7 +48,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "6.1.0", + "matrix-js-sdk": "6.2.0", "mkdirp": "^1.0.3", "needle": "^2.3.2", "node-pre-gyp": "^0.14.0", diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix index 4aa56181c4c..10b201e3c7c 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -146,11 +146,11 @@ }; } { - name = "acorn___acorn_6.4.0.tgz"; + name = "acorn___acorn_6.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_6.4.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz"; - sha1 = "b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"; + name = "acorn___acorn_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; + sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; }; } { @@ -3154,11 +3154,11 @@ }; } { - name = "matrix_js_sdk___matrix_js_sdk_6.1.0.tgz"; + name = "matrix_js_sdk___matrix_js_sdk_6.2.0.tgz"; path = fetchurl { - name = "matrix_js_sdk___matrix_js_sdk_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0.tgz"; - sha1 = "c28ad67c113c4aa9c8bce409c7ba550170bdc2ee"; + name = "matrix_js_sdk___matrix_js_sdk_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.0.tgz"; + sha1 = "b1aa6f23858ab3ee4b66be25d3e854f6e287d36b"; }; } { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index e5b815e7c88..3210d2b8729 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -8,12 +8,12 @@ let executableName = "riot-desktop"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "1anmch9z3na7rphxb0p9cnk55388z22iwfnfjhmjps1ii5wx4rls"; + sha256 = "0dic2xpasf4m22275yrf7s8xnkh77n14cr62gd86j6g7x9rxa8fd"; }; electron = electron_7; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index e61237dbb69..cfe9008273f 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1cyjw3x9yh96cn84r95zziwxgifkmzd5kdf4l69b7mwnqcr78dp0"; + sha256 = "1v8sz2shj2gjf0vlj7r8g9d2v0qbsg9x64bq5g62nglbnphkcv0k"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 566371e3af0..7f5cf65e093 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.0.413237.0524"; + version = "5.0.418682.0603"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "09hr31pzjgwaa898akl953k7fcshkq8r065i2047mk247bjy278k"; + sha256 = "1vlba3jgp3dr16n5g29l0dpdd054d8h6lkwk3a6346shvd46mpja"; }; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index c7c5dab282e..1f14ee3ae40 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,615 +1,615 @@ { - version = "68.8.1"; + version = "68.9.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ar/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ar/thunderbird-68.9.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "0f604cf3e5efff225cc544b3f289056be05ec430cf1481162f3ab1a84234660802c2777de1552f2900ca9cbf43ff13a468d3c97a44896ea02189471676243d22"; + sha512 = "7e0a07631f2130d2876e020f7f28817cbca343e0666abd156d8f5c48a7f4bb0f4775f6366deeffdcd0676172e3b75c48c02635d018a5f1050f635f334834908d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ast/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ast/thunderbird-68.9.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "4c5a5dfdc6d81577df445cee8e4f875c95394f87037feffd47fa22bf4e153fc260f48676e8ff005d3248c31aa346b6756ba9468ae95e542e5814c5a98cfcf7e3"; + sha512 = "47ef45548aeb20dc8dbd4f35bf12913b642986cf6071f060611696da99da30a2b10c9c8aaff8974f4fc02403026146b516e84f8f2244932f290202ef2aa59853"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/be/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/be/thunderbird-68.9.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "fca5948534a7de3c8a6dafab22e45478b79c20d1722d58fc3f423e3c792d754bcf63993b9a8c1f1c6758ea1585dd700b1ce7631a21274b0f8a05e631992ae5ed"; + sha512 = "c704c3e4be866d70c098b07bacdd4a1020ec109e92eb85c9c04d20d90db668a36bfef711acbe8bacb897543e3b8d499d35e54875bbe10fb3fc5436f8759828c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/bg/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/bg/thunderbird-68.9.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "907d252bdc8cf65b8d42ca5ee95cd7f43efe48f44d822558139ee04cee2b628966e11599f1d6db0ef5cff33a8ae424d514dc1df4e049a36432647dd3fa1039bf"; + sha512 = "ac31e7ceb3042c2f2ac4c833687a9a44b6ec593b2d50da2edf9f11fa9bba378dea192cd472470cb7cdb2a0b708b84de688f2988f6161447cf00e5a13fe6cdd9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/br/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/br/thunderbird-68.9.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ca82cbb9f61c6ee285a7b075c79aaf4ae09a86b009ea004818fffb7abd8a12708943e5f2edeb89362f7841ed5f6b9099c9e15f6a7efb2dc261a1e63e569d83c9"; + sha512 = "1c3342c2cca3061d07be17f57d967b1e9e478f5ff91cac1df1dbc901e102e2fbeb68375af20ccc0b6922364c62fcc44a6d7715aee43fef0b2165ac091427708c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ca/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ca/thunderbird-68.9.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "3cc29b0a077b48ea0ab0d3cde6fb9cf6fe6cdcb1ea914be6ed6d38e1bf382f910fad7920e918d2c9c9131845bb24b2818cfc45349270ff636e8bc216fd2b3059"; + sha512 = "2a0bca4b9fe58bb7872265384151ae7d2ed87122a9372ffd52752a11bec29b24a8d28f0e3102c0d6f84e545ccc6004fdace3bba7d68de206a3be5c72962c1a9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/cak/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/cak/thunderbird-68.9.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "184f74a10722a72ad622c54f221b62193259cdd54cd9dc4d71326219fd6dc533c723d5e926bfa0e7a3231a41864fefe578030329f0e24765ddad7459945cc75d"; + sha512 = "ef27a17f5a44072596b753cd110ed4d24d7355649ddfae988a2d6622871421088d1502866226fc1f18bf8233478b5c00e98f10cf3f920ad6b4a7bad9c5e9cae2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/cs/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/cs/thunderbird-68.9.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1f76a6f2e9a4804c697d2842389d9fe0aaf1e8b30eaaf0aaf9ccd252c64a20d10b876011ec6cf54e4d6778d03a51673f4d941d1875ba66d31946bd446006daf8"; + sha512 = "1a68ecf3ae228078c67b296a1642578d8e5a7808707e8a7eab4cbe8191a6b19057fca8e3c4faa660d6a64732ca3a052579fa652bbe5bb30a85d577f7b702e55e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/cy/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/cy/thunderbird-68.9.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "28f9314997024728691ea43b4bb2eec51a8ce8a0da26025c1f6213eb2f20c140dee0c87950a325589c7af8b037f7378025dc05346a7156ee8ea200e89705ed84"; + sha512 = "4d3cc4a57f3e210129ba47c2fc0798d852e4369a62dfefaf3b9a8fc77939431a7cc5839c667a062231ccf49e6eeedfc60c5492fdbf5eec080233b851203305f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/da/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/da/thunderbird-68.9.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d65d1b71b93b08bf783a691b26d39a6749c3b0ece109889ea9342f8dce681e47d4785010548f388d943e10632e9539f9747eb4b9ec7da524d8087300961fe3df"; + sha512 = "79e655f62bc95b65640e3556d2690725ff012a16b2cbe656223a118294915c5619563fbdef9b88fd5db3f982cea5e8ad85a9bc389776ea95ab155539d6a4c217"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/de/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/de/thunderbird-68.9.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "e140fe5153f3c2eadc5bac3891d4c2d2e03e0823da146d78c21884a28bbaa1fc1ea394c726bceaa20ffd2bfd8c1f841966de22fedd3e789b39b8dfabc2bbd930"; + sha512 = "cad5d0c08e07f6d1247cae9737d0747875b9b35036892093230423d92530fe2de2975174dfd6ec0d2e2d7ddf86027601d37d3fce14343ad4cb89be5d68052785"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/dsb/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/dsb/thunderbird-68.9.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "6c17e859826e48d59777a022273540696ec9c1da026922b46f4538067e34561d3717d2e4d092eae8de9c98bdf7d06a76ddc1af7f2832cd690a466a05d0e0e317"; + sha512 = "15ca27de99125e4be3f6cf79ebe5e897efea14ea469040ab39ef2e0ab4a6ce61bb22f9afe95a670fcf9e1cf077512b8214226946e4f4a02e7bb04d136390bf6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/el/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/el/thunderbird-68.9.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c6d830ad93e67262e22dfc1b2551bd40034a3867fa61e5a4bba773db98405fc8c7683c5f606c591242ce95f1c520d754fbeb3eebb36458e3d78a4b8b19c5a3cf"; + sha512 = "8fdda97681d04d9247d8030535d15888d24f3462ee8d91ac86ae9b0489ca4a2c759bbbcb151548786febed90de2ff4bf6e77fa55b8bc2b1cd4c8faef374fcc45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/en-GB/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/en-GB/thunderbird-68.9.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "b39dc8f17de38c94332ed3dabfcd29bd8d8334e83010630cf2fc19f2a601dba9d6db64140a604dd4e1fb401d4d5dca718795503345a4e7bdab666e6fa7776d9b"; + sha512 = "51ccb86fc17862c9264823568fb2453318a8b6625f1d51eecaa150358a9efe4a15126c1a132bc57834645ba3d5799f75dd48e7cacc6305970698bdcad85c0bfd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/en-US/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/en-US/thunderbird-68.9.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "ba1a090f72aa286d94dded8edfbadc7b9c05c4a7f37d485d0d91275dd97ec40322241b3c74f3c183ed13a6cdf6b1d8667858539fba130514eed72dc54e1f4a90"; + sha512 = "ed6caacf356c6487a489e983275a2c3d00eac3b2282445667a1f26ac9ce217afb8261a929ccc9aa2bdf7a89101a86faee2ef87c16f0677ecf5abcc727397275f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/es-AR/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/es-AR/thunderbird-68.9.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "8b280a3329421c9949821d78c891b7a0b9f7ac6e7ad40f99e49233ad6b3848188e7ed42c40bbaa67a31b270cb19644b033d4046ebeed0b1031567a2988ba98ce"; + sha512 = "b8e75f5579740c8d0ae7ef30afb133b827c2e217bf9b0acdc8f117b6ffbd6c2674ff8670db87ede6db3c842af8d6f820bfa4370c0d611b7e74e99e8ad67a31b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/es-ES/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/es-ES/thunderbird-68.9.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "4f103d329c694c6b9d676739936ecb1fc61e23d7210252d8c87a28c916f063ef15437cb57949b5935269c922bc0221e2e9c6d536152503b087f0f00ea0946777"; + sha512 = "e51df8034b18c8dc0d7fa024c3e58317a614f4da4d286c837efac3d21c59d1e58a786cc2ae0afae8730f81e96a4f0263e4fa09b552df3b58f915fd0cad133c62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/et/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/et/thunderbird-68.9.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "a3e61bfd84ac0c2087abdd2c311c53533ebcc79a87289469aa1708e4d276d44f41ddd657afec21b93d0b499a003014d500939af9d6bd0d4773072019cc19f59c"; + sha512 = "a81e2bf12df9ba23b8d330599eb9d32d25cb862d3cbd109183c0164ccfd2036bd327aaba36248e85f738d02d15d59f9fcaa837101b154834b53b04d2925ad666"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/eu/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/eu/thunderbird-68.9.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "898add1a1d7315993b18b2e0d0851f07379c346efe905ca1ef8ee9e5fb249f819b720a1de127ce558b576c0c6b4916c52069d117a0d050414ccdeee239e04e11"; + sha512 = "98a3b4e765683a9fdb9f1b128354ddc8f81ffb7bcdfb3ecc04431e84862d65184f220cddf86ba2a3442f87c27ea990a2868ebf68dce7328857718f9e02ecd474"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/fi/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/fi/thunderbird-68.9.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "d8e6a78f615af1d99c5d23ad050e49add43b06e3cccc727dae512a066d348adda414869adebcce1a4d6b32b0bf666e3a793c9150f521591fd53ab3bb2df04f25"; + sha512 = "75d0523e83f9f95fdef45fb8b6de632eedb8b274225ac5c6d6d460cc7c129f7e34f735262cbc44e8f99957358e33eb8c8e2ce0cdbbd59d237dde468991139e6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/fr/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/fr/thunderbird-68.9.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "67541072216f3362d81bd0f2894a735562ad6703f583b51cfd114e9f591b3f4f7bf9ba70573f124e5209ff805e192d19ab37df6068306ed34ac98ef9292e7edd"; + sha512 = "c7b070e1b5dbb682e6dd119436512c5e2200105294f1c4e84c88fc8326f342196da1abaf8b7b4882397cf797070a524c19b640fc41d532885b9ce867de46d055"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/fy-NL/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/fy-NL/thunderbird-68.9.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "1a2be59965ab12c8380373e0dfff660b62d6f9121549799055cb0318dc40bb517b64d203b7c18c80814f0f1a1426db04781ddc896bdcc5c679f7de234fe35068"; + sha512 = "bd93c4d482231c0c5444b653c045f4951d73c0c4c1ef9126757c41b30280f0009fddec38d8532af2c2e379a26128fe3b5e8db2857709fd2ed226d2fa73f0d88b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ga-IE/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ga-IE/thunderbird-68.9.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "37159206d5d6533b431ed445bd0fe7d22b654531a4f0f9313db35b8c2c55345d1f6cad18a1711aab6042a082324a843e3362a1399ecb20b3595575dea356b220"; + sha512 = "f6da6b1635d44f217b1ffe9e446d4ce8fbc82ecd5fa8a0421abdf83a0bdaf46db35343a5345b009fdf09a8237475b393d2cf0cd3f52fa16cd2cca63b792a546b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/gd/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/gd/thunderbird-68.9.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "b42fe49465f0bfc3d950006be6d6422f60572ad3e6be69e0bf78123e4672d5e93bc1abffc51226608a23a8786cd8689f46819cd1e098f38d94b201038ee7bf5b"; + sha512 = "d6e4c7e51432c4bc81a9470615349624f2d8eea0d6092e53afb833a2cb4a9e770ea4c373fbef424e9139a1668cb695841fe2cf8c752befb650d0e72185693c5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/gl/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/gl/thunderbird-68.9.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "58be0afc433eb4ea47a2467efe8470cb710b56624cb64c308a7e54955b2792fef72b2f697e3055f86faee51f17a4e111f25f23e88e2e48f2377474e59a555d21"; + sha512 = "763f2dc852ac4ecc4accd7140ea9c1945bc343342a01efe8b09470cc41f76fad4f61ec25c9456b10a16f9db528fc6aed802d949252b12e0d73c89c299ee813be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/he/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/he/thunderbird-68.9.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "15c24a2abfc20cd8ce7207f45707bb691b742ff07aa90cce1a79dbc20199ee06bb6f80d2db7cae521672678f37b824c567cc21844e234bb4e132866da490389d"; + sha512 = "82d66c85f843978d9b2e3e0353e831c7779a16cc3a977f225ef93c92cd8eb8ac98afd255e40b1da0c21a356a7f290027b7f2c1c2ecce656524f21d3f8d962a4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/hr/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/hr/thunderbird-68.9.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c4bd90516b22c77ea3fe667d198dc9e304b06495bad96715ea90172488b09083920099d282768d11ff86b1518cf0a9d56613c9243ab7416b0495addd85081822"; + sha512 = "7c013aff2eb1d4d2330df3ec81dd4e6bc99f4ec9b620fd13cc487a02825669f7fbab84d8f9a2cb76cc34290dc301522505352b0985f75b7f26133cc0987d30e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/hsb/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/hsb/thunderbird-68.9.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "e1ff1afdbb83579308927301e683d8c515928ce3dc50ca45391c81d9f66c0af8a61ca4ae140634760e0c0e4f3420a560e837d8490444282b480aea6c23ed92f8"; + sha512 = "707059d39c02b2c95f18817757a4ab5fcdef4eba63645c93a8e1cdb37dd013633aaa7b67628d357e8c530a7d9394448d61fde9fae32befdb351502c27db3cd93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/hu/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/hu/thunderbird-68.9.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "aaed51d4181ff7bd6eccd9801a21a653926ea448d8049c5a52a897f83a2cb463444e1f12d5c6d4a37b69a712a1bc5428a12d42eddb823c4a02732264fc5a1c1c"; + sha512 = "238047229050a38375a05d9d16514c88c5312d56857b179d7818be4421e3fb6450558f378c18035707d2abbbbb878656f1aeff461fb9f6b0f7a1b9e7e9863b96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/hy-AM/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/hy-AM/thunderbird-68.9.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "5df858d448b72d5a6f320048df9ec3cfb8c08914d7c7b63006eb01b1dc6c77e9b7487a951be7e89bc41922e9c3bb9087298a55ae9da146291ea1d284967bdc6d"; + sha512 = "871c444b878cdc2c63d96d389ff0ece2773862e825bf00bb4534475130f4b0b684dcad1002bc1d183f6c81b730bb3af1098d29b81dd7d07a5321e01fff3c39c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/id/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/id/thunderbird-68.9.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3ac1a1acd6b85404594caa11da1be1e55a980179a027b23fb323fb735c4d3bcf1ad12d25608d0f1ac3a89c30cd73a81fbb031112822fccb10e93d0c911504451"; + sha512 = "518ce09cb9cedf086549873f6cc868235afa24fd04be3e2af00d92dcce8c1f08c7855c7af9c4cc21d2329187f2a28ddcbcdd46fb5a7f26f2993261e0f2cf7afc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/is/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/is/thunderbird-68.9.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "fb9569aa59fb4a084fa1c578c4d1ac49765e2e1a5f8a2445081797999d6c877b2e4aa13879d03b54b3f885d5d1054647cd891cc38f7e54db58b5c58b7e906486"; + sha512 = "855c8d301067538bdd1494fb9a6b57e0182e94deab34a9aadc65dbe6a5829023145d88d4233f10702947fbbc7361812fea94b6a1352f687bc006988618781816"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/it/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/it/thunderbird-68.9.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "0c3063e9deebdb4ef1bd08f0d7c0208fe16363fb87c7de0bae772987fa5a3800baf723482506c5957ed0b641cc04cdfa9a80e3e200cacf0eafd9b5fc1870a3b3"; + sha512 = "d447dcae327ceab2edc4302235d9055d1b11ff0407dc3a05cb1f16f8a53c6bd71dbaf5c33766f5c343ec357cbf8a8702c637c0748f658aa2083d244de9fff968"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ja/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ja/thunderbird-68.9.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "bd12eb6ba2ac0c2c7caab313b726909ba35b2eaf21d70c7df98bd970a18e943042c69b7269a038f7edb852d0036cd2e34273aae77a2a4e31dbc05b3c61ec251e"; + sha512 = "1ad5d5c0c7cb04fe7f471ea85557f8c4aac62eb9b7276b53fcc3111d3e37a7eed56e2e4521c1e978acc32c973618d84c05792b4100fbf9175d2a5db0c74eac1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ka/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ka/thunderbird-68.9.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "1ba48f3544e179b75c972c376a2dad256b7657124af9b4037cdef8a87bc0a3e237be79be8a53cf5286f6f5bfd048ecfa6f09624d4559bf5eb38432b4864995ab"; + sha512 = "0d0f376c9a13165978e1b5d77e6b098f17ec552baa9e8e64d32b5d33c5b2d52f78c6e45ff92901f6c94cf9efc1d0349025c3dd7baff9693c9e5ce9f62e0a7c4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/kab/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/kab/thunderbird-68.9.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "5f598ae0de491cf253860c87eb80fa15e1fbbd06f17667f0a78747f412ad8fee9b4a472c1a89f096c9e765ad289ad8d80f86aed50b538e52c68188c41caffa3b"; + sha512 = "76927cd9f2630d8aa4b501a8ff49ebdabeaf75ecf5dc166aaccc254d38493a94df7dc6d432bb68511b78b5e31b483859503bf846b4c2e7fee2ea4d40e4506db9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/kk/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/kk/thunderbird-68.9.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "7e9d7cb00122945a2b74650b71712d1c761cc6df93de74c11812f0d39d25666c911beba60eba97376d9c1212ad0604577cfb46053052be420da1d2f6d53ad445"; + sha512 = "1a0d0a328341a7efffb6fa5ebb7bdced15f8202d37520b1e2972a3f82f37053669d52e0a8a815a8a9f2cb439227fba2c6f25a5967f459b1d2d7140e16315cac1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ko/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ko/thunderbird-68.9.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "5c4406cb82a5dc18235d158fc756eeeaa51bb2e791663ef00d315a56a595fa6290f030f0cad726a9ef98706a80146fe63a3cd5d3edea6869f7ceb4aeb1b7676e"; + sha512 = "d4b654cfc6f0f8be641d844a52eb332c2218b419c7a699852ad693b90958d185ef29c2c1bba5b7b9e397e05fe1572b80b0f0df01e83b65edede368e0c6ad9ead"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/lt/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/lt/thunderbird-68.9.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "3bb3655934068fcb965fb73dd8ff455e48ea4cfe578e0f33a0c442f1f001731aef9fd3d426cf720b9decf610192d1d7722f408e9b8362e25932c3715e396ae27"; + sha512 = "fdedc91f7bffbc4f464682f3a020ab161592015fe5c50180899eecf951e9f775cf5ef3cc6b5baf7faa58221f00e19fe99074f60d292ca258cf44dad2db0d0d69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ms/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ms/thunderbird-68.9.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "0c6635d9e366a85b29549ba3329861d7912f9e1493bc7becb8cfa0225980c0c67b8e671f4f841a5aebb17e123ac4d38aa90ce9cc0bf72525918557a474262931"; + sha512 = "1ecb61c99626dfbc8386364b747e94de7080facd6434813c8afeca60373d3cf07d2259ba90ed6de01c68a65e8b8408e58647d4e72b62f150f82da4a81e78f861"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/nb-NO/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/nb-NO/thunderbird-68.9.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "2c9cca7bd403a0a20ad1911d924555612e8eba7b572d4ac3cc3d1fecf3ff294c729147e77675be1f1026702b41000e43b0930815cf08ea03f7fde757266bc15e"; + sha512 = "45ec1f8def3d2b57e29a3fd22bc38f08a9c7b1ebf44e6dfb736ee13d09cb1bcfcd632c2f8594e3c531d35aa7b696d45ffa1bf5c4cad7e1304fa92763f923df43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/nl/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/nl/thunderbird-68.9.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "a16f58d19f6ec59e9dd557a3b1cf8cc22326596d5505289b93bcd04e801e551608a286df03832e4711b91887c9a408bf36364e9a47be4840a828ce53e0f96f49"; + sha512 = "20dd4c7e946e0fca871fddc3481f2f44b72939de3a7f5064ab8f062981ea717d47f2a3c09af32c9913556e2f5fc01fe1dd78c2d35b5fd44a7f35cdef1e4252d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/nn-NO/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/nn-NO/thunderbird-68.9.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "10a0ce11cf64713079143cf8f357f8abc5001e9d285eb56b4c7e9f4f560d660de7e3bce544b7099e588f599a4a4b1c73241ea5e542d149d41dc8a4ccf21b332e"; + sha512 = "c366bdbd0cda3143c7684c1cfd948965c2b80bd5076878cf3e98b9b5fb82baa6df419445ab0da134209a969baa0e36d759297bfda701d2ea4cd8c6720b61f123"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/pl/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/pl/thunderbird-68.9.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "8a6fec22b065d43ba320508992dca6d21f0782d4c4c28dbc6721852029f74c45b1451002c03f5deac70f09f3e9d07fcb161dd1a3943239231d10da4b2972f7ff"; + sha512 = "163130f55ed9e0cbc68b48c41541748aa320d7a8fdb954c38fc25ca7e2dac6fea98b30b2653b6e8b31230ebd8364ca12281551e00375e4dd64b87515f08e6bec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/pt-BR/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/pt-BR/thunderbird-68.9.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "d57e6e42fef8a13bbe515089d2ee761509f464cc0a97a984e369bd96022dba7cd15dd40aaa9715b63531a161d708e06ec809bcda56c92968da1f11f5e66e62ac"; + sha512 = "5e362e0c53f898d1d156c53415469fe965162047bf5ab55798ece681a33322d677a874b80f9f934067a847da9f2c45a62d63753b866e368585ac5f0844e410df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/pt-PT/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/pt-PT/thunderbird-68.9.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "064d2b04a60bceb7e300ec5f71e13fd1dd427bb89ae471760dc1933c574a36427581bd0d671335e9f52cdfc33f6b9addafcc703a093e2223d58e96e90982c491"; + sha512 = "b322096fd6fb0778fc26146b69fa9a63f249e927de6d2ae3fd6093e3e24b4825ed29a1d09cb68de274aebeb06effdec78e6445fa5282dd6a733b2181ead21248"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/rm/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/rm/thunderbird-68.9.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "4a3025096ce81672a45de762c2ec2fa43d302310206fe04331fb6bd12d73e49427c3a9b9576f39fcfedceaedfa4d44f044b26245b15a8c2ef2fd8e127befe70a"; + sha512 = "715075dabca54e27001f68b11e6c3c99fc5e20f1fcba637e7613584d84a97520e06fd73761bc6c780ae8abbec3121504fb1b51b615a35c0d8660381d71f94eb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ro/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ro/thunderbird-68.9.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "7b28416c0e2cbf248a7ab9cb6d72b5280f7e60f7bf8925a45575afb9a549dbed39f38a9d9984864d7c9dd246546b7597fa51ef7dc14597330fc4cd80cfebe95b"; + sha512 = "fc279090426b3baef609f23228ac11d4665fd805d6118a4ecc2bfd1dd7b36d37004033db4be1095275c677a092026a083199e699b553c6eb82192db0190d844d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ru/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ru/thunderbird-68.9.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "da97be95512ca48f688ff04c701bc7a0e351ad979f9c3ecf2c493aec79f694ecb09cb5399613262b90132934d6600852213d26a3281b48f1598aa692d2e13bd9"; + sha512 = "8c575c2749cd719878ffba2c8158597222d1d494f2c3749c6b5253a8d75607f42a45799a288f85042d8390225f74ac55d7497abc76a8fc870f89f8f7b7a3c699"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/si/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/si/thunderbird-68.9.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d97a111b90bea06760ea58dcafdfb279de340ea1cdecde008e47f9eb101e77e39466890e70f874bcb7f6061de96ce32807476da7aa97c867bf8d9ac4c4d022ac"; + sha512 = "b2edb098eea69332528f24a352e2cd318161ab3383cf13f878c7fdbca14f923f74a769fd494b435d0ef2fd760d4b7cfead063c91112fd44dfd3d4a47d4597549"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sk/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sk/thunderbird-68.9.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "f35670ec66342aa95c50d5cff47a9eff9faf3123174bbf5cf4156bbb1fd3ba98f47972328c0c33513cb92767e0a5dc67550a4a3259981c84b1bca035731544d9"; + sha512 = "2dde57c16b15b823a698f7c17d98eadd5528ea29cbc50d22a586c3ad7357289f2c4719edf8ba47c59c3419383c64b8ff948582a58356719990340f5db0be84c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sl/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sl/thunderbird-68.9.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "49a9f388c696c1708b0bf76dbe3fb7a2836c128f6d40055c585f83c0b62b84b5efa3cc4e2c26889846045340ed8bf95fead053e79b8d7064b1488c3d306d9c94"; + sha512 = "0014d8985ee139ec3ffae5ff18bcb8ac6f0921930853bab3ddcdcd6d21b9453aaa0af058068770dacb04bd1521b555945f9bfa7d9f47ba4a2adfd667fb067d78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sq/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sq/thunderbird-68.9.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "77e9090243b04cc1f0e3dbd074f55f40949556f0284962d5a4cdac53f7c31ca2740fc71602d6eb7b391f0ad71c9a8e81e699ea94871f209c5771745241783698"; + sha512 = "5aa41dfc73adbad839452077b436ff302d0e611fb342998a7f6bffe98fd634d7995a30f49f8640645052b9f68c149c71a6bcdf0fd2df7e3c67783bca3c4ef511"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sr/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sr/thunderbird-68.9.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "9fb67b03585edba5b1d25d4d5667f1cde44e53b7b9c32730fa294e2118698c63527c0abaecc90b2778943490f9167d8bc2cd4bba2aca7054a592fe653a11c759"; + sha512 = "266d0030c7d018dd68d5cd8496eeba061453e1d5a37e99c1645aa9c677492d0da397b2a9e70aed5d927c2e955449ff5b75efbad74d60fea4bb4ef90c36d765ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sv-SE/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sv-SE/thunderbird-68.9.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "d8aa3a745266ab30aa8c32c7ef034576ec293a02f214f8ce96beefecba877e2de3b7944aeca9a218dc587ab77b95f327a619bab5c192857327810c6e81e1b05f"; + sha512 = "6ce755bf48a29522e1f0805d6fb37bdbf145f75a4b6fa176c06562bd1b6b272d752a3d638ab66bf66dd6dc67fd817d76e70cc31fdf9b201f56c6bacd058e49df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/tr/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/tr/thunderbird-68.9.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "56ac7582ffd7fb8c0c8bc02216c2d0a5d4405e356385406c7fd6ae545d128c8c18488e75ea8d8d63de9313aa48f2fc93f3e5e1947298b2b32937af8d40c0fa51"; + sha512 = "302b03ab2e23f6c0cac0fff85cfeacfcebabea838fef824b7d1733054fd9a3cb766dcff1dad333b199ea876a16ab7a059fe4e01289aef4ed481126c27011b4c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/uk/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/uk/thunderbird-68.9.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d783440bdf153ee044204f1b1739f1fa771bfac6d8ed4c5e6fa2b72d406e3c50b3e76b5f9b644fcf5b5e0183584a51336670d5788a949070994206db7187c8e2"; + sha512 = "b3d59d62dd3d3e6e9ce8be3c4c746c41a0a0962d1327d1187b0b2034d0c1691970d181405cc7ab7e2f1fcafec6caaa26863020f5edae4479e453718619b7d02e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/uz/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/uz/thunderbird-68.9.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "7aa40bf1d31cc59d42f90f821b75a75610ca2a66a37003d103f1aaa83d5897388599d41a61346f614db7005bf14fbe0c45cfabbe3dc304c9a2704d2c5466362f"; + sha512 = "73d36534f000d00a52988825c0145288d8d1eb944065d11231501f6e2906e97b0beb89d59b796d3f2828054ed9393e8f65866cfcaed6eb7f939cf657b6f3d740"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/vi/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/vi/thunderbird-68.9.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "ebe1eb9914f489e679d7b4935681b3c5c266e5cb3868507f662e1b4c6a5f791f8a653f3d1cf788758b9aed13fc436a76b20b80fd293563f25543af41372e2f7b"; + sha512 = "b3ec66f92f5d023933e8dae18f0827f0fc8c5880890f9986b339f06b4e565cbe228bc2b0843924bd2a524a77ded7667e63c2747d2ff6c3789d57c8a68e440714"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/zh-CN/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/zh-CN/thunderbird-68.9.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "b15026fffffba21ef50c98a8fe391a3f949a300b104d9d238c07d154d4279b70228e261083a00aca529f69739d3e79a36da3919bbb3cc19043faf182c25464c0"; + sha512 = "e61e72c3dcd376d74e732d76c5a49203b47e2ea31c86bcdcaad673583795f5c01549fa2c5526205857e565f2a72b8abf8b2aa4e7ede45a94b218428607662a1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/zh-TW/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/zh-TW/thunderbird-68.9.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "d5f654661851b4079e7fab3f71e4135f8928d59b822d87e8fa6cc8388fcd5aecc067a88790c27fa8bc4e7d95ff9fa123b8841efaa0e3eaa7bb9e97a50e2c7076"; + sha512 = "f47bfe43ec5b570863ed1fc81828a23beb250db24fb77d2df2dfb5ec60a9c750f188cbda1a0f2927688865219f6a36695d87e4a8eb1fd642c4c9650dcf2e9063"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ar/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ar/thunderbird-68.9.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "9608a6b9e2ad0fa3853f413ae644d5a1c9cf56432b3fe546ad9fb60cd6fda2f42cd8e1a4eff5ac4acc6b95817d03107d248cd6971f049f7f1d95419a3125b0cf"; + sha512 = "83a77d9f39196a8a3ec72469c038c835fb6b50872a2dd611519b178f5e46ef40293bfbdd908b3ce236681205b9b3ed133c845e357abb70285f9920401ad90cd2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ast/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ast/thunderbird-68.9.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1e06d68a8a7999005eee84e3da15c23c2bfc5b4fd03fd1c5ff9e8100f64f974bf894bd62e974d52db4ecf8030dc41de6446f797d83a62529679730b0f24861cd"; + sha512 = "83084855cf03e66968d20d2caca749a9ff9d47b0cfdecdcedf0320b4bc7e628ff5f3a971ae1f6472c5a44facfcaee419250f55ebb254bff9f344c64772f54791"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/be/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/be/thunderbird-68.9.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "82122ff9a1b1327bd3164f1d7c8d18e47d63dbb2981765f7fa7499ebf26f2937f714cddf7882c6c47a6b4f4a480e5a43c44c35eb7a4769988461945ff657e48f"; + sha512 = "722bcaa29137994e36f70a438fddb5be55355cd85d414fcf70cb8bbaf66a9ab0fc21408cf282272dbe977f46b5aa63575c7504bef8292adbd8d4c6e308655411"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/bg/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/bg/thunderbird-68.9.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "1d95aa7716f43591943be6f2f5eedf502cdcb5f08d262e359e3560da7198e9108052d0c5bc5b5d594fd2d8a2560f9332acd661f518c1e3f534843d65dffd02a7"; + sha512 = "95464ffd5256fb181599ad795fbfe5d9cfe8ef0c02a7830174ee4732761cd94a2cca75b6a686559e07d996640f5e973a660fc857f0839d6bea5594e61f2f7e4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/br/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/br/thunderbird-68.9.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6ee97fb0942474747676c191c25c27fffd91810b3ce3d4ae24bac25c3dd90b99192210c242192d533d6e85497f3d4638b0c8d2e939bae93f4dc1648c6b5c9dee"; + sha512 = "fe09bb21248975aa60ffd74a970c9dcfbef578c1188bc1c3704c7411c2e94f88976ac7ac5e52a69ac6235723332f2fc76757ef9118092833fe64bf0a05e3ecf3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ca/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ca/thunderbird-68.9.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "6b7a0e8b8e42b62585ccb333c16ffb19337afd2d68c673bb364f92248248a814ca57d6409a49959d2b8fa7bed1f9031bad1296e24ee7091e62b78a81c059a0bb"; + sha512 = "01ac3c0090448f1ffc7c97623df8576a7a3c184a2bc1a2761f0e3451a18dee6d4f6bc37b305dcaea89930a1750a9541116bdf03f613b333ddc47d5f257b3bfc0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/cak/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/cak/thunderbird-68.9.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "faf8b1a06ffc96cbc6a16e09290652f7a9c270d8dae4aba0d5685d250f8686957341b68459affc8215522cdd6166d1b5e7c498713e9ad8c981d07a97156ca4ab"; + sha512 = "27dad086126a268f2c6700a5f01006c40e911ecbc95dc994da7cd2dadc3f2bd3bc94d5da15a297b2e72e8b20254d40c757456c308b70bae2c1d451ec6ad7d1d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/cs/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/cs/thunderbird-68.9.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "5aaa310e3e67b174114b6c440cc1ceb2b7d0d934b10685ca89e3b7a1cc859bd026ca8fdb8607d70da16c039c853a9f1f11ef94701c90172220d988da03e902d2"; + sha512 = "b99dc13bf43a9aebd08f13fb113186e6e4a72c68d609895afc8a52c4909a0506f646ba394c705004272d1b91db4efc81a5518bbd06e359a8a24c85f4fbb30102"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/cy/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/cy/thunderbird-68.9.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7523a32ca26e46cd388142850c96ae256fa2e7774f5552771b3ea13a2b632feab637a2552b762b1f4bc56b81f92bed3b8139e994b46b515e98070115dd3624e5"; + sha512 = "36c1557a9955e461128929b7be0f679a02592b65e4b401b052ecf1f467a231ba725c92eb96b8118bb75d49ae45f8287bb5fbeb22d94ba11dcf311cdb87170ee0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/da/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/da/thunderbird-68.9.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "0b528d5b0b4838fdb62e49c136f1d997ecfac946154a8c5515ac22a542e7c4e00c1a44dd8aefb4e20528301001d79c88e3fc97b60a10674ec4a3562c0807b508"; + sha512 = "e81b41e38b322f2eddfd68c07f326ec9d716bdbdf31c3a02d22d9377002fd21b58a68a8ac952fed2ed164a02f8b20e9f6678c52fbaca741a4bcde1079ecbe38a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/de/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/de/thunderbird-68.9.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "792545f3fcbad3cb303bb5d91a90788374db1d41962180225f7d1ffaced19dd8b4352d36645df06926347dc31d6ff00eb0fee32efad27a15260115896e7cbcb0"; + sha512 = "da6a44a2a6545b10bbe12644e433932c4410471f5948278b919baca1c6eb0181366114c1a6f611b897c71bf4091a6734393fd36f997c118f49466faa8dd2264d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/dsb/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/dsb/thunderbird-68.9.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "105c814511f32d85ede8c1991074bcde6ce72eb67280a883de13b69de4f74c4f97828dc3e5c170b1346ad22b4ad8b51329c3600979ca468bdbc444cc49b880bd"; + sha512 = "6d19a0010553d1b08bc47a22c0c7f23bf4c86ca79ef3ca26c970cd502e6db003ccf045488f88d68a5b1b0ece4436de55d65592b314126b9b5792be30c9def553"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/el/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/el/thunderbird-68.9.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "e7000a3e243b77cdaf6b46cff8380dfd1ecad3d07f69566f5d34f8e1ae15c582ef56eca8227fc75a8983bbb78736e935fe94dd1e7814e9b95158c9620985da4c"; + sha512 = "67e6382474356c4ff25e6f49a7ee3859eba5bb29a4e795668e1ec52131dbaf0d87b9cfb8ffe1fa855bf8f34e841b8fac90c356545f47a711b533e3593219e957"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/en-GB/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/en-GB/thunderbird-68.9.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "87446eebfdc281eac83e7ad67900d06a2088b67d809f6f5ba1551a069a75d4ec4e642a241954671800ed4900b2930a11c4b8080fff06888c78acc0521d50e39e"; + sha512 = "f4e1d9b10ffc96aa7ef4202e73445d98a06082abcb87fb60d951ce491ead7cee4bad5c1009270004540d03aaf383eb5b8203845f84335b523d92bb586ed5932c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/en-US/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/en-US/thunderbird-68.9.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "644a6d2b6df53d624dbc26301640d4b5f601f60fafafbd4a1ed07583d9258f89a4276655686187e09268c25dd9ecf1d8400ba3bc7e6c55d21dbd19a034614bca"; + sha512 = "a8fcf918c869e8064c2dd39a03bb768616b1a5e4e1c6121aa544d72626bfb790625e2cc48dc973443b947c6e619f9481cb20239d544b10bdf287b7fa4e05128c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/es-AR/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/es-AR/thunderbird-68.9.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "227ddddf7bbf47527f8911b122d74f9c718639a3028ba56a22b2c93dd665521d82b543b0b0814b5bf1923fbc6ef2b39d52fa60616c1c5e5474de067b762c5af4"; + sha512 = "6b98ed36080e8eba879e305aa34ccc77e1735700d104f592095cf9810545bdf25665dd36a527e19cf12ec4cf782a6387e30f7b4406b76230c08a350f4cfd5fcc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/es-ES/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/es-ES/thunderbird-68.9.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "746cc55bfab6a7c71282ebf63738bd7f8c8cab67a01329a3d125a84bdc5a7c210958a52881734315612845a0d386baa75373cc26ce9c5f51c7ccbddbbd752db2"; + sha512 = "0cf479d98ce943e20871e7073188db3c9162dec8cf2b0abaedbaabfac9b29411dad39fdf44c038680956c42f7f7e303d5e2bf8d7ef9225fa093821ce760e9974"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/et/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/et/thunderbird-68.9.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "655bf1fe4942388f357d89c2e7cdeacc4c09f95e3c7a6e25d3991aebd571c6270d45fc52e4b80884c87705232d8113b50f28d657abe49f907878187e03f6b752"; + sha512 = "51584ee5c76710a9b805d4da528d5463f1e51e3efa6ca3b9cf3fc6bb6b953cac6b7919f908975905f619d9be75e4b9ea32980bd5f198f77dae0f75795465fc23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/eu/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/eu/thunderbird-68.9.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "4581e53d1202bd5fbca9b20979a71d51752e8f1883855510722f499489fa40d77070bc71834d371843e6d5a601e0bde8a6c86a5c1c9857a1150a792ca9aeebb7"; + sha512 = "bbcbd4a91856ebb9418c00feed41f00c93ffc5eed4af7c1c27585c707aa8dbfe4e48b0204cbb236a8205a219f0044811dc43f4cc94b6610f30d38120e3ab4b21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/fi/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/fi/thunderbird-68.9.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "4109ca4d181485ead1ed865b101787c6d12879764fd5c399f73eeb23b157f09ad12f237d8b9460634441601d51e5cd4a3365657e3269aef614b6306339a3682f"; + sha512 = "f03014cd7a28b4d85c2d896e8e2a5a1db959c7290c98cfd0c12839170956e98e0087685ab4304fbbdae42b06a8ff7b5563e70c9bbe0a787d2d9b4103019cf31a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/fr/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/fr/thunderbird-68.9.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "53437450a3d67c79c4e44a223e846ac59eb2c534121e923649e0c44891437d5c180d15b43a00955706ada271ecfe651f1a9ca1c1e28830b200bbd6689411a536"; + sha512 = "ce7b187a572da6bee677cc7849bd5123545bf437005b16a855d9e4bfcd58a10f3b095a3b0a767d5a67aa113c0a9e0d437827c37fe1c8bf84a3fc8c8d2c702a8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/fy-NL/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/fy-NL/thunderbird-68.9.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "5c9cecc67893973aafad3b2eba78e82fe459b70a5b467fbeb9839ddad93371b6f6d77f96dad6f7a757821645d680f561f1cda45a360e556229e6202d60f2a75f"; + sha512 = "2062090196c7b07ce148a2937027637469e7593ac092db0bf7139286faac51d350c786c0bfed6e32903bcb7f2ddc4e3df6e993f8637fc68c1aae1be89ceddc98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ga-IE/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ga-IE/thunderbird-68.9.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "2e23ae199d505493dff47191c599d116749d7d4d362906ab9022e1cf3b06d41694247167c96a3c92d58fc7e6c39e850773b7a2dfc2e1a8dbc63385e20a4ffa87"; + sha512 = "fb11eadd35e46081a16116843a4a134b8197c4e8e1d1a52981a085f02bbda7ca49dbf1d9a88f4a7fe2542a99ff24f6d35fc661414cef1fb50edecb98c6693f4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/gd/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/gd/thunderbird-68.9.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "1d703587272271a8787c0ea6020888b202f5f07f529e8f5e448b57adab781946625511941d37d6527e52d027d02be121ef8e5b0d6ff05494a2aad775bfa467e8"; + sha512 = "e9b985732d6619555c24ababbbe38303998750986395c647aadebb0c209467fcdfe5f9dca99ecef0e0b747aa8598f887ef2218140ad1d97e7e3d73b430dad1d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/gl/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/gl/thunderbird-68.9.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "7f07e56433349000859c8dfa420160d9388c4fe70494f0b614b9740aed4cc00f17f3be475303a74a5ef58c16bd334dc8fa8e7d73d989202841a171afca4388bf"; + sha512 = "3b8eff0004db222eff3b4f42be4eff168310fd0e17e676ae92fddd9c11e3a6d4826c63a35f9de37095a7fa88f7f4931e36bc17ace548e36f91bd8334fa53799f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/he/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/he/thunderbird-68.9.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "2ca1b2f949af32e3af1fa80de361c2d35bed79e7e832dc4d7dfa3b3ac3866ae0a5d7c1fe22fe2a49f4d92f4136abb06cdccb44daa4fbce41596a8cf3f30f3711"; + sha512 = "e3dcd319e08ddb5aef2bc576f136eae7838e3aca3c9160aabdaecc32332f0c250201a80f31724233a77f4dd2857684f2bcd9b194df5ec965d69cc04a9e9b7da9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/hr/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/hr/thunderbird-68.9.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "cc01c61ef5c2fd136283b035b3baa282b57643afdc4feb82e014475c6afc7aae73f41b607e16a19367b010fb551f39cccf48250bae6650cfc2882a40e8d59d00"; + sha512 = "84164d00d087e507ab79aa4db6567311bd0cecbde1cb1be7337f4ffc42abc8c7cd0f4fe9a3aae2e35b01683f96e1bfbc816fa96e6fb872157cb473128679e19f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/hsb/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/hsb/thunderbird-68.9.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "abd12a6378f51ef7ec3e5f3cfc4b5f5774a7386887bd39f0d4cf715483810436f258e80753eccc204eaec61f602e90525d63f027a3ac264127eaec3261c30cdc"; + sha512 = "a3fac91f5e2fbf739d2f2c164c6d58ea89026c1e8250a41c51ee11640bd7831c73a4c3148cd80ae2b40a2e1a369d47d3832f96a276dae2c80ba2d90d6990d062"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/hu/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/hu/thunderbird-68.9.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d4ce5b41a15b40539bf123dbf4f075b00da495007eca83c9c49c5ba5578a0744fd3e38ee71d6746432eb8ef79490ea9b5991497946ed6246537ac4d592a85b62"; + sha512 = "002c42f700616d2ddcf1753d37de064959965e4504112e96507a8aaf2398fa25f650e1fcb50189aebf3bc3d0c3de795b496d1f8e1550fc0186d74ef312a11d74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/hy-AM/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/hy-AM/thunderbird-68.9.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "caea7744d3e7d5e76ab5bfb98d18ce27b869f8f3c8e8be206ef4ca8b34819ba8a552dbcbb409d53cb45ba709288fab550f2f46607dd8f67908272be3b64d55ce"; + sha512 = "41fe16657886ccde1c6410e3e62ade72d8890a50e77526994e82cb929c8296110d0aa32d8d02dd7d1482d594322325d28cfa54afe113dc69e2520dcfd56516f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/id/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/id/thunderbird-68.9.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a4e7862dbc71b7af2eb2f348de8632ea7865408c72b8ae6a3f78aaf97746662020b61757072d49639293b529395359e35f459ee11c4f37cabbb848fc363fa16f"; + sha512 = "8fb8703220a801bb2d29e436d28325a3310b61f6a22d3d8964b98bd9cea9e74f9e53cd41c8c9a501057d1915a6c71f6f5d27fea267b802082488d2690a0ee088"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/is/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/is/thunderbird-68.9.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "cca9db1eba2143dc567ca454d33b7c6dbc7d1d3d3daa858bfe2e2db1910b8260c74af0a5b5cbe53d94487d42cd12e7bab143deec5dab33c2bd14f889f2ceeaa5"; + sha512 = "09c59bca1a0282416aff4043b7d64e5f8ce308792efd35e197b2d91125715453769b482e5815c9f33cd0d9d3809bbe898c40e767c13786868673bc7f041f1c17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/it/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/it/thunderbird-68.9.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "185e5c4246f73bb5fc46187bfcb73ea1bf8749f67558bb162f4557e35e8657ffb19b61a04fe425b7bad32c20bcbde67894848422c350ba38a27c32624ab0829b"; + sha512 = "c3f09f2681d0aa197084b0935855dba98517d6f5595595385d93dd7a998ff5b0c98f35141091f41ea8e91ea10b25f6464f242218cd7030351347f77f35396ca2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ja/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ja/thunderbird-68.9.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "1ad054c656cb4d4ea906603aef9370014480f5bd4041d56027fb0f9602f5aacaee709e130fd29cf4a0b1fa638ea52085eb1b86e27e38731da9b22f5b69197e15"; + sha512 = "4bdea34b50edfea5b3dd3bb80935e1148b3ad926c95d84a3d265268f783ff3c487527726b0151643c8f3eb5d061d441742da23f6cb03297894a8076a87275574"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ka/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ka/thunderbird-68.9.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "366542d5b1ca00092fecc577d92111a2db6bc7e3fcc66753d91fc971b9536717494c13a256ccf43522fcdb9964f629870a327488e8201ef5185d6d6e2fe2a1af"; + sha512 = "ec029d7a58aa502742160e131eab70f50f83851124297fef72214d58f1309f047b9881d824432a8bd3841dd158493ca2b41e41f4f9bf9dc043db9ec4df1a1d24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/kab/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/kab/thunderbird-68.9.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "f19a99f2824cd65a10ee264ddc8d21516dcbe2c2d807e076e8d137b56375237307d3adedbaaaff5a3f88a1d4ed80faca292abb7941a349a42bad6207fd267ca2"; + sha512 = "cf291b9d2924e72b9871a4eadf10118cd0299e2206151c67bf36fe0c766b75c9e67e9b11e8612ca5d95c50c6cd3d90e95210e9625ed8eb1c14ba5a8d45bb997b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/kk/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/kk/thunderbird-68.9.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "12903b5f1df5ec077c5ea7cd53a8cec4489613fa87862bdb594819b87d70be76997f9b9c825e1335a3a5e785a070b25f75cc2ac19dac726638aa454822bd2a4a"; + sha512 = "1031db4a9f0716973fb1ddbc8e12b2252bdb8450617a6c642ad4001c119cd3eb3bad999b861e8204a85699b415fdc5d768b6aafa6fee2c5b9efb7e9a3558eda2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ko/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ko/thunderbird-68.9.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "d246ac4a6f110075e7efa1da523e1a171d34415752536c8ecc40d296187d65e589e1a9a20e3da93813dbba058c6c3d820ce93f8473c207190d2b58bda6496326"; + sha512 = "bde75ae38856970c4da871cdbd63d96f31021f707869be7517d4c719ecce3f505f886c65e9faad8bcc0ac26885777e070246576fd47f75669b77f0247689954f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/lt/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/lt/thunderbird-68.9.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "cce06ce9899dd9cd50bcd09f2699fe8fce1a08666240bd997cf03a813befe4c1e15823e4e3ff16148a301e3725210a2bdf2af2ec72b9c55c470519860454a14c"; + sha512 = "9459b50e1fd01ce742bfe6f13ac26241958ad5307c08e3980ed5a84023a12be009dc6a83085ad52c68e162e6a45f4f430e79e21e4d19f67e470ab07151c40bc8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ms/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ms/thunderbird-68.9.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "f9facdfbde7ba320c9d16ca41194fed7a0b7aec758b83c57c64fb2a778aef90ad9840f0b0dea838598d8786ce5318d7ea790048c877d492f1f6f77ea7ce5ad44"; + sha512 = "0632af25fd5245ec2a15a09a075db24a64e3020ea6353e88f72fa74f929d8507cb868cc617da8e97f01efff19a9108c9b2b30adc8e58b0e7e6353332219e658d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/nb-NO/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/nb-NO/thunderbird-68.9.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "994d93d68806ec039ae59fb9ef5a27a940305ca7919ebc427267affc797e5b386cf96d67cbacff0f708b659d4aec8692271f376dc4eb56e510096387a83af0f6"; + sha512 = "b16523b5a40dbe496537df487d72f8cb16ccf338c1a96e6ec3dc7e1a5d3073991c12ada23fc6b31f34d2fb712050334eae145a45420994c607a63799ed42d264"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/nl/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/nl/thunderbird-68.9.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "8ae07cb28e0f777b79c005e0c6848854ed40f072f63b98d68841c3aab4dacab04d90131e4c76c65943eeee05ec01bdf79c3872f0a0df1b10e02be1707e2709ce"; + sha512 = "82f0ab2e4969323ea8294f732b13144ddd453a613a68b582ff398cb85aee88874a5fb5eb61627f142ce8124b476f49fa6cf68cdaa41fdaf3621519c53c4ac16b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/nn-NO/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/nn-NO/thunderbird-68.9.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "994e22db5edc1d1b6ec4f51dbbcdd200695e468aaf7cefa228f54c5ec4eca7aaf5faea8afeb1efcc1db5dd221e2022e666bbee65a685409790dd7614d0dc4b20"; + sha512 = "815d0010de5f6d9144a182a2170c59a502b167f18eec65d23987e4b73e6d5bae46be18d7f55462a3ec8634466639aceca03ad9b772c7e8b232eb874998e6148c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/pl/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/pl/thunderbird-68.9.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "4efb0643491e7b469e277f98d16f106e046514a35a3f33d30ceb25809a037e521639c2c5c6304be6716fc9f7f39c216dd2ecc204d47f81bc9d1a3987808d8ac9"; + sha512 = "5be434a54c91097d4f6477767af96f8b862828912783eee48577cc450a14eceee2e067e9c10697633a2833f473b9d10bea33b3c6c6377b898a18d3d7c6568f96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/pt-BR/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/pt-BR/thunderbird-68.9.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "008c6291daae9eb05a981db2e5931fc5a2b72c55b349978dd3e76c8bc632ef95b78f94af8934e2e89600877899218acd1352e910ab128e8796a30eec4734dc91"; + sha512 = "b7b3fd6bb8535f2328ceb9259d7517bfd695cc881130720d3857d5a27197deba4fe683e163f49613054ebec2827e805a31a62c9a9e578f4ffb760f421a4ea506"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/pt-PT/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/pt-PT/thunderbird-68.9.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "be53376fc3f29cdc6f7bd13fcc4de35292dee928d9c65016dde0910333c028fa85563a688dbd644459aac9bf81a5dc68e5cba528f495170193dbeb5024042b5d"; + sha512 = "b9561a6f55c25cff2bec9bda78e46204dc85429c52bb42f33b6ae972c0bf16f3a99ccbe3f283ef08cca955d31e5eb6d91ff9d8b50e85bd75443998236d6e08b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/rm/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/rm/thunderbird-68.9.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "a66262a586bd1b79772fc791fb93bce764b9f0cd5d39c03b26b1b9743ceb83f54e64b30bfd1fc0e03236aef8f320b90017a4e4d997090910c7b8963e30f505e5"; + sha512 = "7ff72dc448c9303a70403558ae46cd720e645c24681dabbf265db783ef872e92216f8ee9169e155904d3fcd3288f2ee0ad11ca22bbf041b380884d57b306876e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ro/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ro/thunderbird-68.9.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "43fa63b41001e01ae7e0183841d6efa5bda0c2518949b6925d035690f507586e39fe9d1bde404f15f34d807e0fb02efa8f7816efd2b584680b43896c6cdb603f"; + sha512 = "7f585b942076749269ca86161694ef1b9f4e68e75300d60ea4141b2404be0c79761a2658c123787d67e65992e4b3dd5b7406acfee6084846bdefdb0f82d9baea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ru/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ru/thunderbird-68.9.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "2d5d700879d1c95bc7ba066ba336f3b9f5681d089c019279cf27c2a837b6a12527d92940378e1bdc794bdfd516deb09c97fd5fccc07571a9b9c92c7c24bed3ce"; + sha512 = "e4ef9e081cfdb3567f1823866ffd0e3e5fbe8596fd3a7dbb94869a8d1ebd328938c490669c8f46bc6575d6b8c5c351e387faf8dd2a33db263cb2fb5ddb2974f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/si/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/si/thunderbird-68.9.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "b78fa143b483cd6499cb7c4cc71821b8dc7bce79059765650d09876a3ddfa1d62a676f3b3326cd3ecfb6aff9823a7f26c7b83a2c74ada5e7aa57b59238ecb350"; + sha512 = "42db8e43c4bd722102778d4a9cdfb0ba54b0151882b7963e07c0b8cd653d7303eb22a541a8fc3a5b93c9db09c1a24db8f5c3365b5654e997c17d3b4b2c2a5f38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sk/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sk/thunderbird-68.9.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "b6cd21b14fdb6334b03a6e780c6fe4815a3b6124973233e5c783ddf0db9e6e7505b0569eacfa0c2c65d0e740e4616f4ed3fa6f2b9a2461643abca1b437436cdd"; + sha512 = "fb025203b739cd89169bc25b36e6d541ebaf8726720c0b51e58a33fd0e71c2a4ae46428fe16547ed5e639e81ce35253a5519a28de9a8baa952a1b1af184b77a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sl/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sl/thunderbird-68.9.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "9c791c58cbcb91bd682d30feae3b85d8e30b016b9e64fe295b2c11dbae6f72464a2a2637858eb62815f76e83bf92c2ba1549e2e9d1b3a2c19b3720ad383a859b"; + sha512 = "ba392d3748b697d323e63c7217ce3c3aa4eaf6b994d798655a1667644733a6f19b23b95df420b2235e9ee000a868485d4f32fbe5d737ef5c7296c085738168bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sq/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sq/thunderbird-68.9.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "735f2aa6020787f8119dc795af0e28d04f596a001d6ea0f1a2437b90658d571a9b2c96fe2f13e6ea919d8a12ff149e562bb1949d123f0573d8f53bcf0ad0f82c"; + sha512 = "b795928265f2b50a1032ab8fcce954f6d0d35a6dab2b381f11ca1b6b204aa1ae91b0ceb221da5ccadcca303f20792715d0f770c215dc59654df1b325ccc3e42e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sr/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sr/thunderbird-68.9.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "456bc22b998665dfed7a8d87cf754d6d5cbda4e19074086c4a08176e8767244e8b16d90c25173c9f41c51dd27c8c2b83a400424e148dc266da46aed6e75b71a0"; + sha512 = "274c3675cd3d5264c2ce74b101b7c87bfd1703645e4341f6499c25b4905781395f514ed8412b22289ad097994e748ee7b527f1d6081022429292a64155d2df74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sv-SE/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sv-SE/thunderbird-68.9.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "1ad151afb1bf9324c03fc78c98a49d9fe6fd765d245eac3e35f17edd6e96ba3c2503d8569f72e95d22982736e33c391e7f44a5141a9f850f26f9d3504a312c11"; + sha512 = "318ccb06cf2c9f5fdbf25fe70a8c5e65c20e5d7ca375f52f64724410d2afa8a852f9e9e77b673c1f59e26bddd6fde74783a96f69f7bd73a1b7042633b624b310"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/tr/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/tr/thunderbird-68.9.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "ed539d023abf5adfcee314a3da0e1ebdf1a378720c87b75d059d072db65e5682338b58d4b9b0eb1b02920031fa253c2e237cce3635e4897ef618291df6b9a467"; + sha512 = "a86a69a8c146a0765e9fb7c835c1cc774a0a7fc309fa7f6627f427bc2cb4bd1b3e18f4aa61288cb68483f267b0be02662250abcdcafcb6619f1b4e3437cbb908"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/uk/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/uk/thunderbird-68.9.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7f044b3d8d44d3f5177cf7f7fdec7fe8b8fc183a5a231ae64cd403f9a459d2d4b808e0ee08591410163358bf7841e94ba6a14ab74d955dcdddff9240c2bccc6a"; + sha512 = "86407123381e64df9f97190b0df253792582b0ba5296d6663bc0d8faf3004e3ec95cbc0140c9292928a7750cece1cc6887086a9e218f3169bee2246232643685"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/uz/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/uz/thunderbird-68.9.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "3dbb3a4bcf800621f191b11ca3e05e2acb114348dbab49695478fbc653ad154a92f0aa62cd6d86216e1447728d6d3ddd01da678f4a9feb2b7964794f5609f7e5"; + sha512 = "2d31a86952df2f5b339479cc6dabd1cbcc000119514775b07ca086e01e8310fe0d0d2c63cc57cb936588c59a5f72a5d9dae0e0a6e2f9b7cdf6225e400c24bd31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/vi/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/vi/thunderbird-68.9.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "8724cbf93d5d7ebf6fa67b85bf559bfe905cca6b76a4e386db99252d7460ce78d3b63f3c1e5a14782f72d1434906a2d7ad2497bb66ffa6cb66aaf44dc84d0a0e"; + sha512 = "3c241242e918bb69d811289879323205c070620829e05488e224450e7edb2be32b0f2c36f3182fcab95a1673fd133635e89801feaf6a34fa1553d8fea3b57641"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/zh-CN/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/zh-CN/thunderbird-68.9.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "3cc8703dffdedc2de263c2ce10e2fc2f374c991ec7b34ab3d5530d3441ce8049577824cbeb0ec4ab233973e2d5c0120958360b1920e3f43ae9362132b4948cdd"; + sha512 = "b4932b43158a5f8627ec951a3cb726863575a81b9d7b93ab35a9168224cd91480ecde55a1e7d4c01b9ed74f92440724475980010f1645db9b2ef0b6c42e92d93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/zh-TW/thunderbird-68.8.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/zh-TW/thunderbird-68.9.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "bf37041bac13932ad283d49a2f4f552cd4422aaab7baec7a18e19ffd4101b155a8e864aa666eb85683a82668c393c7210631754a375d012e9c9e200c554776c3"; + sha512 = "018fff050295932a492433992a97fd01acc36685f7d1f96bba2f41972fdd6cd592c117434d2de81d0d018595c8473427aefe5a7b66194bc18d127c2e7eab5a34"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index ee8d36b421a..e36d99886e2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.8.1"; + version = "68.9.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "2zq65qhrg8xsz75yywcijdjbkndn79w73v5vyahiyyibc8lfjphz0zaihk67ja82fpnxlnsfvy45s8x5l42kcbb0wibkjy7m55bd6h7"; + "3q0dikgkfr72hhz39pxi2f0cljn09lw4940qcn9kzfwfid2h290j7pihx6gs0z6h82fl78f9fl1598d064lwl1i2434dzx6bg4p4549"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 816e00447a0..2632acd73d3 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,7 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook -, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1 -, libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg -, gobject-introspection, glib-networking +{ stdenv +, fetchurl +, pkg-config +, intltool +, python3Packages +, wrapGAppsHook +, glib +, libxml2 +, libxslt +, sqlite +, libsoup +, webkitgtk +, json-glib +, gst_all_1 +, libnotify +, gtk3 +, gsettings-desktop-schemas +, libpeas +, libsecret +, gobject-introspection +, glib-networking }: stdenv.mkDerivation rec { @@ -13,17 +30,39 @@ stdenv.mkDerivation rec { sha256 = "03pr1gmiv5y0i92bkhcxr8s311ll91chz19wb96jkixx32xav91d"; }; - nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; + nativeBuildInputs = [ + wrapGAppsHook + python3Packages.wrapPython + intltool + pkg-config + ]; buildInputs = [ - glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas - libpeas gsettings-desktop-schemas json-glib dconf gobject-introspection - librsvg glib-networking libnotify + glib + gtk3 + webkitgtk + libxml2 + libxslt + sqlite + libsoup + libpeas + gsettings-desktop-schemas + json-glib + gobject-introspection + libsecret + glib-networking + libnotify ] ++ (with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad ]); - pythonPath = with python3Packages; [ pygobject3 pycairo ]; + pythonPath = with python3Packages; [ + pygobject3 + pycairo + ]; preFixup = '' buildPythonPath "$out $pythonPath" diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 976fc0fcd2d..1fefb46692d 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fetchpatch, pam, python3, libxslt, perl, ArchiveZip, gettext , IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, curl, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which +, bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , openssl, gperf, cppunit, poppler, utillinux , librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra +, libwpg, dbus-glib, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, bluez5, libtool, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf @@ -15,7 +15,8 @@ , gnome3, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ru" "sl" "zh-CN" ] , withHelp ? true -, kdeIntegration ? false +, kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null +, ki18n ? null, kconfig ? null, kcoreaddons ? null, kio ? null, kwindowsystem ? null , variant ? "fresh" } @ args: @@ -31,6 +32,8 @@ let lib = stdenv.lib; langsSpaces = lib.concatStringsSep " " langs; + mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation; + srcs = { third_party = map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) @@ -47,7 +50,7 @@ let translations = primary-src.translations; help = primary-src.help; }; -in (stdenv.mkDerivation rec { +in (mkDrv rec { pname = "libreoffice"; inherit version; @@ -57,8 +60,9 @@ in (stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal" - + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma"; + NIX_CFLAGS_COMPILE = [ + "-I${librdf_rasqal}/include/rasqal" + ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; patches = [ ./xdg-open-brief.patch @@ -84,8 +88,20 @@ in (stdenv.mkDerivation rec { tar -xf ${srcs.translations} ''; - postPatch = '' - sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx + ### QT/KDE + # + # We have to resort to the ugly patching of configure.ac as it assumes that + # the first directory that contains headers and libraries during the check + # contains all the relevant headers/libs which doesn't work with both as they + # are in multiple directories due to each having their own derivation. + postPatch = let + inc = e: path: + "${e.dev}/include/KF5/${path}"; + libs = list: + lib.concatMapStringsSep " " (e: "-L${e.out}/lib") list; + in '' + substituteInPlace shell/source/unix/exec/shellexec.cxx \ + --replace /usr/bin/xdg-open ${if kdeIntegration then "kde-open5" else "xdg-open"} # configure checks for header 'gpgme++/gpgmepp_version.h', # and if it is found (no matter where) uses a hardcoded path @@ -96,9 +112,24 @@ in (stdenv.mkDerivation rec { substituteInPlace configure.ac --replace \ 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \ 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' + '' + lib.optionalString kdeIntegration '' + substituteInPlace configure.ac \ + --replace '$QT5INC' ${qtbase.dev}/include \ + --replace '$QT5LIB' ${qtbase.out}/lib \ + --replace '-I$qt5_incdir ' '-I${qtx11extras.dev}/include '\ + --replace '-L$qt5_libdir ' '${libs [ qtbase qtx11extras ]} ' \ + --replace '$KF5INC' ${kcoreaddons.dev}/include \ + --replace '$KF5LIB' ${kcoreaddons.out}/lib \ + --replace '$kf5_incdir/KCore' ${inc kcoreaddons "KCore"} \ + --replace '$kf5_incdir/KI18n' ${inc ki18n "KI18n"} \ + --replace '$kf5_incdir/KConfig' ${inc kconfig "KConfig"} \ + --replace '$kf5_incdir/KWindow' ${inc kwindowsystem "KWindow"} \ + --replace '$kf5_incdir/KIO' ${inc kio "KIO"} \ + --replace '-L$kf5_libdir ' '${libs [ kconfig kcoreaddons ki18n kio kwindowsystem ]} ' ''; - QT4DIR = qt4; + dontUseCmakeConfigure = true; + dontUseCmakeBuildDir = true; preConfigure = '' configureFlagsArray=( @@ -264,14 +295,16 @@ in (stdenv.mkDerivation rec { ln -s $out/lib/libreoffice/share/xdg $out/share/applications for f in $out/share/applications/*.desktop; do - substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice" - substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice" - substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice" + substituteInPlace "$f" \ + --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice" \ + --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice" done cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") + mkdir -p $dev cp -r include $dev ''; @@ -335,11 +368,15 @@ in (stdenv.mkDerivation rec { "--without-system-libstaroffice" "--without-system-libepubgen" "--without-system-libqxp" - "--without-system-mdds" + "--without-system-mdds" # we have mdds but our version is too new # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" "--without-system-qrcodegen" "--without-system-xmlsec" + ] ++ lib.optionals kdeIntegration [ + "--enable-kf5" + "--enable-qt5" + "--enable-gtk3-kde5" ]; checkPhase = '' @@ -347,17 +384,19 @@ in (stdenv.mkDerivation rec { make slowcheck ''; - nativeBuildInputs = [ wrapGAppsHook gdb fontforge autoconf automake bison pkgconfig libtool ]; + nativeBuildInputs = [ + gdb fontforge autoconf automake bison pkgconfig libtool + ] ++ lib.optional (!kdeIntegration) wrapGAppsHook; buildInputs = with xorg; [ ant ArchiveZip boost cairo clucene_core IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig - freetype getopt gperf gtk3 gtk2 + freetype getopt gperf gtk3 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst - libXdmcp libpthreadstubs libGLU libGL mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base glib libmysqlclient + libXdmcp libpthreadstubs libGLU libGL mythes + glib libmysqlclient neon nspr nss openldap openssl pam perl pkgconfig poppler python3 sane-backends unzip vigra which zip zlib mdds bluez5 libcmis libwps libabw libzmf @@ -365,7 +404,8 @@ in (stdenv.mkDerivation rec { librevenge libe-book libmwaw glm glew ncurses epoxy libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] - ++ lib.optional kdeIntegration kdelibs4; + ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) + ++ lib.optional kdeIntegration [ qtbase qtx11extras kcoreaddons kio ]; passthru = { inherit srcs jdk; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index a53b52c7046..308a2399458 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "12.10.8", - "repo_hash": "189l6l47s5lz0y2qjbai1n9l6yq513d38apyv88c3by3r41m86y1", + "version": "13.0.4", + "repo_hash": "15pfg3ss1diqsnlf0xpx4ixlpjnvzghzjfvs6y3bv21qnjfwkp0g", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.10.8-ee", + "rev": "v13.0.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.10.8", - "GITLAB_PAGES_VERSION": "1.17.0", - "GITLAB_SHELL_VERSION": "12.2.0", - "GITLAB_WORKHORSE_VERSION": "8.30.2" + "GITALY_SERVER_VERSION": "13.0.4", + "GITLAB_PAGES_VERSION": "1.18.0", + "GITLAB_SHELL_VERSION": "13.2.0", + "GITLAB_WORKHORSE_VERSION": "8.31.1" } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 1d50ea07ce9..8a35c8c3b47 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -4,25 +4,25 @@ source 'https://rubygems.org' gem 'bundler', '>= 1.17.3' gem 'rugged', '~> 0.28' -gem 'github-linguist', '~> 7.5', require: 'linguist' -gem 'gitlab-markup', '~> 1.7.0' -gem 'activesupport', '6.0.2' +gem 'github-linguist', '~> 7.9', require: 'linguist' +gem 'gitlab-markup', '~> 1.7.1' +gem 'activesupport', '~> 6.0.3.1' gem 'rdoc', '~> 6.0' -gem 'gitlab-gollum-lib', '~> 4.2.7.8', require: false +gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false -gem 'grpc', '~> 1.27.0' +gem 'grpc', '~> 1.24.0' gem 'sentry-raven', '~> 2.9.0', require: false gem 'faraday', '~> 0.12' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.9.1' +gem 'gitlab-labkit', '~> 0.12.0' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 8.9.0' -gem 'google-protobuf', '~> 3.11.2' +gem 'google-protobuf', '~> 3.8.0' group :development, :test do gem 'rubocop', '~> 0.69', require: false @@ -32,6 +32,8 @@ group :development, :test do gem 'factory_bot', require: false gem 'pry', '~> 0.12.2', require: false + gem 'grpc-tools', '= 1.0.1' + # gitlab-shell spec gems gem 'listen', '~> 0.5.0' gem 'simplecov', '~> 0.17.1', require: false diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 804f643afa8..f409ebb9b41 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,25 +2,25 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.0.2) - actionview (= 6.0.2) - activesupport (= 6.0.2) - rack (~> 2.0) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.2) - activesupport (= 6.0.2) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.0.2) + activesupport (6.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.2) + zeitwerk (~> 2.2, >= 2.2.2) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -34,7 +34,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.6) @@ -47,16 +47,16 @@ GEM activesupport (>= 4.2.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) - ffi (1.11.1) + ffi (1.12.2) gemojione (3.3.0) json - github-linguist (7.5.1) + github-linguist (7.9.0) charlock_holmes (~> 0.7.6) escape_utils (~> 1.2.0) mini_mime (~> 1.0) rugged (>= 0.25.1) github-markup (1.7.0) - gitlab-gollum-lib (4.2.7.8) + gitlab-gollum-lib (4.2.7.9) gemojione (~> 3.2) github-markup (~> 1.6) gitlab-gollum-rugged_adapter (~> 0.4.4.2) @@ -67,20 +67,21 @@ GEM gitlab-gollum-rugged_adapter (0.4.4.2) mime-types (>= 1.15) rugged (~> 0.25) - gitlab-labkit (0.9.1) + gitlab-labkit (0.12.0) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) grpc (~> 1.19) jaeger-client (~> 0.10) opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) - gitlab-markup (1.7.0) - google-protobuf (3.11.4) + gitlab-markup (1.7.1) + google-protobuf (3.8.0) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) - grpc (1.27.0) - google-protobuf (~> 3.11) + grpc (1.24.0) + google-protobuf (~> 3.8) googleapis-common-protos-types (~> 1.0) + grpc-tools (1.0.1) hashdiff (0.3.9) i18n (1.8.2) concurrent-ruby (~> 1.0) @@ -93,7 +94,7 @@ GEM licensee (8.9.2) rugged (~> 0.24) listen (0.5.3) - loofah (2.4.0) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -140,7 +141,7 @@ GEM optimist (>= 3.0.0) rdoc (6.2.0) redis (4.1.3) - rouge (3.18.0) + rouge (3.19.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -185,7 +186,7 @@ GEM thread_safe (0.3.6) thrift (0.11.0.0) timecop (0.9.1) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) unicode-display_width (1.6.0) unparser (0.4.7) @@ -201,23 +202,24 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - zeitwerk (2.2.2) + zeitwerk (2.3.0) PLATFORMS ruby DEPENDENCIES - activesupport (= 6.0.2) + activesupport (~> 6.0.3.1) bundler (>= 1.17.3) factory_bot faraday (~> 0.12) - github-linguist (~> 7.5) - gitlab-gollum-lib (~> 4.2.7.8) + github-linguist (~> 7.9) + gitlab-gollum-lib (~> 4.2.7.9) gitlab-gollum-rugged_adapter (~> 0.4.4.2) - gitlab-labkit (~> 0.9.1) - gitlab-markup (~> 1.7.0) - google-protobuf (~> 3.11.2) - grpc (~> 1.27.0) + gitlab-labkit (~> 0.12.0) + gitlab-markup (~> 1.7.1) + google-protobuf (~> 3.8.0) + grpc (~> 1.24.0) + grpc-tools (= 1.0.1) licensee (~> 8.9.0) listen (~> 0.5.0) pry (~> 0.12.2) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 770f4b46deb..374bf953f78 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -19,14 +19,14 @@ let }; }; in buildGoPackage rec { - version = "12.10.8"; + version = "13.0.4"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "02dih35j97q80kzi46pkf9f9r1sffw11i5zmpjs2rr96al426g8q"; + sha256 = "1hnjv2q98016srvjmyjpd5fkpg68mra6qk0asl1l83z2vin2xrkm"; }; # Fix a check which assumes that hook files are writeable by their @@ -49,13 +49,6 @@ in buildGoPackage rec { postInstall = '' mkdir -p $ruby cp -rv $src/ruby/{bin,lib,proto,git-hooks,gitlab-shell} $ruby - - # gitlab-shell will try to read its config relative to the source - # code by default which doesn't work in nixos because it's a - # read-only filesystem - substituteInPlace $ruby/gitlab-shell/lib/gitlab_config.rb --replace \ - "ROOT_PATH.join('config.yml')" \ - "Pathname.new('/run/gitlab/shell-config.yml')" ''; outputs = [ "out" "ruby" ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index e23c5e08254..221ce16163d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -1,6 +1,15 @@ # file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { + goPackagePath = "bou.ke/monkey"; + fetch = { + type = "git"; + url = "https://github.com/bouk/monkey"; + rev = "v1.0.1"; + sha256 = "050y07pwx5zk7fchp0lhf35w417sml7lxkkzly8f932fy25rydz5"; + }; + } + { goPackagePath = "cloud.google.com/go"; fetch = { type = "git"; @@ -10,6 +19,24 @@ }; } { + goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; + fetch = { + type = "git"; + url = "https://dmitri.shuralyov.com/gpu/mtl"; + rev = "666a987793e9"; + sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; + }; + } + { + goPackagePath = "github.com/AndreasBriese/bbloom"; + fetch = { + type = "git"; + url = "https://github.com/AndreasBriese/bbloom"; + rev = "e2d15f34fcf9"; + sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds"; + }; + } + { goPackagePath = "github.com/BurntSushi/toml"; fetch = { type = "git"; @@ -28,12 +55,21 @@ }; } { + goPackagePath = "github.com/CloudyKit/fastprinter"; + fetch = { + type = "git"; + url = "https://github.com/CloudyKit/fastprinter"; + rev = "74b38d55f37a"; + sha256 = "07wkq3503j7sd5knsgp3lwzfdwm6sj7a3l6i71i52yb3fd8md235"; + }; + } + { goPackagePath = "github.com/Joker/hpp"; fetch = { type = "git"; url = "https://github.com/Joker/hpp"; - rev = "6893e659854a"; - sha256 = "0lsx63c28rzqigv3lwzznqacpk7nr0dn6ig37v023x8lzc728ix5"; + rev = "v1.0.0"; + sha256 = "1xnqkjkmqdj48w80qa74rwcmgar8dcilpkcrcn1f53djk45k1gq2"; }; } { @@ -41,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/Joker/jade"; - rev = "v1.0.0"; - sha256 = "0k9b8dcwwhajw6rzjmakqwmhw9z192pzzdhppcvam6dy63yl4zjf"; + rev = "d475f43051e7"; + sha256 = "0yigzvxp5qd05pai0yimzkpl2m23358a2fqqs585psrdmwsic2pn"; }; } { @@ -100,15 +136,6 @@ }; } { - goPackagePath = "github.com/aymerick/raymond"; - fetch = { - type = "git"; - url = "https://github.com/aymerick/raymond"; - rev = "v2.0.2"; - sha256 = "1w6am4142k8lyjnwwcgx94c2d8zviflzi0a9c81gn2j0gyx475i3"; - }; - } - { goPackagePath = "github.com/beorn7/perks"; fetch = { type = "git"; @@ -185,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/cloudflare/tableflip"; - rev = "8392f1641731"; - sha256 = "0by5hk8s0bhhl3kiw658p5g53zvc61k4q2wxnh1w64p5ghd1rfn8"; + rev = "4baec9811f2b"; + sha256 = "095xb5gfz7dglljp91nh68dnscddvlf7q5ivvz972fq86r3ypq6q"; }; } { @@ -262,6 +289,15 @@ }; } { + goPackagePath = "github.com/dgraph-io/badger"; + fetch = { + type = "git"; + url = "https://github.com/dgraph-io/badger"; + rev = "v1.6.0"; + sha256 = "1vzibjqhb10q6s2chbzlwndij2d9ybjnq7h28hx4akr119avd0d5"; + }; + } + { goPackagePath = "github.com/dgrijalva/jwt-go"; fetch = { type = "git"; @@ -271,6 +307,24 @@ }; } { + goPackagePath = "github.com/dgryski/go-farm"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-farm"; + rev = "6a90982ecee2"; + sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { goPackagePath = "github.com/eknkc/amber"; fetch = { type = "git"; @@ -280,6 +334,24 @@ }; } { + goPackagePath = "github.com/etcd-io/bbolt"; + fetch = { + type = "git"; + url = "https://github.com/etcd-io/bbolt"; + rev = "v1.3.3"; + sha256 = "0dn0zngks9xiz0rrrb3911f73ghl64z84jsmzai2yfmzqr7cdkqc"; + }; + } + { + goPackagePath = "github.com/fasthttp-contrib/websocket"; + fetch = { + type = "git"; + url = "https://github.com/fasthttp-contrib/websocket"; + rev = "1f3b11f56072"; + sha256 = "1yacmwmil625p0pzj800h9dnmiab6bjwfmi48p9fcrvy2yyv9b97"; + }; + } + { goPackagePath = "github.com/fatih/color"; fetch = { type = "git"; @@ -316,12 +388,12 @@ }; } { - goPackagePath = "github.com/gavv/monotime"; + goPackagePath = "github.com/gavv/httpexpect"; fetch = { type = "git"; - url = "https://github.com/gavv/monotime"; - rev = "30dba4353424"; - sha256 = "0w67yyc9y11dp7lp4b712dkcgbiln1qmgfx1nbbrw3mfkzr61d7g"; + url = "https://github.com/gavv/httpexpect"; + rev = "v2.0.0"; + sha256 = "0dqb7lsinciz594q6jg59hrvk4g4awbs2ybsr580j22j2xag53vs"; }; } { @@ -329,7 +401,7 @@ fetch = { type = "git"; url = "https://github.com/getsentry/raven-go"; - rev = "v0.1.0"; + rev = "v0.1.2"; sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z"; }; } @@ -338,8 +410,8 @@ fetch = { type = "git"; url = "https://github.com/getsentry/sentry-go"; - rev = "v0.3.0"; - sha256 = "1919lhvg1swcqyfa6mck6nz53c7n4df21jsz46f7x4wncb6f5il1"; + rev = "v0.5.1"; + sha256 = "1kfn0gcb4c6amhagv04ydpl6p9cqw7f0lxas688a0rf89iwdzz89"; }; } { @@ -469,6 +541,33 @@ }; } { + goPackagePath = "github.com/gobwas/httphead"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/httphead"; + rev = "2c6c146eadee"; + sha256 = "0j7nlrf79cafl8ap69ri2c7v3psr2y133cr2wn735z7yn3dz3kss"; + }; + } + { + goPackagePath = "github.com/gobwas/pool"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/pool"; + rev = "v0.2.0"; + sha256 = "1avpa8c75j1y4hs7awazrjjy7w0pjfw80l424ddn5zyizvh7s67i"; + }; + } + { + goPackagePath = "github.com/gobwas/ws"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/ws"; + rev = "v1.0.2"; + sha256 = "070mfcjbfb40bglc9aw9zjvd4jb1hp3l1s12ww6mjlwbjcg0mm9s"; + }; + } + { goPackagePath = "github.com/gogo/protobuf"; fetch = { type = "git"; @@ -505,6 +604,15 @@ }; } { + goPackagePath = "github.com/golang/lint"; + fetch = { + type = "git"; + url = "https://github.com/golang/lint"; + rev = "06c8688daad7"; + sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + }; + } + { goPackagePath = "github.com/golang/mock"; fetch = { type = "git"; @@ -523,6 +631,15 @@ }; } { + goPackagePath = "github.com/gomodule/redigo"; + fetch = { + type = "git"; + url = "https://github.com/gomodule/redigo"; + rev = "574c33c3df38"; + sha256 = "1qpw8mq9xqj1hmpag1av941swkx39qikahsajyhn34rc2q54f4z6"; + }; + } + { goPackagePath = "github.com/google/btree"; fetch = { type = "git"; @@ -604,12 +721,12 @@ }; } { - goPackagePath = "github.com/gorilla/schema"; + goPackagePath = "github.com/gorilla/websocket"; fetch = { type = "git"; - url = "https://github.com/gorilla/schema"; - rev = "v1.1.0"; - sha256 = "14d31i3h6bg83r7ncmwm2pirab66z9hza38in18l89pbazxyh2n9"; + url = "https://github.com/gorilla/websocket"; + rev = "v1.4.0"; + sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; }; } { @@ -649,6 +766,15 @@ }; } { + goPackagePath = "github.com/hashicorp/go-version"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-version"; + rev = "v1.2.0"; + sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z"; + }; + } + { goPackagePath = "github.com/hashicorp/golang-lru"; fetch = { type = "git"; @@ -712,30 +838,30 @@ }; } { - goPackagePath = "github.com/iris-contrib/formBinder"; + goPackagePath = "github.com/iris-contrib/go.uuid"; fetch = { type = "git"; - url = "https://github.com/iris-contrib/formBinder"; - rev = "v5.0.0"; - sha256 = "0mqk6j7a9d3y28ad4ylqc7z5w4hmn1ws5wwnyll918xn1wkzr5rg"; + url = "https://github.com/iris-contrib/go.uuid"; + rev = "v2.0.0"; + sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; }; } { - goPackagePath = "github.com/iris-contrib/go.uuid"; + goPackagePath = "github.com/iris-contrib/i18n"; fetch = { type = "git"; - url = "https://github.com/iris-contrib/go.uuid"; - rev = "v2.0.0"; - sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; + url = "https://github.com/iris-contrib/i18n"; + rev = "987a633949d0"; + sha256 = "0yslm7hmacc57v970jbys4x5c5yxgcjgff982ngivg9v1a16kifq"; }; } { - goPackagePath = "github.com/iris-contrib/httpexpect"; + goPackagePath = "github.com/iris-contrib/schema"; fetch = { type = "git"; - url = "https://github.com/iris-contrib/httpexpect"; - rev = "ebe99fcebbce"; - sha256 = "126c50c6r5l2gdn60jirpb54pqwswxag3wgrv6wcn998h9w9gv8c"; + url = "https://github.com/iris-contrib/schema"; + rev = "v0.0.1"; + sha256 = "1a1lk2ll2xv3ljffmfw4q8mqqw727pj8dzs6c8g2hh0b0b050g79"; }; } { @@ -824,8 +950,8 @@ fetch = { type = "git"; url = "https://github.com/kataras/golog"; - rev = "99c81de45f40"; - sha256 = "1dgrsvhzymgj7da54ldv8plkxk3n8zh3kc995qxl6mrpz65j801p"; + rev = "v0.0.9"; + sha256 = "160hd3z93c9i33q9g1bhfdxmsqg1lanncnrqcsr2444dy5j6ly3i"; }; } { @@ -833,8 +959,17 @@ fetch = { type = "git"; url = "https://github.com/kataras/iris"; - rev = "v11.1.1"; - sha256 = "1rxpr5hdj9mji26mlfp4zic0pc6nh93akzccw24a5kynj07g68wg"; + rev = "v12.0.1"; + sha256 = "0k1jhamvf0byx6d317gzg6r2jls7bajhhf2spvdinarl2cjnakm5"; + }; + } + { + goPackagePath = "github.com/kataras/neffos"; + fetch = { + type = "git"; + url = "https://github.com/kataras/neffos"; + rev = "v0.0.10"; + sha256 = "0mkqrxff28rcc71nw5qqsywn0fm2jz7magwp9hhvh1s01lgghjdp"; }; } { @@ -869,8 +1004,8 @@ fetch = { type = "git"; url = "https://github.com/klauspost/compress"; - rev = "v1.4.0"; - sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s"; + rev = "v1.9.0"; + sha256 = "07vndz6mdaliwagj2xq0y5c5w2zld14p9i5y7r0bkhb7klfyamfk"; }; } { @@ -878,8 +1013,8 @@ fetch = { type = "git"; url = "https://github.com/klauspost/cpuid"; - rev = "e7e905edc00e"; - sha256 = "0cmyv3rwv5r5iqvvfhbiwp3jsfa40c6xfm42nxbngd5lygjcwwgf"; + rev = "v1.2.1"; + sha256 = "1071wchrs37bvpb99fwf19fjrpz0yaqipi2y2hjvim419flvd49x"; }; } { @@ -932,8 +1067,8 @@ fetch = { type = "git"; url = "https://github.com/labstack/echo"; - rev = "v4.1.10"; - sha256 = "0qg9ykmhgldiv2v1w8sz8x0j0bgqf11ghzrim59fb6pxz8qgg25h"; + rev = "v4.1.11"; + sha256 = "0b14vgwzznn7wzyjb98xdmq4wjg16l3y62njiwfz4qsm4pwzk405"; }; } { @@ -955,6 +1090,15 @@ }; } { + goPackagePath = "github.com/libgit2/git2go"; + fetch = { + type = "git"; + url = "https://github.com/libgit2/git2go"; + rev = "ecaeb7a21d47"; + sha256 = "14r7ryff93r49g94f6kg66xc0y6rwb31lj22s3qmzmlgywk0pgvr"; + }; + } + { goPackagePath = "github.com/lightstep/lightstep-tracer-go"; fetch = { type = "git"; @@ -1000,6 +1144,15 @@ }; } { + goPackagePath = "github.com/mattn/go-shellwords"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-shellwords"; + rev = "2444a32a19f4"; + sha256 = "08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d"; + }; + } + { goPackagePath = "github.com/mattn/go-sqlite3"; fetch = { type = "git"; @@ -1027,6 +1180,24 @@ }; } { + goPackagePath = "github.com/mediocregopher/mediocre-go-lib"; + fetch = { + type = "git"; + url = "https://github.com/mediocregopher/mediocre-go-lib"; + rev = "cb65787f37ed"; + sha256 = "0lg6q76fxjhxv05m80k4l6nrkj9qwzafs2mb2gbvhznxh8m0cv9j"; + }; + } + { + goPackagePath = "github.com/mediocregopher/radix"; + fetch = { + type = "git"; + url = "https://github.com/mediocregopher/radix"; + rev = "v3.3.0"; + sha256 = "0pchn5z2g4wnf87350war5fr9pqpdksia1ffvw7cphg4q9blggfx"; + }; + } + { goPackagePath = "github.com/microcosm-cc/bluemonday"; fetch = { type = "git"; @@ -1099,6 +1270,33 @@ }; } { + goPackagePath = "github.com/nats-io/nats.go"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/nats.go"; + rev = "v1.8.1"; + sha256 = "0h9zzpjl6ac227bhf0i4ram9a5jlibq53pawv0zzxdirxrnp1vkj"; + }; + } + { + goPackagePath = "github.com/nats-io/nkeys"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/nkeys"; + rev = "v0.0.2"; + sha256 = "0kibc1g60w031rssk3vs74gfick3jdl3igckn1v4k8b5grawcks1"; + }; + } + { + goPackagePath = "github.com/nats-io/nuid"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/nuid"; + rev = "v1.0.1"; + sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg"; + }; + } + { goPackagePath = "github.com/olekukonko/tablewriter"; fetch = { type = "git"; @@ -1112,8 +1310,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/ginkgo"; - rev = "v1.10.1"; - sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d"; + rev = "v1.10.3"; + sha256 = "00a40by9f5ylycnar8h3p9b4z5rcsvfvg4j3v5s5mchdqrqjv1pc"; }; } { @@ -1121,8 +1319,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/gomega"; - rev = "v1.7.0"; - sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y"; + rev = "v1.7.1"; + sha256 = "06p3x0910cdaa64l7d44s728d4j3yhps315dlcvrbjzhljjj7mam"; }; } { @@ -1135,6 +1333,33 @@ }; } { + goPackagePath = "github.com/otiai10/copy"; + fetch = { + type = "git"; + url = "https://github.com/otiai10/copy"; + rev = "v1.0.1"; + sha256 = "0xmy0kfcx48q10s040579pcjswfaxlwhv7a2z07z9r92fdrgw03k"; + }; + } + { + goPackagePath = "github.com/otiai10/curr"; + fetch = { + type = "git"; + url = "https://github.com/otiai10/curr"; + rev = "v1.0.0"; + sha256 = "0fpw20adq2wff7l4c87zaavj9jra4d64a8bbjixiiv3bbarim987"; + }; + } + { + goPackagePath = "github.com/otiai10/mint"; + fetch = { + type = "git"; + url = "https://github.com/otiai10/mint"; + rev = "v1.3.0"; + sha256 = "0kfc95jc2hfgwzcpdfa5hrxgj7s6rzx5jc0n1sn863bsngx2q1ca"; + }; + } + { goPackagePath = "github.com/pelletier/go-toml"; fetch = { type = "git"; @@ -1157,8 +1382,8 @@ fetch = { type = "git"; url = "https://github.com/pingcap/errors"; - rev = "v0.11.1"; - sha256 = "00wr0l4cwq0qx8jw51j0n7pbh9l7hdq2874x9rf1mz5svz1wbmcp"; + rev = "v0.11.4"; + sha256 = "02k6b30m42aya763fnwx3paq4r8h28yav4i2kv2z4r28r70xxcgn"; }; } { @@ -1310,7 +1535,7 @@ fetch = { type = "git"; url = "https://github.com/smartystreets/goconvey"; - rev = "505e41936337"; + rev = "v1.6.4"; sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; }; } @@ -1427,8 +1652,8 @@ fetch = { type = "git"; url = "https://github.com/ugorji/go"; - rev = "v1.1.4"; - sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; + rev = "v1.1.7"; + sha256 = "068gja55kbh2iivp03x4n9dcml0rxv0k64ivkmq06si2ar1835rm"; }; } { @@ -1454,8 +1679,8 @@ fetch = { type = "git"; url = "https://github.com/valyala/fasthttp"; - rev = "v1.4.0"; - sha256 = "0kypc7r91n61fm6qsadza1aiy9n6byghvcxzvx7agi6yzrllk956"; + rev = "v1.6.0"; + sha256 = "1r1hm4rv9w6x829jjg75y8xd523b76parsyyvjwyz8k2l6bm4h0b"; }; } { @@ -1481,8 +1706,8 @@ fetch = { type = "git"; url = "https://github.com/xeipuuv/gojsonpointer"; - rev = "df4f5c81cb3b"; - sha256 = "0dfwc66z5gq75m3z7va80c10c22ijiq99bahq86l26ki71g286xn"; + rev = "4e3ac2762d5f"; + sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"; }; } { @@ -1499,8 +1724,8 @@ fetch = { type = "git"; url = "https://github.com/xeipuuv/gojsonschema"; - rev = "v1.1.0"; - sha256 = "10gn5y4l72zknj21mff29d9vnk4pz7jnw39xnlsb373lsiih91xg"; + rev = "v1.2.0"; + sha256 = "1mqiq0r8qw4qlfp3ls8073r6514rmzwrmdn4j33rppk3zh942i6l"; }; } { @@ -1558,12 +1783,21 @@ }; } { + goPackagePath = "gitlab.com/gitlab-org/gitlab-shell"; + fetch = { + type = "git"; + url = "https://gitlab.com/gitlab-org/gitlab-shell.git"; + rev = "716e30c55e89"; + sha256 = "0g2bgwm5rf93xfd40j3d2a5js1a212r2l2qdbds3gp7h0v73npjw"; + }; + } + { goPackagePath = "gitlab.com/gitlab-org/labkit"; fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/labkit.git"; - rev = "fac94cb428e6"; - sha256 = "19wvfjij6zm88fxbx0cngr6ny4yh3fw469d6vlv741b37s07w3j0"; + rev = "0149780c759d"; + sha256 = "1krp5jkwpckpdznbl9xp4yvq6cii750r24agcni3snbbs8hd8gb1"; }; } { diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index becc33a6e5c..f693d5b4c7b 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zg96vjjw1kbli6nk6cyk64zfh4lgpl7fqx38ncbgfacl4dq7y0b"; + sha256 = "1665r4ffqdpykxwpgdnaq7xsaz1nfswc5wjs2qr0npx8bq7g49kh"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bfh9z3n98c76c6jdp6avh75wsckxyp74r59hmgnqdhfznbkppv4"; + sha256 = "1n21pswh3k7m33vzhxyrbi5lj64b1138yqv34jjhkhlq3474b4rh"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1brlp5pmawb2hqdybjb732zxxkamcmis6px3wyh09rjlc0gqnzzz"; + sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3.1"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -118,10 +118,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; crack = { dependencies = ["safe_yaml"]; @@ -213,10 +213,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; + sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; type = "gem"; }; - version = "1.11.1"; + version = "1.12.2"; }; gemojione = { dependencies = ["json"]; @@ -233,10 +233,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "092bq7bjfj2yvss2ig6jb71j0h04cigq79xxfis37j315iixl12j"; + sha256 = "0rhw05d88l928g6y2bngvmr66565b2z822hyynmb13b7khf07y1a"; type = "gem"; }; - version = "7.5.1"; + version = "7.9.0"; }; github-markup = { source = { @@ -252,10 +252,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dwrggw38wkadm9i1q8bj15lf0ik5z6qlbbggkgcvmbxb0a4hrmx"; + sha256 = "0y21k8bix3h2qdys2kz2z831cclmx3zc15x67cp8s945dkmh39sj"; type = "gem"; }; - version = "4.2.7.8"; + version = "4.2.7.9"; }; gitlab-gollum-rugged_adapter = { dependencies = ["mime-types" "rugged"]; @@ -274,30 +274,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s1cgnnzlnfglsh5r0iihgvyasa2zbqkyrrnbxshvnkddb10i94z"; + sha256 = "0a63zgjll83b25hiq8m4sk75jci2rj8z46lss0j3bc6zi3pxnzax"; type = "gem"; }; - version = "0.9.1"; + version = "0.12.0"; }; gitlab-markup = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d"; + sha256 = "0xnlra517pfj3hx07kasbqlcw51ix4xajr6bsd3mwg8bc92dlwy7"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.1"; }; google-protobuf = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1swxvka4qcfa986qr5d3hxqlcsraxfb6fsc0mf2ngxmq15wad8br"; + sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4"; type = "gem"; }; - version = "3.11.4"; + version = "3.8.0"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -316,10 +316,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jbfnsdvb9hbqgkh2qkckzxvdwcbhdkwwvlnc5mb8679hxz7b7bs"; + sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf"; type = "gem"; }; - version = "1.27.0"; + version = "1.24.0"; + }; + grpc-tools = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pjs2sm43mai2fy0jsbxl8rs9bych8f5j8hv630fjwh0323cmcc9"; + type = "gem"; + }; + version = "1.0.1"; }; hashdiff = { groups = ["default" "development" "test"]; @@ -404,10 +414,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn"; + sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -669,10 +679,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n9h0ls2a2zq0bcsw31wxci1wdxb8s3vglfadxpcs6b04vkf6nqq"; + sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; type = "gem"; }; - version = "3.18.0"; + version = "3.19.0"; }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; @@ -861,10 +871,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; unicode-display_width = { groups = ["default" "development" "test"]; @@ -909,9 +919,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1"; + sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.0"; }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index e9a3ccfa24a..3e32e90a6d2 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,12 +2,12 @@ buildGoPackage rec { pname = "gitlab-shell"; - version = "12.2.0"; + version = "13.2.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "0zjpjk7iv083ys11sn3hiqawp09zgi9hhhv4hdh13axaw9ld340v"; + sha256 = "0drdpg4nmhzrmy8sl1f3hcd1278bpapgf0wmhi94xlyayh47j53a"; }; buildInputs = [ ruby ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 7679439465d..f6710643f6d 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.30.2"; + version = "8.31.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1ws59ry16kx4nqp92xcqw3fri570pvpdgvy822ndi7rybw5xij7p"; + sha256 = "1c2y1icil98qay9d95q1rlpi0ffhll990grkkib9srsn55b2i86v"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix index 63b52b1c85f..530eb073c7b 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix @@ -10,6 +10,15 @@ }; } { + goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; + fetch = { + type = "git"; + url = "https://dmitri.shuralyov.com/gpu/mtl"; + rev = "666a987793e9"; + sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; + }; + } + { goPackagePath = "github.com/BurntSushi/toml"; fetch = { type = "git"; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index d15628eb83c..9c8c5e8b30d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '6.0.2' +gem 'rails', '~> 6.0.3' gem 'bootsnap', '~> 1.4.6' @@ -26,7 +26,7 @@ gem 'marginalia', '~> 1.8.0' # Authentication libraries gem 'devise', '~> 4.6' -gem 'doorkeeper', '~> 5.0.2' +gem 'doorkeeper', '~> 5.0.3' gem 'doorkeeper-openid_connect', '~> 1.6.3' gem 'omniauth', '~> 1.8' gem 'omniauth-auth0', '~> 2.0.0' @@ -138,7 +138,7 @@ gem 'faraday_middleware-aws-signers-v4' # Markdown and HTML processing gem 'html-pipeline', '~> 2.12' gem 'deckar01-task_list', '2.3.1' -gem 'gitlab-markup', '~> 1.7.0' +gem 'gitlab-markup', '~> 1.7.1' gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'commonmarker', '~> 0.20' gem 'RedCloth', '~> 4.3.2' @@ -148,11 +148,11 @@ gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false -gem 'asciidoctor-plantuml', '0.0.10' -gem 'rouge', '~> 3.18.0' +gem 'asciidoctor-plantuml', '~> 0.0.12' +gem 'rouge', '~> 3.19.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.10.5' +gem 'nokogiri', '~> 1.10.9' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -166,7 +166,7 @@ gem 'diff_match_patch', '~> 0.1.0' gem 'rack', '~> 2.0.9' group :unicorn do - gem 'unicorn', '~> 5.4.1' + gem 'unicorn', '~> 5.5' gem 'unicorn-worker-killer', '~> 0.4.4' end @@ -204,7 +204,7 @@ gem 'ruby-progressbar' gem 'settingslogic', '~> 2.0.9' # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.1.1' +gem 're2', '~> 1.2.0' # Misc @@ -230,7 +230,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false gem 'hipchat', '~> 1.5.0' # Jira integration -gem 'jira-ruby', '~> 1.7' +gem 'jira-ruby', '~> 2.0.0' gem 'atlassian-jwt', '~> 0.2.0' # Flowdock integration @@ -287,13 +287,13 @@ gem 'addressable', '~> 2.7' gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.2' -gem 'request_store', '~> 1.3' +gem 'request_store', '~> 1.5' gem 'base32', '~> 0.3.0' gem "gitlab-license", "~> 1.0" # Protect against bruteforcing -gem 'rack-attack', '~> 6.2.0' +gem 'rack-attack', '~> 6.3.0' # Sentry integration gem 'sentry-raven', '~> 2.9' @@ -318,13 +318,9 @@ gem 'peek', '~> 1.1' # Snowplow events tracking gem 'snowplow-tracker', '~> 0.6.1' -# Memory benchmarks -gem 'derailed_benchmarks', require: false - # Metrics group :metrics do gem 'method_source', '~> 0.8', require: false - gem 'influxdb', '~> 0.2', require: false # Prometheus gem 'prometheus-client-mmap', '~> 0.10.0' @@ -355,7 +351,7 @@ group :development, :test do gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 5.1.0' - gem 'rspec-rails', '~> 4.0.0.beta4' + gem 'rspec-rails', '~> 4.0.0' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' @@ -414,12 +410,15 @@ group :test do gem 'test-prof', '~> 0.10.0' gem 'rspec_junit_formatter' gem 'guard-rspec' + + # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 + gem 'derailed_benchmarks', require: false end gem 'octokit', '~> 4.15' # https://gitlab.com/gitlab-org/gitlab/issues/207207 -gem 'gitlab-mail_room', '~> 0.0.3', require: 'mail_room' +gem 'gitlab-mail_room', '~> 0.0.4', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' @@ -445,7 +444,7 @@ gem 'sys-filesystem', '~> 1.1.6' gem 'net-ntp' # SSH host key support -gem 'net-ssh', '~> 5.2' +gem 'net-ssh', '~> 6.0' gem 'sshkey', '~> 2.0' # Required for ED25519 SSH host key support @@ -455,7 +454,7 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 12.9.0.pre.rc4' +gem 'gitaly', '~> 13.0.0.pre.rc1' gem 'grpc', '~> 1.24.0' @@ -481,8 +480,6 @@ gem 'countries', '~> 3.0' gem 'retriable', '~> 3.1.2' -gem 'liquid', '~> 4.0' - # LRU cache gem 'lru_redux' @@ -495,3 +492,9 @@ gem 'mail', '= 2.7.1' # File encryption gem 'lockbox', '~> 0.3.3' + +# Email validation +gem 'valid_email', '~> 0.1' + +# JSON +gem 'json', '~> 2.3.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index efe1ecca467..723863edfd9 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -6,64 +6,64 @@ GEM ace-rails-ap (4.1.2) acme-client (2.0.5) faraday (~> 0.9, >= 0.9.1) - actioncable (6.0.2) - actionpack (= 6.0.2) + actioncable (6.0.3) + actionpack (= 6.0.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.2) - actionpack (= 6.0.2) - activejob (= 6.0.2) - activerecord (= 6.0.2) - activestorage (= 6.0.2) - activesupport (= 6.0.2) + actionmailbox (6.0.3) + actionpack (= 6.0.3) + activejob (= 6.0.3) + activerecord (= 6.0.3) + activestorage (= 6.0.3) + activesupport (= 6.0.3) mail (>= 2.7.1) - actionmailer (6.0.2) - actionpack (= 6.0.2) - actionview (= 6.0.2) - activejob (= 6.0.2) + actionmailer (6.0.3) + actionpack (= 6.0.3) + actionview (= 6.0.3) + activejob (= 6.0.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.2) - actionview (= 6.0.2) - activesupport (= 6.0.2) - rack (~> 2.0) + actionpack (6.0.3) + actionview (= 6.0.3) + activesupport (= 6.0.3) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.2) - actionpack (= 6.0.2) - activerecord (= 6.0.2) - activestorage (= 6.0.2) - activesupport (= 6.0.2) + actiontext (6.0.3) + actionpack (= 6.0.3) + activerecord (= 6.0.3) + activestorage (= 6.0.3) + activesupport (= 6.0.3) nokogiri (>= 1.8.5) - actionview (6.0.2) - activesupport (= 6.0.2) + actionview (6.0.3) + activesupport (= 6.0.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.2) - activesupport (= 6.0.2) + activejob (6.0.3) + activesupport (= 6.0.3) globalid (>= 0.3.6) - activemodel (6.0.2) - activesupport (= 6.0.2) - activerecord (6.0.2) - activemodel (= 6.0.2) - activesupport (= 6.0.2) + activemodel (6.0.3) + activesupport (= 6.0.3) + activerecord (6.0.3) + activemodel (= 6.0.3) + activesupport (= 6.0.3) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.0.2) - actionpack (= 6.0.2) - activejob (= 6.0.2) - activerecord (= 6.0.2) + activestorage (6.0.3) + actionpack (= 6.0.3) + activejob (= 6.0.3) + activerecord (= 6.0.3) marcel (~> 0.3.1) - activesupport (6.0.2) + activesupport (6.0.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.2) + zeitwerk (~> 2.2, >= 2.2.2) acts-as-taggable-on (6.5.0) activerecord (>= 5.0, < 6.1) adamantium (0.2.0) @@ -84,7 +84,7 @@ GEM asciidoctor (2.0.10) asciidoctor-include-ext (0.3.1) asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-plantuml (0.0.10) + asciidoctor-plantuml (0.0.12) asciidoctor (>= 1.5.6, < 3.0.0) ast (2.4.0) atlassian-jwt (0.2.0) @@ -153,7 +153,6 @@ GEM activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - cause (0.1) character_set (1.1.2) charlock_holmes (0.7.6) childprocess (3.0.0) @@ -245,7 +244,7 @@ GEM docile (1.3.2) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.0.2) + doorkeeper (5.0.3) railties (>= 4.2) doorkeeper-openid_connect (1.6.3) doorkeeper (>= 5.0, < 5.2) @@ -378,7 +377,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) git (1.5.0) - gitaly (12.9.0.pre.rc4) + gitaly (13.0.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) @@ -391,8 +390,8 @@ GEM opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) - gitlab-mail_room (0.0.3) - gitlab-markup (1.7.0) + gitlab-mail_room (0.0.4) + gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) gitlab-puma (4.3.3.gitlab.2) nio4r (~> 2.0) @@ -535,9 +534,6 @@ GEM i18n_data (0.8.0) icalendar (2.4.1) ice_nine (0.11.2) - influxdb (0.2.3) - cause - json invisible_captcha (0.12.1) rails (>= 3.2.0) ipaddress (0.8.3) @@ -545,7 +541,7 @@ GEM opentracing (~> 0.3) thrift jaro_winkler (1.5.4) - jira-ruby (1.7.1) + jira-ruby (2.0.0) activesupport atlassian-jwt multipart-post @@ -555,7 +551,7 @@ GEM character_set (~> 1.1) regexp_parser (~> 1.1) regexp_property_values (~> 0.3) - json (1.8.6) + json (2.3.0) json-jwt (1.11.0) activesupport (>= 4.2) aes_key_wrap @@ -575,7 +571,7 @@ GEM activerecord kaminari-core (= 1.0.1) kaminari-core (1.0.1) - kgio (2.11.2) + kgio (2.11.3) knapsack (1.17.0) rake kramdown (2.1.0) @@ -602,7 +598,6 @@ GEM xml-simple licensee (8.9.2) rugged (~> 0.24) - liquid (4.0.3) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -614,7 +609,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.4.0) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -634,7 +629,7 @@ GEM mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2019.0331) - mimemagic (0.3.3) + mimemagic (0.3.5) mini_histogram (0.1.3) mini_magick (4.9.5) mini_mime (1.0.2) @@ -653,11 +648,11 @@ GEM nenv (0.3.0) net-ldap (0.16.2) net-ntp (2.1.3) - net-ssh (5.2.0) + net-ssh (6.0.0) netrc (0.11.0) nio4r (2.5.2) no_proxy_fix (0.1.2) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -791,7 +786,7 @@ GEM rack (2.0.9) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (6.2.0) + rack-attack (6.3.0) rack (>= 1.0, < 3) rack-cors (1.0.6) rack (>= 1.6.0) @@ -808,20 +803,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.1) - rails (6.0.2) - actioncable (= 6.0.2) - actionmailbox (= 6.0.2) - actionmailer (= 6.0.2) - actionpack (= 6.0.2) - actiontext (= 6.0.2) - actionview (= 6.0.2) - activejob (= 6.0.2) - activemodel (= 6.0.2) - activerecord (= 6.0.2) - activestorage (= 6.0.2) - activesupport (= 6.0.2) + rails (6.0.3) + actioncable (= 6.0.3) + actionmailbox (= 6.0.3) + actionmailer (= 6.0.3) + actionpack (= 6.0.3) + actiontext (= 6.0.3) + actionview (= 6.0.3) + activejob (= 6.0.3) + activemodel (= 6.0.3) + activerecord (= 6.0.3) + activestorage (= 6.0.3) + activesupport (= 6.0.3) bundler (>= 1.3.0) - railties (= 6.0.2) + railties (= 6.0.3) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -835,14 +830,14 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.2) - actionpack (= 6.0.2) - activesupport (= 6.0.2) + railties (6.0.3) + actionpack (= 6.0.3) + activesupport (= 6.0.3) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) - raindrops (0.19.0) + raindrops (0.19.1) rake (12.3.3) rb-fsevent (0.10.2) rb-inotify (0.9.10) @@ -854,10 +849,10 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rdoc (6.1.2) - re2 (1.1.1) + re2 (1.2.0) recaptcha (4.13.1) json - recursive-open-struct (1.1.0) + recursive-open-struct (1.1.1) redis (4.1.3) redis-actionpack (5.2.0) actionpack (>= 5, < 7) @@ -883,7 +878,8 @@ GEM declarative (< 0.1.0) declarative-option (< 0.2.0) uber (< 0.2.0) - request_store (1.3.1) + request_store (1.5.0) + rack (>= 1.4) responders (3.0.0) actionpack (>= 5.0) railties (>= 5.0) @@ -894,7 +890,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.18.0) + rouge (3.19.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -905,7 +901,7 @@ GEM rspec-mocks (~> 3.9.0) rspec-core (3.9.1) rspec-support (~> 3.9.1) - rspec-expectations (3.9.0) + rspec-expectations (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) @@ -917,7 +913,7 @@ GEM proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (4.0.0.beta4) + rspec-rails (4.0.0) actionpack (>= 4.2) activesupport (>= 4.2) railties (>= 4.2) @@ -1077,7 +1073,7 @@ GEM truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) @@ -1091,7 +1087,7 @@ GEM unicode_plot (0.0.4) enumerable-statistics (>= 2.0.1) unicode_utils (1.4.0) - unicorn (5.4.1) + unicorn (5.5.5) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) @@ -1108,6 +1104,9 @@ GEM equalizer (~> 0.0.9) parser (>= 2.6.5) procto (~> 0.0.2) + valid_email (0.1.3) + activemodel + mail (>= 2.6.1) validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) @@ -1146,7 +1145,7 @@ GEM xml-simple (1.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.2.2) + zeitwerk (2.3.0) PLATFORMS ruby @@ -1163,7 +1162,7 @@ DEPENDENCIES asana (~> 0.9) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) - asciidoctor-plantuml (= 0.0.10) + asciidoctor-plantuml (~> 0.0.12) atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) awesome_print @@ -1202,7 +1201,7 @@ DEPENDENCIES diff_match_patch (~> 0.1.0) diffy (~> 3.3) discordrb-webhooks-blackst0ne (~> 3.3) - doorkeeper (~> 5.0.2) + doorkeeper (~> 5.0.3) doorkeeper-openid_connect (~> 1.6.3) ed25519 (~> 1.2) elasticsearch-api (~> 6.8) @@ -1235,13 +1234,13 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 12.9.0.pre.rc4) + gitaly (~> 13.0.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) gitlab-labkit (= 0.12.0) gitlab-license (~> 1.0) - gitlab-mail_room (~> 0.0.3) - gitlab-markup (~> 1.7.0) + gitlab-mail_room (~> 0.0.4) + gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-puma (~> 4.3.3.gitlab.2) gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) @@ -1273,10 +1272,10 @@ DEPENDENCIES html2text httparty (~> 0.16.4) icalendar - influxdb (~> 0.2) invisible_captcha (~> 0.12.1) - jira-ruby (~> 1.7) + jira-ruby (~> 2.0.0) js_regex (~> 3.1) + json (~> 2.3.0) json-schema (~> 2.8.0) jwt (~> 2.1.0) kaminari (~> 1.0) @@ -1285,7 +1284,6 @@ DEPENDENCIES letter_opener_web (~> 1.3.4) license_finder (~> 5.4) licensee (~> 8.9) - liquid (~> 4.0) lockbox (~> 0.3.3) lograge (~> 0.5) loofah (~> 2.2) @@ -1300,8 +1298,8 @@ DEPENDENCIES nakayoshi_fork (~> 0.0.4) net-ldap net-ntp - net-ssh (~> 5.2) - nokogiri (~> 1.10.5) + net-ssh (~> 6.0) + nokogiri (~> 1.10.9) oauth2 (~> 1.4) octokit (~> 4.15) omniauth (~> 1.8) @@ -1332,12 +1330,12 @@ DEPENDENCIES pry-byebug (~> 3.5.1) pry-rails (~> 0.3.9) rack (~> 2.0.9) - rack-attack (~> 6.2.0) + rack-attack (~> 6.3.0) rack-cors (~> 1.0.6) rack-oauth2 (~> 1.9.3) rack-proxy (~> 0.6.0) rack-timeout - rails (= 6.0.2) + rails (~> 6.0.3) rails-controller-testing rails-i18n (~> 6.0) rainbow (~> 3.0) @@ -1345,18 +1343,18 @@ DEPENDENCIES rblineprof (~> 0.3.6) rbtrace (~> 0.4) rdoc (~> 6.1.2) - re2 (~> 1.1.1) + re2 (~> 1.2.0) recaptcha (~> 4.11) redis (~> 4.0) redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) - request_store (~> 1.3) + request_store (~> 1.5) responders (~> 3.0) retriable (~> 3.1.2) - rouge (~> 3.18.0) + rouge (~> 3.19.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 4.0.0.beta4) + rspec-rails (~> 4.0.0) rspec-retry (~> 0.6.1) rspec_junit_formatter rspec_profiling (~> 0.0.5) @@ -1398,9 +1396,10 @@ DEPENDENCIES u2f (~> 0.2.1) uglifier (~> 2.7.2) unf (~> 0.1.4) - unicorn (~> 5.4.1) + unicorn (~> 5.5) unicorn-worker-killer (~> 0.4.4) unleash (~> 0.1.5) + valid_email (~> 0.1) validates_hostname (~> 1.0.6) version_sorter (~> 2.2.4) vmstat (~> 2.3.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 2544cd0ac89..041f19226f4 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dngxp5r9ww4xgryn458ngq2h3ylx7d6d258wcfqhibpyjr7qvpj"; + sha256 = "0lvbyv15j3g3xhywr8jdgv5rjn26mz7430886njjfrd12x812szy"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11wpcjc806y82p1nn3ly9savcdqcf4b0qml5ri5bmd6r2g802s2z"; + sha256 = "1nwvx83lha87052jywaiqq284nabp3h5lfq7vrb01myh6cr3ggaq"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -58,10 +58,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ych434bbim8n65png7hg35xfgmpv0qxvkngpvrr3qgj7l1xgdi5"; + sha256 = "16d40j1hcak5p9185dbb015difw12m5f3wjfbh4mw9w8agqsc8mr"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -69,10 +69,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zg96vjjw1kbli6nk6cyk64zfh4lgpl7fqx38ncbgfacl4dq7y0b"; + sha256 = "1v885hs35r8217py08z5k1wvgfzfml64g9wf5v3djgh8mhlf5nfn"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -80,10 +80,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1acw3yypd4w35ra87d0kzwwcwj3hps6j0g108rnxy7pscvzajw8q"; + sha256 = "00w8a5vxs1rlbn0innhrwhjjavmgx0scnkz8h7k83df9l1s7f70j"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -91,10 +91,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bfh9z3n98c76c6jdp6avh75wsckxyp74r59hmgnqdhfznbkppv4"; + sha256 = "0s6fr50l714rvzr9vavg1ckgx5xjj5zz7dca42xxjp4jkr7jva7q"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -102,10 +102,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bhf4lxnrmz73zshl5rzvw65x3kd18yligf11lcg7ik9b2i9j6pi"; + sha256 = "1qr5p1sijan8k2m39w602s1mn3bwwsl7jm14drsgdhvdx5ilwg7b"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; activemodel = { dependencies = ["activesupport"]; @@ -113,10 +113,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09p7si419x0fb5cw8cbfmzplyk2bdrx0m5cy9pwja89rnhp8yhl0"; + sha256 = "0pi9waxcvb8gxwp4i4wmxszyqhr28gn9jzbq1ivy84g1q658lmqz"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w60vnkg88frbpsixfm9immh211pbqg9dwm0gqrr17kdjd00r5z4"; + sha256 = "1wkm8741i00l5cq88wl9nr131wh955x4cjg2q2d60m3qhpqbxirv"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -146,10 +146,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qsjhyrjcklqf7dqw6yjvmbfd8yhqyz0dy9apmpd0swiwxnn8kds"; + sha256 = "1yy832p0q7gxp1vbncb677y35y112d2f6mvf131n0m2w35ig9m4f"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -157,10 +157,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1brlp5pmawb2hqdybjb732zxxkamcmis6px3wyh09rjlc0gqnzzz"; + sha256 = "0shh34xx9ygxb57s8mag8l22klvjfnk1c4jbjvchk16r6z0ps326"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -264,10 +264,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bnrz4ywaq7vaw66fy3kkbwf07fvyqwngm3vb83s9h5zvr4n593b"; + sha256 = "02knhmyd3h1yryn66xjfciz7jjsq676kl7ama0r0cf92vyyvm12x"; type = "gem"; }; - version = "0.0.10"; + version = "0.0.12"; }; ast = { groups = ["default" "development" "test"]; @@ -620,16 +620,6 @@ }; version = "1.3.1"; }; - cause = { - groups = ["default" "metrics"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00"; - type = "gem"; - }; - version = "0.1"; - }; character_set = { groups = ["default"]; platforms = []; @@ -1071,10 +1061,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0488m6nwp31mxrhayj60gsb7jgyw1lzh73r2kldx00a9bw3634d4"; + sha256 = "0w554smil33j64h50w29xavgg4k7172r0c2rrygfbp5p4ap9py9c"; type = "gem"; }; - version = "5.0.2"; + version = "5.0.3"; }; doorkeeper-openid_connect = { dependencies = ["doorkeeper" "json-jwt"]; @@ -1678,10 +1668,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19aqxxgq8d9jqvzz36jciqb54nrb8w2b85abpy98cq7ldj1lh497"; + sha256 = "01ki2isvqyhfw503z3ahksbfb0s0m3psi4din9azdpgcqyv1pxlh"; type = "gem"; }; - version = "12.9.0.pre.rc4"; + version = "13.0.0.pre.rc1"; }; github-markup = { groups = ["default"]; @@ -1730,20 +1720,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q4z5p8hxyzrwr93r4mqr794fvqppi7ijcnp5nw9m4vd076hp4vh"; + sha256 = "10ajr3l8vasy4zkc0p481m806g7k7idnw7mi6rlkmx4gkgb0z46j"; type = "gem"; }; - version = "0.0.3"; + version = "0.0.4"; }; gitlab-markup = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d"; + sha256 = "0xnlra517pfj3hx07kasbqlcw51ix4xajr6bsd3mwg8bc92dlwy7"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.1"; }; gitlab-net-dns = { groups = ["default"]; @@ -2270,17 +2260,6 @@ }; version = "0.11.2"; }; - influxdb = { - dependencies = ["cause" "json"]; - groups = ["metrics"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vhg5nd88nwvfa76lqcczld916nljswwq6clsixrzi3js8ym9y1w"; - type = "gem"; - }; - version = "0.2.3"; - }; invisible_captcha = { dependencies = ["rails"]; groups = ["default"]; @@ -2329,10 +2308,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hb3645x0p3bkmqcgc9b2q4b5kn02wgmb03brx7ag1h5y79an4q5"; + sha256 = "1bfqb5qkgbcjrspspa2lha2is0anjnby20x9gp7bfjr5j5j9my32"; type = "gem"; }; - version = "1.7.1"; + version = "2.0.0"; }; jmespath = { groups = ["default"]; @@ -2356,14 +2335,14 @@ version = "3.1.1"; }; json = { - groups = ["default" "development" "metrics" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; + sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; type = "gem"; }; - version = "1.8.6"; + version = "2.3.0"; }; json-jwt = { dependencies = ["activesupport" "aes_key_wrap" "bindata"]; @@ -2445,10 +2424,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50"; + sha256 = "0ai6bzlvxbzpdl466p1qi4dlhx8ri2wcrp6x1l19y3yfs3a29rng"; type = "gem"; }; - version = "2.11.2"; + version = "2.11.3"; }; knapsack = { dependencies = ["rake"]; @@ -2548,16 +2527,6 @@ }; version = "8.9.2"; }; - liquid = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by"; - type = "gem"; - }; - version = "4.0.3"; - }; listen = { dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; groups = ["default" "test"]; @@ -2606,10 +2575,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn"; + sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; lru_redux = { groups = ["default"]; @@ -2735,10 +2704,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw"; + sha256 = "1qfqb9w76kmpb48frbzbyvjc0dfxh5qiw1kxdbv2y2kp6fxpa1kf"; type = "gem"; }; - version = "0.3.3"; + version = "0.3.5"; }; mini_histogram = { groups = ["default"]; @@ -2916,10 +2885,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; + sha256 = "1l0kgd7w08fx2522aw8grlfzwmrgw4jgjakpkgkwm0134g5xv432"; type = "gem"; }; - version = "5.2.0"; + version = "6.0.0"; }; netrc = { groups = ["default"]; @@ -2957,10 +2926,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.8"; + version = "1.10.9"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -3553,10 +3522,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sqjqwa18c0l59zdymcvvvnh5nk3pjggnzaydb2q1qbrk3rypcnq"; + sha256 = "15b8lk54j2abqhpn588b1wvbzwmxwa7iql6241kxpjc0gyb51p0z"; type = "gem"; }; - version = "6.2.0"; + version = "6.3.0"; }; rack-cors = { dependencies = ["rack"]; @@ -3629,10 +3598,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02sxw1f3n2ydmhacakmgjjwv84vqplgr1888cv5dyflb11a3f8mm"; + sha256 = "1rvkzj2hn1rlxc0ndn742mgbdpq0l38i6pjhhwgpaq519jpkk41r"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -3684,10 +3653,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lpzw7bwvg42x6mwfv7d3bhcnyy8p7rcd8yy8cj5qq5mjznhawca"; + sha256 = "01h2ifvvmlzmq8dmpqkhrrmj704v79r1vkcrnvmrqhf4a9bbyqsi"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; rainbow = { groups = ["default" "development" "test"]; @@ -3704,10 +3673,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp"; + sha256 = "0zjja00mzgx2lddb7qrn14k7qrnwhf4bpmnlqj78m1pfxh7svync"; type = "gem"; }; - version = "0.19.0"; + version = "0.19.1"; }; rake = { groups = ["default" "development" "test"]; @@ -3781,10 +3750,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00wf9k1hkv3z3nfkrnfyyfq9ah0l7k14awqys3h2hqz4c21pqd2i"; + sha256 = "16q71cc9wx342c697q18pkz19ym4ncjd97hcw4v6f1mgflkdv400"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.0"; }; recaptcha = { dependencies = ["json"]; @@ -3802,10 +3771,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wfcyigmf5mwrxy76p0bi4sdb4h9afs8jc73pjav5cnqszljjl3c"; + sha256 = "0acrxff186sn6sxdfiy7nacjgwak5cqd7jha9v3kshpf3sfr7qd1"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; RedCloth = { groups = ["default"]; @@ -3925,14 +3894,15 @@ version = "3.0.4"; }; request_store = { + dependencies = ["rack"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1va9x0b3ww4chcfqlmi8b14db39di1mwa7qrjbh7ma0lhndvs2zv"; + sha256 = "0cx74kispmnw3ljwb239j65a2j14n8jlsygy372hrsa8mxc71hxi"; type = "gem"; }; - version = "1.3.1"; + version = "1.5.0"; }; responders = { dependencies = ["actionpack" "railties"]; @@ -3991,10 +3961,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n9h0ls2a2zq0bcsw31wxci1wdxb8s3vglfadxpcs6b04vkf6nqq"; + sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; type = "gem"; }; - version = "3.18.0"; + version = "3.19.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4046,10 +4016,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gjqfb39da6gywdcp4h77738r7khbrn2v4y45589z25bj4z9paf0"; + sha256 = "0fjbwvq7qaz6h3sh1bs9q2qiy4zwcrc8f7xwv82dx2bc09dmqzhd"; type = "gem"; }; - version = "3.9.0"; + version = "3.9.1"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -4079,10 +4049,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p2ji21avixi0sf9xlgrdz319kvs4pjhlbz7kj4anmx5s25w1x7j"; + sha256 = "01cyd449g4lsgrlck7nn3ynn8c8vwfhjb913y05wil56y77wsfkl"; type = "gem"; }; - version = "4.0.0.beta4"; + version = "4.0.0"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -4851,10 +4821,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; u2f = { groups = ["default"]; @@ -4945,10 +4915,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak"; + sha256 = "1cznkq0agsm7s66nbqbalmq5nlc5cdpd2h88r8jdzsc7wsi5a098"; type = "gem"; }; - version = "5.4.1"; + version = "5.5.5"; }; unicorn-worker-killer = { dependencies = ["get_process_mem" "unicorn"]; @@ -4993,6 +4963,17 @@ }; version = "0.4.7"; }; + valid_email = { + dependencies = ["activemodel" "mail"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w3587sa7d1a51djyla57pbv9v105jsqvxhkg6vbxi343fsm455q"; + type = "gem"; + }; + version = "0.1.3"; + }; validate_email = { dependencies = ["activemodel" "mail"]; groups = ["default"]; @@ -5169,9 +5150,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1"; + sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.0"; }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index f85ee249029..f7851c6adcb 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -698,27 +698,27 @@ }; } { - name = "_gitlab_eslint_plugin___eslint_plugin_2.2.1.tgz"; + name = "_gitlab_eslint_plugin___eslint_plugin_3.1.0.tgz"; path = fetchurl { - name = "_gitlab_eslint_plugin___eslint_plugin_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-2.2.1.tgz"; - sha1 = "7033030787981ded5ae24f4051109d069c98fcc0"; + name = "_gitlab_eslint_plugin___eslint_plugin_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-3.1.0.tgz"; + sha1 = "18e03630d10788defbb4c2d746620aec09517295"; }; } { - name = "_gitlab_svgs___svgs_1.121.0.tgz"; + name = "_gitlab_svgs___svgs_1.127.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.121.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.121.0.tgz"; - sha1 = "77083a68f72e9aa0e294da7715f378eef13b839e"; + name = "_gitlab_svgs___svgs_1.127.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.127.0.tgz"; + sha1 = "1f7ffdffe44d6a82b372535f93d78f3a895d1960"; }; } { - name = "_gitlab_ui___ui_12.1.0.tgz"; + name = "_gitlab_ui___ui_14.10.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_12.1.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-12.1.0.tgz"; - sha1 = "b97c7898410767c85cf1768f9b9e36329e59a7ec"; + name = "_gitlab_ui___ui_14.10.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-14.10.0.tgz"; + sha1 = "39c04d62c914fcefe96c7ec32fdf31b1f98f1119"; }; } { @@ -842,6 +842,14 @@ }; } { + name = "_rails_actioncable___actioncable_6.0.3.tgz"; + path = fetchurl { + name = "_rails_actioncable___actioncable_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3.tgz"; + sha1 = "722b4b639936129307ddbab3a390f6bcacf3e7bc"; + }; + } + { name = "_sentry_browser___browser_5.10.2.tgz"; path = fetchurl { name = "_sentry_browser___browser_5.10.2.tgz"; @@ -890,11 +898,27 @@ }; } { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.36.tgz"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.46.tgz"; + path = fetchurl { + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.46.tgz"; + url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.46.tgz"; + sha1 = "05e4cda671ed00450be12461e6a3caff473675aa"; + }; + } + { + name = "_toast_ui_editor___editor_2.0.1.tgz"; + path = fetchurl { + name = "_toast_ui_editor___editor_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.0.1.tgz"; + sha1 = "749e5be1f02f42ded51488d1575ab1c19ca59952"; + }; + } + { + name = "_toast_ui_vue_editor___vue_editor_2.0.1.tgz"; path = fetchurl { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.36.tgz"; - url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.36.tgz"; - sha1 = "2f4d287840ac2944c78ef92f10f0db0ef8a077fa"; + name = "_toast_ui_vue_editor___vue_editor_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.0.1.tgz"; + sha1 = "c9c8c8da4c0a67b9fbc4240464388c67d72a0c22"; }; } { @@ -938,6 +962,22 @@ }; } { + name = "_types_codemirror___codemirror_0.0.71.tgz"; + path = fetchurl { + name = "_types_codemirror___codemirror_0.0.71.tgz"; + url = "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.71.tgz"; + sha1 = "861f1bcb3100c0a064567c5400f2981cf4ae8ca7"; + }; + } + { + name = "_types_estree___estree_0.0.44.tgz"; + path = fetchurl { + name = "_types_estree___estree_0.0.44.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.44.tgz"; + sha1 = "980cc5a29a3ef3bea6ff1f7d021047d7ea575e21"; + }; + } + { name = "_types_events___events_1.2.0.tgz"; path = fetchurl { name = "_types_events___events_1.2.0.tgz"; @@ -978,6 +1018,14 @@ }; } { + name = "_types_json_schema___json_schema_7.0.4.tgz"; + path = fetchurl { + name = "_types_json_schema___json_schema_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz"; + sha1 = "38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"; + }; + } + { name = "_types_minimatch___minimatch_3.0.3.tgz"; path = fetchurl { name = "_types_minimatch___minimatch_3.0.3.tgz"; @@ -1018,6 +1066,14 @@ }; } { + name = "_types_tern___tern_0.23.3.tgz"; + path = fetchurl { + name = "_types_tern___tern_0.23.3.tgz"; + url = "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.3.tgz"; + sha1 = "4b54538f04a88c9ff79de1f6f94f575a7f339460"; + }; + } + { name = "_types_uglify_js___uglify_js_3.0.4.tgz"; path = fetchurl { name = "_types_uglify_js___uglify_js_3.0.4.tgz"; @@ -1074,6 +1130,22 @@ }; } { + name = "_typescript_eslint_experimental_utils___experimental_utils_2.30.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_experimental_utils___experimental_utils_2.30.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.30.0.tgz"; + sha1 = "9845e868c01f3aed66472c561d4b6bac44809dd0"; + }; + } + { + name = "_typescript_eslint_typescript_estree___typescript_estree_2.30.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_typescript_estree___typescript_estree_2.30.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.30.0.tgz"; + sha1 = "1b8e848b55144270255ffbfe4c63291f8f766615"; + }; + } + { name = "_vue_component_compiler_utils___component_compiler_utils_2.6.0.tgz"; path = fetchurl { name = "_vue_component_compiler_utils___component_compiler_utils_2.6.0.tgz"; @@ -1874,14 +1946,6 @@ }; } { - name = "babel_code_frame___babel_code_frame_6.26.0.tgz"; - path = fetchurl { - name = "babel_code_frame___babel_code_frame_6.26.0.tgz"; - url = "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; - sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; - }; - } - { name = "babel_eslint___babel_eslint_10.0.3.tgz"; path = fetchurl { name = "babel_eslint___babel_eslint_10.0.3.tgz"; @@ -2794,6 +2858,14 @@ }; } { + name = "codemirror___codemirror_5.53.2.tgz"; + path = fetchurl { + name = "codemirror___codemirror_5.53.2.tgz"; + url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.53.2.tgz"; + sha1 = "9799121cf8c50809cca487304e9de3a74d33f428"; + }; + } + { name = "codesandbox_api___codesandbox_api_0.0.23.tgz"; path = fetchurl { name = "codesandbox_api___codesandbox_api_0.0.23.tgz"; @@ -3290,11 +3362,11 @@ }; } { - name = "css_loader___css_loader_1.0.1.tgz"; + name = "css_loader___css_loader_2.1.1.tgz"; path = fetchurl { - name = "css_loader___css_loader_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.1.tgz"; - sha1 = "6885bb5233b35ec47b006057da01cc640b6b79fe"; + name = "css_loader___css_loader_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz"; + sha1 = "d8254f72e412bb2238bb44dd674ffbef497333ea"; }; } { @@ -3306,14 +3378,6 @@ }; } { - name = "css_selector_tokenizer___css_selector_tokenizer_0.7.2.tgz"; - path = fetchurl { - name = "css_selector_tokenizer___css_selector_tokenizer_0.7.2.tgz"; - url = "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.2.tgz"; - sha1 = "11e5e27c9a48d90284f22d45061c303d7a25ad87"; - }; - } - { name = "css___css_2.2.4.tgz"; path = fetchurl { name = "css___css_2.2.4.tgz"; @@ -4514,11 +4578,11 @@ }; } { - name = "eslint_plugin_jest___eslint_plugin_jest_22.3.0.tgz"; + name = "eslint_plugin_jest___eslint_plugin_jest_23.8.2.tgz"; path = fetchurl { - name = "eslint_plugin_jest___eslint_plugin_jest_22.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.3.0.tgz"; - sha1 = "a10f10dedfc92def774ec9bb5bfbd2fb8e1c96d2"; + name = "eslint_plugin_jest___eslint_plugin_jest_23.8.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.8.2.tgz"; + sha1 = "6f28b41c67ef635f803ebd9e168f6b73858eb8d4"; }; } { @@ -4578,6 +4642,14 @@ }; } { + name = "eslint_utils___eslint_utils_2.0.0.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz"; + sha1 = "7be1cc70f27a72a76cd14aa698bcabed6890e1cd"; + }; + } + { name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; path = fetchurl { name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; @@ -4882,14 +4954,6 @@ }; } { - name = "fastparse___fastparse_1.1.2.tgz"; - path = fetchurl { - name = "fastparse___fastparse_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz"; - sha1 = "91728c5a5942eced8531283c79441ee4122c35a9"; - }; - } - { name = "fault___fault_1.0.2.tgz"; path = fetchurl { name = "fault___fault_1.0.2.tgz"; @@ -5562,11 +5626,11 @@ }; } { - name = "graphql_tag___graphql_tag_2.10.0.tgz"; + name = "graphql_tag___graphql_tag_2.10.3.tgz"; path = fetchurl { - name = "graphql_tag___graphql_tag_2.10.0.tgz"; - url = "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.0.tgz"; - sha1 = "87da024be863e357551b2b8700e496ee2d4353ae"; + name = "graphql_tag___graphql_tag_2.10.3.tgz"; + url = "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.3.tgz"; + sha1 = "ea1baba5eb8fc6339e4c4cf049dabe522b0edf03"; }; } { @@ -5938,11 +6002,11 @@ }; } { - name = "icss_utils___icss_utils_2.1.0.tgz"; + name = "icss_utils___icss_utils_4.1.1.tgz"; path = fetchurl { - name = "icss_utils___icss_utils_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz"; - sha1 = "83f0a0ec378bf3246178b6c2ad9136f135b1c962"; + name = "icss_utils___icss_utils_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz"; + sha1 = "21170b53789ee27447c2f47dd683081403f9a467"; }; } { @@ -7202,14 +7266,6 @@ }; } { - name = "js_tokens___js_tokens_3.0.2.tgz"; - path = fetchurl { - name = "js_tokens___js_tokens_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz"; - sha1 = "9866df395102130e38f7f996bceb65443209c25b"; - }; - } - { name = "js_yaml___js_yaml_3.13.1.tgz"; path = fetchurl { name = "js_yaml___js_yaml_3.13.1.tgz"; @@ -8346,6 +8402,14 @@ }; } { + name = "mitt___mitt_1.2.0.tgz"; + path = fetchurl { + name = "mitt___mitt_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/mitt/-/mitt-1.2.0.tgz"; + sha1 = "cb24e6569c806e31bd4e3995787fe38a04fdf90d"; + }; + } + { name = "mixin_deep___mixin_deep_1.3.2.tgz"; path = fetchurl { name = "mixin_deep___mixin_deep_1.3.2.tgz"; @@ -9546,35 +9610,35 @@ }; } { - name = "postcss_modules_extract_imports___postcss_modules_extract_imports_1.2.1.tgz"; + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_2.0.0.tgz"; path = fetchurl { - name = "postcss_modules_extract_imports___postcss_modules_extract_imports_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz"; - sha1 = "dc87e34148ec7eab5f791f7cd5849833375b741a"; + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz"; + sha1 = "818719a1ae1da325f9832446b01136eeb493cd7e"; }; } { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_1.2.0.tgz"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_2.0.6.tgz"; path = fetchurl { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz"; - sha1 = "f7d80c398c5a393fa7964466bd19500a7d61c069"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz"; + sha1 = "dd9953f6dd476b5fd1ef2d8830c8929760b56e63"; }; } { - name = "postcss_modules_scope___postcss_modules_scope_1.1.0.tgz"; + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; path = fetchurl { - name = "postcss_modules_scope___postcss_modules_scope_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz"; - sha1 = "d6ea64994c79f97b62a72b426fbe6056a194bb90"; + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; + sha1 = "385cae013cc7743f5a7d7602d1073a89eaae62ee"; }; } { - name = "postcss_modules_values___postcss_modules_values_1.3.0.tgz"; + name = "postcss_modules_values___postcss_modules_values_2.0.0.tgz"; path = fetchurl { - name = "postcss_modules_values___postcss_modules_values_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz"; - sha1 = "ecffa9d7e192518389f42ad0e83f72aec456ea20"; + name = "postcss_modules_values___postcss_modules_values_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz"; + sha1 = "479b46dc0c5ca3dc7fa5270851836b9ec7152f64"; }; } { @@ -9666,14 +9730,6 @@ }; } { - name = "postcss___postcss_6.0.23.tgz"; - path = fetchurl { - name = "postcss___postcss_6.0.23.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz"; - sha1 = "61c82cc328ac60e677645f979054eb98bc0e3324"; - }; - } - { name = "postcss___postcss_7.0.27.tgz"; path = fetchurl { name = "postcss___postcss_7.0.27.tgz"; @@ -9682,6 +9738,14 @@ }; } { + name = "postcss___postcss_7.0.30.tgz"; + path = fetchurl { + name = "postcss___postcss_7.0.30.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz"; + sha1 = "cc9378beffe46a02cbc4506a0477d05fcea9a8e2"; + }; + } + { name = "prelude_ls___prelude_ls_1.1.2.tgz"; path = fetchurl { name = "prelude_ls___prelude_ls_1.1.2.tgz"; @@ -11794,11 +11858,11 @@ }; } { - name = "throttle_debounce___throttle_debounce_2.0.1.tgz"; + name = "throttle_debounce___throttle_debounce_2.1.0.tgz"; path = fetchurl { - name = "throttle_debounce___throttle_debounce_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.0.1.tgz"; - sha1 = "7307ddd6cd9acadb349132fbf6c18d78c88a5e62"; + name = "throttle_debounce___throttle_debounce_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.1.0.tgz"; + sha1 = "257e648f0a56bd9e54fe0f132c4ab8611df4e1d5"; }; } { @@ -12114,11 +12178,19 @@ }; } { - name = "tslib___tslib_1.9.3.tgz"; + name = "tslib___tslib_1.11.1.tgz"; + path = fetchurl { + name = "tslib___tslib_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz"; + sha1 = "eb15d128827fbee2841549e171f45ed338ac7e35"; + }; + } + { + name = "tsutils___tsutils_3.17.1.tgz"; path = fetchurl { - name = "tslib___tslib_1.9.3.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz"; - sha1 = "d7e4dd79245d85428c4d7e4822a79917954ca286"; + name = "tsutils___tsutils_3.17.1.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz"; + sha1 = "ed719917f11ca0dee586272b2ac49e015a2dd759"; }; } { @@ -12242,14 +12314,6 @@ }; } { - name = "underscore___underscore_1.9.2.tgz"; - path = fetchurl { - name = "underscore___underscore_1.9.2.tgz"; - url = "https://registry.yarnpkg.com/underscore/-/underscore-1.9.2.tgz"; - sha1 = "0c8d6f536d6f378a5af264a72f7bec50feb7cf2f"; - }; - } - { name = "underscore___underscore_1.8.3.tgz"; path = fetchurl { name = "underscore___underscore_1.8.3.tgz"; @@ -12666,11 +12730,11 @@ }; } { - name = "vue_apollo___vue_apollo_3.0.0_beta.28.tgz"; + name = "vue_apollo___vue_apollo_3.0.3.tgz"; path = fetchurl { - name = "vue_apollo___vue_apollo_3.0.0_beta.28.tgz"; - url = "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.0-beta.28.tgz"; - sha1 = "be6a3a1504be2096cbfb23996537e2fc95c8c239"; + name = "vue_apollo___vue_apollo_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.3.tgz"; + sha1 = "7f29558df76eec0f03251847eef153816a261827"; }; } { diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index d3e13b913f3..468dd0c4b1a 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -137,6 +137,7 @@ stdenv.mkDerivation (args // { # give a friendlier error msg. if ! [ -e $srcLockfile ]; then echo "ERROR: Missing Cargo.lock from src. Expected to find it at: $srcLockfile" + echo "Hint: You can use the cargoPatches attribute to add a Cargo.lock manually to the build." exit 1 fi diff --git a/pkgs/data/icons/mint-x-icons/default.nix b/pkgs/data/icons/mint-x-icons/default.nix new file mode 100644 index 00000000000..213ba877dc6 --- /dev/null +++ b/pkgs/data/icons/mint-x-icons/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, fetchurl +, gnome-icon-theme +, gtk3 +, hicolor-icon-theme +, humanity-icon-theme +, ubuntu-themes +}: + +stdenv.mkDerivation rec { + pname = "mint-x-icons"; + version = "1.5.5"; + + src = fetchurl { + url = "http://packages.linuxmint.com/pool/main/m/${pname}/${pname}_${version}.tar.xz"; + sha256 = "0nq3si06m98b71f33wism0bvlvib57rm96msf0wx852ginw3a5yd"; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + gnome-icon-theme + hicolor-icon-theme + humanity-icon-theme + ubuntu-themes # provides the parent icon theme: ubuntu-mono-dark + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + cp -vai usr/share/icons/* $out/share/icons + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Mint/metal theme based on mintified versions of Clearlooks Revamp, Elementary and Faenza"; + homepage = "https://github.com/linuxmint/mint-x-icons"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index ea64b75214f..b838c19afc8 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -1,26 +1,42 @@ -{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2, withGtk3 ? false, gtk3 }: +{ stdenv +, fetchurl +, intltool +, pkg-config +, libX11 +, gtk2 +, gtk3 +, withGtk3 ? true +}: stdenv.mkDerivation rec { name = "lxappearance-0.6.3"; - src = fetchurl{ + src = fetchurl { url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz"; sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ + pkg-config + intltool + ]; - buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) ]; + buildInputs = [ + libX11 + (if withGtk3 then gtk3 else gtk2) + ]; - patches = [ ./lxappearance-0.6.3-xdg.system.data.dirs.patch ]; + patches = [ + ./lxappearance-0.6.3-xdg.system.data.dirs.patch + ]; configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; - meta = { - description = "A lightweight program for configuring the theme and fonts of gtk applications"; + meta = with stdenv.lib; { + description = "Lightweight program for configuring the theme and fonts of gtk applications"; homepage = "https://lxde.org/"; - maintainers = [ stdenv.lib.maintainers.hinton ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ hinton romildo ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 8886b60d39e..ee77185cde6 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -110,7 +110,7 @@ in with passthru; stdenv.mkDerivation { # Backport a fix for discovering `rpmbuild` command when doing `python setup.py bdist_rpm` to 3.5, 3.6, 3.7. # See: https://bugs.python.org/issue11122 ./3.7/fix-hardcoded-path-checking-for-rpmbuild.patch - ] ++ optionals (isPy37 || isPy38) [ + ] ++ optionals (isPy37 || isPy38 || isPy39) [ # Fix darwin build https://bugs.python.org/issue34027 ./3.7/darwin-libutil.patch ] ++ optionals (pythonOlder "3.8") [ @@ -129,7 +129,7 @@ in with passthru; stdenv.mkDerivation { ( if isPy35 then ./3.5/python-3.x-distutils-C++.patch - else if isPy37 || isPy38 then + else if isPy37 || isPy38 || isPy39 then ./3.7/python-3.x-distutils-C++.patch else fetchpatch { diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix new file mode 100644 index 00000000000..c6faa4fc017 --- /dev/null +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub +, meson, ninja, pkgconfig, wayland-protocols +, pipewire, wayland, elogind, systemd, libdrm }: + +stdenv.mkDerivation rec { + pname = "xdg-desktop-portal-wlr"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "emersion"; + repo = pname; + rev = "v${version}"; + sha256 = "12k92h9dmn1fyn8nzxk69cyv0gnb7g9gj7a66mw5dcl5zqnl07nc"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ]; + buildInputs = [ pipewire wayland elogind systemd libdrm ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/emersion/xdg-desktop-portal-wlr"; + description = "xdg-desktop-portal backend for wlroots"; + maintainers = with maintainers; [ minijackson ]; + platforms = platforms.linux; + license = licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/custom_printf/default.nix b/pkgs/development/ocaml-modules/custom_printf/default.nix deleted file mode 100644 index 8f8a0a5c886..00000000000 --- a/pkgs/development/ocaml-modules/custom_printf/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, buildOcaml, fetchurl, type_conv, sexplib_p4, pa_ounit}: - -buildOcaml rec { - name = "custom_printf"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/custom_printf/archive/${version}.tar.gz"; - sha256 = "dad3aface92c53e8fbcc12cc9358c4767cb1cb09857d4819a10ed98eccaca8f9"; - }; - - buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ type_conv sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/custom_printf"; - description = "Syntax extension for printf format strings"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 19be6d28e17..5a1b7600ecf 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "228ea058361763a5a31273df7d813b9134d0ecff4567c533eb7e1afaf772fbc7"; + sha256 = "03417eecfa1fac906e674cb1cb43ed7da27a96277277b091d7c389ba39f6c3fe"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix index c23ebfc2ce9..fd0c527344c 100644 --- a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-hanaonazure"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "cc4058174e371a0b68b305cd5a082fcca47f3446dd9aefd9ada72da4bd637da9"; + sha256 = "7f8b912ca62431c1697b4914c12cc5f8123e60ee6c65d123591f937744d204e0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index f5b04c36b0d..404caf4ebf5 100644 --- a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.4.0"; pname = "azure-mgmt-imagebuilder"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0r4sxr3pbcci5qif1ip1lrix3cryj0b3asqch3zds4q705jiakc4"; + sha256 = "4c9291bf16b40b043637e5e4f15650f71418ac237393e62219cab478a7951733"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index eb4772ce543..69c1aaffada 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "16f4c4f676ea718b7e1c59bd9a516fcfc796f1aff844b183a7ce9afe69fb214d"; + sha256 = "a1527fe8b1e8a47558bfa03bd6c587706d8fb9213142aea42da07397daa2d039"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix index 2ccb773c105..8192064626e 100644 --- a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-signalr"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "08b2i6wz9n13h77ahay1hvmg8abk2vvs7kn4y7xip9gi6ij8fv0a"; + sha256 = "6503ddda9d6f4b634dfeb8eb4bcd14ede5e0900585f6c83bf9010cf82215c126"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 02460b27952..2a3552d1fb5 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "0.50.2"; + version = "0.50.3"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "836649d510aa2b7467bc87d8dab18f2db917b63aa2fe8f3e5d0bb44011e465f5"; + sha256 = "2b1e60c81fcf5b6a5bb3ceddb27f24543f479912e39a4706a390a16d8c0a71f4"; }; buildInputs = [ @@ -29,6 +29,9 @@ buildPythonPackage rec { # has no tests doCheck = false; + # python2 will fail due to pep 420 + pythonImportsCheck = lib.optionals isPy3k [ "azure.servicebus" ]; + meta = with lib; { description = "This is the Microsoft Azure Service Bus Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index b088480f5de..f9a73d24831 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k, +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, fetchpatch, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, future, sqlalchemy, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, @@ -25,12 +25,17 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.7.0"; + version = "2.8.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0jj8fh611n7xc3vsfbgpqsllp38cfj3spkr2kz3ara2x7jvh3406"; + # tests fail with the 2.8.0 sdist, so fetchFromGitHub instead + # https://github.com/buildbot/buildbot/pull/5322 + src = fetchFromGitHub { + owner = "buildbot"; + repo = "buildbot"; + rev = "v${version}"; + sha256 = "0akd61mgjp53c3vyf2yyzd0xf0cjwpvsi7g8pz72xrvnil1s4w7k"; }; + sourceRoot = "./source/master"; propagatedBuildInputs = [ # core diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index cb3124ec7e3..12a7e99984f 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.7.0"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "03zb09r8w8dvd9qas7h6gdwlqc7q482ikph6h3708lpnkn72xdkb"; + sha256 = "09sf36h8q8wrp0n57nb9915k86qdjyjj4xpdzy8q4s9z121iw0xz"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index cd35f14fb37..abb5d356540 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1d8xdk4rq4p3fw03cvz7d1pmpjjbyrnzzjifzv46q88vk7jakgxi"; + sha256 = "1xq7pqvvsvgd2n38yzk0bqx943ldxsldrdcldwjshazq831rbdbn"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "03pl75avi6cmmhjvfn0a0b4drn35yv37kvgn04zjdwa3m6p3haa8"; + sha256 = "0ixq8x845glnykpab2z0vhwp69nbw98mg0df34kf32wjvm8j6kjh"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0rzjk3qmlvid8qag3r00zaszchncl1nl8l2yapvc1zqh2dqlln58"; + sha256 = "1gn0amv8l0n0ny1x78g8x4rpfsnhcs9gkws2zw3nx78y4pbs6lw5"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1n4j73y9kwfqk7dz1fh1bpan68vlpnbz7idxpmsphyay8w8y9dd4"; + sha256 = "04c0m4liyl4aaksq9x8wncasacfv0vgl0igafnhf440cf9lhkkwy"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1babkcgxczs6zfk2b6jmsy2vwbrgdydrp2px1mfwa3wmv8fwlssg"; + sha256 = "0c7lr4q3dvz3zhbnsvs2chsc6yn2jh10dnh1y66axdxk8hpqs3nc"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 365ca0bcf14..4f77fb7ae06 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -3,11 +3,11 @@ buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.7.0"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "1vwy46acvczgk1hhpsqdwpcw55j4hm5pkw6j01f92axiga8r5jk6"; + sha256 = "19pabha9jh3jnz9micfn5y4khnx4q6g1zc27wvfw6663mw6spykx"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix new file mode 100644 index 00000000000..9f2143e2f20 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nbformat +, sphinx +, ipywidgets +, pythonOlder +}: + +buildPythonPackage rec { + pname = "jupyter-sphinx"; + version = "0.2.4"; + + src = fetchPypi { + inherit version; + pname = "jupyter_sphinx"; + sha256 = "b5ba1efdd1488b385de0068036a665932ed93998e40ce3a342c60f0926781fd9"; + }; + + propagatedBuildInputs = [ nbformat sphinx ipywidgets ]; + + doCheck = false; + + disabled = pythonOlder "3.5"; + + meta = with lib; { + description = "Jupyter Sphinx Extensions"; + homepage = "https://github.com/jupyter/jupyter-sphinx/"; + license = licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/development/python-modules/pythonmagick/default.nix index 487648d07ca..a647fa1005b 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/development/python-modules/pythonmagick/default.nix @@ -1,10 +1,19 @@ -# This expression provides Python bindings to ImageMagick. Python libraries are supposed to be called via `python-packages.nix`. +{ lib +, buildPythonPackage +, fetchurl +, python +, pkg-config +, imagemagick +, autoreconfHook +, boost +, isPy3k +, pythonImportsCheckHook +}: -{ stdenv, fetchurl, python, pkgconfig, imagemagick, autoreconfHook }: - -stdenv.mkDerivation rec { +buildPythonPackage rec { pname = "pythonmagick"; version = "0.9.16"; + format = "other"; src = fetchurl { url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz"; @@ -15,12 +24,18 @@ stdenv.mkDerivation rec { rm configure ''; - configureFlags = [ "--with-boost=${python.pkgs.boost}" ]; + configureFlags = [ "--with-boost=${boost}" ]; + + nativeBuildInputs = [ pkg-config autoreconfHook pythonImportsCheckHook ]; + buildInputs = [ python boost imagemagick ]; + + pythonImportsCheck = [ + "PythonMagick" + ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ python python.pkgs.boost imagemagick ]; + disabled = isPy3k; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.imagemagick.org/script/api.php"; license = licenses.imagemagick; description = "PythonMagick provides object oriented bindings for the ImageMagick Library."; diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 35ef67326ce..e1527ea27e6 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.2.7"; + version = "1.2.8"; src = fetchPypi { inherit pname version; - sha256 = "d5ac4f6e66baf466cb1c5e00d52f5da3a42bf811724522475b7e2125fbae4aae"; + sha256 = "12yq435h27iv1kzgq3gl7c7hxdivvc2sl0l1kslgf2wxw53n7jgj"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 98c3b1be93b..410abbbb622 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -1,29 +1,29 @@ { stdenv , buildPythonPackage , fetchPypi -, Babel +, markupsafe }: buildPythonPackage rec { - version = "2.1"; - pname = "wtforms"; + version = "2.3.1"; + pname = "WTForms"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "0vyl26y9cg409cfyj8rhqxazsdnd0jipgjw06civhrd53yyi1pzz"; + sha256 = "0whrd9cqhlibm31yqhvhp9illddxf0cpgcn3v806f7ajmsri66l6"; }; + propagatedBuildInputs = [ markupsafe ]; + # Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet." - # This is fixed in master I believe but not yet in 2.1; doCheck = false; - propagatedBuildInputs = [ Babel ]; - meta = with stdenv.lib; { - homepage = "https://github.com/wtforms/wtforms"; description = "A flexible forms validation and rendering library for Python"; + homepage = "https://github.com/wtforms/wtforms"; + changelog = "https://github.com/wtforms/wtforms/blob/${version}/CHANGES.rst"; license = licenses.bsd3; + maintainers = [ maintainers.bhipple ]; }; } diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 98675d98d57..f331272a5f3 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -1,13 +1,9 @@ { buildBazelPackage , fetchFromGitHub -, fetchpatch , git , go , python , stdenv -, iana-etc -, mailcap -, tzdata }: let @@ -17,13 +13,13 @@ let in buildBazelPackage rec { name = "bazel-watcher-${version}"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "1fc3sp79znbbq1yjap56lham72n7cap8yfghpzrzmpl5brybjkvm"; + sha256 = "0n28q27510ymg5d455hrbk7z8wawszgjmqjjhb4zximqhvxks7kh"; }; nativeBuildInputs = [ go git python ]; @@ -60,7 +56,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0i77nnbd1sd39qw4vm3n5mwkag3dskqjhzr7qs4w1arbiih45zd4"; + sha256 = "16zgjd6zww9skk34ggfx5l3kbsdyv98zxawrvmx1arv5gaj63pp9"; }; buildAttrs = { diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index 5fe73ed33f0..89ba58ea5f5 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, libiconv, llvmPackages, v8 }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, libiconv, llvmPackages, v8 }: rustPlatform.buildRustPackage rec { pname = "rq"; @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0c5vwy3c5ji602dj64z6jqvcpi2xff03zvjbnwihb3ydqwnb3v67"; - buildInputs = [ llvmPackages.clang-unwrapped v8 ]; + buildInputs = [ llvmPackages.clang-unwrapped v8 ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; configurePhase = '' export LIBCLANG_PATH="${llvmPackages.clang-unwrapped}/lib" diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 519d4e3a741..223f0a6ae8c 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, pkgconfig, SDL2, libpng, zlib, xz, freetype, fontconfig, libxdg_basedir +{ stdenv, fetchurl, fetchzip, pkgconfig, which, SDL2, libpng, zlib, xz, freetype, fontconfig, libxdg_basedir , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true , withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps , writeScriptBin, makeWrapper, runtimeShell @@ -29,14 +29,14 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - sha256 = "0d22a3c50f7a321f4f211594f4987ac16c381e8e3e40f116848e63e91e7fbb9b"; + sha256 = "1xdn9rr858nq22a13cpbhcw74bwygf7lw95kvx3wn4zvb795b74k"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig which makeWrapper ]; buildInputs = [ SDL2 libpng xz zlib freetype fontconfig libxdg_basedir ] ++ stdenv.lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ]; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index dd105b8e74c..4ecfa222de7 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -197,12 +197,12 @@ let ayu-vim = buildVimPluginFrom2Nix { pname = "ayu-vim"; - version = "2020-04-13"; + version = "2020-05-29"; src = fetchFromGitHub { owner = "ayu-theme"; repo = "ayu-vim"; - rev = "a3a2d2a4ce36e0f681236b3ab15043c0b09460b1"; - sha256 = "06lhfwh8z178bgbbcz4mxjpk6zajz19x1jhaahbsqg3641y5pj0p"; + rev = "0745635421688ce777f663d13531996cb4da6514"; + sha256 = "0w7ixhz72g3lr1hkn450k6x8sdgv95pp6pxbykka3s01i506rzmj"; }; meta.homepage = "https://github.com/ayu-theme/ayu-vim/"; }; @@ -293,12 +293,12 @@ let caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2020-05-12"; + version = "2020-06-01"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "2c6b9f2d9a2b4d172adde4c393b1a04c59a0b471"; - sha256 = "0137vs50xmdggc2nqclp6i7i640nkj31czm8cmqx19504b7hy8vw"; + rev = "0725e7c273e2c39d8730adc78e0fd20e0d57d173"; + sha256 = "14rsjy5lllmb84vs5q111cb17c6nwc37zf460kh8ii1ijziyqhy2"; }; meta.homepage = "https://github.com/tyru/caw.vim/"; }; @@ -401,12 +401,12 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-05-28"; + version = "2020-06-02"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "ba8cf9afc8aae3ea4086d89a01bd414d42a6b8bc"; - sha256 = "13dv08kpp3cxqgikznyxkl7nsjzxn97aklk6k6s19cw3b5al15pn"; + rev = "8c89226acc29fe2695e8f86355c04ce1587f0fda"; + sha256 = "04616lzpch9r5cj6nh4dw4b666iyi314n95mi62n5qcaibr6r85s"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -473,12 +473,12 @@ let coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2020-04-23"; + version = "2020-05-29"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "3c914c2b9e154889361d2631cd2188cf7e5fa020"; - sha256 = "0q7q2z7k2sxqgi6nyj669iq2p4h3962i8hv3gzg2mpi0p73xs98k"; + rev = "bf698c0df4d63c7c84013d58111b7b458f6b12f1"; + sha256 = "1nyswz55dg4d1nz6ff2479ibnzcdhv9ky8a4awlakwp0g0c3680s"; }; meta.homepage = "https://github.com/neoclide/coc-java/"; }; @@ -521,12 +521,12 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-05-25"; + version = "2020-06-01"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "99431ec2eb4e5a9a0309d63bd4167e5af2f1d781"; - sha256 = "13qqfhwv745svf5672hm7m4n3dk9c15py5l0znygn5a6gs5rjzzm"; + rev = "0286d7f11647dca4a63d84fe4101dbabc7731c04"; + sha256 = "068aqynvzsnrz2dh68zdy40h342nfrf8kvv9234qdr91mhbvrxv4"; }; meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; @@ -605,12 +605,12 @@ let coc-rust-analyzer = buildVimPluginFrom2Nix { pname = "coc-rust-analyzer"; - version = "2020-05-27"; + version = "2020-06-04"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "95fe45bb82f88a5da5461a2925c7daac1ff24155"; - sha256 = "1zczdz07fmcd7i05bz99m3a90v1dnbf4mjbh1iha0h2kyj0fj0sd"; + rev = "acd5e7fca38dbc8ad8bfe9f187f1f4e6ee64ea88"; + sha256 = "14qyszmyzykibdkdv38cypc8gmhaz0301prirjbpf2gijryk922b"; }; meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; }; @@ -773,24 +773,24 @@ let coc-yank = buildVimPluginFrom2Nix { pname = "coc-yank"; - version = "2020-03-17"; + version = "2020-06-02"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-yank"; - rev = "6cb8bc7f2d41b9fb75c797c5805444badeff3dd9"; - sha256 = "0s28684531ihczg5nf2m3f8z1vx9fw4yllfq7jz8g7ifw922ddxb"; + rev = "7983c28509a61a7eb014e178525845797f5779ed"; + sha256 = "1mjdd1kqvc5hzygjs2gv8vrpr3wc2a9590cr6vq0pfllxbkyqjng"; }; meta.homepage = "https://github.com/neoclide/coc-yank/"; }; coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-05-28"; + version = "2020-06-04"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "60cd2a0935319ec7150006ce6457a9f10a5f04c2"; - sha256 = "1wanp845yv07gkyvl4kv7bd1l46mz8wy0mw7bmcxi4d6qqfjpdrv"; + rev = "d992e129997d9bda225a4e59ed5e5a57fca1896a"; + sha256 = "0f4vsg2fbwn4jpfj8lv8ib8i8adzvr9inw4q861w87zssk65bi8g"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -821,12 +821,12 @@ let command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2020-05-09"; + version = "2020-06-02"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "9c7f81208a32fe4d26096d0d268ac6e802d945fd"; - sha256 = "0jmwhlcycb1hp65d2g54mdd7xmpmvr33lm0130c9yk16mv2ia65i"; + rev = "ea7a889bda2849ba87fc12053bf6dd14467d7b72"; + sha256 = "02rswhlkgbapnjzqi2nv95ag08p9cjlqscwv6i17f9kvba929hkl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/wincent/command-t/"; @@ -918,12 +918,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2020-05-07"; + version = "2020-05-29"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "361e9c1190c53d78446743be308709bb1c253981"; - sha256 = "104qgkcvnvff59ydk18wwlsvsyw6l3nh6x49f1j2rpfmnlclamcs"; + rev = "c84fd12a226d7b3b8d4b7e77ed5ddd1c5fa970ad"; + sha256 = "1gjhbgwqf1zg813a3wcqj2x29gs4x7yc185mxi3lvnxghwj9j2i3"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -1014,12 +1014,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-05-26"; + version = "2020-05-30"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "56e0c4fd9ce28dce416420a0639792b0fc42115f"; - sha256 = "1nliphg9fjyga8p5b3flzqn7znxyazqakpzr03czzdm0vr96z9r1"; + rev = "5d8133aba89acaab3b532b15eed8e6cba77b1cd2"; + sha256 = "1gw73cybp1qxgnqfa6hn6g2ky30canhmrchf550kp5j8nflqa887"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1062,12 +1062,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-05-23"; + version = "2020-06-01"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "09c22ad10f4adaca9845db106b7a46a80dd6f6ca"; - sha256 = "1prkahf7793bi4zr60vmjsky33bzn69wjgsfkdhvgjla8kyiwf6v"; + rev = "7c971aa2e40853b21f7967788e9ea3baa4e97ab2"; + sha256 = "04v3v14g7nnmc6rhz5vpppqgkk8z67am4nc6k8jwbrv61sq1ga6b"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1209,12 +1209,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2020-03-07"; + version = "2020-05-30"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "6aa2bfd73a181fa6b55021264c4a8a83237ce558"; - sha256 = "1bcvfbv046fk34vnc1ly8civ3sibqlzli8vm2548dfxc55wcwsys"; + rev = "2994bf57fed476a5b9878e842b14b5b5c5b22211"; + sha256 = "0y22nay6qkn0sl74hlhhri3hjw5r3fwmmxby3j9q0avszlmq7352"; }; meta.homepage = "https://github.com/Shougo/deoplete-lsp/"; }; @@ -1293,12 +1293,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-05-26"; + version = "2020-06-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "8aef99a951686488c03070d1cf1a2155837f5f1b"; - sha256 = "0rhni3hix26flls9i1ajwnpfdynkvqxll5rhi1256pvhy2nizamq"; + rev = "921688d72168e436c82f3d413a5de7d78369a0c7"; + sha256 = "01wpq4majnhh4lxmai0ix5dqvfxrbdsj2pic785x3kaqn4all31w"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1353,12 +1353,12 @@ let editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2020-05-26"; + version = "2020-06-02"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "0818c7eb7ccd1cfb687161e68e55355c34694d28"; - sha256 = "1qiljz47b59sd3gyvr7l0kmb13hbi5204nnhjnpj8bd98kf676w7"; + rev = "0a3c1d8082e38a5ebadcba7bb3a608d88a9ff044"; + sha256 = "1w60rsij0ag74vjal2l75k4g4xv8438a0izvzpy5xir4bby2g7dz"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -1548,12 +1548,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-05-23"; + version = "2020-06-01"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "7a655179a43cd431862a2bf5d297d9e55fd3f814"; - sha256 = "1ivxkg60g3jlmd14ndwfqdkzm74naddfghafpv622dainv4qw20j"; + rev = "5aa5977d744d1183806079d307f023b0c5ceaaef"; + sha256 = "0b7lgdr66q99dfc73iwgb11pd4b465qmslfzqypsp8jamckk1jii"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1572,12 +1572,12 @@ let gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2020-03-08"; + version = "2020-06-04"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "42163237b57c56de9a24fe6549e46c805fab2bb3"; - sha256 = "1bg3ismjlp99drsfyrkjb137ypxmp0qpy8pp9ry9i8ljmnffbgal"; + rev = "632d0a72c83cd0ccf7f40cb64470dc84f51bdce2"; + sha256 = "0q5cj2zpcdxmwm8dcj0nbyffjs1a075fgqbang4s0ikangbhx586"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -1800,12 +1800,12 @@ let indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2020-03-06"; + version = "2020-05-29"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "15aceda8c4eea621b66faa8673fca0b9fbe2f457"; - sha256 = "1icb1h811lp86hg4w8y8mmmsfm4c80n7m8r1wi58lnm60mjasas4"; + rev = "43dbd7092801637972b1d9fcecaaeee11f8e00cf"; + sha256 = "0qnzi19vb5qk773pc9v75wqm2ipdkcscljblla6gq05srm1h8x9d"; }; meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; @@ -1846,6 +1846,18 @@ let meta.homepage = "https://github.com/twerth/ir_black/"; }; + is-vim = buildVimPluginFrom2Nix { + pname = "is-vim"; + version = "2017-10-30"; + src = fetchFromGitHub { + owner = "haya14busa"; + repo = "is.vim"; + rev = "61d5029310c69bde700b2d46a454f80859b5af17"; + sha256 = "1nnf6y62mc0rj7hbrapfkmr91ypsqkzhwgpfx7pahz8m3a2324q6"; + }; + meta.homepage = "https://github.com/haya14busa/is.vim/"; + }; + jdaddy-vim = buildVimPluginFrom2Nix { pname = "jdaddy-vim"; version = "2014-02-22"; @@ -2029,24 +2041,24 @@ let lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2020-05-16"; + version = "2020-06-03"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "2f70a30a342969e8cf4e21c965d523ff456173a9"; - sha256 = "0qpiqrcr9azamvm8mzcfb3fbp7rxgbhi2bdc926i9a7psazgmyfl"; + rev = "d6ea4b24b14f3ead29dc8df2e2d942c2b0287948"; + sha256 = "0gh21v0gnwhq2gim1hhfd0376zk4jdhfn9dldczxvzipxw3jaknr"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-05-18"; + version = "2020-06-03"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "03673b75c2b2ba8d25c1323804725a6eb9bbb995"; - sha256 = "0nk3s916k7vv9cgpf4rxf5qc4bmsf74mxa59fdi8wlzda0m5dyhk"; + rev = "448982501112f69f8edb7fb7bb61573091036366"; + sha256 = "1k4man0jm8pkvb2f8l2f743ipwiz76ljzzn1hi4pvs0wncdr7k6q"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2379,22 +2391,22 @@ let pname = "NeoSolarized"; version = "2020-03-10"; src = fetchFromGitHub { - owner = "icymind"; + owner = "overcache"; repo = "NeoSolarized"; rev = "70609c44215c8d2c43ad8c631296caae08a9c8d4"; sha256 = "0bxrm2vm3z1y37sm6m2hdn72g2sw31dx1xhmjvd0ng72cnp84d9k"; }; - meta.homepage = "https://github.com/icymind/NeoSolarized/"; + meta.homepage = "https://github.com/overcache/NeoSolarized/"; }; neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-04-29"; + version = "2020-05-30"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "667f02bc417d2a4669502d1fc6876684882d8ba9"; - sha256 = "0xa4w935hfbs8nqw4aqw7ihasw4rlsqjx2i92pi1x5w8d40jnws1"; + rev = "d6667d8fca8425753d7da215f57e1a0e936e75de"; + sha256 = "1wmsqnhbd438xs8dp2jrkk7fhzzi7w1l66jqwfwz6sxl0ayc3k7y"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -2449,12 +2461,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-05-26"; + version = "2020-06-01"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "052b1f00a0ef14b0019f4d0cda9906ba93f9a0d6"; - sha256 = "1wn0gf8cqhmv23llhydvkhd638b3n5ya8fa6r74gm40f9h3qcp85"; + rev = "d48ab70721d4f688ed34bd5939e2d6f4c89548c5"; + sha256 = "0rd228ks4gppskcvz6cj94gnbd9wykic8f4ilc9smaqw817gq20s"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2497,12 +2509,12 @@ let NrrwRgn = buildVimPluginFrom2Nix { pname = "NrrwRgn"; - version = "2020-04-21"; + version = "2020-05-29"; src = fetchFromGitHub { owner = "chrisbra"; repo = "NrrwRgn"; - rev = "a558325a2d0cca810520ed2b62e0c0e543e97bf6"; - sha256 = "1ngwyga0pslkw1d5qwz98zz8axfwc0mvxig5yp59gra9awgk6nw8"; + rev = "82a0fc6a3415db9a891f9d9f19b512041c865109"; + sha256 = "00fd466i5860bazd4pj69k8piicgckxj68lkn2l7haawj9chslzs"; }; meta.homepage = "https://github.com/chrisbra/NrrwRgn/"; }; @@ -2557,12 +2569,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-05-24"; + version = "2020-06-02"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "54f4f823a27ffa8f9e6c308d550888f3ae21373e"; - sha256 = "19v8gwq6ym0ipia039x6xw00xlwrhrmm1bw8s5v5d6j1wl1mbcmz"; + rev = "a7fdf268b1c51f6395900e437060728701aa8b77"; + sha256 = "04v1g4sa6dccaffrlkmyh410ppza5zlrnrapf9c3sfj6bmsr4jd3"; }; meta.homepage = "https://github.com/neovim/nvim-lsp/"; }; @@ -3266,12 +3278,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-05-05"; + version = "2020-05-30"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "2a1486447aa62e47faeb98e43fe75c50007870b3"; - sha256 = "0003l09xhdyyq9m0y7hs1nccv3vdmz64qd3ra3rl6lqigzv8v01n"; + rev = "a36880be2217814b7034f05eb0f402e8183befc9"; + sha256 = "16rj8pv8b9knbxi2967h96kgwp4r631kmpxdy74xsf938z4cya0j"; }; meta.homepage = "https://github.com/majutsushi/tagbar/"; }; @@ -3795,12 +3807,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-05-27"; + version = "2020-05-31"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "c744fb81b657417512af20063a36e7cb1ecd4f5c"; - sha256 = "1x55gkqgvy9k2wmcs5y1jmzqni6xd7fjh5269c3465br3hhzlgh2"; + rev = "d221dc531298f467a6901861b0360741c2a387b0"; + sha256 = "0w4lwpynn5cj9si3apyfmxb8x8hv0acggsyfvmhpi41638sz2310"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -3867,12 +3879,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-04-03"; + version = "2020-05-29"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "555c956db3bdd8ae6f1aa5af1c5fd37eac749e6a"; - sha256 = "0dhxa9jrhahqs1wh41115w8r3xcczbjpvnj65ldzs7q9vc4n12xq"; + rev = "f116a3b86cb3e9fbcd8563cce4958759610d8f51"; + sha256 = "1vamldn3y9pima18ryrrzn2mz1czzzadkiiklcrcl104v9mhv4am"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -4011,12 +4023,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-05-08"; + version = "2020-06-02"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "57d6fbb4ab3480ab0b0f4c10ecc7c14eb44d94bc"; - sha256 = "0a8w2cb1aj4764hbdxnjpnpdl6xf6slsz4f19lbm8fdsq0v3izk8"; + rev = "e083709f482332e5ff765f4d7b7901d51ddc9ef4"; + sha256 = "0d46h4jx01mib4wyj60qx4r34y201gaj1vpkb48pkw9qlsaqs31i"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -4203,12 +4215,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-05-28"; + version = "2020-05-30"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "8a5133cb5ba229fa80055a031b6070b1651cd102"; - sha256 = "0lxvl378gjwaywmj5fskr8bzdchlh0g33p79ja0pgzs6qffg4jj2"; + rev = "15b532ebd4455d9d099e9ccebab09915e0562754"; + sha256 = "0cfiwdaj43fx2gq7916i98iyn3ky79d359ylgpznczn88k37s1wi"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -4539,24 +4551,24 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-05-28"; + version = "2020-05-31"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "5d32f7528988644c3b4a9491a9a4b37ccbd1aa62"; - sha256 = "1h544c7h53fjn9cnvx67p1yays6147v0d445h60n6zwz02zgr4q1"; + rev = "27a5c3abd211c2784513dab4db082fa414ad0967"; + sha256 = "18rvp600vk0anbzxdgcw3kdswqr3100b3jgnmz6c2k5c50wz37rm"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; vim-ghost = buildVimPluginFrom2Nix { pname = "vim-ghost"; - version = "2020-05-20"; + version = "2020-06-04"; src = fetchFromGitHub { owner = "raghur"; repo = "vim-ghost"; - rev = "795b24dd248d507b88e30baadc46080ace07cdea"; - sha256 = "1g0gblkwba7fd4jgkp2y6rsdld7zhhwf7m2fv63j0aj5fhr74q5r"; + rev = "fd3665df734c1f8d3620b11fc8bdfacb2faae35e"; + sha256 = "0p1y5g9fj58m48z9c6vdis7d4zajlv9j0y8065rmivws3df9n50j"; }; meta.homepage = "https://github.com/raghur/vim-ghost/"; }; @@ -4599,12 +4611,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-05-01"; + version = "2020-05-29"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "b356cc9a7da08ebeb919cd04b2831dad71a34d38"; - sha256 = "0y13nbrfank0rqsq5pf1cfcrrfapfvqinhbww97lxhs9clv44kny"; + rev = "9784226ba766662d298554a5c66fd938497f2233"; + sha256 = "19f28c3wasgck78xqdygsyiwv17qqh69nkn9n1gajcbmbr55lhzn"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -4635,12 +4647,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-05-28"; + version = "2020-05-31"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "9d76bb022e09c1d7c26a71748aa523453da9a764"; - sha256 = "0yi0m25m1vh2h4gfqj04zf6llqg6cinxd96c7q42h1fa9w8kx93s"; + rev = "8e72eef0b35839db0a028a37bd28debc20c1201b"; + sha256 = "0rpay08m3q0syvw9ks45b3cvggghi1350h7dp87bx24jd3dqvdvf"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -4789,6 +4801,18 @@ let meta.homepage = "https://github.com/alx741/vim-hindent/"; }; + vim-hocon = buildVimPluginFrom2Nix { + pname = "vim-hocon"; + version = "2017-09-08"; + src = fetchFromGitHub { + owner = "GEverding"; + repo = "vim-hocon"; + rev = "bb8fb14e00f8fc1eec27dd39dcc605aac43328a3"; + sha256 = "0w6ckm931zpm1k3w02gl58hgfxzfy53sgcc9m8jz3vgi3zz0vki2"; + }; + meta.homepage = "https://github.com/GEverding/vim-hocon/"; + }; + vim-hoogle = buildVimPluginFrom2Nix { pname = "vim-hoogle"; version = "2018-03-04"; @@ -4825,6 +4849,18 @@ let meta.homepage = "https://github.com/vim-utils/vim-husk/"; }; + vim-hybrid = buildVimPluginFrom2Nix { + pname = "vim-hybrid"; + version = "2016-01-05"; + src = fetchFromGitHub { + owner = "w0ng"; + repo = "vim-hybrid"; + rev = "cc58baabeabc7b83768e25b852bf89c34756bf90"; + sha256 = "1c3q39121hiw85r9ymiyhz5zsf6bl9pwk4pgj6nh6ckwns4cgcmw"; + }; + meta.homepage = "https://github.com/w0ng/vim-hybrid/"; + }; + vim-hybrid-material = buildVimPluginFrom2Nix { pname = "vim-hybrid-material"; version = "2018-11-12"; @@ -5188,24 +5224,24 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-05-29"; + version = "2020-06-02"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "22ad7433b35b194015856d5b41037b752e192764"; - sha256 = "1jww2x2cl9pfgjxwcmcl829fvhxqagn1fcnk4d5hrgg7w6k4c10g"; + rev = "baa44d450043cc020e1d6f0609d0e081bbcc6f9e"; + sha256 = "07m2wqich31pxp9jgh3fzjqqdm7vdjh8rjf67d4l6kkf13dw89yh"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2020-05-28"; + version = "2020-05-29"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "7260313ed17b2cd11b18d817d4afc8fb8cb6f3f3"; - sha256 = "0nn8c1kyg0s41id46g7s9qklnnxck8xvnvsd3gpak5ii1rxpzrsh"; + rev = "2636a0fabaae80e3bebdb3c571220aebf875dfcf"; + sha256 = "1vcc8gaikbgdq1k4f3jdjrmlwad1z44g3biifgqyp0sgd7bjd9lp"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -5318,6 +5354,18 @@ let meta.homepage = "https://github.com/terryma/vim-multiple-cursors/"; }; + vim-mundo = buildVimPluginFrom2Nix { + pname = "vim-mundo"; + version = "2020-05-06"; + src = fetchFromGitHub { + owner = "simnalamburt"; + repo = "vim-mundo"; + rev = "046fc0664b953ab17153da379df0b9fd34b85ec1"; + sha256 = "0np83qa95cfg1059r4iaf31sfhs86241jzkmw026gdja9s30q3m1"; + }; + meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; + }; + vim-nerdtree-tabs = buildVimPluginFrom2Nix { pname = "vim-nerdtree-tabs"; version = "2018-12-21"; @@ -5378,6 +5426,18 @@ let meta.homepage = "https://github.com/LnL7/vim-nix/"; }; + vim-numbertoggle = buildVimPluginFrom2Nix { + pname = "vim-numbertoggle"; + version = "2017-10-26"; + src = fetchFromGitHub { + owner = "jeffkreeftmeijer"; + repo = "vim-numbertoggle"; + rev = "cfaecb9e22b45373bb4940010ce63a89073f6d8b"; + sha256 = "1rrmvv7ali50rpbih1s0fj00a3hjspwinx2y6nhwac7bjsnqqdwi"; + }; + meta.homepage = "https://github.com/jeffkreeftmeijer/vim-numbertoggle/"; + }; + vim-obsession = buildVimPluginFrom2Nix { pname = "vim-obsession"; version = "2020-01-19"; @@ -5584,12 +5644,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-05-06"; + version = "2020-06-03"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "71c41fccf5ca42081d4d49aa1ea2f71c694bc4cf"; - sha256 = "1cp8qw1fblp26v9hjvd00bl2kcjqi44xw30aclxcqis6pfj1yvv0"; + rev = "6583b990321f03500505dc43a3f62cbbc7369862"; + sha256 = "1k9y119xwb84fgsyyp1npjh5z1wlbbm1922n411h70cfa4928rfh"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -5608,12 +5668,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-05-28"; + version = "2020-06-01"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "f0f49cf0fa8bbcb7f84e3ffe699a934142498b14"; - sha256 = "1fpiwjn16lvzcghsjbcak1hf0fqgknfyimbbw3pw4dcnvzv5w03a"; + rev = "5b3866302755da9e5a917ca42a38a4a03fb5f3e5"; + sha256 = "0v6ll98j44hgmczhl6cp4rw734x582iz7942cw5jmbp7wg83nz88"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -5668,12 +5728,12 @@ let vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2020-03-30"; + version = "2020-06-03"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "9fdf92846fbeb8445e535cf0c5bdb4b1dce4a506"; - sha256 = "0w98zcjvb64fhd6ahy3cqrs4y7zacak9nzpkkhr03l6zzbqb5kz4"; + rev = "9d52746c3f879aa1aca4deb46edd63823d76d89d"; + sha256 = "1yx1rnpln0lxvf6pbdn8yyxiyhi7rfl8wl94kd8djk51h5lhq1n3"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -6028,12 +6088,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-05-16"; + version = "2020-06-02"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "087d3e7c72912baeb6b1d7ba626e61d50092c848"; - sha256 = "1vir3sl2px0m4pr2z013mfzwagrh9wqkj3wagysjvm779l462407"; + rev = "900bf93c6680e38ce568dba26c3f48b4365ac730"; + sha256 = "1gxqmvr6hz7vblrji2dz2l1x18264ainbl70j60yfx3vjp5aa9vq"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6086,6 +6146,18 @@ let meta.homepage = "https://github.com/tpope/vim-speeddating/"; }; + vim-spirv = buildVimPluginFrom2Nix { + pname = "vim-spirv"; + version = "2019-11-20"; + src = fetchFromGitHub { + owner = "kbenzie"; + repo = "vim-spirv"; + rev = "e71404f92990aa4718925ade568427c0d8631469"; + sha256 = "0aimpcz6vvrkcfgsj0xp12xdy1l83n387rsy74dzk23a220d59na"; + }; + meta.homepage = "https://github.com/kbenzie/vim-spirv/"; + }; + vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; version = "2020-04-18"; @@ -6220,12 +6292,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-05-26"; + version = "2020-06-03"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "b882783760b954144dda5be7ad6cd4bdefd013fb"; - sha256 = "0s0dlgjkkxajkfnpihc09py0qbbamibhalsv2vdvwcqva02xrylx"; + rev = "e819de903fe10fdcbb3714f3e96bafd918e4d117"; + sha256 = "05jh89rgd4p6mkryv5dm83jhxfmg1k77rk4zq35i8dy8i6cvi41z"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -6326,6 +6398,18 @@ let meta.homepage = "https://github.com/tmux-plugins/vim-tmux/"; }; + vim-tmux-clipboard = buildVimPluginFrom2Nix { + pname = "vim-tmux-clipboard"; + version = "2019-04-07"; + src = fetchFromGitHub { + owner = "roxma"; + repo = "vim-tmux-clipboard"; + rev = "47187740b88f9dab213f44678800cc797223808e"; + sha256 = "1a7rpbvb7dgjfnrh95zg2ia6iiz2mz2xps31msb8h14hcj6dsv6y"; + }; + meta.homepage = "https://github.com/roxma/vim-tmux-clipboard/"; + }; + vim-tmux-focus-events = buildVimPluginFrom2Nix { pname = "vim-tmux-focus-events"; version = "2019-12-09"; @@ -6448,12 +6532,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-05-28"; + version = "2020-05-30"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "cdcaa75d5a6054c7c69b6ebbaa4dff2fce6f96ed"; - sha256 = "0mszzkmi4kgmf6qjh5f2mr9y1b3p4jzvlsykvzavz8zb55yy4vkx"; + rev = "40991d51a6a3b22d56eefe9f6145602dfe1d494b"; + sha256 = "0kawg12w7ssk58lv6ppv85c75x4af7dbkw9ngx7n91y1f1wkinjj"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6700,12 +6784,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-05-25"; + version = "2020-06-02"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "666191bc563be6716af6e167404dccb27f2fb8d1"; - sha256 = "03gc4w57j5xpcnmj60qrsc2qbrkvpmn9cfzz8xwha26cpngrwv9q"; + rev = "7ef9c50aaf110debb54a8b1f4bafcb34ec86a623"; + sha256 = "1i9phcxb29x14n202971vflqlwd9y2wa74v8aic4xhvqb5rli8as"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 6e558ed67f9..e22ddc50ddd 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -111,6 +111,7 @@ fsharp/vim-fsharp fszymanski/deoplete-emoji garbas/vim-snipmate gentoo/gentoo-syntax +GEverding/vim-hocon gibiansky/vim-textobj-haskell glts/vim-textobj-comment godlygeek/csapprox @@ -130,6 +131,7 @@ guns/xterm-color-table.vim hashivim/vim-terraform haya14busa/incsearch-easymotion.vim haya14busa/incsearch.vim +haya14busa/is.vim haya14busa/vim-asterisk heavenshell/vim-jsdoc hecal3/vim-leader-guide @@ -141,7 +143,6 @@ hsanson/vim-android hsitz/VimOrganizer iamcco/coc-spell-checker ianks/vim-tsx -icymind/NeoSolarized idris-hackers/idris-vim Inazuma110/deoplete-greek inkarkat/vim-SyntaxRange @@ -160,6 +161,7 @@ jceb/vim-orgmode jeetsukumaran/vim-buffergator jeetsukumaran/vim-indentwise jeffkreeftmeijer/neovim-sensible +jeffkreeftmeijer/vim-numbertoggle jelera/vim-javascript-syntax jgdavey/tslime.vim jhradilek/vim-docbk @@ -206,6 +208,7 @@ kana/vim-tabpagecd kana/vim-textobj-function kana/vim-textobj-user kassio/neoterm +kbenzie/vim-spirv kchmck/vim-coffee-script KeitaNakamura/neodark.vim keith/swift.vim @@ -366,6 +369,7 @@ osyo-manga/shabadou.vim osyo-manga/vim-anzu osyo-manga/vim-textobj-multiblock osyo-manga/vim-watchdogs +overcache/NeoSolarized pangloss/vim-javascript parsonsmatt/intero-neovim pearofducks/ansible-vim @@ -404,6 +408,7 @@ ron89/thesaurus_query.vim roxma/nvim-cm-racer roxma/nvim-completion-manager roxma/nvim-yarp +roxma/vim-tmux-clipboard RRethy/vim-illuminate rust-lang/rust.vim ryanoasis/vim-devicons @@ -437,6 +442,7 @@ Shougo/vimproc.vim Shougo/vimshell.vim shumphrey/fugitive-gitlab.vim sickill/vim-pasta +simnalamburt/vim-mundo SirVer/ultisnips sjl/gundo.vim sjl/splice.vim @@ -560,6 +566,7 @@ vito-c/jq.vim vmchale/ats-vim vmchale/dhall-vim VundleVim/Vundle.vim +w0ng/vim-hybrid wakatime/vim-wakatime wannesm/wmgraphviz.vim wellle/targets.vim diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix index 743ae13a3e4..1de3bce3d0d 100644 --- a/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -1,12 +1,7 @@ { stdenv, lib, buildEnv, writeShellScriptBin, fetchurl, vscode, unzip, jq }: let - extendedPkgVersion = lib.getVersion vscode; - extendedPkgName = lib.removeSuffix "-${extendedPkgVersion}" vscode.name; - - buildVscodeExtension = a@{ name, - namePrefix ? "${extendedPkgName}-extension-", src, # Same as "Unique Identifier" on the extension's web page. # For the moment, only serve as unique extension dir. @@ -18,14 +13,14 @@ let buildInputs ? [], ... }: - stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // { + stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // { - name = namePrefix + name; + name = "vscode-extension-${name}"; inherit vscodeExtUniqueId; inherit configurePhase buildPhase dontPatchELF dontStrip; - installPrefix = "share/${extendedPkgName}/extensions/${vscodeExtUniqueId}"; + installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; buildInputs = [ unzip ] ++ buildInputs; @@ -80,7 +75,7 @@ let vscodeDefault = vscode; }; - + vscodeExts2nix = import ./vscodeExts2nix.nix { inherit lib writeShellScriptBin; vscodeDefault = vscode; @@ -90,7 +85,7 @@ let inherit lib buildEnv writeShellScriptBin extensionsFromVscodeMarketplace jq; vscodeDefault = vscode; }; -in +in { inherit fetchVsixFromVscodeMarketplace buildVscodeExtension buildVscodeMarketplaceExtension extensionFromVscodeMarketplace diff --git a/pkgs/os-specific/linux/cgmanager/default.nix b/pkgs/os-specific/linux/cgmanager/default.nix deleted file mode 100644 index d890ef44f74..00000000000 --- a/pkgs/os-specific/linux/cgmanager/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libnih, dbus, pam, popt }: - -stdenv.mkDerivation rec { - pname = "cgmanager"; - version = "0.42"; - - src = fetchurl { - url = "https://linuxcontainers.org/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "15np08h9jrvc1y1iafr8v654mzgsv5hshzc0n4p3pbf0rkra3h7c"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libnih dbus pam popt ]; - - configureFlags = [ - "--with-init-script=systemd" - "--sysconfdir=/etc" - "--localstatedir=/var" - ]; - - meta = with stdenv.lib; { - homepage = "https://linuxcontainers.org/cgmanager/introduction/"; - description = "A central privileged daemon that manages all your cgroups"; - license = licenses.lgpl21; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 59e6e768a4b..a25057043f8 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,22 +1,22 @@ { "4.14": { - "name": "linux-hardened-4.14.182.a.patch", - "sha256": "1kkchcv3qkm41rgscm12ii852q2846crbpvafywz31qg62lb6qig", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.182.a/linux-hardened-4.14.182.a.patch" + "name": "linux-hardened-4.14.183.a.patch", + "sha256": "0k9dg37q3hcm13iyw662indwy23aylc03ldqfn7613c7ymqmbzj7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.183.a/linux-hardened-4.14.183.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.125.a.patch", - "sha256": "1dhb8syp4j7hc4mx3s7c2x0gxil5dw7jh0swfqzjm02npbwpp19r", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.125.a/linux-hardened-4.19.125.a.patch" + "name": "linux-hardened-4.19.126.a.patch", + "sha256": "1wr4spaqgh404w0fqpys8xwj11as86j0cfzb903c0rx6lhqfp6sf", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.126.a/linux-hardened-4.19.126.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.43.a.patch", - "sha256": "14d9sg1f2a0fnr2q9z6ck5biip1kbzqqwlg4xzpwv83vaycq4i3b", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.43.a/linux-hardened-5.4.43.a.patch" + "name": "linux-hardened-5.4.44.a.patch", + "sha256": "0gihrcxqg3hax20xhvna4lmgsivari6wwsyqz09w34v8p1fhd5nx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.44.a/linux-hardened-5.4.44.a.patch" }, "5.6": { - "name": "linux-hardened-5.6.15.a.patch", - "sha256": "0gvp4mra07aj22mrjj8gzd3k7z1zafvak461iajrxfjhzh1z3bdf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.15.a/linux-hardened-5.6.15.a.patch" + "name": "linux-hardened-5.6.16.a.patch", + "sha256": "0nci30k7xh56b6454cd0hkpvpkfqb98cqdpvjaamlnmiphz4sk1f", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.16.a/linux-hardened-5.6.16.a.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index ca48ed48558..e80b8f76574 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.182"; + version = "4.14.183"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "142v7qnfska86jqzilwq00kxdrq08iaaaw7f47xp9bnhb8fiy7b7"; + sha256 = "11c0vd2pwplm8wafich4zg2mnp10vvnap987c5jh96w1avpsyra2"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 20aced02a86..20b553caf4e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.125"; + version = "4.19.126"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0zmxs6q2rgssvsh76xq9xgcax7bps19x2448d1q1fj9pzc7g8hwq"; + sha256 = "129ziwvk3f4xh8jvnq2krajc0bnrl2zxffqsiz63j7p3vc57wakf"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index a9d45bcdea7..125f8f723c5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.225"; + version = "4.4.226"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0pn66hf9yrjg15skq1inscr5m0slvgsd2qm8rg5id70llrb4jis9"; + sha256 = "1dwvm81i62b06jsl38spfn719zrsbwq5z8viwckrpw4ma4w9k0j1"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index b13ed0e8fc5..88809a74b7b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.225"; + version = "4.9.226"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1s63aymgsc4lsysy9d972ps9cyrf6bncyy5wcpv5a3wbaj678iz5"; + sha256 = "1jj5ydz5cy87z7hrv54bkyl9739lpzja8580ngjhrip5iwb8q2j6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 801003dc4f5..b4ec0169f5b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.43"; + version = "5.4.44"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0i07g72138xdf1l8x593jndq0waf3fx7plz3m6n5f9fl885bjrr6"; + sha256 = "0fc4nsv1zwlknvfv1bzkjlq2vlx28wfl09hg2p7r8cn7a77bphlp"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix index d19fe9cbc6a..a6d3ce6c6a0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.15"; + version = "5.6.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0kh34f9vdfsi9g83fa1i1926djyzfi466w02c4y4d46ljf9pkav5"; + sha256 = "1xvwk6yxi5nhiwhskpmr89a31286mw9hpm0y3l3i5ydswx6lnl15"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index bcea8bed753..2daf3d4b885 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17506"; - sha256 = "0yial2fib8bvv31ihzlxn80xlnpx8f0z6ml9md5xj3zxzslsy5iq"; + rev = "17527"; + sha256 = "0kijrflm1z6wnd4hg46lgm1sqps3fvnrrbzwjfwqq171a78sphhr"; } , ... }: diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix new file mode 100644 index 00000000000..3d461d52556 --- /dev/null +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, kernel, bc }: + +stdenv.mkDerivation rec { + name = "rtl88x2bu-${kernel.version}-${version}"; + version = "unstable-2020-05-19"; + + src = fetchFromGitHub { + owner = "cilynx"; + repo = "rtl88x2BU"; + rev = "0f159d7cd937a12b818121cb1f1c4910bd1adc72"; + sha256 = "0flqnvzfdb4wsiiqv9vf5gfwd5fgpjvhs9zhqknnv1cmp8msgw6y"; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = [ bc ]; + buildInputs = kernel.moduleBuildDependencies; + + prePatch = '' + substituteInPlace ./Makefile \ + --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /sbin/depmod \# \ + --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + meta = with stdenv.lib; { + description = "Realtek rtl88x2bu driver"; + homepage = "https://github.com/cilynx/rtl88x2bu"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 07f5abd7fa5..64ecd981fc4 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.5.0"; + version = "7.5.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "177n20cjlrnv767ql72dldmdrsky6xnn7cl52qpvahnglnp5878z"; + sha256 = "0lxvff0sn1kxsm599lq72hw11qnwjn2da3mz1h8mqz0rn2adhg07"; }; buildPhase = '' diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 8d862373b99..44118277a28 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, systemd, boost, darwin +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, darwin # Inputs , curl, libmms, libnfs, samba # Archive support @@ -19,6 +19,13 @@ # Tag support , libid3tag , nixosTests +# For documentation +, doxygen +, python3Packages # for sphinx-build +# For tests +, gtest +, fetchpatch # used to fetch an upstream patch fixing a failing test +, zip }: let @@ -112,17 +119,60 @@ let sha256 = "0jnhjhm1ilpcwb4f58b8pgyzjq3dlr0j2xyk0zck0afwkdxyj9cb"; }; - buildInputs = [ glib boost ] + # Won't be needed when 0.21.24 will be out + patches = [ + # Tests fail otherwise, see https://github.com/MusicPlayerDaemon/MPD/issues/844 + (fetchpatch { + url = "https://github.com/MusicPlayerDaemon/MPD/commit/7aea2853612743e111ae5e947c8d467049e291a8.patch"; + sha256 = "1bmxlsaiz3wlg1yyc4rkwsmgvc0pirv0s1vdxxsn91yssmh16c2g"; + excludes = [ + # The patch fails otherwise because it tries to update the NEWS + # file which doesn't have the title "ver 0.21.24" yet. + "NEWS" + ]; + }) + ]; + + buildInputs = [ + glib + boost + # According to the configurePhase of meson, gtest is considered a + # runtime dependency. Quoting: + # + # Run-time dependency GTest found: YES 1.10.0 + gtest + ] ++ (lib.concatLists (lib.attrVals features_ featureDependencies)) ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.AudioUnit ]; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + python3Packages.sphinx + doxygen + ]; + + # Otherwise, the meson log says: + # + # Program zip found: NO + checkInputs = [ zip ]; + + doCheck = true; enableParallelBuilding = true; mesonAutoFeatures = "disabled"; - mesonFlags = - map (x: "-D${x}=enabled") features_ + + outputs = [ "out" "doc" "man" ]; + + mesonFlags = [ + # Documentation is enabled unconditionally but it's not installed + # unconditionally thanks to the outputs being split + "-Ddocumentation=true" + "-Dtest=true" + ] + ++ map (x: "-D${x}=enabled") features_ ++ map (x: "-D${x}=disabled") (lib.subtractLists features_ knownFeatures) ++ lib.optional (builtins.elem "zeroconf" features_) "-Dzeroconf=avahi" diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index cdeaaa77c05..aa8bac28bbd 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.19.2.2737-b69929dab"; + version = "1.19.3.2852-219a9974e"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "00s3ab66wnpwkjrp0ng8srcy3l32sh5ibv0i9m6l4d0a19hr01fs"; + sha256 = "0sp7lnzf3zrwdmcg54mpvml89q1cbaq6s1cl9gj2z31xfiz07a26"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch b/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch deleted file mode 100644 index 864ee818d3c..00000000000 --- a/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/plugin/auth_pam/CMakeLists.txt b/plugin/auth_pam/CMakeLists.txt -index a556b870..918a26f9 100644 ---- a/plugin/auth_pam/CMakeLists.txt -+++ b/plugin/auth_pam/CMakeLists.txt -@@ -22,7 +22,6 @@ IF(HAVE_PAM_APPL_H) - COMPONENT Server) - ENDIF() - IF(TARGET auth_pam OR TARGET auth_pam_v1) -- ADD_SUBDIRECTORY(testing) - ADD_LIBRARY(pam_user_map MODULE mapper/pam_user_map.c) - TARGET_LINK_LIBRARIES(pam_user_map pam) - SET_TARGET_PROPERTIES (pam_user_map PROPERTIES PREFIX "") diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ac9772922ec..9c2134e211f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -23,14 +23,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.4.12"; + version = "10.4.13"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "0252b9rxxz1ljjv6ni0wwgy14j8qmmdd2sq0a65dslx2ib9y3wgy"; + sha256 = "1pwibmm52sc04qxp832pc3ylxw9wq90fjc7nxpcyp3yys49bpfs5"; name = "mariadb-${version}.tar.gz"; }; @@ -72,6 +72,8 @@ common = rec { # attributes common to both builds "-DINSTALL_SUPPORTFILESDIR=share/doc/mysql" "-DINSTALL_MYSQLTESTDIR=OFF" "-DINSTALL_SQLBENCHDIR=OFF" + "-DINSTALL_PAMDIR=share/pam/lib/security" + "-DINSTALL_PAMDATADIR=share/pam/etc/security" "-DWITH_ZLIB=system" "-DWITH_SSL=system" @@ -94,7 +96,7 @@ common = rec { # attributes common to both builds rm "$out"/bin/{mariadb_config,mysql_config} rm -r $out/include rm -r $out/lib/pkgconfig - rm -r $out/share/{aclocal,pkgconfig} + rm -r $out/share/aclocal ''; enableParallelBuilding = true; @@ -160,10 +162,7 @@ server = stdenv.mkDerivation (common // { ++ optional stdenv.hostPlatform.isLinux linux-pam ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; - patches = common.patches ++ [ - # Disable build unused plugin pam_mariadb_mtr.so. See https://jira.mariadb.org/browse/MDEV-21654 - ./cmake-disable-auth-pam-testing.patch - ] ++ optionals stdenv.hostPlatform.isDarwin [ + patches = common.patches ++ optionals stdenv.hostPlatform.isDarwin [ ./cmake-without-plugin-auth-pam.patch ]; @@ -202,6 +201,9 @@ server = stdenv.mkDerivation (common // { chmod +x "$out"/bin/wsrep_sst_common rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} rm -r "$out"/data # Don't need testing data + mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security + mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security + rm -r "$out"/OFF '' + optionalString withStorageMroonga '' mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' + optionalString (!stdenv.hostPlatform.isDarwin) '' diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 6c3a1af907d..14ab75d159b 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.3"; + version = "26.4.5"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "1r0b4kxgqrivnwm4hprnpscb16v6l6j8cnvk4i8c64fig1ly8g3j"; + sha256 = "10sir0hxxglw9jsjrclfgrqm8n5zng6rwj2fgff141x9n9l55w7l"; fetchSubmodules = true; }; @@ -48,7 +48,6 @@ in stdenv.mkDerivation rec { install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2" install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio" install -m 444 "www.evanjones.ca/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c" - install -m 444 "chromium/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.chromium" ''; meta = with stdenv.lib; { diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 4c4fbfaefef..a2de44412ad 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-06-02"; + version = "2020-06-05"; pname = "oh-my-zsh"; - rev = "c58572d5fe51b3ba09801837b6eee2cb6f0bf913"; + rev = "94e784360e2ad34faa6a4a648c67a5c6ed6c987f"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1gvw90ma96wrg6bpphdgfqfhrgf5327q7dwqjmxxy67xspczm9v4"; + sha256 = "032ba9mjf72jlzn6kcd9dygz28q1kj34fz54ss7rpw17di8hnydb"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 942346bc1a7..4cfe1beb2cd 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.5.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "129v01da0whayqi9nvrfnlrq10mn5j096k43xl72214nk7iliwfy"; + sha256 = "0g0ddg04pwcsmyyzrqllx4ladw4x5zxc5yw29q8f6q59j6jaf1zb"; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 61633c1bbdc..157da72a73b 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -157,8 +157,8 @@ let azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.0.0" "zip" "0pm565v05480f672l0n8z2sg6zk6iqyi91n0dhscibhdl54sy3si"; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.13.0" "zip" - "160cn4arl4dy6ax1zb64bzw0ygmpg8jc942m1zlh4nwx5x322gg8"; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.14.0" "zip" + "1af2vigpmcg2mp36dqi9g2dx4589bqm4w2af9dx6l9x65zfl89b9"; azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; @@ -166,8 +166,8 @@ let azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.2.1" "zip" "0mwlvy4x5nr3hsz7wdpdhpzwarzzwz4225bfpd68hr0pcjgzspky"; - azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.11.0" "zip" - "11887zf61ji1dh62czrsgxwz8idybw93m6iwahjy777jkdyviyzn"; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.12.0" "zip" + "187z0w5by7d9a2zsz3kidmzjw591akpc6dwhps4jyb4skcmyw86s"; azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "3.0.0" "zip" "0iq04hvivq3fvg2lhax95gx0x35avk5hps42227z3qna5i2cznpn"; @@ -175,8 +175,8 @@ let azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" "1pmcdgimd66h964a3d5m2j2fbydshcwhrk87wblhwhfl3xwbgf4y"; - azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "2.2.0" "zip" - "15lpyv9z8ss47rjmg1wx5akh22p9br2vckaj7jk3639vi38ac5nl"; + azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" + "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.8.0" "zip" "0vbg5mpahrnnnbj80flgzxxiffic94wsc9srm4ir85y2j5rprpv7"; @@ -184,20 +184,20 @@ let azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; - azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.5.0" "zip" - "0k91zdlzx6nfly1v2i7qmzqrdiygdx8rmgar3iz8nwgafvvc9x0n"; + azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.6.0" "zip" + "0ffhlbd9fwx05njawhii46wqyvbhhz2xcfx0pxc7b978n7l7ylm1"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "10.1.0" "zip" - "0fmsdwzyn167lwh87yyadq1bdc4q6rfz3gj5bh1mgavi9ghhxb75"; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "10.2.0" "zip" + "1nd2rcwl83x3xq4h5brb16jwbbq57gyxz6pgvmhnign9q76p836m"; - azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "1.1.1" "zip" - "16wk0ksycrscsn3n14qk4vvf7i567vq6f96lwf5dwbc81wx6n32x"; + azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "2.1.0" "zip" + "1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm"; azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; - azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.44.0" "zip" - "05dqakhfi301k2jnvccxdkigqvwnf9xz858pqg9vsri3dq69f1rw"; + azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.46.0" "zip" + "19n4cr8a2fwjks3485rkv31bsib9akah5b289sl5lsqyp6i8m671"; azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip" "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; @@ -211,6 +211,9 @@ let azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.1.0" "zip" "1cb466722bs0ribrirb32kc299716pl0pwivz3jyn40dd78cwhhx"; + azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "0.3.0" "zip" + "08b2i6wz9n13h77ahay1hvmg8abk2vvs7kn4y7xip9gi6ij8fv0a"; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.18.0" "zip" "0i9lnhcx85xccddvz1wdz5j0idm6sw2cn3066dww5993nmg0ijlr"; @@ -232,8 +235,8 @@ let azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.1.0rc1" "zip" "00q5723gvc57kg2w1iyhfchp018skwd89ibrw23p7ngm2bb76g45"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc11" "zip" - "1ixh2wmrbm1v2xlrnmy1l513jpqch6b5vyh9x77flm649x1cff2q"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc12" "zip" + "0q7w26n53x0lvr1a944jjl9d0yn0l029brx5nzfrz7ydf3jpb2i2"; azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.9.0" "zip" "170jyr1qzwhv5ihyrsg5d8qzjylqmg31dscd31jzi4i7bwqf3sb8"; @@ -320,12 +323,12 @@ let }); knack = super.knack.overridePythonAttrs(oldAttrs: rec { - version = "0.7.0rc4"; + version = "0.7.1"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "10v6qjpr7sbq5irq3kz24jiivpfm0f7jbj9iyx4dm8fgkrhgzlb6"; + sha256 = "1z50vf0q7kzg3cq9cr24j43ri6wc76dhhklyc9lpvgjf2r061vzw"; }; }); diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 1c626785483..a737728784b 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "03s9nsss4895x4lp90y65jajavk8c2nj1jjnmx0vbbwl210ghlv1"; + sha256 = "0b6ichf528v9mca67301ncm808mzbdi212j0b8zz72aw8dff6ph2"; }; - cargoSha256 = "0p20d7paiafvl4k9iiazbgq75wk7k42sz2h1y5lalq16f5rp6dbp"; + cargoSha256 = "13812swawp65f4j0c0q9x5bs9s3qancw0q2awasry0pcyh7nrxrj"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index f99be6d7575..a0ef58ae8b6 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -1,6 +1,6 @@ { stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper -, clang_9, llvm_9, gcc, which, libcgroup, python, perl, gmp -, file, cmocka, wine ? null, fetchpatch +, clang, llvm, gcc, which, libcgroup, python, perl, gmp +, file, wine ? null, fetchpatch }: # wine fuzzing is only known to work for win32 binaries, and using a mixture of @@ -17,38 +17,28 @@ let libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; aflplusplus = stdenvNoCC.mkDerivation rec { pname = "aflplusplus"; - version = "2.64c"; + version = "2.65c"; src = fetchFromGitHub { owner = "AFLplusplus"; repo = "AFLplusplus"; rev = version; - sha256 = "0n618pk6nlmkcbv1qm05fny4mnhcprrw0ppmra1phvk1y22iildj"; + sha256 = "1np2a3kypb2m8nyv6qnij18yzn41pl8619jzydci40br4vxial9l"; }; enableParallelBuilding = true; - # build of unsigaction32 broken in 2.64c: - # https://github.com/AFLplusplus/AFLplusplus/commit/079fdbf9bc5be1adba19e4bd08be965bd4dd79dc#commitcomment-38428357 - # The applied patch fixes it. - patches = [ - (fetchpatch { - url = "https://github.com/AFLplusplus/AFLplusplus/commit/5b9928f1a9d4b017ea04365ca8b522fde71236eb.patch"; - sha256 = "1m4w9w4jaxb2mjkwvr6r4qa2j5cdzzpchjphpwd95861h0zvb6hh"; - }) - ]; - # Note: libcgroup isn't needed for building, just for the afl-cgroup # script. - nativeBuildInputs = [ makeWrapper which clang_9 gcc ]; - buildInputs = [ llvm_9 python gmp ] + nativeBuildInputs = [ makeWrapper which clang gcc ]; + buildInputs = [ llvm python gmp ] ++ stdenv.lib.optional (wine != null) python.pkgs.wrapPython; postPatch = '' # Replace the CLANG_BIN variables with the correct path substituteInPlace llvm_mode/afl-clang-fast.c \ - --replace "CLANGPP_BIN" '"${clang_9}/bin/clang++"' \ - --replace "CLANG_BIN" '"${clang_9}/bin/clang"' \ + --replace "CLANGPP_BIN" '"${clang}/bin/clang++"' \ + --replace "CLANG_BIN" '"${clang}/bin/clang"' \ --replace 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")" # Replace "gcc" and friends with full paths in afl-gcc @@ -115,7 +105,7 @@ let wrapPythonProgramsIn $out/bin ${python.pkgs.pefile} ''; - installCheckInputs = [ perl file cmocka ]; + installCheckInputs = [ perl file ]; doInstallCheck = true; installCheckPhase = '' # replace references to tools in build directory with references to installed locations @@ -123,7 +113,7 @@ let --replace '../libcompcov.so' '`$out/bin/get-afl-qemu-libcompcov-so`' \ --replace '../libdislocator.so' '`$out/bin/get-libdislocator-so`' \ --replace '../libtokencap.so' '`$out/bin/get-libtokencap-so`' - perl -pi -e 's|(?<!\.)(\.\./)([^\s\/]+?)(?<!\.c)(?<!\.s?o)(?=\s)|\$out/bin/\2|g' test/test.sh + perl -pi -e 's|(?<!\.)(?<!-I)(\.\./)([^\s\/]+?)(?<!\.c)(?<!\.s?o)(?=\s)|\$out/bin/\2|g' test/test.sh cd test && ./test.sh ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ff405131074..1004a444469 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -67,6 +67,7 @@ mapAliases ({ bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 catfish = xfce.catfish; # added 2019-12-22 + cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05 checkbashism = checkbashisms; # added 2016-08-16 cide = throw "deprecated in 2019-09-11: abandoned by upstream"; cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 @@ -275,6 +276,7 @@ mapAliases ({ lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 lua5_expat = luaPackages.luaexpat; # added 2017-05-02 lua5_sec = luaPackages.luasec; # added 2017-05-02 + lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # added 2020-06-03 m3d-linux = m33-linux; # added 2016-08-13 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f017003a93a..37749de497b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -600,7 +600,8 @@ in }; aflplusplus = callPackage ../tools/security/aflplusplus { - stdenv = clangStdenv; + clang = clang_9; + llvm = llvm_9; python = python37; wine = null; }; @@ -4586,6 +4587,8 @@ in peruse = libsForQt5.callPackage ../tools/misc/peruse { }; + ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { }; + kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { }; @@ -9512,12 +9515,11 @@ in nodejs = nodejs-13_x; }; - lxappearance = callPackage ../desktops/lxde/core/lxappearance { - gtk2 = gtk2-x11; - }; + lxappearance = callPackage ../desktops/lxde/core/lxappearance { }; - lxappearance-gtk3 = lxappearance.override { - withGtk3 = true; + lxappearance-gtk2 = callPackage ../desktops/lxde/core/lxappearance { + gtk2 = gtk2-x11; + withGtk3 = false; }; lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; @@ -16570,8 +16572,6 @@ in cachefilesd = callPackage ../os-specific/linux/cachefilesd { }; - cgmanager = callPackage ../os-specific/linux/cgmanager { }; - checkpolicy = callPackage ../os-specific/linux/checkpolicy { }; checksec = callPackage ../os-specific/linux/checksec { }; @@ -17068,6 +17068,8 @@ in rtl8821ce = callPackage ../os-specific/linux/rtl8821ce { }; + rtl88x2bu = callPackage ../os-specific/linux/rtl88x2bu { }; + rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; openafs = callPackage ../servers/openafs/1.6/module.nix { }; @@ -18186,6 +18188,8 @@ in medio = callPackage ../data/fonts/medio { }; + mint-x-icons = callPackage ../data/icons/mint-x-icons { }; + mno16 = callPackage ../data/fonts/mno16 { }; mnist = callPackage ../data/machine-learning/mnist { }; @@ -20600,6 +20604,14 @@ in }; }; + libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { + libreoffice = libsForQt5.callPackage ../applications/office/libreoffice + (libreoffice-args // { + kdeIntegration = true; + variant = "fresh"; + }); + }); + libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { @@ -21630,8 +21642,6 @@ in pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { }; - pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { }; qbittorrent-nox = qbittorrent.override { guiSupport = false; @@ -23050,6 +23060,8 @@ in xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; + xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { }; + xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; xdg_utils = callPackage ../tools/X11/xdg-utils { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c19e0b612b0..cca067557d2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -191,8 +191,6 @@ let curses = callPackage ../development/ocaml-modules/curses { }; - custom_printf = callPackage ../development/ocaml-modules/custom_printf { }; - ctypes = callPackage ../development/ocaml-modules/ctypes { }; decompress = callPackage ../development/ocaml-modules/decompress { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 885622b9be9..00960b45725 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1367,6 +1367,8 @@ in { pytmx = callPackage ../development/python-modules/pytmx { }; + pythonmagick = callPackage ../development/python-modules/pythonmagick { }; + python-binance = callPackage ../development/python-modules/python-binance { }; python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; @@ -3119,6 +3121,8 @@ in { jupyterlab = callPackage ../development/python-modules/jupyterlab {}; + jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { }; + jupytext = callPackage ../development/python-modules/jupytext { }; PyLTI = callPackage ../development/python-modules/pylti { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 60a4a679f16..fc317f51ab5 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -183,6 +183,9 @@ let idrisPackages = packagePlatforms pkgs.idrisPackages; agdaPackages = packagePlatforms pkgs.agdaPackages; + pkgsMusl.stdenv = [ "x86_64-linux" "aarch64-linux" ]; + pkgsStatic.stdenv = [ "x86_64-linux" "aarch64-linux" ]; + tests = packagePlatforms pkgs.tests; # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66 |