diff --git a/lib/licenses.nix b/lib/licenses.nix
index 5cdb43ded6d..ee11966b0d5 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -436,6 +436,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
};
# Proprietary binaries; free to redistribute without modification.
+ databricks = {
+ fullName = "Databricks Proprietary License";
+ url = "https://pypi.org/project/databricks-connect";
+ free = false;
+ };
+
issl = {
fullName = "Intel Simplified Software License";
url = "https://software.intel.com/en-us/license/intel-simplified-software-license";
diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix
new file mode 100644
index 00000000000..9d1c29fd9f0
--- /dev/null
+++ b/lib/systems/architectures.nix
@@ -0,0 +1,77 @@
+{ lib }:
+
+rec {
+ # platform.gcc.arch to its features (as in /proc/cpuinfo)
+ features = {
+ default = [ ];
+ # x86_64 Intel
+ westmere = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" ];
+ sandybridge = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ];
+ ivybridge = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ];
+ haswell = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ];
+ broadwell = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ];
+ skylake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ];
+ skylake-avx512 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ];
+ # x86_64 AMD
+ btver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" ];
+ btver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ];
+ bdver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ];
+ bdver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ];
+ bdver3 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ];
+ bdver4 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" "fma4" ];
+ znver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ];
+ znver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ];
+ # other
+ armv5te = [ ];
+ armv6 = [ ];
+ armv7-a = [ ];
+ armv8-a = [ ];
+ mips32 = [ ];
+ loongson2f = [ ];
+ };
+
+ # a superior CPU has all the features of an inferior and is able to build and test code for it
+ inferiors = {
+ # x86_64 Intel
+ default = [ ];
+ westmere = [ ];
+ sandybridge = [ "westmere" ] ++ inferiors.westmere;
+ ivybridge = [ "sandybridge" ] ++ inferiors.sandybridge;
+ haswell = [ "ivybridge" ] ++ inferiors.ivybridge;
+ broadwell = [ "haswell" ] ++ inferiors.haswell;
+ skylake = [ "broadwell" ] ++ inferiors.broadwell;
+ skylake-avx512 = [ "skylake" ] ++ inferiors.skylake;
+ # x86_64 AMD
+ btver1 = [ ];
+ btver2 = [ ]; # TODO: fill this (need testing)
+ bdver1 = [ ]; # TODO: fill this (need testing)
+ bdver2 = [ ]; # TODO: fill this (need testing)
+ bdver3 = [ ]; # TODO: fill this (need testing)
+ bdver4 = [ ]; # TODO: fill this (need testing)
+ znver1 = [ ]; # TODO: fill this (need testing)
+ znver2 = [ ]; # TODO: fill this (need testing)
+ # other
+ armv5te = [ ];
+ armv6 = [ ];
+ armv7-a = [ ];
+ armv8-a = [ ];
+ mips32 = [ ];
+ loongson2f = [ ];
+ };
+
+ predicates = let
+ featureSupport = feature: x: builtins.elem feature features.${x};
+ in {
+ sse3Support = featureSupport "sse3";
+ ssse3Support = featureSupport "ssse3";
+ sse4_1Support = featureSupport "sse4_1";
+ sse4_2Support = featureSupport "sse4_2";
+ sse4_aSupport = featureSupport "sse4a";
+ avxSupport = featureSupport "avx";
+ avx2Support = featureSupport "avx2";
+ avx512Support = featureSupport "avx512";
+ aesSupport = featureSupport "aes";
+ fmaSupport = featureSupport "fma";
+ fma4Support = featureSupport "fma4";
+ };
+}
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index c929781dd8f..9939743157e 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -7,6 +7,7 @@ rec {
inspect = import ./inspect.nix { inherit lib; };
platforms = import ./platforms.nix { inherit lib; };
examples = import ./examples.nix { inherit lib; };
+ architectures = import ./architectures.nix { inherit lib; };
# Elaborate a `localSystem` or `crossSystem` so that it contains everything
# necessary.
@@ -76,6 +77,7 @@ rec {
# uname -r
release = null;
};
+ isStatic = final.isWasm || final.isRedox;
kernelArch =
if final.isAarch32 then "arm"
@@ -125,6 +127,7 @@ rec {
else throw "Don't know how to run ${final.config} executables.";
} // mapAttrs (n: v: v final.parsed) inspect.predicates
+ // mapAttrs (n: v: v final.platform.gcc.arch or "default") architectures.predicates
// args;
in assert final.useAndroidPrebuilt -> final.isAndroid;
assert lib.foldl
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 002d8c435e2..78f3c9dcd2a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4310,6 +4310,12 @@
githubId = 494012;
name = "Kevin Cox";
};
+ kfollesdal = {
+ email = "kfollesdal@gmail.com";
+ github = "kfollesdal";
+ githubId = 546087;
+ name = "Kristoffer K. Føllesdal";
+ };
khumba = {
email = "bog@khumba.net";
github = "khumba";
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 0b8651e8f42..e2e7f637f22 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -997,6 +997,53 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
the previous behaviour using undervolt.useTimer.
+
+
+ Agda has been heavily reworked.
+
+
+
+ agda.mkDerivation has been heavily changed and
+ is now located at agdaPackages.mkDerivation.
+
+
+
+
+ New top-level packages agda and
+ agda.withPackages have been added, the second
+ of which sets up agda with access to chosen libraries.
+
+
+
+
+ All agda libraries now live under
+ agdaPackages.
+
+
+
+
+ Many broken libraries have been removed.
+
+
+
+ See the new
+ documentation for more information.
+
+
+
+
+ The deepin package set has been removed from
+ nixpkgs. It was a work in progress to package the
+ Deepin Desktop Environment (DDE),
+ including libraries, tools and applications, and it was still
+ missing a service to lauch the desktop environment. It has shown
+ to no longer be a feasible goal due to reasons discussed in
+ issue #94870.
+ The package netease-cloud-music has also been
+ removed, as it depends on libraries from deepin.
+
+
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 1fe00e9142b..fad0b40a9db 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -19,6 +19,7 @@ with lib;
# Completely removed modules
(mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
+ (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "")
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "")
(mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.")
diff --git a/nixos/modules/services/misc/beanstalkd.nix b/nixos/modules/services/misc/beanstalkd.nix
index bcd133c9741..1c674a5b23b 100644
--- a/nixos/modules/services/misc/beanstalkd.nix
+++ b/nixos/modules/services/misc/beanstalkd.nix
@@ -28,6 +28,12 @@ in
example = "0.0.0.0";
};
};
+
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to open ports in the firewall for the server.";
+ };
};
};
@@ -35,6 +41,10 @@ in
config = mkIf cfg.enable {
+ networking.firewall = mkIf cfg.openFirewall {
+ allowedTCPPorts = [ cfg.listen.port ];
+ };
+
environment.systemPackages = [ pkg ];
systemd.services.beanstalkd = {
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 0fbc9cecb4d..2680b1cc0d3 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -587,16 +587,10 @@ in
nix.systemFeatures = mkDefault (
[ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++
- optionals (pkgs.stdenv.isx86_64 && pkgs.hostPlatform.platform ? gcc.arch) (
- # a x86_64 builder can run code for `platform.gcc.arch` and minor architectures:
- [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ {
- sandybridge = [ "gccarch-westmere" ];
- ivybridge = [ "gccarch-westmere" "gccarch-sandybridge" ];
- haswell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" ];
- broadwell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" ];
- skylake = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" ];
- skylake-avx512 = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" "gccarch-skylake" ];
- }.${pkgs.hostPlatform.platform.gcc.arch} or []
+ optionals (pkgs.hostPlatform.platform ? gcc.arch) (
+ # a builder can run code for `platform.gcc.arch` and inferior architectures
+ [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++
+ map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch}
)
);
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 10343df70aa..f6c23c9b900 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -1006,7 +1006,7 @@ in
"sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf";
"sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf";
- "tmpfiles.d".source = pkgs.symlinkJoin {
+ "tmpfiles.d".source = (pkgs.symlinkJoin {
name = "tmpfiles.d";
paths = map (p: p + "/lib/tmpfiles.d") cfg.tmpfiles.packages;
postBuild = ''
@@ -1016,8 +1016,10 @@ in
exit 1
)
done
- '';
- };
+ '' + concatMapStrings (name: optionalString (hasPrefix "tmpfiles.d/" name) ''
+ rm -f $out/${removePrefix "tmpfiles.d/" name}
+ '') config.system.build.etc.targets;
+ }) + "/*";
"systemd/system-generators" = { source = hooks "generators" cfg.generators; };
"systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; };
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
index 9c818eee73b..aa2fb73533a 100644
--- a/nixos/modules/virtualisation/cri-o.nix
+++ b/nixos/modules/virtualisation/cri-o.nix
@@ -101,6 +101,7 @@ in
log_level = "${cfg.logLevel}"
manage_ns_lifecycle = true
pinns_path = "${cfg.package}/bin/pinns"
+ hooks_dir = []
${optionalString (cfg.runtime != null) ''
default_runtime = "${cfg.runtime}"
diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix
index 1b642e1ed69..7d4d53408d2 100644
--- a/pkgs/applications/audio/bchoppr/default.nix
+++ b/pkgs/applications/audio/bchoppr/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bchoppr";
- version = "1.6.4";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = "${version}";
- sha256 = "16b0sg7q2b8l4y4bp5s3yzsj9j6jayjy2mlvqkby6l7hcgjcj493";
+ sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix
index 458fe20937a..e1a5bee64b3 100644
--- a/pkgs/applications/audio/bjumblr/default.nix
+++ b/pkgs/applications/audio/bjumblr/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BJumblr";
- version = "1.4.0";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = version;
- sha256 = "03x1gvri9yk000fvvc8zvvywf38cc41vkyhhp9xby71b23n5wbn0";
+ sha256 = "0kl6hrxmqrdf0195bfnzsa2h1073fgiqrfhg2276fm1954sm994v";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/applications/audio/bschaffl/default.nix
index de8e55a9545..c0d11e1fe5a 100644
--- a/pkgs/applications/audio/bschaffl/default.nix
+++ b/pkgs/applications/audio/bschaffl/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bschaffl";
- version = "0.3";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = version;
- sha256 = "1pcch7j1wgsb77mjy58hl3z43p83dv0vcmyh129m9k216b09gy29";
+ sha256 = "1c09acqrbd387ba41f8ch1qykdap5h6cg9if5pgd16i4dmjnpghj";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix
index b42929ff204..e5cbcd4a2e2 100644
--- a/pkgs/applications/audio/dragonfly-reverb/default.nix
+++ b/pkgs/applications/audio/dragonfly-reverb/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dragonfly-reverb";
- version = "3.1.1";
+ version = "3.2.1";
src = fetchFromGitHub {
owner = "michaelwillis";
repo = "dragonfly-reverb";
rev = version;
- sha256 = "188cm45hr0i33m4h2irql1wrsmsfis65s706wjiid0z59q47rf9p";
+ sha256 = "0vfm2510shah67k87mdyar4wr4vqwii59y9lqfhwm6blxparkrqa";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix
index c2dc39fe610..dcfb5426034 100644
--- a/pkgs/applications/audio/geonkick/default.nix
+++ b/pkgs/applications/audio/geonkick/default.nix
@@ -2,20 +2,21 @@
stdenv.mkDerivation rec {
pname = "geonkick";
- version = "2.3.3";
+ version = "2.3.7";
src = fetchFromGitLab {
owner = "iurie-sw";
repo = pname;
rev = "v${version}";
- sha256 = "0h1abb6q2bmi01a3v37adkc4zc03j47jpvffz8p2lpp33xhljghs";
+ sha256 = "1wdcbwiyy6i5agq5lffkyilyc8mv1cc4mp9h0nybn240vb2flqc2";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ];
- cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" ];
+ # https://github.com/iurie-sw/geonkick/issues/120
+ cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" "-DCMAKE_INSTALL_LIBDIR=lib" ];
meta = {
homepage = "https://gitlab.com/iurie-sw/geonkick";
diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index 90dc4e6db33..2fcbf82107d 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -14,16 +14,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
- sha256 = "1yx0fc24bgh1x6fdwznc1hqvjq0j7i0zvws3bsyijzs7q48jm0z7";
+ sha256 = "1i17pidw2hylijwfn96f2bnswfxxwdln2ydsq8b1q4hfzfbxlfk2";
};
- cargoSha256 = "0bh2shg80xbs2cw10dabrdxkvhf2csk5h9wmmk5z87q6w25paz1f";
+ cargoSha256 = "1cpy4wrj9dz2crva4p18f8hzym73x4m2mcfds4ppri4ir7qg29dr";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
diff --git a/pkgs/applications/audio/surge/default.nix b/pkgs/applications/audio/surge/default.nix
new file mode 100644
index 00000000000..1614bbfae66
--- /dev/null
+++ b/pkgs/applications/audio/surge/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, cmake, git, pkg-config, python3
+, cairo, libsndfile, libxcb, libxkbcommon, xcbutil, xcbutilcursor, xcbutilkeysyms, zenity
+}:
+
+stdenv.mkDerivation rec {
+ pname = "surge";
+ version = "1.7.1";
+
+ src = fetchFromGitHub {
+ owner = "surge-synthesizer";
+ repo = pname;
+ rev = "release_${version}";
+ sha256 = "1b3ccc78vrpzy18w7070zfa250dnd1bww147xxcnj457vd6n065s";
+ leaveDotGit = true; # for SURGE_VERSION
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ cmake git pkg-config python3 ];
+ buildInputs = [ cairo libsndfile libxcb libxkbcommon xcbutil xcbutilcursor xcbutilkeysyms zenity ];
+
+ postPatch = ''
+ substituteInPlace src/common/SurgeStorage.cpp --replace "/usr/share/Surge" "$out/share/surge"
+ substituteInPlace src/common/gui/PopupEditorDialog.cpp --replace '"zenity' '"${zenity}/bin/zenity'
+ substituteInPlace src/linux/UserInteractionsLinux.cpp --replace '"zenity' '"${zenity}/bin/zenity'
+ substituteInPlace vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp --replace /usr/bin/zenity ${zenity}/bin/zenity
+ '';
+
+ installPhase = ''
+ mkdir -p $out/lib/lv2 $out/lib/vst3 $out/share/surge
+ cp -r surge_products/Surge.lv2 $out/lib/lv2/
+ cp -r surge_products/Surge.vst3 $out/lib/vst3/
+ cp -r ../resources/data/* $out/share/surge/
+ '';
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ cd ..
+ build/surge-headless
+ '';
+
+ meta = with stdenv.lib; {
+ description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)";
+ homepage = "https://surge-synthesizer.github.io";
+ license = licenses.gpl3;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ magnetophon orivej ];
+ };
+}
diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/applications/audio/tunefish/default.nix
new file mode 100644
index 00000000000..72802c4f878
--- /dev/null
+++ b/pkgs/applications/audio/tunefish/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, pkg-config, python3
+, alsaLib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk
+}:
+
+stdenv.mkDerivation {
+ pname = "tunefish";
+ version = "unstable-2020-08-13";
+
+ src = fetchFromGitHub {
+ owner = "jpcima";
+ repo = "tunefish";
+ rev = "b3d83cc66201619f6399500f6897fbeb1786d9ed";
+ fetchSubmodules = true;
+ sha256 = "0rjpq3s609fblzkvnc9729glcnfinmxljh0z8ldpzr245h367zxh";
+ };
+
+ nativeBuildInputs = [ pkg-config python3 ];
+ buildInputs = [ alsaLib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ];
+
+ postPatch = ''
+ patchShebangs src/tunefish4/generate-lv2-ttl.py
+ '';
+
+ makeFlags = [
+ "-C" "src/tunefish4/Builds/LinuxMakefile"
+ "CONFIG=Release"
+ ];
+
+ installPhase = ''
+ mkdir -p $out/lib/lv2
+ cp -r src/tunefish4/Builds/LinuxMakefile/build/Tunefish4.lv2 $out/lib/lv2
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = "https://tunefish-synth.com/";
+ description = "Virtual analog synthesizer LV2 plugin";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ orivej ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix
index b6c7879c3b8..831195f06f0 100644
--- a/pkgs/applications/blockchains/lnd.nix
+++ b/pkgs/applications/blockchains/lnd.nix
@@ -4,16 +4,16 @@
buildGoModule rec {
pname = "lnd";
- version = "0.10.3-beta";
+ version = "0.11.0-beta";
src = fetchFromGitHub {
owner = "lightningnetwork";
repo = "lnd";
rev = "v${version}";
- sha256 = "129vi8z2sk4hagk7axa675nba6sbj9km88zlq8a1g8di7v2k9z6a";
+ sha256 = "1r1hwz8ka5mnmrvj9zcd78kn68g8fg3d4bdx9i0xy4sc2hh1dcpj";
};
- vendorSha256 = "0a4bk2qry0isnrvl0adwikqn6imxwzlaq5j3nglb5rmwwq2cdz0r";
+ vendorSha256 = "090b9sxvdwh787w0rhrcbky9pbx64qgqx1pvk9ysk3886nxdhf7k";
doCheck = false;
diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix
index a098f14668e..3b4ec1c49c4 100644
--- a/pkgs/applications/blockchains/wasabiwallet/default.nix
+++ b/pkgs/applications/blockchains/wasabiwallet/default.nix
@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "wasabiwallet";
- version = "1.1.11.1";
+ version = "1.1.12";
src = fetchurl {
- url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
- sha256 = "04v8f2h67aqvcb5a8vmzbp2sqnq7g4m0v1ng52ccb4ii668ya8hy";
+ url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
+ sha256 = "0nfd0pwsgrkaxcxfs8wb3i8kslfcqnc91iahw3rmlcxdzb81kjs4";
};
dontBuild = true;
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index f1e680f60e6..605d810b3d9 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -200,7 +200,7 @@ in runCommand
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; rec {
stable = [ meutraa ];
- beta = [ galagora ];
+ beta = [ meutraa ];
canary = [ meutraa ];
dev = canary;
}."${channel}";
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 14a6853af1c..e84d2e9dac1 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -14,9 +14,9 @@ let
sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j";
};
betaVersion = {
- version = "4.1.0.14"; # "Android Studio 4.1 Beta 4"
- build = "201.6667167";
- sha256Hash = "11lkwcbzdl86cyz4lci65cx9z5jjhrc4z40maqx2r5hw1xka9290";
+ version = "4.1.0.17"; # "Android Studio 4.1 RC 2"
+ build = "201.6776251";
+ sha256Hash = "sha256-3W+eUcffRk7lZxbvf3X/Np4hkwAUqU51sQ061XR7Ddc=";
};
latestVersion = { # canary & dev
version = "4.2.0.8"; # "Android Studio 4.2 Canary 8"
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 94837023ca0..8f7e18a35c5 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "texstudio";
- version = "2.12.22";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "${pname}-org";
repo = pname;
rev = version;
- sha256 = "037jvsfln8wav17qj9anxz2a7p51v7ky85wmhdj2hgwp40al651g";
+ sha256 = "1663lgl30698awa7fjplr8rjnf6capqvf8z80lzlnkfl5m9ph0jb";
};
nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ];
diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix
index 5c7b4c22a38..08ef0cd7b58 100644
--- a/pkgs/applications/graphics/xfractint/default.nix
+++ b/pkgs/applications/graphics/xfractint/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, libX11, libXft}:
stdenv.mkDerivation rec {
pname = "xfractint";
- version = "20.04p15";
+ version = "20.04p16";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
src = fetchurl {
url = "https://www.fractint.net/ftp/current/linux/xfractint-${version}.tar.gz";
- sha256 = "1wv2hgyjvrjxzqxb55vz65ra80p24j8sd34llykk2qlx73x8f3nk";
+ sha256 = "1ba77jifxv8jql044mdydh4p4ms4w5vw3qrqmcfzlvqfxk7h2m2f";
};
buildInputs = [libX11 libXft];
diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix
index b67e514ce54..ecd130426de 100644
--- a/pkgs/applications/misc/adobe-reader/default.nix
+++ b/pkgs/applications/misc/adobe-reader/default.nix
@@ -28,5 +28,9 @@ stdenv.mkDerivation {
description = "Adobe Reader, a viewer for PDF documents";
homepage = "http://www.adobe.com/products/reader";
license = stdenv.lib.licenses.unfree;
+ knownVulnerabilities = [
+ "Numerous unresolved vulnerabilities"
+ "See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53"
+ ];
};
}
diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix
index 52db4d0c6cc..14b9ebfe4c7 100644
--- a/pkgs/applications/misc/minder/default.nix
+++ b/pkgs/applications/misc/minder/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "minder";
- version = "1.9.1";
+ version = "1.9.2";
src = fetchFromGitHub {
owner = "phase1geo";
repo = pname;
rev = version;
- sha256 = "1823nl9hgsa9l04ra1drj3c7r8s5ybx6c06d9ijpwqz191sz2jg2";
+ sha256 = "0lhwwx515f0ycpinkhgbjnik7dj2c7fckikbgzwkzzs25xqp9ayj";
};
nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ];
diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
index c57153fe0e0..e9f049159bf 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -3,17 +3,19 @@
, makeWrapper, perlPackages, mkDerivation }:
let
- version = "1.6.1";
-in mkDerivation rec {
pname = "qdirstat";
- inherit version;
+ version = "1.7";
src = fetchFromGitHub {
owner = "shundhammer";
- repo = "qdirstat";
+ repo = pname;
rev = version;
- sha256 = "0q77a347qv1aka6sni6l03zh5jzyy9s74aygg554r73g01kxczpb";
+ sha256 = "163x3fxra0l3vvrzm25mh7jvcwjbmwsqlpppkxx76mkz9a1769fy";
};
+in
+
+mkDerivation {
+ inherit pname version src;
nativeBuildInputs = [ qmake makeWrapper ];
diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix
index 997786fc107..d220047a0a3 100644
--- a/pkgs/applications/misc/sdcv/default.nix
+++ b/pkgs/applications/misc/sdcv/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sdcv";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchFromGitHub {
owner = "Dushistov";
repo = "sdcv";
rev = "v${version}";
- sha256 = "1b67s4nj0s5fh3cjk7858qvhiisc557xx72xwzrb8hq6ijpwx5k0";
+ sha256 = "144qpl9b8r2php0zhi9b7vg6flpvdgjy6yfaipydwwhxi4wy9600";
};
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 10d9e7b2a22..7548eb94fa6 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,965 +1,965 @@
{
- version = "80.0b8";
+ version = "81.0b4";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ach/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ach/firefox-81.0b4.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "0dfa5e6840276f2bda03babdbf5273f7d5549d7610b3cf00983fae5a1e8e4ad6";
+ sha256 = "4b133dd14e8ce1b934e482c4f7f7b5ca4b58751181bed89f6573ba5994ebe644";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/af/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/af/firefox-81.0b4.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "ab51a6e8eb2fa5bd828da95600e7eeffa19c96fa8471299d832cc8024c5da998";
+ sha256 = "8e50a0845eb058ee853fe40b13c88d764e721f7f8ac2eb54695049ab2a66e3e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/an/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/an/firefox-81.0b4.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "5b7f60f06964dc13d0dff9c603d00a8bdaf86b1c0871fc60b6b074cd535f5dd4";
+ sha256 = "3edf8e157cac424b1cbfff019240877e7b7c3bf5ed1b576580569c155c5dd660";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ar/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ar/firefox-81.0b4.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "8be8cc6f547475cccae9ff6675689334c5baa10025208035bbed4a186ff3d61e";
+ sha256 = "b2167ff357963e3295eed2ed423a1c3bcf62d645329b8f4cf817ad3c0e101c97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ast/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ast/firefox-81.0b4.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "2efd5fcf0e69f155ae0aadb28534e141224d16c64706e05c1b72f6ef44fed6fc";
+ sha256 = "805a87a99a417ff4b762c01a9a2b88c7963f53a04fc19b42015db304b15f4bbe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/az/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/az/firefox-81.0b4.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "9ab8f6b96db687367bf8f770ba2f72f19ee7f438a949373830d03eca0dca22bc";
+ sha256 = "79c61c9515a683731649bcb5d36b26b95dd56165765e5a952339910310c9d259";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/be/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/be/firefox-81.0b4.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "b1b3e44c5733e197c53f013bfbe82eb7f6a300278f5b170338fcd56670445bd6";
+ sha256 = "318fece7d1ad734f6a19faa7003e060b1254b31bf62e59580c70a64c4a167ec6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/bg/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bg/firefox-81.0b4.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "e659b463c9a152e635dbc36ab972a64e3b6c28987ba5e5437672e68f24f6dcb7";
+ sha256 = "55616606306dbd0933240d718fef8e83004fd65e4f53dd18f1601f09d0b94e92";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/bn/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bn/firefox-81.0b4.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "f2e4e6e80747754fa449105cc870b87fbae387b64d044f8dd2fef743e34c749f";
+ sha256 = "c38fdef89f6aee7bf03362d2edfe4dcc665d540b1e1dc1dad8c53db20d70087d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/br/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/br/firefox-81.0b4.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "90749e4392f518e5636cc687946e066545eaa26badc23c46e6b63da6ce1cdd59";
+ sha256 = "c5ac1c8e9dc2f4c5a1a2b6e33bf699a823a9422bce46922bc36222700a29d2e5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/bs/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bs/firefox-81.0b4.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "929758b30ab1ff8c034da26be688541ea1ba9e99e7206b981f11a7209ff6d771";
+ sha256 = "a18718ef7f467ed87c76816fb6797165db3e06bc166c5e88b526c9f2ce5c1d19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ca-valencia/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ca-valencia/firefox-81.0b4.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "1e60124bf4946605bd100945748302ba61d406b44563e9c51f58d781226d4a07";
+ sha256 = "fcfccd0714c965801ce468f6817bf37eb074064e6e0b616c81be7218a6b632fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ca/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ca/firefox-81.0b4.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "6c16d41ae0748931de875f756b0a3b09268bc96c6ebec54a56e6fe8672879c95";
+ sha256 = "5f08a2b2d357d5a6828865913b9e28fe90bda7a8ce17a0ea60effb25b8441b7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/cak/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cak/firefox-81.0b4.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "f3f6877e2d8132737b978d073b54171ad6d30c227f50e1bb2dd2e1d15e2201db";
+ sha256 = "db41156b75e1148527c51b915e3d9367d1c36a8d24a52132d1cc9cfe63bd9db6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/cs/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cs/firefox-81.0b4.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "0677a8fd1ad69a8bb2869942624ae0cf37dfc5e89bc0bfccc68b79b7b4382688";
+ sha256 = "d3287f28964581e63a3b1a5484e47e8ef33c136b39f13e07d6f3d555c27864cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/cy/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cy/firefox-81.0b4.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "c037ba4d4f757784923aedd914527e8fc079ab33384d84694b469af3e9eaf125";
+ sha256 = "f41fd34cf1cc72d5fc80113cdc9fae7f03f434e45e990e17a94dd68463464c49";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/da/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/da/firefox-81.0b4.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "5c0b86cede27223a159a0052ea146f4f79a2cc95a9515d4da6bac598b1a792e7";
+ sha256 = "dbbf1611913315ac5294f400c727cd5afbc832efbea56bd839b77cd4d6a5b823";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/de/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/de/firefox-81.0b4.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "e40a4752fb32a31689bcf546aa4867ead0da80207de3583bb2ed43b944a12f53";
+ sha256 = "1047799de5b42b5cb0827371872b7e85b93a4474bde9288da54a573841e156bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/dsb/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/dsb/firefox-81.0b4.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "d0e22abdfecbfbe2a25dbacf35e1bdaba716bfd2e09c0a4206c7260f405df15b";
+ sha256 = "602eaa32d32db35d6a6d07f1c0cc53eaa4e432b7ab81d1f23b47d3125ac98d24";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/el/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/el/firefox-81.0b4.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "6a4206278f3aa89aa0a49b41df8372c4ae10a6afdd107210a7a1d8a240d800f8";
+ sha256 = "8a460f9542e213b1605265c6497742e7d55213ac91b42d00a15b3123b47754ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/en-CA/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-CA/firefox-81.0b4.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "3b767fdf9d08e08526f72bb8bf14a7577370003f29734a39a61cd31d65491f80";
+ sha256 = "9bcc44ca3f4192a2a7a001f27db6884dd481551663b6d0c348ed0b9281dabe87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/en-GB/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-GB/firefox-81.0b4.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "29108de728a833a8f6df04e2e4aaa21aadf3a572534844f4a44ee4ae0b78eb2d";
+ sha256 = "9d241d56362ec52619ce02cdd2f11dc90c2e0f7c515c707ea56eca2e8f0eb306";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/en-US/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-US/firefox-81.0b4.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "01b005fe37487f7bc9ed39aacd09c891755fea9adff44addacb708000deebd1d";
+ sha256 = "28972b08f8b3f2d19f5d50a2c9275fc459fc3e57df11c884149d1fdb9d99300b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/eo/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/eo/firefox-81.0b4.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "ca8f65b6bfb491ab66640ea2b02b234d2b68d268480532aafbba6fb6a190414f";
+ sha256 = "013caa4590462b4bc5dc09cb963cfd85cba4b5419111cdc87316574ca5691e80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-AR/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-AR/firefox-81.0b4.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "19bf5b10da6afe691cd50530c57256b18c4059c48561c1c776e5e35a7a0db327";
+ sha256 = "d6970ccf4d58e2f1219cb0d43a8788084d0863f0f349ab3292e182fb0201e860";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-CL/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-CL/firefox-81.0b4.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "42e383a691ef11afe1ed5afc64a0e6fc7e87534826d71d169e060f10fb07cd1e";
+ sha256 = "76fb3c865b3efa1da1d34c8caa7b56b5b6d0af2cbbaeaef873fa96d2b8c93bb1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-ES/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-ES/firefox-81.0b4.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "7cb0aa8fbe6983bb68a583bd61d307d3b44a6a38f5b4c8cfcb1bd401bcd10421";
+ sha256 = "7b41a2b297df4f0f6d4f44e1eb0ea0cbf02454382d0994f119a77876c578c4b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-MX/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-MX/firefox-81.0b4.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "e9485c3a290a0a240d3cb9d18ec6929645aee333a919b4aa09776da106d943f8";
+ sha256 = "733b90640a30df66700397ab0cc2045fcbc25af94ef9f36463a191228b511b77";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/et/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/et/firefox-81.0b4.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "eb1a74b4e901b09cf287e59d1c8fcb500cf2f948ecd5098f3d928413ff219897";
+ sha256 = "027286d744b1d9f21157d8242445ccd7610a08d8d541d64635fc16549aac1b4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/eu/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/eu/firefox-81.0b4.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "8daba1de73e594e3138ffc8bf58865fd4ece581a43337097691f2bec4f419fc6";
+ sha256 = "ff555da3aaf1abb2c384772b309fb4129dad57b9fd523fcabef5b2743d3063ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fa/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fa/firefox-81.0b4.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "f0cbaec0e1087ad8f55d24ba39d60fd91972189aa367d6b80a22de3f5b5ff821";
+ sha256 = "c99f9297568f93eda17058d96dfaf83e587907be9b5005e8f649f693662e4fb6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ff/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ff/firefox-81.0b4.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "6b98dcb2d5493dc7084f626b6e8aa807d1b71d0d8bc1ad30f2ebd3c002bfde23";
+ sha256 = "91658b195a622afa3c6fde535391eff1aa6b70f4c0cccc5c55e56e6d66459435";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fi/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fi/firefox-81.0b4.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "4ebc56f8a38c32026380e02271cde2f651046d0b0fe4efadc48883fc2562fa50";
+ sha256 = "cbc70d2051c96813ab081251c339f6cacd29ff26bdd8174b35caf9905a874635";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fr/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fr/firefox-81.0b4.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "b6d4ca33e93968bc0efcb504db785f5dee55bed9834d90482ba5abf54ab97672";
+ sha256 = "51890621c8c3c0e40103a10e705adbc860937e5dbbb8a3984eb71a5cae3ed63b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fy-NL/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fy-NL/firefox-81.0b4.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "438d72ed1e22da87cd0ec63fad41b5e355cbd8d2417627d74ded59940b6b1b26";
+ sha256 = "5c3a982a51951901732ec7684514be233fe1c44780531fb38f7205724c241387";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ga-IE/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ga-IE/firefox-81.0b4.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "6d3b4a427fc80b4f7e69f94a90d5d2fb9ebd366d224136316de8e2b03c06ddb7";
+ sha256 = "04b5d338c7557f12fc6fb2206d444a8a00be6814b1ca26de4923449a4425b57d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gd/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gd/firefox-81.0b4.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "ee54acaee8f5b2c0033fc3bf27cb6c90a6d1849c4eebb427e2efeb3a7fe44c0b";
+ sha256 = "6bc0de0ac627203b1ba035f7a7ba7dd19bd82a7730c526c217150cc5de668fd4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gl/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gl/firefox-81.0b4.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "bce9bfb74c965ec6d2e346b86910c73dfc242be98473ba52f7d0cc34f14b42f8";
+ sha256 = "37522d032422af770e37a93e33de6c0b8b79b2d22c6e71f32107cc8808de4d35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gn/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gn/firefox-81.0b4.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "a98fce4baf9e0424317231aac5ffc0b3574c2ec6feddd9e538faab59bf9ab432";
+ sha256 = "f761db975c72d7e419601988c0674acc7fe17227d5569cac85a1fe2d91f5141c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gu-IN/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gu-IN/firefox-81.0b4.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "35161db5c7fb962ad5c60118d422250c2b6a776ef13d116bd23b31fa5c312a5b";
+ sha256 = "8565c1965e09060ddc5b253fa126998f827d17dd58692ec4d17d194d29a464a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/he/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/he/firefox-81.0b4.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "66fc1b065881a4dea1ac8d82bbd64bb6aec223c1419663b7a50752cd1700781d";
+ sha256 = "c3cc5911103ce955f89c5104ceb1ee50f7c047e4ec761681c8693b643f5d91a8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hi-IN/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hi-IN/firefox-81.0b4.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "b1ce60f26dc79eb360e185805b98b2d1197a2e45c26cd24bd3c82edcfad42a5c";
+ sha256 = "95463325675e56e700eaffb6e6690f4b398adb5cb77aaa34b87e16cb142f3533";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hr/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hr/firefox-81.0b4.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "712ce7b7e90c4b424a4ed46385a34905b7c4f59e6d07ced9e5e94a6108a3c206";
+ sha256 = "6332ae812507f79baaed24e4fb79fc6c383418c4c9d41c0f3dbebc2fb72efef5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hsb/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hsb/firefox-81.0b4.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "43fcc61024fa21216e7e05dd0fc46410b2dc32eaa87215014f9f3e0d83ebf37d";
+ sha256 = "b18a7d31d3ce7373bcbd6bb7ff56adc023c58097126781d5f915828be8fef92b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hu/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hu/firefox-81.0b4.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "0b73ab77e5e0f4ca34d0eed7fd734f30c1484a930751d5f2704e09e94179ed88";
+ sha256 = "b1e4c6c9c21b2593f3fa111820a7e6a2e2e72e8b3065738f6a50df6ef4b7f18b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hy-AM/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hy-AM/firefox-81.0b4.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "bb52a07de2b0c1fccdc0910c0d861345822c9708f9f66471225a9e148f159cd4";
+ sha256 = "562f4d9e094b688cb53860834e425997e65b78222724c48ff4ddd71ccca264fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ia/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ia/firefox-81.0b4.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "50cfffd20294f00e5194093b6114cfd1529e5f383f389565be7998c02a8802ae";
+ sha256 = "87299a8aeee6da57666a06cc2d4f479b0c74c220e2b22ddf5254a052f11edacd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/id/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/id/firefox-81.0b4.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "ed6473750ffa1006d0ed8a502809b56573681c85656f12cbc6fdfaf50506c15e";
+ sha256 = "0cf1bae8def307d08e4c24fb44f7cfbebf150f1edfde2a3c0855a69775f26539";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/is/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/is/firefox-81.0b4.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "1467ae111e51a4cddbf3611503e35da489fa6f506bedf441989fd093a1b507cf";
+ sha256 = "6140d270e99173d995e42d32c0b696a51f72b1c6baa746549bdbbe7e2a08a811";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/it/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/it/firefox-81.0b4.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "b4c96a1e12d8c6e16b7e85c0080ff0c1e50cf78d0762907af075a9e272ea9ed1";
+ sha256 = "3583cf0223528929141879c085278354927ced41d71321fe8d832ebd356d4614";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ja/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ja/firefox-81.0b4.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "f79a5b441d4f6d10c9022e5b872e5e607065a6f8932b1f1ac4a32f586848a676";
+ sha256 = "4a1bcf87b3cd09d7c3379bd922ede7a3c6c4a19bf11596e858634b408df95cad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ka/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ka/firefox-81.0b4.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "4e1e846659d18470e098dd9244278de6343bdb2d076927a46ae154f7b19b7843";
+ sha256 = "320567daf4e4bb12c7209aff34d98efdbb2dead9b34f23d4a2181d2cdddeed71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/kab/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kab/firefox-81.0b4.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "d538a9b1b4c439bb2f1c57cb076b9f6f5be5ad673ef7f4e468031cb8f9f83d86";
+ sha256 = "5b9d60703b494a4eb5956e59bc2d6893bc70e8b890d0c940f25d25b605000c89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/kk/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kk/firefox-81.0b4.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "3aad1bffa285439350fd1c3fb09450e1d27f51a011383106b5341f75450884a3";
+ sha256 = "45580e0c3cbb265f718a69ac9de7220d3d89e52e3b8a5cfceb7363c20e63c83e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/km/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/km/firefox-81.0b4.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "2d59a3a69a96e793efa5257fd9ba903fbcaefef99267f3f0921c3ef073a12f8e";
+ sha256 = "24b4879f22829a2a5d72219cba2c5658bf7c7e73ffdc9640f6e897ec613733c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/kn/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kn/firefox-81.0b4.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "804f85a1d5e8f5acd561aa8ae91e1100de2e62ae270d742f0b16111dab20f94f";
+ sha256 = "905ed3fa762c73c5ba677b8ca5b620294cb1ad36dea2ac53fdfca5a739c0c0e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ko/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ko/firefox-81.0b4.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "a09382d10e2114f02848e7deb8c770599ff8f84e18a5c0253f4884b7b7174233";
+ sha256 = "a6a63ca4106ee9c710331ea50099e2a50842465095d38ea55a63dcb3ee3d80ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/lij/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lij/firefox-81.0b4.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "b088949b9d87986b2ff1fe4020a59faed22b0c205a432ab29b862d07bda0dc42";
+ sha256 = "b6fa42dc9bc68d4b71ae93eebfb1a19416f0cdd06d20fb344c0c0347aa2d4862";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/lt/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lt/firefox-81.0b4.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "8dd0b88ab0d16dcdf218b58e9f2fe8d8311d826461de8a4c94c9cfdabc8bf905";
+ sha256 = "c70f6e7c20e252fdef6bf136c99095ebc27672719594df302e58be801a3f06d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/lv/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lv/firefox-81.0b4.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "bf289b7115d3114a59e92a3c63cbaf98bdb3f3fd1cc03a9cd5976a4834ef147e";
+ sha256 = "c64d561be20fc8f0e7507a0b1dc2e5d79af407531a37cc7da3fd880789899fdb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/mk/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/mk/firefox-81.0b4.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "cd9b7abe6c53a221d88c5f49fee164d069c21d956285ad2d0fe06e7012b72870";
+ sha256 = "aa38b13c6bc5288ab491f5ccee3a881474b1f42f1bd959435035782d1c39f407";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/mr/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/mr/firefox-81.0b4.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "370d8540a678b356a4f373a81e4807170b3599db6472633b34c768070c77217a";
+ sha256 = "e56eea60ca1cd447e30cccc82ce7a4797fa23e9bb4871a5e20e05d44ac35f720";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ms/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ms/firefox-81.0b4.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "f141f3a22d6b5914f8cebbef0d2e124fc50833ca86bb62dd2a01d957ced6c099";
+ sha256 = "9d8445e2bda6a8cc8714a0eaf82e1b9ec03fbd94042c3557f07d9c8b25bc4b6f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/my/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/my/firefox-81.0b4.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "ac62b25be480b30ee2c71371a6a702c37b58e537a4c4781b92e4f0b74c11cace";
+ sha256 = "4a7527e5e3e6ea0181cc8b9a2f206bbe162a4e1867faa75b4af261f08e89ae0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/nb-NO/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nb-NO/firefox-81.0b4.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "c3364a0364176839b97d08294ec7291fa13d212edb806738392796218b7a7080";
+ sha256 = "c2ae9f5fb235541cc69cc3c4307dd4b7de51a9f4b6e038ef3091a773edec6c5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ne-NP/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ne-NP/firefox-81.0b4.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "75d005443c28be517828d07be438b8c980d6885b4dacf42eba58573be4291b47";
+ sha256 = "05acc175b06ab7f5861a3a7e58e9a92c40e0660224426fc8225fba6c25888726";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/nl/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nl/firefox-81.0b4.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "cebae8c9c06bba81194c7126f115ffca44ae020af33b0de8e201ba930f4649f2";
+ sha256 = "640be4e631343c9f2a55c24a4d5c63908627e9ab2d39a5346d1842d8e4a57799";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/nn-NO/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nn-NO/firefox-81.0b4.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "27607aad3a1d5ac50f159289cdb92e71d882b77ec9d2d320b470dfba799295d4";
+ sha256 = "46a898f41e5c3c9853b05fda8f44be01b2fd5a7fe3dad281c21588c2deaaedce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/oc/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/oc/firefox-81.0b4.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "634372a5d704c890d464c7c3dceb365689f260feeb9ee273e97d32d8b8c9a102";
+ sha256 = "7481c8bad2e905a033f09ec4c20f8d4b184a0f90fce1c10648c4fc57a7a5f301";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pa-IN/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pa-IN/firefox-81.0b4.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "16a165ec3517839d07d2177cd3e88a61f063ad7341095a2c70baaa5de1f7a2b5";
+ sha256 = "a460ed0241c569e1ac62727b17f8c8d0d4091e794900e2e2be7d8d8e2b90ada4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pl/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pl/firefox-81.0b4.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "cceb8d8fc319344bf031c7d86ab5d19ddd059b67a7293a2bb785621b99cd98ad";
+ sha256 = "d82e300cc8be61ddc2aa66bd4d4ec35cd18e47603bd19530cf48728c5fe67a5c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pt-BR/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pt-BR/firefox-81.0b4.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "5be4bd15fdfd7b80a156740c57166eb31c77ff32f7e4c354d403606aa3049f8d";
+ sha256 = "1ee1560d4597adbd230fb0c556a4d8fa6984ee86bb731f7a5a936d660897eb99";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pt-PT/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pt-PT/firefox-81.0b4.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "0dbb3aff49303f94539f82ad5d434351f5c2d1ffaf414b94f6b8ebf6535d656e";
+ sha256 = "be7e484f8c3f4d8b7b894a437b70b2f4b448e3a7df518ce6906295df9be7749d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/rm/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/rm/firefox-81.0b4.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "6880c4976bb118fa934d189d6af4cde582d64b909ba0671a4ae62e41bba4d95b";
+ sha256 = "819cf6a13d1690dee4e4255aa0c3f551411e2b7076f8ce3447bba47f07c806db";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ro/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ro/firefox-81.0b4.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "4e5ee175921c2e919d2cf1eace39d52c5b89c6bf4ff9bfd9080d885d2a2f83a5";
+ sha256 = "2baa8154f358962983c7e0b26c4a7cc8cf97587b646884527fafe46f5d8d92ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ru/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ru/firefox-81.0b4.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "d4be0a9f6d4dd99409a5099624429f951768585a955022c0efc0ca00140bebfb";
+ sha256 = "eaaa5338ff8ffbc9bad5321ee3eb7410feb9a26a06d3cc49707c0a048f4412e2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/si/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/si/firefox-81.0b4.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "77460dd1207e11ef6227756c1fabca26777a98a5ae92bd38be2e86161c0efa12";
+ sha256 = "ce04721a96cea62eb7011c261f740e9e0ad6288ad9ff231538c3a6df86fb40ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sk/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sk/firefox-81.0b4.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "018602509df7c86cb001f007937dcd44694438fcfaa9002562995b8cec0d956f";
+ sha256 = "4b19fef341d64f94ad97a0bb8821693b00e4e7e04454156f92f0c82f4fee0005";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sl/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sl/firefox-81.0b4.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "f35c5a8d8b3eb56c9241a13d20708069073558caa02bf6ca55459150869ad114";
+ sha256 = "96192922f2012a3e6be634c7ed09017cebf9498c6fc2862336bfddbc4ea40840";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/son/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/son/firefox-81.0b4.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "561d9939c3065e2a604d7b51535a5b4b8c0da7e3fc9274657ea88366c5924c74";
+ sha256 = "dfb144edeb3712bc0a3bf7e0675de80315c78bea7d7c6ee5f6047c077acbddf9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sq/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sq/firefox-81.0b4.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "1e38655b0ca5684decc1619a51b2bec39b8fdd7ed302513a8f8d14a3ddc7533a";
+ sha256 = "54dfab9e843dcde43cf188ae33922371fb90c1bfda53ef629df16576d6a0bac2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sr/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sr/firefox-81.0b4.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "ab879d65f27ebe393ee86c12b2eea256639d17f2dcfd8b4981072772a277d783";
+ sha256 = "f00b5184ccb47223858128aa26481867fb33aa50a914a8c807235c9a2bdf74fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sv-SE/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sv-SE/firefox-81.0b4.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "832ca5b1e0d41675066e7bcfd16563a9e03dd87bcd96d4592232ca26321af7e9";
+ sha256 = "d3884cf4a9ff23971badfb1a794c9489e0006e6851a0e501e290d8793054cc1e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ta/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ta/firefox-81.0b4.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "ad9c6fcb91fc87aa11ac0912f049db9cf93f5e62797335a8a699b9ea8a7ede9f";
+ sha256 = "53584d2093feffd36a8a5249ee438b82d21af834a3c2c210944030c127b91cb2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/te/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/te/firefox-81.0b4.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "37c7836f86fc5f4f48aefcf28330e1003687752d506d1050528a19b592bbd7d7";
+ sha256 = "63b65440720bc492fc95d080b191ba452cc87c8501b195e02df66ea4487fb902";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/th/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/th/firefox-81.0b4.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "66cd4f8cd18f1c076b9d7538600459fe01998185cbf6899126841b16b3184321";
+ sha256 = "3b01fff09734f2206e4aee227ee7f0c13544fb1635f92a5221ee356117955446";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/tl/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/tl/firefox-81.0b4.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "d3f6102c2eeec1ecb1ba28884592c11e544e71d42ea2204de59ded1065f71f5f";
+ sha256 = "00f1c65baf63246a9ff44d98171a6ceec6e276488f5d6fbdf6f97760509b3bc7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/tr/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/tr/firefox-81.0b4.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "ea161412fd08571782f607c2aab116a1e1912caa3eae785db1129f617b389f11";
+ sha256 = "064d6c6036fae215fcb50a87863e6808bd1626084d9144a18f7ea1f4c7072093";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/trs/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/trs/firefox-81.0b4.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "a1824abd2c3f0e0ab3e1ad971137cc81c636af48865f7bdf7eb1029a7d08a16e";
+ sha256 = "73c892e0b0ab0bcdbcf6af88fdc8de335bcd5c56805675ba7b487ed3b620ed22";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/uk/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/uk/firefox-81.0b4.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "38afb4f054d9b577257509b17e32049e7c5fb50e47971fe52bc5ecc7d9b5806d";
+ sha256 = "8ac48524702e3f177e78fe97e4fcf528752a3ea0ef08e9212037dbd0febea53e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ur/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ur/firefox-81.0b4.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "8b9503d7b5452c43e7300c8a1b1c2ec9d2b0572aed78e7b8f05fc7c1ca883d07";
+ sha256 = "154dd642021769aa67a081080f33d87d736686b9e6e46cdfa2bd2201605bda26";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/uz/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/uz/firefox-81.0b4.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "789a4b08daadd64f6275bf267bc269ea92177902ae7a8b20dd14bdabcda49cde";
+ sha256 = "dd36910596d777f49de3dfe8e22f2838b76081cb259107047b9a98c3445c01eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/vi/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/vi/firefox-81.0b4.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "10702553917f359954b204b65bfe311826cd44f6e81e7864c05a94d541dbd636";
+ sha256 = "3cef9f657f83bbfc68ab4a7c8ab84e1e937553cca98cfc30d3fbbec5c8be7907";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/xh/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/xh/firefox-81.0b4.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "d99ea01e9d8bb5efeea45e2c2e14da6618d1eaaa25f4f1a1facfec1ebdef2291";
+ sha256 = "30a98fa9218cbb07d792629e73a250659b321a3555eedca0a68e6ffb1d5191a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/zh-CN/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/zh-CN/firefox-81.0b4.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "5c7c3d76a7e4fea7ca207cbcea698eedc970a6fb727fad7c071e19325fd8631d";
+ sha256 = "bf15e819d84a3cd3825df2046bd9ffc139008f45fdbbdc64e04cec6a549af3e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/zh-TW/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/zh-TW/firefox-81.0b4.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "9fbe3205110e83ff45fdc8f5c1659caeaef48c75db30a7014454d6338f1aceb7";
+ sha256 = "b194749cb05fe282f59f2f6621a5d04fba42406d7a3ea71242b667fe94a5a857";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ach/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ach/firefox-81.0b4.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "a6a965e26d90ef0dc4b892d0d90f8b0b81ea7ced3ea1de3a70126c4095731fd8";
+ sha256 = "203ca1a13f76935935daf2124c662329df93af0e44b4bcee7334ff60092c8027";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/af/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/af/firefox-81.0b4.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "649d3f77f16832b3a645f98616bdab4b788fad7d2ecc2d91558d369b439857be";
+ sha256 = "481d233552b0702a8b8092748b4c71da3c14c8df5e971c5b4662273cd8808022";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/an/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/an/firefox-81.0b4.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "8b0e52a60af14565dbc514536a8808fc8aafefab56d765fb0ce42565f67ce1da";
+ sha256 = "a128b96a34eea409a8b5fa412e6a1a36bcc28f2fbed40ba9b474b9d86d23dbae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ar/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ar/firefox-81.0b4.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "522f35d947d56354d31ed106ba5fc6feda9ad0a4c29476c7497aec6cb2f6dd36";
+ sha256 = "a2ab8b556b6b477bb1aa287f630e7ae6aa902fd1b75968c01c2e2c76fe9cdf09";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ast/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ast/firefox-81.0b4.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "03220451f980f89f3d9b23b53f90e852402fdbf54494ac99be7dc8932287d732";
+ sha256 = "193422cbafcaf5ed58f334a9d5b30f9a6181aa1cb649303df18626d9a3484088";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/az/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/az/firefox-81.0b4.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "2d70285230ec8fd4f5f0e3232d08b5c669e5f71d4758d88947b82f907305df3e";
+ sha256 = "c206f5351f0ba474a5277e223514f032c7ff0b66029f570143f2d1d2b8ccf566";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/be/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/be/firefox-81.0b4.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "02967f01fe3f8b225d60d462e4dd17cee0d031bd5171ec781d2938796b1174ed";
+ sha256 = "c3d7d04ea43230b6a6e4227b799d47348bc5c2ab6a60e93f4107efa6e7b34ef3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/bg/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bg/firefox-81.0b4.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "9b5acf3d80fc9f7e8ea20d0df282d6ff1b605fcd46a5a329a9138734df501035";
+ sha256 = "08edf0db8aebd41f25366ef4302214b4ef00540be39406fc780eec288b0de324";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/bn/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bn/firefox-81.0b4.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "e8a65769c738e9079d1aa9fda2ba74d21b96cbb76d4e348acba7ea1887d90d52";
+ sha256 = "a6d5dd5918d94e74ee8ffeb10c4caba65697ecdb81598b0bda815fa5d4830a78";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/br/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/br/firefox-81.0b4.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "7c2a12900d2adfa765b4036e05875adbf59f70e4eaab33568799cae91d948b5a";
+ sha256 = "4e7ffbc380b6f8716399ee9d7b9ffc5fcdcae72f48b63ae4bcd2011a85efa0b1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/bs/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bs/firefox-81.0b4.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "bd0e3d7b35cb845288f91eb1ae21d405f4dea2a6633897c30fcf56219982cd59";
+ sha256 = "ef36dae13dc3c943e5981a16d7ca61b4c6daa9a4873d2cd87022fbbcd01c8907";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ca-valencia/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ca-valencia/firefox-81.0b4.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "a167e7db353adf008d28458aa24209175c29c1af92f21da7e999729a8ce7e5b9";
+ sha256 = "584a0370f79011dd2691461acd573133348a94cc1323d6fb99dea9dd6df1e155";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ca/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ca/firefox-81.0b4.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "809cca0c4549e747944f043c96bab11e50a1ee6f4ddd6436ae94f85cb55063e8";
+ sha256 = "e280fe05f4e9320fd354407811ea8664d50de3810298e5eb4922b2d3e549ad11";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/cak/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cak/firefox-81.0b4.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "8575e1572ff2872993aa7cc07ea1fe82d66830e80c779f742412128344afdc07";
+ sha256 = "3decca8b5b0d44db169abfa20f07b3c109bbea0a68ae3e44a35f97e3b989324b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/cs/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cs/firefox-81.0b4.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "a4e5c1e08e138c077a8cd5a3f54e3a7a1ebaf7ac674d2658e1c4cb10b4a26a5a";
+ sha256 = "efccc2a43f961179f61eb7858b1e17ffd069bf7a26027faaad09f1b529ade52c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/cy/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cy/firefox-81.0b4.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "149d1bb8bcedcf215095629e71e530a58e0dfb60a13e72d6346db1200f79a882";
+ sha256 = "dc8a1945d0230070e2bdf65b673a9aecc4868c9821f7f1e2f6e0d18bb98c912d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/da/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/da/firefox-81.0b4.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "5eb27549c370ca89421a9d39bc5f33c948f85c48d67446b32281a54c50e12ea1";
+ sha256 = "058b800e2c9fc464f2a75fa48542269056a88916b9474a953f0d29a3e9041257";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/de/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/de/firefox-81.0b4.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "d868edc9f9831a4f8f196f438a1235339592a05086c3d5e4ed25714df36421af";
+ sha256 = "7fbd0b27073b2c46829fc0d631ed11fd9a38a07d0ce474f6837ad1f5c2adff62";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/dsb/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/dsb/firefox-81.0b4.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "ffc379cbd30f04c1f7c78f6991414b9214ca2c23280655690dea42c9a11992aa";
+ sha256 = "d0b6083098d416366040a877a92b163d469e2764af995c65fced49de23148624";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/el/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/el/firefox-81.0b4.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "a87721a1a6da5674d0b9b754d142ad5c00fca4274cca7d4d1d5e15f1e21be389";
+ sha256 = "104258b0e47b661d7c75c72f5a0d7750399a101a9996a3f8837f0f524e9820db";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/en-CA/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-CA/firefox-81.0b4.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "dd04f6027f1cac7b5a34013ad4dfd3b0494f40f243665a80ae058887997ec299";
+ sha256 = "be6750a6946b7ef58869d0c9f0412febffcbe4955c823a573d02822f9a14266e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/en-GB/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-GB/firefox-81.0b4.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "d425ea90fa18877faac09cd7ba1b499cc92133580f720cf0481dd651f529582c";
+ sha256 = "e6d2c60c30aa90b6026cb85d6fc3a1d1b7266263980df652c9a1c158528cfc74";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/en-US/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-US/firefox-81.0b4.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "777291dacd6ada8f3777c63e0264d36f3477b15e262d575e60b9efc4ac5de30d";
+ sha256 = "be534d43126a7fdd297f3431b579495b6f22832a358a0c793a23bea8adce1c9d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/eo/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/eo/firefox-81.0b4.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "df865cc147074318eb89c0ac4966b42aedd12aecb2a637bab18f6c231fafbb29";
+ sha256 = "6ffe84994fe7db178e59ea667495e95e6fba621cd0e4ec812d94dc3d98cf0a3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-AR/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-AR/firefox-81.0b4.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "cbccc83c1e54a59716173e5f1a8e675ed1e3567a7a316e48b5bf83adbfe39597";
+ sha256 = "982874a48791db0bc98559de45bb8884da93ee0a0738664c73ae5a08b3b1a2ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-CL/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-CL/firefox-81.0b4.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "45b0243d594b5e8b4828746719b93a9388ab509aef54d03412292b76365f4fd2";
+ sha256 = "c21fcdeacdf570a9f8bba9c34c64a60776aa8a4de56b5f773b1d26eca6d65b70";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-ES/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-ES/firefox-81.0b4.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "8eb9961ed19594381a761385af10bb0acd0bddc95166737a766b20de03e12e0c";
+ sha256 = "bb34dda74d59c862ab24ad9ff0c5ad1e1fb5d73e6029b915f966d0913cf4506a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-MX/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-MX/firefox-81.0b4.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "d4cd439aa71e06af039922fa98dc33bd25f90c728faf09c6bfaab4bfefc6dc0f";
+ sha256 = "53686263f77643ad4f769faac81697c7e1eca216ed0a7b051c2318b181318d7b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/et/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/et/firefox-81.0b4.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "dedb23bc1ee86909143b02b1d1601beb1dce38e9bb14ec8cf015e274fbab9e97";
+ sha256 = "053d8ad6cf01be9f51cd133090e99230dfe797effc749e14c8a21ba712546776";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/eu/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/eu/firefox-81.0b4.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "8e51b57208029e32ae01c93724f7b2f25d896f732e6739d5537e770b386e22be";
+ sha256 = "77774b9126ccbca2b5716b1701f8eb7933ee67ec5437a00b8ab991f423888a80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fa/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fa/firefox-81.0b4.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "1c332cda9a1445ba3b58ea93c614300f3b0679d3b32e9722068a554c92e3c8d8";
+ sha256 = "4a0554bff8c11ca39f1de223537d595d298e6f61c2590543151e8ab1d8eca36e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ff/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ff/firefox-81.0b4.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "c99e29b5b31196dc71a8c89b66b0e34b9bca8ae630414190ef7f56133bd08959";
+ sha256 = "272784bfa53ddc48fa43590b3ebd2fce808786b4649efa1d5b417488efbb8911";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fi/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fi/firefox-81.0b4.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "98a35572115ce221a03215bc4a4347f9579a3052191d81f64af1455f38f47ff7";
+ sha256 = "c389eb80f3cdd215549c7ce55402a7c03544eca2fa3c2074842af32755d14cac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fr/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fr/firefox-81.0b4.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "34f0991b083d5a924a0e77000010d89f049767a86338db7f565a1fbc815216fe";
+ sha256 = "dc5a79229fbdd3e9fada6b6bbb35183c17a703b9c3f29d9172f2b56cd5c0d289";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fy-NL/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fy-NL/firefox-81.0b4.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "157dacc021af4ca81590394c4dd01cb337f4436df1020718ffa424d43f023606";
+ sha256 = "3eb69867818f0a8448e4f421f0ded4ad1a172bd5c99048065bd4b6cf83e8b25c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ga-IE/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ga-IE/firefox-81.0b4.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "0e338674ea0ebb68052aefbb33c8eadcbb0bd71c78fe9bb7eba455e7c58f1a5d";
+ sha256 = "b09208ca65279e393f512a04712f91b2b170ca6e32777479acb7a03db89e87dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gd/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gd/firefox-81.0b4.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "6129a4db1d2c0b0b2f250ea2ef30d08cf41da50c1d2401a7464ec4f6b8cbbe76";
+ sha256 = "011beadfc3e78ff216a13d55a9b54471ebf84bb1be852aa986ab5ba1648836f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gl/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gl/firefox-81.0b4.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "94ea69444a49b0ea79f22d805963adff4a7d8fab8321e415fe8b4682b489e7b8";
+ sha256 = "c492314ad418a190484fce335d1dc5a28a515f630c59b1cf2d7e812b6d3c3bf4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gn/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gn/firefox-81.0b4.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "e3e6533130afd6577b8f1d41f66c2b16d3b385aeb398cfb211e7196073d7ff9e";
+ sha256 = "25b03d5251a69631f5d0cbf9dd89d1ce1dd5355e05efcc233bcf62e5311d4d01";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gu-IN/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gu-IN/firefox-81.0b4.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "25ab691be04561a2dcfb2185fe5deac0b6e4785f3cbbed871b8f51e370429b3d";
+ sha256 = "1cc9a3b933b625a26beeb7c31eb062e22ff8dc98c4860bf6ef4aef5567552d63";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/he/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/he/firefox-81.0b4.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "9ca2569009d5707c9ee9051173b24c5f531bb9c3aced445bc3bc01fe99c7926e";
+ sha256 = "027cd01f51db3b4d27381870ddf95ca2f7252bf7c6588c3d073d303bebb45311";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hi-IN/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hi-IN/firefox-81.0b4.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "c39d4070be5517f8979527064b5553236d2f1f15eacfb3fc66fe4f7a2a063814";
+ sha256 = "99d6d2159ae34ce2154678e4913145ccb9c96572ef19a18db6a223647b7ec68e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hr/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hr/firefox-81.0b4.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "c6c37633f91a675dbd33180761542d8f1af950e876dbd1635f73a0243e2165ec";
+ sha256 = "d9b2fbc6474bac73fe7fb5c4eb818f5dc0d74cbbd52c3aacbed0f17db8bce9eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hsb/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hsb/firefox-81.0b4.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "4bc5975c97a98c4a93ffb4940b2f0f35670cbc9785f5fc07be5d387c3403fa64";
+ sha256 = "dcd0c254c542a50807cbf1d0036a4cab5463c237318fb1d1fec9826d052aef62";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hu/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hu/firefox-81.0b4.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "5c76f9bed31bd9e906b0a044b67113f1cc6d91ae738d3c6e1c2746eeccf8854c";
+ sha256 = "5a0a94eeb9c8d219b3e34e92fc51163e190c606f975735215177d521b7ed9656";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hy-AM/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hy-AM/firefox-81.0b4.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "40d1896dd1763f035ea5f626430e6de77df4e0c83f3cb4d2d9c2b992379695fb";
+ sha256 = "2ff26ab884697d226bcfe224ff5c068aed355f6bb00777fa6d9f3bd0b9f9b386";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ia/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ia/firefox-81.0b4.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "5c8a0451233c3d55d764a3ab073ae25b3fd2125aae40c73968672fed9b2520f6";
+ sha256 = "7bd9d940f81d76984886463cc10920896247084f91efedf99f787601a47abba6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/id/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/id/firefox-81.0b4.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "7328e7f45205c3f9109eef8d7e512f41dfaf179eea50233f63a549efec0412b4";
+ sha256 = "c415b55ec7701219557cc4815ec0975d86f18312a2ef6a8abf3e82876edc5045";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/is/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/is/firefox-81.0b4.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "3f9e92d8218acf6da2ca09bda7544b6ae6d99d1ec2398bd3281fd28aaf3b7845";
+ sha256 = "3ee6e83bd9c244b123c1a1989fbcc0524c4101fefe697ea0a9ab7c6a05302ac5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/it/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/it/firefox-81.0b4.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "947b2947b5b33c3d62645fd2a5ba7e02eac525bd3fdc511f62881b61c77a1eb7";
+ sha256 = "de141769375ff5da94ee1030f5af84b309917eeea48cde769419004ca5a015c6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ja/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ja/firefox-81.0b4.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "fc82a3d2b816af47b8dd632d672135f7dfa3016a554c6b1840129394007f25da";
+ sha256 = "69c5c01998a78c17ba55f262493c4e7bfa4fe03bd19a8ca605546f41f0c6f794";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ka/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ka/firefox-81.0b4.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "9dc51bcb8d60327d5f893f334a54181eb6a4f34800ca9f15671fbc833e8a4026";
+ sha256 = "4c37f22f1a20c79c1b391b0f86bde8535c0766980a1b9a42ef912cbf91752392";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/kab/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kab/firefox-81.0b4.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "bda38d2522f0fdf8d1d6903bb11b63dcd242684bea412f9176c49fdf56b6d5f6";
+ sha256 = "1c6722e18e1eff26918de17454d8103929115f7f036a1c23247695f7fee13051";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/kk/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kk/firefox-81.0b4.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "d89d7aaea34b094c6a452c3d566ca03f42e4a1dae4db26d1dea5bc2da49d808d";
+ sha256 = "9ef2e2142d2e6d49adf59e6dd190b4ff816cf566cd35e5d288f66794aa2d73c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/km/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/km/firefox-81.0b4.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "932469479db43ced4b9ee82a481ef00adb5808f7d2e859ef7564e20cd764417f";
+ sha256 = "bf0899cad62f3331d157c557cbf3cf1f7faadaa7f9aeed3c6547b4533689dd7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/kn/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kn/firefox-81.0b4.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "80564390296e12424ad2fbe1952397cf7b36af4e9dfc1fdcf914745aa01a5836";
+ sha256 = "cfea495b254e1ca8c1be94e95f0c1f126d5f1a1c9d54129562fbec5ded6dec58";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ko/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ko/firefox-81.0b4.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "b3f091451469caea3f87f81be1da8d2e981327ba36df12224f8466ab68a2e9ea";
+ sha256 = "ba8c93f8567a4f6bbf7af3c38a2d2ee793b05c0246638ded86538f91e6e9112b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/lij/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lij/firefox-81.0b4.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "becabccd189bad47d9e716889698811f39c0833474bf48df2e4f2792b67bca6f";
+ sha256 = "c093b95b291af78460396e87ad39aa142d9925a7253f74aef9640fac0134e397";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/lt/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lt/firefox-81.0b4.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "fe38d20e2cc294f3ae11df9ea7d34849489b1456355b7d110f8639649d5cd944";
+ sha256 = "b035e58bfe373138626d9c5a22e6b6a8c6f35e8ba30ce821f80a1a85fd16c35c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/lv/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lv/firefox-81.0b4.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "1f6b7bf9f9b1fb0eeb80ef4a9ff280b042f9f524edd88b9ccd0500fa4ab40063";
+ sha256 = "6dd5cf66db0207527966532a2728d37438f71d1e79caf9b97916d0e404c9509f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/mk/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/mk/firefox-81.0b4.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "732585681ae095a83428cdc32c4277f98861c73583c6b12fb1ba07f0265be8ab";
+ sha256 = "1308f476d0052e1317b4c7db29d4d2218c60921a9ba7f619dde4455aee7978de";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/mr/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/mr/firefox-81.0b4.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "1aea289a62cee8243f69bccb02770b026ed183b6621bb99f33b1f5b4c8a5b667";
+ sha256 = "7336012a19cd650dfb8f842de37da8e29e7b0948cc707880667eca87bb31869a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ms/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ms/firefox-81.0b4.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "12726f171b6d5a831898fe0c6379949860e8aa899789c2dbff7df86281549076";
+ sha256 = "192e12151ed1be4c3f7ea12beedd2c50f6e7fa877ae8c448cc899cd0fa1c6d24";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/my/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/my/firefox-81.0b4.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "4545ba6aee4231640d4670e08a5bfb71b0cae5faadd5bd3d9705b37df04f5dba";
+ sha256 = "08db2ff728d5bfcf751e95eb9bba34a94c435e53863790ae06daf803d56c227d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/nb-NO/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nb-NO/firefox-81.0b4.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "1b741c62a58ac9a0ca845fa942ae169576242a3d97018439d85c9efba09e41ed";
+ sha256 = "22cfe518994fff77dc41e6f45550549593564ef2fa2dd34e31af17f5e42d636d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ne-NP/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ne-NP/firefox-81.0b4.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "5f44c3bb3351ded2b7f5ed216323fcee990175ef55b34a32026a2c6afa280ebd";
+ sha256 = "605180e46adcaee8fb813dc41c4e7bbe5f509f181b607554137712405c0cc294";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/nl/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nl/firefox-81.0b4.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "5da24260eec62457572431b2667eba929876c68e0122f589cd87c7df3c364e7d";
+ sha256 = "ba8b45685a1d428d5fa1e38e1a3ec024f55db2f3ce4221fd53b96b0e0801a6b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/nn-NO/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nn-NO/firefox-81.0b4.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "3d8ae8f44295cb55a3c148510922e5e74b0ec8b69333fc9dde04e6f05d1109e4";
+ sha256 = "0b76c63f7942576a2deb29cf15b089d2e73aa0b25f07eb1a511ccf033c68234a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/oc/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/oc/firefox-81.0b4.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "913bfa234f56906bb48d2410ba8bb400cce92f6f960d7e1557786092f03aec30";
+ sha256 = "5de508b4039c395b594a0c78d25655113906b95a735d1e94f8e1171ca789da19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pa-IN/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pa-IN/firefox-81.0b4.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "f6c276a03f658fe7f62b49d8ed4e7ecfa14c9852384b224b732bb80d6d0421df";
+ sha256 = "0bf9e4751ef967f4c6f63cb6332fe3940698b3e67d0e4873ea6bf639487159f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pl/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pl/firefox-81.0b4.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "f1118903f6774c4e24cf2a01238f0cdefbb137e8af829dc403b13290bad64124";
+ sha256 = "0fcece8a65132810cb297a599cd4b003604854f0af684b33c9de554fbf7b1e86";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pt-BR/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pt-BR/firefox-81.0b4.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "e421152016cf3551bc66382559e947aec03698090ed797514a35bbcee07229af";
+ sha256 = "8363d209d1eb7e8053acb4805df119e230ab31e74b3389ddb01b53b032c12bf4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pt-PT/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pt-PT/firefox-81.0b4.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "a4da74dda8c2641e349cabc2360bbcf4ad531719d3652c96a8c9a8f2130794d1";
+ sha256 = "cf2ecf2a673f0a4f17cecb10b330bec530fd6e37aff9ed821aa68e202f59f864";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/rm/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/rm/firefox-81.0b4.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "578499fc230856e300a6774a8ab0b1d58c1afaee1e0fe6987ae16ea033cd6beb";
+ sha256 = "8849e945e79f0f9605e288de967e9f5316c792b150654e23ca65f6c91bba8978";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ro/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ro/firefox-81.0b4.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "967ada36c6bfb6bd658493417f5f21e1cad56afc40081463072eee40a964f809";
+ sha256 = "452496612b170e53423009a128f092a3d4a372e0e6fe352e649b3c989f6f254b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ru/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ru/firefox-81.0b4.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "58008daaf760fb6a9202d10771764cc3c46347b905aa622319b0631d833120e1";
+ sha256 = "0e7787bee9fdbb1ca0bd3ef050b1ee5d6c6d8277da941232d6ef10c612003773";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/si/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/si/firefox-81.0b4.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "c599e263b7084a69ea0730755483fdd6334610e07188c5c9f06b4be6bb7f073e";
+ sha256 = "bfd6df7b86490aa941f5878ad749d7918bc3c907a177213ab8a60df0270eea69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sk/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sk/firefox-81.0b4.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "a7170c138b30450e5b56ef7d5460f549288488455e482c8a89ea897dc9607f73";
+ sha256 = "87c4827968ac3de5fb7609b9d7685653ef279bafbbb8b15f15f93cc876d6e021";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sl/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sl/firefox-81.0b4.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "f7dea114d00831e71a6940348692b6523174a9fe099dad3743bb69f277cd2d7d";
+ sha256 = "6b272ee0cc91ba6114dc777f1833ed5201a96fd905a0d68a71cbafafe1a066cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/son/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/son/firefox-81.0b4.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "9d9917d01601e3de913267d1836764cc10acb09363b05049867d7069964171ad";
+ sha256 = "342f9eedcb359409fb324c13120ed25421435b614e9b5e15585ccf1551c263c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sq/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sq/firefox-81.0b4.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "85c34be5e061157f94444cfa07d8c8c1768aea4d4ed29a63d46b13bbb5d80438";
+ sha256 = "ad11f5878139c46a2344d0bcf6b02ad2c19e59f9861e7ac74668801e14742b73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sr/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sr/firefox-81.0b4.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "15a348fbf5fb4ae31e0a33b17d866e40b655b4dd788329d579afc82bb5ed86a3";
+ sha256 = "5e555aafe353036537609b9ba997374d106bb5ecaaa386b5395b7d156ff89901";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sv-SE/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sv-SE/firefox-81.0b4.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "bb9bbd0edb5934f5d33d4f8db92d1e039f8519c0c126f5156f88d4a5be864902";
+ sha256 = "cbd33b4fd20d8a7401e384196c28adf9fda6ee2bf24895d75e75f8b727d33e53";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ta/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ta/firefox-81.0b4.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "1d886bf18808d2dd3d6a95e5ae377c24be50f7e3788bf2c37c42606e2141d3ae";
+ sha256 = "8e4e9919ec79c1847449cc75539f24801d972b67d6895727aafddf7485d95ed3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/te/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/te/firefox-81.0b4.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "72bcbe4f087f8ed8248d5056adc786d96982a87fb79bc3e83dfb9e9f209211e2";
+ sha256 = "cb756aa758e69f26eb50d2e81bcb922c2a15a2304ef99debe67a57c44b2c3c52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/th/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/th/firefox-81.0b4.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "ba0d8e25d5d2de631c05b9aa7317eca67dfa12564e677f9391a7da61c7630ddd";
+ sha256 = "8c2be1458aa4077264ec946181d7ab3160086d12c821dc3d5fa3bbba46de3574";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/tl/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/tl/firefox-81.0b4.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "020791c52209fe806aa92f7945724ac1bbfc5554ec7827d7c320e1cefb5d6e60";
+ sha256 = "e51e4cf97b79b3720129ed9467b57d393a4ffd5698a9a941cd28feffa1d166fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/tr/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/tr/firefox-81.0b4.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "e803849628fb4a07aac2b23d457a8d1f954d2270d989fdd167c82e4ff407dd23";
+ sha256 = "9f0a494434bc3d78c43428bc535517b5d61743326fbdbf1836a84f353408a54e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/trs/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/trs/firefox-81.0b4.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "8aa74977fc2ae7e85150406541673b71b122f10a79762ae98787f9196d6e1ac9";
+ sha256 = "24cadb7247a254595c29aebe60784d37061465f2c960a8d036096c6df71e4186";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/uk/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/uk/firefox-81.0b4.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "7489d2f06cc74a759e6128a9e1ae19305ac8d81f026e8d16fce30dd8c23762de";
+ sha256 = "6aa85e7119fd3ca00cd87d898eb93d954b1e58d01edf14106c41df98bdca4d99";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ur/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ur/firefox-81.0b4.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "a0e924a25bdde879856fbf53fc0ca3972a3f701338079ef408694c0f87a13aa1";
+ sha256 = "6b188379acb89178d08e827a60244c2298eae62434991d53378327c36829fa01";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/uz/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/uz/firefox-81.0b4.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "4603be13c80926a5de1a2fac56d433798c2e2415ac5e769a7d4893b3eae7ec86";
+ sha256 = "782ced50737f68a9fa6db854cde83ef7bbc6f95776a44918248efcedd95230ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/vi/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/vi/firefox-81.0b4.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "1f9aef09fd0707121eb3335d60bf0b3b06554294594f45158cd41cd37f0beb07";
+ sha256 = "37b600b306c901080f659955163b1696f5129e71bc3c5f65dc74d280ee6e3024";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/xh/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/xh/firefox-81.0b4.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "4c61f2ca3c4ecbc5b6a71edfa540400633d689c2cb042030c2291117443ade65";
+ sha256 = "ebdfb9a50a5a7cad0508ade647ef3f81e18837d6b84212de6393a854bbfc652f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/zh-CN/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/zh-CN/firefox-81.0b4.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "b24226ecd5946ea1320dd8ceabcf5402af96c7674c45d058b548aa212da1e1aa";
+ sha256 = "fbc7b8952fa6d2d73b736abf4e60a10512eb983ea4588f7e746bff9512b953ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/zh-TW/firefox-80.0b8.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/zh-TW/firefox-81.0b4.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "9765b5e72e0e2bb22b080d6a9a050a52fe003771e172f4865948b0c8b0000ff4";
+ sha256 = "5c29c56ef6480703ef9b6a2dc3cae8bc45b2fc01495ba099bd1ee28bbcdce55a";
}
];
}
diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index c2ffb816aa9..c3ec58df35d 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
- version = "0.17.0";
+ version = "0.17.2";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
- sha256 = "0bd01fmrf17njzf8ri4bw4qi7bxcvd3dx7yyf42qfvnp7hrfzipk";
+ sha256 = "0wiqnlam4f7085n3djvb5phhvw9df61bj8w6c5rcpffykg33vhmi";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index a857abcfed1..9c3ed826a2d 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -6,11 +6,11 @@
mkDerivation rec {
pname = "teamviewer";
- version = "15.5.6";
+ version = "15.8.3";
src = fetchurl {
url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb";
- sha256 = "12dzrg9qf5gj9srv482n3jsjar8jhs3s5kkp6v5pvfp8kbmwcbib";
+ sha256 = "1c947yxgs0mv5x6qvy40dypbbhhjbglma1pwl66z39gzg51n2dmc";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 0893ee21a55..69b7b432b0a 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -4,13 +4,13 @@
mkDerivation rec {
pname = "seafile-client";
- version = "7.0.7";
+ version = "7.0.9";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile-client";
rev = "v${version}";
- sha256 = "0szdyprljyckmbrw5sypizs22j96q84ak6nyidyr2j6gf4grh9mg";
+ sha256 = "0pcn6lfzma2hvpwsp9q0002wvym7zabpp8fvq29l101gzirn79m9";
};
nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 40351ba64a1..b0609863c5a 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, perlPackages
+{ stdenv, fetchurl, pkg-config, intltool, perlPackages
, goffice, gnome3, wrapGAppsHook, gtk3, bison, python3Packages
, itstool
}:
@@ -7,16 +7,16 @@ let
inherit (python3Packages) python pygobject3;
in stdenv.mkDerivation rec {
pname = "gnumeric";
- version = "1.12.47";
+ version = "1.12.48";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1khrf72kiq50y8b5prbj2207k9shn36h2b2i588cc4wa28s9y5a0";
+ sha256 = "14556b0vyxdvdwjlin0rv7jk0vq4nplbmvp9j89bhkfk84xf7k2p";
};
configureFlags = [ "--disable-component" ];
- nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ];
+ nativeBuildInputs = [ pkg-config intltool bison itstool wrapGAppsHook ];
# ToDo: optional libgda, introspection?
buildInputs = [
diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix
index 73f50998f63..310f57d7cda 100644
--- a/pkgs/applications/office/portfolio/default.nix
+++ b/pkgs/applications/office/portfolio/default.nix
@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
- version = "0.47.0";
+ version = "0.48.0";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "0l328wvikdmm2i0kbpv9qwd0mkbs24y89cgfg28swhcvpywjpk36";
+ sha256 = "12skl08isz2f1a6ksmcw7sm82xk909y636ch8jp80lglb21i0q1j";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix
index d711440fc34..489b759f48c 100644
--- a/pkgs/applications/office/todo.txt-cli/default.nix
+++ b/pkgs/applications/office/todo.txt-cli/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl }:
let
- version = "2.11.0";
+ version = "2.12.0";
in stdenv.mkDerivation {
pname = "todo.txt-cli";
inherit version;
src = fetchurl {
url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz";
- sha256 = "0majx8lcvhh8ji54qi0sxr833wchdss95fjc92byd8g3lfz27rsz";
+ sha256 = "0gni8nj3wwdf7nl98d1bpx064bz5xari65hb998qqr92h0n9pnp6";
};
installPhase = ''
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index c0690415d67..567508c3675 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -35,11 +35,11 @@
stdenv.mkDerivation rec {
pname = "zotero";
- version = "5.0.88";
+ version = "5.0.89";
src = fetchurl {
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
- sha256 = "19r9jmakr04raqripfnqm2b9gwpi52lklrrqgqyb1x35a4xvnj62";
+ sha256 = "18p4qnnfx9f2frk7f2nk1d7jr4cjzg9z7lfzrk7vq11qgbjdpqbl";
};
nativeBuildInputs = [ wrapGAppsHook ];
diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix
index 377619f5088..8fb719567d5 100644
--- a/pkgs/applications/radio/chirp/default.nix
+++ b/pkgs/applications/radio/chirp/default.nix
@@ -4,11 +4,11 @@
}:
python2.pkgs.buildPythonApplication rec {
pname = "chirp-daily";
- version = "20200430";
+ version = "20200807";
src = fetchurl {
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz";
- sha256 = "060fzplgmpfrk6wkfaasx7phpfk90mmylk6drbwzk4f9r1655vda";
+ sha256 = "60b682793698e6427ad485546eae3a044b8290a220f190633158a2fb0e942fa0";
};
propagatedBuildInputs = with python2.pkgs; [
diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix
index 5a70831d824..ad8fa3c7a7a 100644
--- a/pkgs/applications/science/electronics/openhantek6022/default.nix
+++ b/pkgs/applications/science/electronics/openhantek6022/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "openhantek6022";
- version = "3.1.1";
+ version = "3.1.2";
src = fetchFromGitHub {
owner = "OpenHantek";
repo = "OpenHantek6022";
rev = version;
- sha256 = "17b0qmz7g0nk7n7jhbh5xhs135dpj9kv41n42vvpdzwr6z5rk4qm";
+ sha256 = "104j7d3i5y6jd20c2z3l10sr6sgdy8iki3g9mlwhddnr8x6nzc03";
};
nativeBuildInputs = [ cmake makeWrapper ];
diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
index 002acbf3875..9d14df5a798 100644
--- a/pkgs/applications/science/math/nasc/default.nix
+++ b/pkgs/applications/science/math/nasc/default.nix
@@ -1,7 +1,9 @@
{ stdenv
, fetchFromGitHub
-, fetchpatch
, pkgconfig
+, python3
+, meson
+, ninja
, vala
, gtk3
, glib
@@ -9,52 +11,67 @@
, libsoup
, gtksourceview
, libgee
-, cmake
+, nix-update-script
+, webkitgtk
, libqalculate
-, cln
+, intltool
+, gnuplot
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "nasc";
- version = "0.5.4";
+ version = "0.7.5";
src = fetchFromGitHub {
owner = "parnold-x";
repo = pname;
rev = version;
- sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn";
+ sha256 = "kSRc5RLkI6SBJirUYw6swZi8IJhaL3y74b2Zw8kh2XA=";
+ fetchSubmodules = true;
};
- patches = [
- # fix build with gcc9
- (fetchpatch {
- url = "https://github.com/parnold-x/nasc/commit/46b9b80e228b6b86001bded45d85e073a9411549.patch";
- sha256 = "1sm2aw0xhw2chk036r231nmp2f2ypxcmzggwljkn7wfzgg3h1mx3";
- })
- ];
-
nativeBuildInputs = [
- cmake
- vala
+ glib # post_install.py
+ gtk3 # post_install.py
+ intltool # for libqalculate
+ meson
+ ninja
pkgconfig
+ python3
+ vala
wrapGAppsHook
];
buildInputs = [
- cln
- libsoup
- gtk3
glib
+ gtk3
gtksourceview
libgee
- libqalculate
pantheon.elementary-icon-theme
pantheon.granite
- ];
+ webkitgtk
+ # We add libqalculate's runtime dependencies because nasc has it as a modified subproject.
+ ] ++ libqalculate.buildInputs ++ libqalculate.propagatedBuildInputs;
+
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+
+ # patch subproject. same code in libqalculate expression
+ substituteInPlace subprojects/libqalculate/libqalculate/Calculator-plot.cc \
+ --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
+ --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - '
+ '';
+
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = pname;
+ };
+ };
meta = with stdenv.lib; {
- description = "Do maths like a normal person";
+ description = "Do maths like a normal person, designed for elementary OS";
longDescription = ''
It’s an app where you do maths like a normal person. It lets you
type whatever you want and smartly figures out what is math and
@@ -63,7 +80,7 @@ stdenv.mkDerivation rec {
the equations it’s used in.
'';
homepage = "https://github.com/parnold-x/nasc";
- maintainers = with maintainers; [ samdroid-apps ];
+ maintainers = pantheon.maintainers;
platforms = platforms.linux;
license = licenses.gpl3Plus;
};
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index c1d408213b9..d75fc9731cd 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -10,15 +10,13 @@ stdenv.mkDerivation rec {
sha256 = "1nym0p2djws8ylkpr0kgpxfa6fxdlh46cmvz0gn5vd02jzgs0aww";
};
outputs = [ "out" "dev" ];
- configureFlags = {
+ configureFlags = [
# Prevent nauty from sniffing some cpu features. While those are very
# widely available, it can lead to nasty bugs when they are not available:
# https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA
- default = [ "--disable-clz" "--disable-popcnt" ];
- westmere = [ "--disable-clz" ];
- sandybridge = [ "--disable-clz" ];
- ivybridge = [ "--disable-clz" ];
- }.${stdenv.hostPlatform.platform.gcc.arch or "default"} or [];
+ "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-popcnt"
+ "--${if stdenv.hostPlatform.sse4_aSupport then "enable" else "disable"}-clz"
+ ];
installPhase = ''
mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty}
diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/applications/version-management/sparkleshare/default.nix
new file mode 100644
index 00000000000..d4ae8a95b3e
--- /dev/null
+++ b/pkgs/applications/version-management/sparkleshare/default.nix
@@ -0,0 +1,87 @@
+{
+ appindicator-sharp,
+ coreutils,
+ fetchFromGitHub,
+ git,
+ glib,
+ gtk-sharp-3_0,
+ lib,
+ makeWrapper,
+ meson,
+ mono,
+ ninja,
+ notify-sharp,
+ openssh,
+ openssl,
+ pkg-config,
+ stdenv,
+ symlinkJoin,
+ webkit2-sharp,
+ xdg_utils,
+}:
+
+stdenv.mkDerivation rec {
+ pname = "sparkleshare";
+ version = "3.28";
+
+ src = fetchFromGitHub {
+ owner = "hbons";
+ repo = "SparkleShare";
+ rev = version;
+ sha256 = "sha256:1x5nv2f3mrsr4a336bz5kc2lzkzilfh43bxy2yqhhjp2dgb20497";
+ };
+
+ nativeBuildInputs = [
+ makeWrapper
+ meson
+ mono
+ ninja
+ pkg-config
+ ];
+
+ buildInputs = [
+ appindicator-sharp
+ gtk-sharp-3_0
+ notify-sharp
+ webkit2-sharp
+ ];
+
+ patchPhase = ''
+ # Nix will manage the icon cache.
+ echo '#!/bin/sh' >scripts/post-install.sh
+ '';
+
+ postInstall = ''
+ wrapProgram $out/bin/sparkleshare \
+ --set PATH ${symlinkJoin {
+ name = "mono-path";
+ paths = [
+ coreutils
+ git
+ glib
+ mono
+ openssh
+ openssl
+ xdg_utils
+ ];
+ }}/bin \
+ --set MONO_GAC_PREFIX ${lib.concatStringsSep ":" [
+ appindicator-sharp
+ gtk-sharp-3_0
+ webkit2-sharp
+ ]} \
+ --set LD_LIBRARY_PATH ${lib.makeLibraryPath [
+ appindicator-sharp
+ gtk-sharp-3_0.gtk3
+ webkit2-sharp
+ webkit2-sharp.webkitgtk
+ ]}
+ '';
+
+ meta = {
+ description = "Share and collaborate by syncing with any Git repository instantly. Linux, macOS, and Windows.";
+ homepage = "https://sparkleshare.org";
+ license = lib.licenses.gpl3;
+ maintainers = with lib.maintainers; [ kevincox ];
+ };
+}
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 7d214b4abd3..871592c88c2 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -16,13 +16,13 @@
buildGoModule rec {
pname = "podman";
- version = "2.0.5";
+ version = "2.0.6";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
- sha256 = "0db0q52va9w8aprzx08xnv6y84l4x4lc113sd97hjgjnhknp8d3m";
+ sha256 = "1kl8cfsqwfbjl14mbp58wrxfm90y2w58x6138zq0sn4jzwwpy1a4";
};
vendorSha256 = null;
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 6ee287e287b..bfb15f2f783 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -64,18 +64,26 @@ let
# older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu
isGccArchSupported = arch:
if isGNU then
- { skylake = versionAtLeast ccVersion "6.0";
+ { # Intel
+ skylake = versionAtLeast ccVersion "6.0";
skylake-avx512 = versionAtLeast ccVersion "6.0";
cannonlake = versionAtLeast ccVersion "8.0";
icelake-client = versionAtLeast ccVersion "8.0";
icelake-server = versionAtLeast ccVersion "8.0";
knm = versionAtLeast ccVersion "8.0";
+ # AMD
+ znver1 = versionAtLeast ccVersion "6.0";
+ znver2 = versionAtLeast ccVersion "9.0";
}.${arch} or true
else if isClang then
- { cannonlake = versionAtLeast ccVersion "5.0";
+ { # Intel
+ cannonlake = versionAtLeast ccVersion "5.0";
icelake-client = versionAtLeast ccVersion "7.0";
icelake-server = versionAtLeast ccVersion "7.0";
knm = versionAtLeast ccVersion "7.0";
+ # AMD
+ znver1 = versionAtLeast ccVersion "4.0";
+ znver2 = versionAtLeast ccVersion "9.0";
}.${arch} or true
else
false;
diff --git a/pkgs/data/misc/cldr-emoji-annotation/default.nix b/pkgs/data/misc/cldr-emoji-annotation/default.nix
index f2dc4213e00..8164012b69a 100644
--- a/pkgs/data/misc/cldr-emoji-annotation/default.nix
+++ b/pkgs/data/misc/cldr-emoji-annotation/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "cldr-emoji-annotation";
- version = "37.0_13.0_0_1";
+ version = "37.0_13.0_0_2";
src = fetchFromGitHub {
owner = "fujiwarat";
repo = "cldr-emoji-annotation";
rev = version;
- sha256 = "19cqxyrap3p7djzzs99pndjbcvzmdv86n2m1sw2zqiwpirw7y1sy";
+ sha256 = "0la3h6l58j9jfjvzwz65x56ijx7sppirwpqbqc06if4c2g0kzswj";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
index d248ad37d02..20cc3877efb 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch {
name = "0001-gnome-scores.h-Convert-to-UTF-8.patch";
- url = "https://github.com/GNOME/libgnomeui/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff";
+ url = "https://gitlab.gnome.org/Archive/libgnomeui/-/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff";
sha256 = "1sn8j8dkam14wfkpw8nga3gk63wniff243mzv3jp0fvv52q8sqhk";
})
];
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index d871ceb2875..abb5659526f 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.17.5/ )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.18.5/ )
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch b/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch
new file mode 100644
index 00000000000..2fe4672f675
--- /dev/null
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch
@@ -0,0 +1,21 @@
+diff --git a/kded/gtkconfig.cpp b/kded/gtkconfig.cpp
+index 5303636..199c4d5 100644
+--- a/kded/gtkconfig.cpp
++++ b/kded/gtkconfig.cpp
+@@ -41,6 +41,16 @@ GtkConfig::GtkConfig(QObject *parent, const QVariantList&) :
+ kdeglobalsConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kdeglobals")))),
+ kwinConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kwinrc"))))
+ {
++ // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS.
++ // Normally this would be done by wrapGAppsHook, but this plugin
++ // (shared object) cannot be wrapped.
++ QByteArray xdgdata = qgetenv("XDG_DATA_DIRS");
++ if (!xdgdata.isEmpty()) {
++ xdgdata.push_front(":");
++ }
++ xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH));
++ qputenv("XDG_DATA_DIRS", xdgdata);
++
+ QDBusConnection dbus = QDBusConnection::sessionBus();
+ dbus.registerService(QStringLiteral("org.kde.GtkConfig"));
+ dbus.registerObject(QStringLiteral("/GtkConfig"), this, QDBusConnection::ExportScriptableSlots);
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index 8cfc947d30b..c1ed6dbd6c6 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -2,7 +2,7 @@
mkDerivation,
extra-cmake-modules, wrapGAppsHook,
glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,
- knewstuff, gsettings-desktop-schemas
+ knewstuff, gsettings-desktop-schemas, xsettingsd
}:
mkDerivation {
@@ -11,14 +11,16 @@ mkDerivation {
dontWrapGApps = true; # There is nothing to wrap
buildInputs = [
ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
- knewstuff gsettings-desktop-schemas
+ knewstuff gsettings-desktop-schemas xsettingsd
];
- patches = [ ./patches/follow-symlinks.patch ./patches/gsettings.patch ];
cmakeFlags = [
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
"-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"
];
+ # The gtkconfig KDED module will crash the daemon if the GSettings schemas
+ # aren't found.
+ patches = [ ./0001-gsettings-schemas-path.patch ];
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\""
'';
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch b/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch
deleted file mode 100644
index f30a0a4588f..00000000000
--- a/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Tue, 27 Oct 2015 18:07:54 -0500
-Subject: [PATCH] follow symlinks
-
----
- src/appearancegtk2.cpp | 2 +-
- src/iconthemesmodel.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: kde-gtk-config-5.12.4/src/appearancegtk2.cpp
-===================================================================
---- kde-gtk-config-5.12.4.orig/src/appearancegtk2.cpp
-+++ kde-gtk-config-5.12.4/src/appearancegtk2.cpp
-@@ -69,7 +69,7 @@ QString AppearanceGTK2::themesGtkrcFile(
- QStringList themes=installedThemes();
- themes=themes.filter(QRegExp("/"+themeName+"/?$"));
- if(themes.size()==1) {
-- QDirIterator it(themes.first(), QDirIterator::Subdirectories);
-+ QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
- while(it.hasNext()) {
- it.next();
- if(it.fileName()=="gtkrc") {
-Index: kde-gtk-config-5.12.4/src/iconthemesmodel.cpp
-===================================================================
---- kde-gtk-config-5.12.4.orig/src/iconthemesmodel.cpp
-+++ kde-gtk-config-5.12.4/src/iconthemesmodel.cpp
-@@ -47,7 +47,7 @@ QList IconThemesModel::installedTh
-
- foreach(const QString& dir, dirs) {
- QDir userIconsDir(dir);
-- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
-+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
- while(it.hasNext()) {
- QString currentPath = it.next();
- QDir dir(currentPath);
-Index: kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp
-===================================================================
---- kde-gtk-config-5.12.4.orig/src/cursorthemesmodel.cpp
-+++ kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp
-@@ -47,7 +47,7 @@ QList CursorThemesModel::installed
-
- foreach(const QString& dir, dirs) {
- QDir userIconsDir(dir);
-- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
-+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
- while(it.hasNext()) {
- QString currentPath = it.next();
- QDir dir(currentPath);
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch b/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch
deleted file mode 100644
index 69f7bc4e56a..00000000000
--- a/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp
-index 7b82d50..96831d8 100644
---- a/src/gtkconfigkcmodule.cpp
-+++ b/src/gtkconfigkcmodule.cpp
-@@ -91,6 +91,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args )
- iconsProxyModel->sort(0);
- ui->cb_icon->setModel(iconsProxyModel);
- ui->cb_icon_fallback->setModel(iconsProxyModel);
-+
-+ // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS.
-+ // Normally this would be done by wrapGAppsHook, but this plugin
-+ // (shared object) cannot be wrapped.
-+ QByteArray xdgdata = qgetenv("XDG_DATA_DIRS");
-+ if (!xdgdata.isEmpty()) {
-+ xdgdata.push_front(":");
-+ }
-+ xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH));
-+ qputenv("XDG_DATA_DIRS", xdgdata);
-
- m_tempGtk2Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/gtkrc-2.0";
- m_tempGtk3Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/.config/gtk-3.0/settings.ini";
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/series b/pkgs/desktops/plasma-5/kde-gtk-config/patches/series
deleted file mode 100644
index 7aad1acf6ac..00000000000
--- a/pkgs/desktops/plasma-5/kde-gtk-config/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-follow-symlinks.patch
-gsettings.patch
diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index 398fc356fc9..f214d4070ee 100644
--- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
@@ -1,17 +1,18 @@
{
mkDerivation,
extra-cmake-modules, kdoctools,
- kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, kio,
- knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus,
- plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, kholidays
+ kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, kholidays,
+ kio, knewstuff, kpurpose, kross, krunner, kservice, ksysguard,
+ kunitconversion, ibus, plasma-framework, plasma-workspace, qtdeclarative,
+ qtwebengine, qtx11extras
}:
mkDerivation {
name = "kdeplasma-addons";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff
- kross krunner kservice ksysguard kunitconversion ibus plasma-framework
- plasma-workspace qtdeclarative qtx11extras kholidays
+ kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kholidays kio
+ knewstuff kpurpose kross krunner kservice ksysguard kunitconversion ibus
+ plasma-framework plasma-workspace qtdeclarative qtwebengine qtx11extras
];
}
diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix
index b35493929ff..cf353af5891 100644
--- a/pkgs/desktops/plasma-5/kinfocenter.nix
+++ b/pkgs/desktops/plasma-5/kinfocenter.nix
@@ -2,8 +2,9 @@
mkDerivation,
extra-cmake-modules, kdoctools,
kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
- kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice,
- kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, solid
+ kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kirigami2, kpackage,
+ kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils,
+ solid
}:
mkDerivation {
@@ -11,7 +12,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
- kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice
- kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid
+ kdeclarative kdelibs4support ki18n kiconthemes kio kirigami2 kpackage
+ kservice kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid
];
}
diff --git a/pkgs/desktops/plasma-5/kscreen-417316.patch b/pkgs/desktops/plasma-5/kscreen-417316.patch
deleted file mode 100644
index 92b347e2dbf..00000000000
--- a/pkgs/desktops/plasma-5/kscreen-417316.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://phabricator.kde.org/file/data/dyr2qr4wrhxg4eahkgd3/PHID-FILE-7d4og3zr4mk53u6lzkk2/D27442.diff
-https://bugs.kde.org/show_bug.cgi?id=417316
-
-diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml kscreen-5.17.5/kcm/package/contents/ui/main.qml
---- kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml 2020-01-07 16:28:39.000000000 +0100
-+++ kscreen-5.17.5/kcm/package/contents/ui/main.qml 2020-04-03 17:54:26.097809557 +0200
-@@ -24,8 +24,8 @@
- KCM.SimpleKCM {
- id: root
-
-- implicitWidth: units.gridUnit * 30
-- implicitHeight: units.gridUnit * 38
-+ implicitWidth: Kirigami.Units.gridUnit * 32
-+ implicitHeight: Kirigami.Units.gridUnit * 38
-
- property int selectedOutput: 0
-
-@@ -113,7 +113,7 @@
- id: screen
-
- Layout.alignment: Qt.AlignHCenter
-- Layout.preferredWidth: Math.max(root.width * 0.8, units.gridUnit * 26)
-+ Layout.preferredWidth: Math.max(root.width * 0.8, Kirigami.Units.gridUnit * 26)
- Layout.topMargin: Kirigami.Units.smallSpacing
- Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
-
-diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml kscreen-5.17.5/kcm/package/contents/ui/Output.qml
---- kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml 2020-01-07 16:28:39.000000000 +0100
-+++ kscreen-5.17.5/kcm/package/contents/ui/Output.qml 2020-04-03 17:53:22.491686708 +0200
-@@ -19,6 +19,7 @@
- import QtQuick.Layouts 1.1
- import QtQuick.Controls 2.3 as Controls
- import QtGraphicalEffects 1.0
-+import org.kde.kirigami 2.4 as Kirigami
-
- Rectangle {
- id: output
-@@ -77,7 +78,7 @@
-
- Controls.Label {
- Layout.fillWidth: true
-- Layout.margins: units.smallSpacing
-+ Layout.margins: Kirigami.Units.smallSpacing
-
- text: model.display
- wrapMode: Text.Wrap
-@@ -87,7 +88,7 @@
-
- Controls.Label {
- Layout.fillWidth: true
-- Layout.bottomMargin: units.smallSpacing
-+ Layout.bottomMargin: Kirigami.Units.smallSpacing
-
- text: "(" + model.size.width + "x" + model.size.height + ")"
- horizontalAlignment: Text.AlignHCenter
-diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml kscreen-5.17.5/kcm/package/contents/ui/Screen.qml
---- kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml 2020-01-07 16:28:39.000000000 +0100
-+++ kscreen-5.17.5/kcm/package/contents/ui/Screen.qml 2020-04-03 17:53:22.491686708 +0200
-@@ -45,7 +45,7 @@
- property int xOffset: (width - totalSize.width / relativeFactor) / 2;
- property int yOffset: (height - totalSize.height / relativeFactor) / 2;
-
-- implicitHeight: Math.max(root.height * 0.4, units.gridUnit * 13)
-+ implicitHeight: Math.max(root.height * 0.4, Kirigami.Units.gridUnit * 13)
-
- Component.onCompleted: background.visible = true;
-
-@@ -54,7 +54,7 @@
- anchors {
- bottom: parent.bottom
- horizontalCenter: parent.horizontalCenter
-- margins: units.smallSpacing
-+ margins: Kirigami.Units.smallSpacing
- }
- spacing: units.smallSpacing
- Controls.Button {
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
index 2f37c4212da..11b0f38fed0 100644
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
@@ -2,17 +2,16 @@
mkDerivation,
extra-cmake-modules,
kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n,
- kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects,
+ kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors,
kwindowsystem, kdeclarative, plasma-framework
}:
mkDerivation {
name = "kscreen";
- patches = [ ./kscreen-417316.patch ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n
- kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects
+ kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors
kwindowsystem kdeclarative plasma-framework
];
}
diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
index 01e740f74c4..72793fdf083 100644
--- a/pkgs/desktops/plasma-5/ksysguard.nix
+++ b/pkgs/desktops/plasma-5/ksysguard.nix
@@ -1,7 +1,7 @@
{
mkDerivation,
extra-cmake-modules, kdoctools,
- lm_sensors,
+ libcap, libpcap, lm_sensors,
kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
knewstuff, libksysguard
}:
@@ -11,6 +11,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
- kdelibs4support ki18n lm_sensors
+ kdelibs4support ki18n libcap libpcap lm_sensors
];
}
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index c3e9e2b9c24..7c1f2292eca 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -5,13 +5,14 @@
epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor,
xwayland,
- qtdeclarative, qtmultimedia, qtscript, qtx11extras,
+ qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors,
+ qtvirtualkeyboard, qtx11extras,
breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets,
kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui,
- plasma-framework, qtsensors, libcap, libdrm, mesa
+ plasma-framework, libcap, libdrm, mesa
}:
# TODO (ttuegel): investigate qmlplugindump failure
@@ -23,7 +24,8 @@ mkDerivation {
epoxy libICE libSM libinput libxkbcommon udev wayland xcb-util-cursor
xwayland
- qtdeclarative qtmultimedia qtscript qtx11extras qtsensors
+ qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors
+ qtvirtualkeyboard qtx11extras
breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets
kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 4183b38ba49..b042fc3bd6a 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -12,7 +12,7 @@
kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n,
kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner,
kscreenlocker, ksysguard, kwallet, kwin, phonon, plasma-framework,
- plasma-workspace, xf86inputlibinput
+ plasma-workspace, qqc2-desktop-style, xf86inputlibinput
}:
mkDerivation {
@@ -27,7 +27,7 @@ mkDerivation {
attica baloo kactivities kactivities-stats kauth kcmutils kdbusaddons
kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels
knewstuff knotifications knotifyconfig kpeople krunner kscreenlocker
- ksysguard kwallet kwin plasma-framework plasma-workspace
+ ksysguard kwallet kwin plasma-framework plasma-workspace qqc2-desktop-style
];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
index a46212af10f..6c04081ae29 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
+++ b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
@@ -17,7 +17,7 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
void ClockHelper::toHwclock()
{
-- QString hwclock = KStandardDirs::findExe(QStringLiteral("hwclock"), exePath);
+- QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':')));
+ QString hwclock = QLatin1String(NIXPKGS_HWCLOCK);
if (!hwclock.isEmpty()) {
KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));
diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
index b60b5298d6d..e29df104f3c 100644
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -1,15 +1,20 @@
{
mkDerivation,
extra-cmake-modules, kdoctools,
- gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n,
- libcanberra-gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem
+ kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework,
+ qtdeclarative,
+ gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop
}:
mkDerivation {
name = "plasma-pa";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n
- libcanberra-gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem
+ gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop
+
+ kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework
+ kwindowsystem
+
+ qtdeclarative
];
}
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
index d230e1270be..12080092629 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
@@ -1,4 +1,4 @@
-From 1796822e4c97062b919a596ce13db68e2c46c7e8 Mon Sep 17 00:00:00 2001
+From 6477e377fcca39c07ef5f91a55084d7d74715d00 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel
Date: Tue, 28 Jan 2020 05:00:53 -0600
Subject: [PATCH 1/2] startkde
@@ -6,11 +6,11 @@ Subject: [PATCH 1/2] startkde
---
startkde/startplasma-waylandsession.cpp | 2 +-
startkde/startplasma-x11.cpp | 2 +-
- startkde/startplasma.cpp | 32 ++++++++-----------------
- 3 files changed, 12 insertions(+), 24 deletions(-)
+ startkde/startplasma.cpp | 24 ++++++++++--------------
+ 3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
-index 87c71c6..5fc5314 100644
+index 87c71c6b3..5fc53140e 100644
--- a/startkde/startplasma-waylandsession.cpp
+++ b/startkde/startplasma-waylandsession.cpp
@@ -67,7 +67,7 @@ int main(int /*argc*/, char** /*argv*/)
@@ -23,7 +23,7 @@ index 87c71c6..5fc5314 100644
cleanupX11();
out << "startplasma-waylandsession: Done.\n";
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
-index 3314b62..14cbe29 100644
+index 3314b6283..14cbe29fa 100644
--- a/startkde/startplasma-x11.cpp
+++ b/startkde/startplasma-x11.cpp
@@ -111,7 +111,7 @@ int main(int /*argc*/, char** /*argv*/)
@@ -36,7 +36,7 @@ index 3314b62..14cbe29 100644
cleanupPlasmaEnvironment();
cleanupX11();
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
-index e0f7004..8ac41fd 100644
+index 4c9f5cef6..5ea4c2cf1 100644
--- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp
@@ -34,7 +34,7 @@ QTextStream out(stderr);
@@ -48,22 +48,7 @@ index e0f7004..8ac41fd 100644
}
QStringList allServices(const QLatin1String& prefix)
-@@ -184,14 +184,6 @@ void runEnvironmentScripts()
- }
- }
- sourceFiles(scripts);
--
-- // Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
-- // The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
-- // to set it to a list of paths *not* including the KDE prefix if it's not /usr or
-- // /usr/local.
-- if (!qEnvironmentVariableIsSet("XDG_DATA_DIRS")) {
-- qputenv("XDG_DATA_DIRS", KDE_INSTALL_FULL_DATAROOTDIR ":/usr/share:/usr/local/share");
-- }
- }
-
-
-@@ -240,15 +232,15 @@ void setupX11()
+@@ -242,15 +242,15 @@ void setupX11()
// If the user has overwritten fonts, the cursor font may be different now
// so don't move this up.
@@ -84,7 +69,7 @@ index e0f7004..8ac41fd 100644
}
// TODO: Check if Necessary
-@@ -265,11 +257,7 @@ bool syncDBusEnvironment()
+@@ -267,11 +267,7 @@ bool syncDBusEnvironment()
{
int exitCode;
// At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
@@ -97,7 +82,7 @@ index e0f7004..8ac41fd 100644
return exitCode == 0;
}
-@@ -285,7 +273,7 @@ void setupFontDpi()
+@@ -287,7 +283,7 @@ void setupFontDpi()
//TODO port to c++?
const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0));
QProcess p;
@@ -106,7 +91,7 @@ index e0f7004..8ac41fd 100644
p.setProcessChannelMode(QProcess::ForwardedChannels);
p.write(input);
p.closeWriteChannel();
-@@ -307,7 +295,7 @@ QProcess* setupKSplash()
+@@ -309,7 +305,7 @@ QProcess* setupKSplash()
KConfigGroup ksplashCfg = cfg.group("KSplash");
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
p = new QProcess;
@@ -115,7 +100,7 @@ index e0f7004..8ac41fd 100644
}
}
return p;
-@@ -329,7 +317,7 @@ bool startKDEInit()
+@@ -331,7 +327,7 @@ bool startKDEInit()
{
// We set LD_BIND_NOW to increase the efficiency of kdeinit.
// kdeinit unsets this variable before loading applications.
@@ -125,5 +110,5 @@ index e0f7004..8ac41fd 100644
messageBox(QStringLiteral("startkde: Could not start kdeinit5. Check your installation."));
return false;
--
-2.23.1
+2.25.1
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
index 8fa9e1d31cf..366707d2703 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
@@ -1,4 +1,4 @@
-From 7c6f939aea290bc3ec7629f26d02441d1d4bcb8a Mon Sep 17 00:00:00 2001
+From f43f15870f14b8fa17ba0765c0d7e2b225fafc3f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel
Date: Wed, 5 Feb 2020 05:03:11 -0600
Subject: [PATCH 2/2] absolute-wallpaper-install-dir
@@ -8,15 +8,16 @@ Subject: [PATCH 2/2] absolute-wallpaper-install-dir
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
-index ea9a943..c8458ba 100644
+index 8494a5c8a..f723c1e1b 100644
--- a/sddm-theme/theme.conf.cmake
+++ b/sddm-theme/theme.conf.cmake
-@@ -2,4 +2,4 @@
+@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg
type=image
color=#1d99f3
fontSize=10
--background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png
-+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png
+-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg
++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg
+ needsFullUserModel=false
--
-2.23.1
+2.25.1
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 6aa0e3b5738..2c4287f8edf 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -11,7 +11,8 @@
kinit, kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner,
kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin,
kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt,
- phonon, plasma-framework, prison, solid, kholidays,
+ phonon, plasma-framework, prison, solid, kholidays, kquickcharts,
+ appstream-qt,
qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
qtwayland, qtx11extras,
@@ -31,7 +32,7 @@ mkDerivation {
knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor
ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
libqalculate networkmanager-qt phonon plasma-framework prison solid
- kholidays
+ kholidays kquickcharts appstream-qt
qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras
];
@@ -47,7 +48,6 @@ mkDerivation {
./0002-absolute-wallpaper-install-dir.patch
];
-
NIX_CFLAGS_COMPILE = [
''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"''
''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"''
diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix
index 47cfd644ad7..e70d18621a9 100644
--- a/pkgs/desktops/plasma-5/powerdevil.nix
+++ b/pkgs/desktops/plasma-5/powerdevil.nix
@@ -21,16 +21,16 @@ mkDerivation {
patches = [
# This fixes an issue where 'DDCA_Feature_List*' cannot be converted to
# 'DDCA_Feature_List'.
- # This can be dropped with the next release.
# https://bugs.kde.org/show_bug.cgi?id=423605
(fetchpatch {
url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch";
sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s";
})
- # This is a backport of
- # https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch,
- # which doesn't apply cleanly to 5.17.5. It should make it into 5.20, so
- # this patch can be removed when we upgrade to 5.20.
- ./patches/0001-Add-a-logging-category-config-file.patch
+
+ # Reduce log message spam by setting the default log level to Warning.
+ (fetchpatch {
+ url = "https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch";
+ sha256 = "0vj70mhx6qhvbh4vn9qk9ir5w4s2m76hw2lsxmh3ibgsydz4yilz";
+ })
];
}
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index fe78f210c17..6f9214ccd60 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -1,374 +1,390 @@
# DO NOT EDIT! This file is generated automatically.
-# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5/
+# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5
{ fetchurl, mirror }:
{
bluedevil = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/bluedevil-5.17.5.tar.xz";
- sha256 = "22e9c683dfc56a559e652809ade238f8eb0ffb09d5ab042f5cd4b8216f647c09";
- name = "bluedevil-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/bluedevil-5.18.5.tar.xz";
+ sha256 = "5350efbaee01c78fd451e96bb2aceb7986d45ab05500476d1e95c4e79ec89a66";
+ name = "bluedevil-5.18.5.tar.xz";
};
};
breeze = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/breeze-5.17.5.tar.xz";
- sha256 = "f89bf857321b18789089efc9271d7bd7b6459a173dd078dd03242775db76c8d7";
- name = "breeze-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/breeze-5.18.5.tar.xz";
+ sha256 = "1d08dfd24df4a4fcacad1e3759e559e82f6014ba63dc75dc32a24de6cd133563";
+ name = "breeze-5.18.5.tar.xz";
};
};
breeze-grub = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/breeze-grub-5.17.5.tar.xz";
- sha256 = "591a1d7a510c76a1f2729a61a4d14c0f33db4d1e8ea5dbc87b74f2e7e7e2a2ba";
- name = "breeze-grub-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/breeze-grub-5.18.5.tar.xz";
+ sha256 = "24c40171601b82d1c7d01eb85d16718a2f46cf23ee792f5524ac89fda3d278b1";
+ name = "breeze-grub-5.18.5.tar.xz";
};
};
breeze-gtk = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/breeze-gtk-5.17.5.tar.xz";
- sha256 = "6dbd8e7d936840fbaf7016574d07729c9d0791711ad6d371136585ddb8f76e66";
- name = "breeze-gtk-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/breeze-gtk-5.18.5.tar.xz";
+ sha256 = "41c7e83a28c033903d4fcab3da28a4c74ddb72958e66693a2d2e451f716cb7e9";
+ name = "breeze-gtk-5.18.5.tar.xz";
};
};
breeze-plymouth = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/breeze-plymouth-5.17.5.tar.xz";
- sha256 = "e95f9eaf04e74383f5e1abe74d999787e408be7a34fd07a4f64e253e35150af0";
- name = "breeze-plymouth-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/breeze-plymouth-5.18.5.tar.xz";
+ sha256 = "c0d48dc5a02f3236ff657f86ee8cf532cf885a0e8b36bfe79f007e4d5e277281";
+ name = "breeze-plymouth-5.18.5.tar.xz";
};
};
discover = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/discover-5.17.5.tar.xz";
- sha256 = "986ef367aef59c5a956d4163f987a60cfd3674a300880376ddedc0222769789f";
- name = "discover-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/discover-5.18.5.tar.xz";
+ sha256 = "d5ce4f4668c50ba9be37e04227db4bbe469e00470c87907f1e217fdcad6e76b6";
+ name = "discover-5.18.5.tar.xz";
};
};
drkonqi = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/drkonqi-5.17.5.tar.xz";
- sha256 = "756c50f2458a8c564e608ea97244f6b2b3d5fb4a675a8cec29307be1d5ab5457";
- name = "drkonqi-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/drkonqi-5.18.5.tar.xz";
+ sha256 = "b1a626c4ed2f9de8f8bc3359d8827e7fa6ac17486b8477674e47627fcf6efad1";
+ name = "drkonqi-5.18.5.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/kactivitymanagerd-5.17.5.tar.xz";
- sha256 = "362721c3a9712751fba29cd1f1ef440a1e74561a611f2d171692a4ddc895b3e4";
- name = "kactivitymanagerd-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/kactivitymanagerd-5.18.5.tar.xz";
+ sha256 = "24f32eb4585d427ee62e08a9fa2f057353085c62644d6bec8fb4b2568e507ac7";
+ name = "kactivitymanagerd-5.18.5.tar.xz";
};
};
kde-cli-tools = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/kde-cli-tools-5.17.5.tar.xz";
- sha256 = "d14299ebeaf89854cb89435cfaaa4da1d84bf23a97df23ff8c7f95dae5bec55f";
- name = "kde-cli-tools-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/kde-cli-tools-5.18.5.tar.xz";
+ sha256 = "e3981d1a17111f4e284b787a6e841d7ff47f4fdbca0ad17e105c0a047e5aaaa8";
+ name = "kde-cli-tools-5.18.5.tar.xz";
};
};
kdecoration = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/kdecoration-5.17.5.tar.xz";
- sha256 = "7d8f0128306d436aeba010e47a3dddbcb9fb9fd05ef9308cbad1934914875cd9";
- name = "kdecoration-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/kdecoration-5.18.5.tar.xz";
+ sha256 = "f09856245f2cb08d9013da4c3128b5438f1e2f58af40031eb547ae765f57a9c8";
+ name = "kdecoration-5.18.5.tar.xz";
};
};
kde-gtk-config = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/kde-gtk-config-5.17.5.tar.xz";
- sha256 = "5feff23c756f1fb0ba9ab88c2aed92c0e7c5521c757f5a0cdd057273538f0010";
- name = "kde-gtk-config-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/kde-gtk-config-5.18.5.tar.xz";
+ sha256 = "9d7b1fd8b61f9f99c5a5721ea0227c4562588834a4886d66637f4c092f0e53ab";
+ name = "kde-gtk-config-5.18.5.tar.xz";
};
};
kdeplasma-addons = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/kdeplasma-addons-5.17.5.tar.xz";
- sha256 = "997d6a3542ab1f1fd7fb17580693dc8281ff29b03c82577dbae3fc1ec4cccdb8";
- name = "kdeplasma-addons-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/kdeplasma-addons-5.18.5.tar.xz";
+ sha256 = "1d135a32a7442f79dba4cb4e23221cd2ad1aad36b54fb12bfa91918daf3ff53f";
+ name = "kdeplasma-addons-5.18.5.tar.xz";
};
};
kgamma5 = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/kgamma5-5.17.5.tar.xz";
- sha256 = "3b8fd1539d035d4d39dcde6ca0dd214e6653c98778ac79b9cbf2f7009b155ca9";
- name = "kgamma5-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/kgamma5-5.18.5.tar.xz";
+ sha256 = "3aa89e361646214fb4910409644b941c83a85505d3d8a1d37984598d3e54269f";
+ name = "kgamma5-5.18.5.tar.xz";
};
};
khotkeys = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/khotkeys-5.17.5.tar.xz";
- sha256 = "cf78b5bfb8568fb4eea592b209bdb79aeac92bd08a580c3b6c08d45dd34a2d56";
- name = "khotkeys-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/khotkeys-5.18.5.tar.xz";
+ sha256 = "8f02fdf3bbecdc31c305c276fe2b3b2eca6dc10195e65c723ee9148fed81e766";
+ name = "khotkeys-5.18.5.tar.xz";
};
};
kinfocenter = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/kinfocenter-5.17.5.tar.xz";
- sha256 = "679870f10ee6494136d87a897a57a23c2905054d7a83ff11a4e85c204eb9fd9a";
- name = "kinfocenter-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/kinfocenter-5.18.5.tar.xz";
+ sha256 = "a9679bce4cd2d64e6f471c89de6da410237263b02512768f3acd0a4932b12ec5";
+ name = "kinfocenter-5.18.5.tar.xz";
};
};
kmenuedit = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/kmenuedit-5.17.5.tar.xz";
- sha256 = "59beed03298cd9fd6b05d67844794ed6a77be0d1b25b55d5bbcdf72e15e357de";
- name = "kmenuedit-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/kmenuedit-5.18.5.tar.xz";
+ sha256 = "59d998972121662d2835d43ff5be36eca7bf62e66e39fd67b7005e8ef8afd5f6";
+ name = "kmenuedit-5.18.5.tar.xz";
};
};
kscreen = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/kscreen-5.17.5.tar.xz";
- sha256 = "de8a00b33d0254245a53a5c097347aa86709d415754b3e3c675eef8fb4fe5bc0";
- name = "kscreen-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/kscreen-5.18.5.tar.xz";
+ sha256 = "9b6238447a4a38babdff482724ae3d33786b211e8b4224aaadafaad7435f6ba2";
+ name = "kscreen-5.18.5.tar.xz";
};
};
kscreenlocker = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/kscreenlocker-5.17.5.tar.xz";
- sha256 = "078cfaa9f117a985f5c71152bdf4a9f5cb65ef23c0090cfaaccc9539770f138f";
- name = "kscreenlocker-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/kscreenlocker-5.18.5.tar.xz";
+ sha256 = "b4269cd027e1fee721760a22ca5d738d3d98622fa222fcf9e57d2da77a4e18d2";
+ name = "kscreenlocker-5.18.5.tar.xz";
};
};
ksshaskpass = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/ksshaskpass-5.17.5.tar.xz";
- sha256 = "b09e0d780340fc5a6a65e67a30d08a3f117f31e2dbfbb35579aa4cefb15c3b27";
- name = "ksshaskpass-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/ksshaskpass-5.18.5.tar.xz";
+ sha256 = "c483c17d6ce2e3dffd54fc812f97b88c32f5def6e8c5e7a526e23f5e7f208cc5";
+ name = "ksshaskpass-5.18.5.tar.xz";
};
};
ksysguard = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/ksysguard-5.17.5.tar.xz";
- sha256 = "69bc12311dcf363b168a259139d30456ed395ec03b948bd35e992300c7e7bd82";
- name = "ksysguard-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/ksysguard-5.18.5.tar.xz";
+ sha256 = "4acb352698b612a21a5eccf22042ab46265d50bbf3aa85844bbca762a64c9e2f";
+ name = "ksysguard-5.18.5.tar.xz";
};
};
kwallet-pam = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/kwallet-pam-5.17.5.tar.xz";
- sha256 = "c829c7a44408e58beb87c71f5c70bccd349d285c3fcefb16df98bf2f29357fe9";
- name = "kwallet-pam-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/kwallet-pam-5.18.5.tar.xz";
+ sha256 = "bc4fe3dde503645d6233c3932d3cf74a7f5bf7acefb96bd6dbd224c8919d841a";
+ name = "kwallet-pam-5.18.5.tar.xz";
};
};
kwayland-integration = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/kwayland-integration-5.17.5.tar.xz";
- sha256 = "818b4e14611e26f297ef60427d399edc458a44e113bc092390fa65ecababcedb";
- name = "kwayland-integration-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/kwayland-integration-5.18.5.tar.xz";
+ sha256 = "82d6943d79a9a2a9bce10623adb2c9af396a2dcf258a723bb349aafbde20e6d5";
+ name = "kwayland-integration-5.18.5.tar.xz";
};
};
kwin = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/kwin-5.17.5.tar.xz";
- sha256 = "8517adaf8270d783aea7b3886d86b5abed6a5ec2b5c78b632479597d956baadc";
- name = "kwin-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/kwin-5.18.5.tar.xz";
+ sha256 = "ca39c63fd740432e95490031fd9d5ac003da034582014fa41c2be2b89627ddf8";
+ name = "kwin-5.18.5.tar.xz";
};
};
kwrited = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/kwrited-5.17.5.tar.xz";
- sha256 = "ca22b1fa3e657fa2e58bf0c9dc1ebff3be8c0e003750223e7a7c5932d5b90823";
- name = "kwrited-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/kwrited-5.18.5.tar.xz";
+ sha256 = "45ffa31d3d141ce453fb09fd823d7edd8e6c782b353bce22b8c879ad794fd1fe";
+ name = "kwrited-5.18.5.tar.xz";
};
};
libkscreen = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/libkscreen-5.17.5.tar.xz";
- sha256 = "aa186e5751287701daec4d036aba776a911e4b84ca7eea44dc5fb531875afd94";
- name = "libkscreen-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/libkscreen-5.18.5.tar.xz";
+ sha256 = "a962319000324200ec1abe3c58b1b8ab71ed4cc7c88a3c7e03a1c8eca86c287c";
+ name = "libkscreen-5.18.5.tar.xz";
};
};
libksysguard = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/libksysguard-5.17.5.tar.xz";
- sha256 = "f5d237af554d65740a28360e6d8fa39d4912239c5f21288846b1c934897a7e14";
- name = "libksysguard-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/libksysguard-5.18.5.tar.xz";
+ sha256 = "d4d7030a2869a546a211844aa158dcef3598386cc035a8655529938ba102440b";
+ name = "libksysguard-5.18.5.tar.xz";
};
};
milou = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/milou-5.17.5.tar.xz";
- sha256 = "b89796e34cc8b6d6d4196169e814249f7b75c1c15763e0b4c1da5c97ccc2c8cf";
- name = "milou-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/milou-5.18.5.tar.xz";
+ sha256 = "7ec763833c025aa719d1e25f3c5c1c8b6c934a48bf346517e94660e09d8582b2";
+ name = "milou-5.18.5.tar.xz";
};
};
oxygen = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/oxygen-5.17.5.tar.xz";
- sha256 = "58954374a4b9067365ee5d50b32b1986b2e7dd31e73cbf79fda8d978949943be";
- name = "oxygen-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/oxygen-5.18.5.tar.xz";
+ sha256 = "479bdfa80b3f2216075470ab4be1e3159a17620870acf276144b9639134609f8";
+ name = "oxygen-5.18.5.tar.xz";
};
};
plasma-browser-integration = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/plasma-browser-integration-5.17.5.tar.xz";
- sha256 = "07bc4285991ab43830873a12b8c07f60e4faea1ec81121db783c425f18a4f87d";
- name = "plasma-browser-integration-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/plasma-browser-integration-5.18.5.tar.xz";
+ sha256 = "3a087a836657b5304e2e0ef9ebefb84ce1f896bfbfc5dbf948d4b3eb7b709383";
+ name = "plasma-browser-integration-5.18.5.tar.xz";
};
};
plasma-desktop = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/plasma-desktop-5.17.5.tar.xz";
- sha256 = "7f741ab026989bdcc68701955fc290d5ead38bf4bc310f18a2f32c64b411ab04";
- name = "plasma-desktop-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/plasma-desktop-5.18.5.tar.xz";
+ sha256 = "aeb106018fd90da79c8a3c444d880282846a842029b1223e7830db2d4b42df9f";
+ name = "plasma-desktop-5.18.5.tar.xz";
};
};
plasma-integration = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/plasma-integration-5.17.5.tar.xz";
- sha256 = "169206bebd790d2fee49cec621c46f6f64a8e20ee3e56bf16ee7373f61cad959";
- name = "plasma-integration-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/plasma-integration-5.18.5.tar.xz";
+ sha256 = "c99b987efb2ab965cc2a55793ef94c7ccb2152ca5d75956a40ec99261ad4b870";
+ name = "plasma-integration-5.18.5.tar.xz";
+ };
+ };
+ plasma-nano = {
+ version = "5.18.5";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.18.5/plasma-nano-5.18.5.tar.xz";
+ sha256 = "d2f29b05894573517cb3336088e102d3604b1c2735e9bbe605119f559f0c6341";
+ name = "plasma-nano-5.18.5.tar.xz";
};
};
plasma-nm = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/plasma-nm-5.17.5.tar.xz";
- sha256 = "2165e47a0654d17735abc97aec287b46b52a2eafccc3591b667ea2755b731255";
- name = "plasma-nm-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/plasma-nm-5.18.5.tar.xz";
+ sha256 = "1e091d01993708220f89501bb8a289279bf527d0593fd9e4b9223e6e8caf9aaa";
+ name = "plasma-nm-5.18.5.tar.xz";
};
};
plasma-pa = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/plasma-pa-5.17.5.tar.xz";
- sha256 = "933c6ab1fda52b336a157a48b1ea64b81fd1d84ca08a40a52bfae276cca2bf23";
- name = "plasma-pa-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/plasma-pa-5.18.5.tar.xz";
+ sha256 = "28765c07f584e7688a85c9761155e606440936de2ebb678917dac2c85f5d0209";
+ name = "plasma-pa-5.18.5.tar.xz";
+ };
+ };
+ plasma-phone-components = {
+ version = "5.18.5";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.18.5/plasma-phone-components-5.18.5.tar.xz";
+ sha256 = "d0c091367ae07c71457a0c03d1023ac48d8665385a6a1b0e32f6ae7ad1fa7070";
+ name = "plasma-phone-components-5.18.5.tar.xz";
};
};
plasma-sdk = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/plasma-sdk-5.17.5.tar.xz";
- sha256 = "ff736029b1ae5773991db06f5827d9dcbd8e7a4e9a430c9014c35ddee2c55314";
- name = "plasma-sdk-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/plasma-sdk-5.18.5.tar.xz";
+ sha256 = "5f399231d16d62f9880f953891477f74e0b1f7b931448a4b0fbb97f37acd2fe5";
+ name = "plasma-sdk-5.18.5.tar.xz";
};
};
plasma-tests = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/plasma-tests-5.17.5.tar.xz";
- sha256 = "1b566b7118a5c8d1b25078d331a6bc77f48781010fbd3425d85b137811218982";
- name = "plasma-tests-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/plasma-tests-5.18.5.tar.xz";
+ sha256 = "3251ea30cb3c62de9bba2deb152370ea9e0e56b7506efd655888f1892c18413a";
+ name = "plasma-tests-5.18.5.tar.xz";
};
};
plasma-thunderbolt = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/plasma-thunderbolt-5.17.5.tar.xz";
- sha256 = "3743f9841d269d51f1b1419e24d5cd1b26a0ba5a90e76b531328a8cc43184382";
- name = "plasma-thunderbolt-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/plasma-thunderbolt-5.18.5.tar.xz";
+ sha256 = "c61dc7abe350ead15ca4d6111606aaf19773c38a0307ae8a7d8a7c60b82be5d1";
+ name = "plasma-thunderbolt-5.18.5.tar.xz";
};
};
plasma-vault = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/plasma-vault-5.17.5.tar.xz";
- sha256 = "3e5c6b4dd6c1122b6a221205da506881959ab905e467b74b0536e7f5fe130d71";
- name = "plasma-vault-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/plasma-vault-5.18.5.tar.xz";
+ sha256 = "cae2713823e8c59c7a2beb96d362a15024fe260cf10419ba037e8a798f3c1b41";
+ name = "plasma-vault-5.18.5.tar.xz";
};
};
plasma-workspace = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/plasma-workspace-5.17.5.tar.xz";
- sha256 = "764488e66d52bc3017efb2c1471f57196aa50fbfa3a80637bf48f24955cfba88";
- name = "plasma-workspace-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-5.18.5.tar.xz";
+ sha256 = "14e82033be745f4db46a70d319e2c86012295ea31056092bc974004189b92354";
+ name = "plasma-workspace-5.18.5.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/plasma-workspace-wallpapers-5.17.5.tar.xz";
- sha256 = "8a28ef67b65c340d40ff8f5bfc333ead68e6d8c9e410769c43af847ced9b4ca9";
- name = "plasma-workspace-wallpapers-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-wallpapers-5.18.5.tar.xz";
+ sha256 = "f8da3bd7b97a9944639ed0860303b8a7a008905246313e1983367810a3a84d6d";
+ name = "plasma-workspace-wallpapers-5.18.5.tar.xz";
};
};
plymouth-kcm = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/plymouth-kcm-5.17.5.tar.xz";
- sha256 = "bbd6994f60ed9d63b4e4dd0abe78bf1f9c14b8ecce8ba4355d16cd52a0a86528";
- name = "plymouth-kcm-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/plymouth-kcm-5.18.5.tar.xz";
+ sha256 = "e8f75dd8c8a45cd706a0a6e62826d1eb4fff9c3912cbaadba8c06e9de915d2e3";
+ name = "plymouth-kcm-5.18.5.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.17.5";
+ version = "1-5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/polkit-kde-agent-1-5.17.5.tar.xz";
- sha256 = "a79d76a2f584f6567639228fde6f75b3960484f7a65cfc69b6acb6df1de53f5d";
- name = "polkit-kde-agent-1-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/polkit-kde-agent-1-5.18.5.tar.xz";
+ sha256 = "5e1733cb51c826c6215da4fbbc9c9568240275cf86b9922cd7a643d192a75a91";
+ name = "polkit-kde-agent-1-5.18.5.tar.xz";
};
};
powerdevil = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/powerdevil-5.17.5.tar.xz";
- sha256 = "27904361e85e1267d933d8f0a0d3be4dc712099ed2eb3cf90959209a4443dd82";
- name = "powerdevil-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/powerdevil-5.18.5.tar.xz";
+ sha256 = "e000185ee61bff81fe28896a7d6353746c82c7f4d2626792fd22d34b5f49f548";
+ name = "powerdevil-5.18.5.tar.xz";
};
};
sddm-kcm = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/sddm-kcm-5.17.5.tar.xz";
- sha256 = "e85fb9e014439e8c0e73638112139561aff9a9f71f26c3eafedff5a98a07b33b";
- name = "sddm-kcm-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/sddm-kcm-5.18.5.tar.xz";
+ sha256 = "cc99c185d701acc7442f33ef17b2396894dcf164f3f583c25105ac3f2528c33b";
+ name = "sddm-kcm-5.18.5.tar.xz";
};
};
systemsettings = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/systemsettings-5.17.5.tar.xz";
- sha256 = "50fa4d7866639995a6859446fc6a02a73ae05203e8f2ed31221e232ed3491eaf";
- name = "systemsettings-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/systemsettings-5.18.5.tar.xz";
+ sha256 = "cde5b714261aaa54f937887657c3d3e74814c5447448b989159ee6035be4783b";
+ name = "systemsettings-5.18.5.tar.xz";
};
};
user-manager = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/user-manager-5.17.5.tar.xz";
- sha256 = "10ed3196063c7dfed3b3f25dd199a48ca39fa86db5d0126ec84a543b1c212f0d";
- name = "user-manager-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/user-manager-5.18.5.tar.xz";
+ sha256 = "741d293947fa3fb3966f047bab121597bf1071be010684daff4a91626cf54484";
+ name = "user-manager-5.18.5.tar.xz";
};
};
xdg-desktop-portal-kde = {
- version = "5.17.5";
+ version = "5.18.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.17.5/xdg-desktop-portal-kde-5.17.5.tar.xz";
- sha256 = "a993bd4b86a44c8237a3f4957c2594aa2ca8916204ad866f8af32f7df34740f6";
- name = "xdg-desktop-portal-kde-5.17.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.18.5/xdg-desktop-portal-kde-5.18.5.tar.xz";
+ sha256 = "807452708a0318b8e21b43f9ec7e016d1de51cac5d8714d70c577bb6f3976224";
+ name = "xdg-desktop-portal-kde-5.18.5.tar.xz";
};
};
}
diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
index 1e04eb1e2b0..c03c6a89161 100644
--- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
+++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
@@ -1,15 +1,18 @@
{
mkDerivation,
extra-cmake-modules, gettext, kdoctools, python,
+ cups, epoxy, mesa, pcre, pipewire,
kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem,
- cups, pcre, pipewire, kio
+ kirigami2, kdeclarative, plasma-framework, kio
}:
mkDerivation {
name = "xdg-desktop-portal-kde";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
buildInputs = [
- cups pcre pipewire kio
- kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
+ cups epoxy mesa pcre pipewire
+
+ kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
+ kirigami2 kdeclarative plasma-framework
];
}
diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix
index b3851741c69..adc3185babb 100644
--- a/pkgs/development/compilers/go/1.15.nix
+++ b/pkgs/development/compilers/go/1.15.nix
@@ -31,11 +31,11 @@ in
stdenv.mkDerivation rec {
pname = "go";
- version = "1.15";
+ version = "1.15.1";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
- sha256 = "0fmc53pamxxbvmp5bcvh1fhffirpv3gz6y7qz97iacpmsiz8yhv9";
+ sha256 = "0c2d2ngckcfsgrb7a4p6ag83mk5yd15npiq7q1f1p211li93fx6k";
};
# perl is used for testing go vet
diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix
index 13cae5ae539..afda8592818 100644
--- a/pkgs/development/compilers/ocaml/4.11.nix
+++ b/pkgs/development/compilers/ocaml/4.11.nix
@@ -1,6 +1,6 @@
import ./generic.nix {
major_version = "4";
minor_version = "11";
- patch_version = "0";
- sha256 = "04b13yfismkqh21ag641q9dl0i602khgh4427g1a7pb77c4skr7z";
+ patch_version = "1";
+ sha256 = "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa";
}
diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index 689745003df..54654f37bac 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -1,6 +1,10 @@
{ stdenv, fetchFromGitHub, autoreconfHook, coq }:
let params = {
+ "8.12" = {
+ version = "0.6.8";
+ sha256 = "1mj6sknsd53xfb387sp3kdwvl4wn80ck24bfzf3s6mgw1a12vyps";
+ };
"8.11" = {
version = "0.6.7";
sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09";
diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index 8e6b434281e..e2bf921f882 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, readline, libedit, bc
-, avxSupport ? false
+, avxSupport ? stdenv.hostPlatform.avxSupport
}:
stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index 1157142e5b8..1bb79a64ba1 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec
{
pname = "alembic";
- version = "1.7.13";
+ version = "1.7.14";
src = fetchFromGitHub {
owner = "alembic";
repo = "alembic";
rev = version;
- sha256 = "01j4fsq917jckdh16nvmc35xiy11j4g1sc17y6g8qxa00s2sfsa4";
+ sha256 = "0yri063v7j5jsvqbmlwr0hf2d1a55dgc1nj85rf10sxqhijwzk55";
};
outputs = [ "bin" "dev" "out" "lib" ];
diff --git a/pkgs/development/libraries/appindicator-sharp/default.nix b/pkgs/development/libraries/appindicator-sharp/default.nix
new file mode 100644
index 00000000000..9eff4e3895b
--- /dev/null
+++ b/pkgs/development/libraries/appindicator-sharp/default.nix
@@ -0,0 +1,43 @@
+{
+ autoreconfHook,
+ fetchFromGitHub,
+ lib,
+ libappindicator,
+ mono,
+ gtk-sharp-3_0,
+ pkg-config,
+ stdenv,
+}:
+
+stdenv.mkDerivation rec {
+ pname = "appindicator-sharp";
+ version = "5a79cde93da6d68a4b1373f1ce5796c3c5fe1b37";
+
+ src = fetchFromGitHub {
+ owner = "stsundermann";
+ repo = "appindicator-sharp";
+ rev = version;
+ sha256 = "sha256:1i0vqbp05l29f5v9ygp7flm4s05pcnn5ivl578mxmhb51s7ncw6l";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook
+ mono
+ pkg-config
+ ];
+
+ buildInputs = [
+ gtk-sharp-3_0
+ libappindicator
+ ];
+
+ ac_cv_path_MDOC = "no";
+ installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"];
+
+ meta = {
+ description = "Bindings for appindicator using gobject-introspection";
+ homepage = "https://github.com/stsundermann/appindicator-sharp";
+ license = lib.licenses.lgpl3Only;
+ maintainers = with lib.maintainers; [ kevincox ];
+ };
+}
diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix
index 41e4c92e56b..66ead87daa0 100644
--- a/pkgs/development/libraries/ayatana-ido/default.nix
+++ b/pkgs/development/libraries/ayatana-ido/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "ayatana-ido";
- version = "0.4.90";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "AyatanaIndicators";
repo = pname;
rev = version;
- sha256 = "02vqjryni96zzrpkq5d7kvgw7nf252d2fm2xq8fklvvb2vz3fa0w";
+ sha256 = "1jmdvvgrgicpnpnygc24qcisqb9y026541gb6lw6fwapvc9aj73p";
};
nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc vala ];
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index 3f59368c278..43ac2530cc1 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -2,7 +2,7 @@
, guiSupport ? false, libX11
# see http://dlib.net/compile.html
-, avxSupport ? true
+, avxSupport ? stdenv.hostPlatform.avxSupport
, cudaSupport ? true
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
rm -rf dlib/external
'';
- cmakeFlags = [
+ cmakeFlags = [
"-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}"
"-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ];
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index bc84039a9aa..23b31fe439f 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -31,19 +31,21 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-blas-libs=-lcblas"
"--with-lapack-libs=-llapacke"
- ] ++ stdenv.lib.optionals stdenv.isx86_64 {
+ ] ++ stdenv.lib.optionals stdenv.isx86_64 [
# disable SIMD instructions (which are enabled *when available* by default)
# for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284)
- default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ];
- westmere = [ "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ];
- sandybridge = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ];
- ivybridge = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ];
- haswell = [ "--disable-fma4" ];
- broadwell = [ "--disable-fma4" ];
- skylake = [ "--disable-fma4" ];
- skylake-avx512 = [ "--disable-fma4" ];
- }.${stdenv.hostPlatform.platform.gcc.arch or "default"};
-
+ "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3"
+ "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3"
+ "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41"
+ "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42"
+ "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx"
+ "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2"
+ "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512f"
+ "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512dq"
+ "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512vl"
+ "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma"
+ "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4"
+ ];
doCheck = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix
index 7167112b6bd..675d994cf0e 100644
--- a/pkgs/development/libraries/g2o/default.nix
+++ b/pkgs/development/libraries/g2o/default.nix
@@ -27,16 +27,13 @@ mkDerivation rec {
# Detection script is broken
"-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer"
"-DG2O_BUILD_EXAMPLES=OFF"
- ] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ {
- default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ];
- westmere = [ "-DDISABLE_SSE4_A=ON" ];
- sandybridge = [ "-DDISABLE_SSE4_A=ON" ];
- ivybridge = [ "-DDISABLE_SSE4_A=ON" ];
- haswell = [ "-DDISABLE_SSE4_A=ON" ];
- broadwell = [ "-DDISABLE_SSE4_A=ON" ];
- skylake = [ "-DDISABLE_SSE4_A=ON" ];
- skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ];
- }.${stdenv.hostPlatform.platform.gcc.arch or "default"});
+ ] ++ lib.optionals stdenv.isx86_64 [
+ "-DDO_SSE_AUTODETECT=OFF"
+ "-DDISABLE_SSE3=${ if stdenv.hostPlatform.sse3Support then "OFF" else "ON"}"
+ "-DDISABLE_SSE4_1=${if stdenv.hostPlatform.sse4_1Support then "OFF" else "ON"}"
+ "-DDISABLE_SSE4_2=${if stdenv.hostPlatform.sse4_2Support then "OFF" else "ON"}"
+ "-DDISABLE_SSE4_A=${if stdenv.hostPlatform.sse4_aSupport then "OFF" else "ON"}"
+ ];
meta = with lib; {
description = "A General Framework for Graph Optimization";
diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix
index 169506e66cc..daca5fc0bdb 100644
--- a/pkgs/development/libraries/gensio/default.nix
+++ b/pkgs/development/libraries/gensio/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gensio";
- version = "2.1.3";
+ version = "2.1.4";
src = fetchFromGitHub {
owner = "cminyard";
repo = "${pname}";
rev = "v${version}";
- sha256 = "0sdqv4j1jjjc2nxnd9h7r4w66bdjl5ksvfia4i4cjj7jfl0hhynl";
+ sha256 = "0c44qhhrknjl7sp94q34z7nv7bvnlqs8wzm385661liy4mnfn4dc";
};
configureFlags = [
diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
index fdaf518c611..78b6b088270 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -17,17 +17,17 @@ stdenv.mkDerivation rec {
configureFlags = [
"--disable-optimization"
- ] ++ stdenv.lib.optionals stdenv.isx86_64 {
+ ] ++ stdenv.lib.optionals stdenv.isx86_64 [
# disable SIMD instructions (which are enabled *when available* by default)
- default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- haswell = [ "--disable-fma4" ];
- broadwell = [ "--disable-fma4" ];
- skylake = [ "--disable-fma4" ];
- skylake-avx512 = [ "--disable-fma4" ];
- }.${stdenv.hostPlatform.platform.gcc.arch or "default"};
+ "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3"
+ "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3"
+ "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41"
+ "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42"
+ "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx"
+ "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2"
+ "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma"
+ "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4"
+ ];
# On darwin, tests are linked to dylib in the nix store, so we need to make
# sure tests run after installPhase.
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index f7b0667741d..cb2b8a11c03 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -16,9 +16,6 @@ with stdenv.lib;
assert stdenv.isLinux -> utillinuxMinimal != null;
# TODO:
-# * Add gio-module-fam
-# Problem: cyclic dependency on gamin
-# Possible solution: build as a standalone module, set env. vars
# * Make it build without python
# Problem: an example (test?) program needs it.
# Possible solution: disable compilation of this example somehow
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index 308a4db2800..46b40d00d78 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "goffice";
- version = "0.10.47";
+ version = "0.10.48";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0xmigfdzvmlpa0fw79mf3xwchmxc8rlidryn5syv8bz7msmrb215";
+ sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4";
};
nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix
index 84dedfa0b3b..1288242faf2 100644
--- a/pkgs/development/libraries/itk/default.nix
+++ b/pkgs/development/libraries/itk/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "itk";
- version = "5.1.0";
+ version = "5.1.1";
src = fetchFromGitHub {
owner = "InsightSoftwareConsortium";
repo = "ITK";
rev = "v${version}";
- sha256 = "0rvkp00xj1js60021jv2ydyl74wvbyb205gm9d7hf8gy2q456hgl";
+ sha256 = "1z7rmqrhgl7hfb3d0077kvp8vpi05r2zk3qyqzmv7bzbal5sqqhv";
};
cmakeFlags = [
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 966d89e4cbf..02e25692ef1 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -112,6 +112,7 @@ let
kitemmodels = callPackage ./kitemmodels.nix {};
kitemviews = callPackage ./kitemviews.nix {};
kplotting = callPackage ./kplotting.nix {};
+ kquickcharts = callPackage ./kquickcharts.nix {};
kwayland = callPackage ./kwayland.nix {};
kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
kwindowsystem = callPackage ./kwindowsystem {};
diff --git a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix
new file mode 100644
index 00000000000..5a06d4c1cad
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix
@@ -0,0 +1,15 @@
+{
+ mkDerivation, lib,
+ extra-cmake-modules,
+ qtquickcontrols2,
+}:
+
+mkDerivation {
+ name = "kquickcharts";
+ meta = {
+ maintainers = [ lib.maintainers.ttuegel ];
+ };
+ nativeBuildInputs = [ extra-cmake-modules ];
+ propagatedBuildInputs = [ qtquickcontrols2 ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index ed9de3aaa4c..5edcb7e410f 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "libfilezilla";
- version = "0.23.0";
+ version = "0.24.0";
src = fetchurl {
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "0lk84aw5ylrhpy26djdw3byhjbn9qrzx5k98r0i4nwfizckw3smd";
+ sha256 = "1372i9f501kn8p1vkqdydaqvvi6lzxsnw2yzyxx5j4syqd4p0qa5";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
index bd45cb529f1..5d83b137b8e 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3 }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3, fetchpatch }:
stdenv.mkDerivation rec {
pname = "libpwquality";
@@ -11,8 +11,21 @@ stdenv.mkDerivation rec {
sha256 = "0n4pjhm7wfivk0wizggaxq4y4mcxic876wcarjabkp5z9k14y36h";
};
- nativeBuildInputs = [ autoreconfHook perl ];
- buildInputs = [ cracklib python3 ];
+ nativeBuildInputs = [ autoreconfHook perl python3 ];
+ buildInputs = [ cracklib ];
+
+ patches = lib.optional stdenv.hostPlatform.isStatic [
+ (fetchpatch {
+ name = "static-build.patch";
+ url = "https://github.com/libpwquality/libpwquality/pull/40.patch";
+ sha256 = "1ypccq437wxwgddd98cvd330jfm7jscdlzlyxgy05g6yzrr68xyk";
+ })
+ ];
+
+ configureFlags = lib.optional stdenv.hostPlatform.isStatic [
+ # Python binding generates a shared library which are unavailable with musl build
+ "--disable-python-bindings"
+ ];
meta = with lib; {
description = "Password quality checking and random password generation library";
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 69169c7e9af..f20810801d9 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "libraw";
- version = "0.19.5";
+ version = "0.20.0";
src = fetchurl {
url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz";
- sha256 = "1x827sh6vl8j3ll2ihkcr234y07f31hi1v7sl08jfw3irkbn58j0";
+ sha256 = "18wlsvj6c1rv036ph3695kknpgzc3lk2ikgshy8417yfl8ykh2hz";
};
outputs = [ "out" "lib" "dev" "doc" ];
diff --git a/pkgs/development/libraries/libusb/fix-headers.patch b/pkgs/development/libraries/libusb-compat/fix-headers.patch
similarity index 100%
rename from pkgs/development/libraries/libusb/fix-headers.patch
rename to pkgs/development/libraries/libusb-compat/fix-headers.patch
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index 2217996acdb..09bd7e12091 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -39,18 +39,17 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-blas-libs=-lblas"
"--disable-optimization"
- ] ++ stdenv.lib.optionals stdenv.isx86_64 {
+ ] ++ stdenv.lib.optionals stdenv.isx86_64 [
# disable SIMD instructions (which are enabled *when available* by default)
- default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- haswell = [ "--disable-fma4" ];
- broadwell = [ "--disable-fma4" ];
- skylake = [ "--disable-fma4" ];
- skylake-avx512 = [ "--disable-fma4" ];
- }.${stdenv.hostPlatform.platform.gcc.arch or "default"}
- ++ stdenv.lib.optionals withSage [
+ "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3"
+ "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3"
+ "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41"
+ "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42"
+ "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx"
+ "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2"
+ "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma"
+ "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4"
+ ] ++ stdenv.lib.optionals withSage [
"--enable-sage"
];
diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix
index 403b0326bb5..58d35767d1e 100644
--- a/pkgs/development/libraries/notify-sharp/default.nix
+++ b/pkgs/development/libraries/notify-sharp/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
+{ stdenv, fetchFromGitLab, pkgconfig, autoreconfHook
, mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }:
stdenv.mkDerivation rec {
pname = "notify-sharp";
version = "3.0.3";
- src = fetchFromGitHub {
- owner = "GNOME";
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "Archive";
repo = "notify-sharp";
rev = version;
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index 506c78aca8a..d1c39b42a9d 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -4,13 +4,13 @@
}:
stdenv.mkDerivation rec {
- name = "pcl-1.11.0";
+ name = "pcl-1.11.1";
src = fetchFromGitHub {
owner = "PointCloudLibrary";
repo = "pcl";
rev = name;
- sha256 = "0nr3j71gh1v8x6wjr7a7xyr0438sw7vf621a5kbw4lmsxbj55k8g";
+ sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 4d7507220b5..3cbcaaacefb 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -255,18 +255,18 @@ stdenv.mkDerivation {
"-no-warnings-are-errors"
]
++ (
- if (!stdenv.hostPlatform.isx86_64)
- then [ "-no-sse2" ]
- else lib.optionals (compareVersion "5.9.0" >= 0) {
- default = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ];
- westmere = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ];
- sandybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ];
- ivybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ];
- haswell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
- broadwell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
- skylake = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
- skylake-avx512 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
- }.${stdenv.hostPlatform.platform.gcc.arch or "default"}
+ if (!stdenv.hostPlatform.isx86_64) then [
+ "-no-sse2"
+ ] else if (compareVersion "5.9.0" >= 0) then [
+ "-sse2"
+ "${if stdenv.hostPlatform.sse3Support then "" else "-no"}-sse3"
+ "${if stdenv.hostPlatform.ssse3Support then "" else "-no"}-ssse3"
+ "${if stdenv.hostPlatform.sse4_1Support then "" else "-no"}-sse4.1"
+ "${if stdenv.hostPlatform.sse4_2Support then "" else "-no"}-sse4.2"
+ "${if stdenv.hostPlatform.avxSupport then "" else "-no"}-avx"
+ "${if stdenv.hostPlatform.avx2Support then "" else "-no"}-avx2"
+ ] else [
+ ]
)
++ [
"-no-mips_dsp"
diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix
index 8bf3200e295..6aed49d65e3 100644
--- a/pkgs/development/libraries/readosm/default.nix
+++ b/pkgs/development/libraries/readosm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, expat, zlib, geos, libspatialite }:
stdenv.mkDerivation rec {
- name = "readosm-1.1.0";
+ name = "readosm-1.1.0a";
src = fetchurl {
url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz";
- sha256 = "1v20pnda67imjd70fn0zw30aar525xicy3d3v49md5cvqklws265";
+ sha256 = "0igif2bxf4dr82glxz9gyx5mmni0r2dsnx9p9k6pxv3c4lfhaz6v";
};
buildInputs = [ expat zlib geos libspatialite ];
diff --git a/pkgs/development/libraries/redkite/default.nix b/pkgs/development/libraries/redkite/default.nix
index 63e5eea25a4..be6bf0d7fa0 100644
--- a/pkgs/development/libraries/redkite/default.nix
+++ b/pkgs/development/libraries/redkite/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "redkite";
- version = "1.0.1";
+ version = "1.0.3";
src = fetchFromGitLab {
owner = "iurie-sw";
repo = pname;
rev = "v${version}";
- sha256 = "1qd4r7ps0fg2m1vx3j48chfdh2c5909j4f9wip4af59inrid4w6a";
+ sha256 = "1m2db7c791fi33snkjwnvlxapmf879g5r8azlkx7sr6vp2s0jq2k";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix
new file mode 100644
index 00000000000..3ae46270586
--- /dev/null
+++ b/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -0,0 +1,111 @@
+{ callPackage
+, stdenv
+, fetchzip
+, lib
+
+, addOpenGLRunpath
+, patchelf
+, fixDarwinDylibNames
+
+, cudaSupport
+, nvidia_x11
+}:
+
+let
+ version = "1.6.0";
+ device = if cudaSupport then "cuda" else "cpu";
+ srcs = import ./binary-hashes.nix;
+ unavailable = throw "libtorch is not available for this platform";
+in stdenv.mkDerivation {
+ inherit version;
+ pname = "libtorch";
+
+ src = fetchzip srcs."${stdenv.targetPlatform.system}-${device}" or unavailable;
+
+ nativeBuildInputs =
+ if stdenv.isDarwin then [ fixDarwinDylibNames ]
+ else [ addOpenGLRunpath patchelf ]
+ ++ stdenv.lib.optionals cudaSupport [ addOpenGLRunpath ];
+
+ buildInputs = [
+ stdenv.cc.cc
+ ] ++ lib.optionals cudaSupport [ nvidia_x11 ];
+
+ dontBuild = true;
+ dontConfigure = true;
+ dontStrip = true;
+
+ installPhase = ''
+ # Copy headers and CMake files.
+ install -Dm755 -t $dev/lib lib/*.a
+ cp -r include $dev
+ cp -r share $dev
+
+ install -Dm755 -t $out/lib lib/*${stdenv.hostPlatform.extensions.sharedLibrary}*
+
+ # We do not care about Java support...
+ rm -f $out/lib/lib*jni* 2> /dev/null || true
+ '';
+
+ postFixup = let
+ libPaths = [ stdenv.cc.cc.lib ]
+ ++ stdenv.lib.optionals cudaSupport [ nvidia_x11 ];
+ rpath = stdenv.lib.makeLibraryPath libPaths;
+ in stdenv.lib.optionalString stdenv.isLinux ''
+ find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+ echo "setting rpath for $lib..."
+ patchelf --set-rpath "${rpath}:$out/lib" "$lib"
+ ${lib.optionalString cudaSupport ''
+ addOpenGLRunpath "$lib"
+ ''}
+ done
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ install_name_tool -change @rpath/libshm.dylib $out/lib/libshm.dylib $out/lib/libtorch_python.dylib
+ install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_python.dylib
+ install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_python.dylib
+ install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libtorch_python.dylib
+ install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_python.dylib
+
+ install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch.dylib
+ install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch.dylib
+ install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch.dylib
+
+ install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_cpu.dylib
+ install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_cpu.dylib
+ install_name_tool -change @rpath/libtensorpipe.dylib $out/lib/libtensorpipe.dylib $out/lib/libtorch_cpu.dylib
+
+ install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_observers.dylib
+ install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_observers.dylib
+ install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_observers.dylib
+ install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_observers.dylib
+
+ install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_module_test_dynamic.dylib
+ install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_module_test_dynamic.dylib
+ install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_module_test_dynamic.dylib
+ install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_module_test_dynamic.dylib
+
+ install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_detectron_ops.dylib
+ install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_detectron_ops.dylib
+ install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_detectron_ops.dylib
+ install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_detectron_ops.dylib
+
+ install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libshm.dylib
+ install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libshm.dylib
+ install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libshm.dylib
+ install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libshm.dylib
+
+ install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_global_deps.dylib
+ install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_global_deps.dylib
+ '';
+
+ outputs = [ "out" "dev" ];
+
+ passthru.tests = callPackage ./test { };
+
+ meta = with stdenv.lib; {
+ description = "C++ API of the PyTorch machine learning framework";
+ homepage = "https://pytorch.org/";
+ license = licenses.unfree; # Includes CUDA and Intel MKL.
+ platforms = with platforms; linux ++ darwin;
+ };
+}
diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
new file mode 100644
index 00000000000..92a2e05e0ba
--- /dev/null
+++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
@@ -0,0 +1,14 @@
+{
+ x86_64-darwin-cpu = {
+ url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.6.0.zip";
+ sha256 = "0d4n7la31qzl4s9pwvm07la7q6lhcwiww0yjpfz3kw6nvx84p22r";
+ };
+ x86_64-linux-cpu = {
+ url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.6.0%2Bcpu.zip";
+ sha256 = "1975b4zvyihzh89vnwspw0vf9qr05sxj8939vcrlmv3gzvdspcxz";
+ };
+ x86_64-linux-cuda = {
+ url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-1.6.0.zip";
+ sha256 = "127qnfyi1faqbm40sbnsyqxjhrqj82bzwqyz7c1hs2bm0zgrrpya";
+ };
+}
diff --git a/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt b/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt
new file mode 100644
index 00000000000..b302449ef77
--- /dev/null
+++ b/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt
@@ -0,0 +1,4 @@
+find_package(Torch REQUIRED)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}")
+add_executable(test test.cpp)
+target_link_libraries(test "${TORCH_LIBRARIES}")
diff --git a/pkgs/development/libraries/science/math/libtorch/test/default.nix b/pkgs/development/libraries/science/math/libtorch/test/default.nix
new file mode 100644
index 00000000000..d661ec28db9
--- /dev/null
+++ b/pkgs/development/libraries/science/math/libtorch/test/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, cmake, libtorch-bin, symlinkJoin }:
+
+stdenv.mkDerivation {
+ pname = "libtorch-test";
+ version = libtorch-bin.version;
+
+ src = ./.;
+
+ postPatch = ''
+ cat CMakeLists.txt
+ '';
+
+ makeFlags = [ "VERBOSE=1" ];
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ libtorch-bin ];
+
+ installPhase = ''
+ touch $out
+ '';
+
+ checkPhase = ''
+ ./test
+ '';
+}
diff --git a/pkgs/development/libraries/science/math/libtorch/test/test.cpp b/pkgs/development/libraries/science/math/libtorch/test/test.cpp
new file mode 100644
index 00000000000..5537724ce5f
--- /dev/null
+++ b/pkgs/development/libraries/science/math/libtorch/test/test.cpp
@@ -0,0 +1,7 @@
+#include
+#include
+
+int main() {
+ torch::Tensor tensor = torch::eye(3);
+ std::cout << tensor << std::endl;
+}
diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
index 5244ccdb281..1c910a4f75b 100644
--- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "suitesparse-graphblas";
- version = "3.3.0";
+ version = "3.3.3";
outputs = [ "out" "dev" ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "DrTimothyAldenDavis";
repo = "GraphBLAS";
rev = "v${version}";
- sha256 = "1fin9741ild3dv7c9gk07kpizsnnx17ar9cv9lny8vl47pms940h";
+ sha256 = "1nmygb2yny0mdqp0mc6760gbxklq1jjm0c6s39qkdwzf3n9f8j7p";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix
index 6845c616e9c..6007560a11f 100644
--- a/pkgs/development/libraries/sparsehash/default.nix
+++ b/pkgs/development/libraries/sparsehash/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "sparsehash-2.0.3";
+ name = "sparsehash-2.0.4";
src = fetchFromGitHub {
owner = "sparsehash";
repo = "sparsehash";
rev = name;
- sha256 = "0m3f0cnpnpf6aak52wn8xbrrdw8p0yhq8csgc8nlvf9zp8c402na";
+ sha256 = "1pf1cjvcjdmb9cd6gcazz64x0cd2ndpwh6ql2hqpypjv725xwxy7";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index eab6c1d446c..fbf399cb246 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -39,11 +39,11 @@ let
throw "You need to enable at least one output module.";
in stdenv.mkDerivation rec {
pname = "speech-dispatcher";
- version = "0.9.1";
+ version = "0.10.1";
src = fetchurl {
url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "16bg52hnkrsrs7kgbzanb34b9zb6fqxwj0a9bmsxmj1skkil1h1p";
+ sha256 = "0j2lfzkmbsxrrgjw6arzvnfd4jn5pxab28xsk2djssr2ydb9x309";
};
patches = [
diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index d13cdaff8c6..2b3414df1a4 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -1,14 +1,14 @@
{ fetchurl, stdenv, flex }:
stdenv.mkDerivation rec {
- version = "7.3";
+ version = "7.3.1";
pname = "wcslib";
buildInputs = [ flex ];
src = fetchurl {
url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2";
- sha256 ="0q99k61l2zh6irzkd5195aama37mlm0nivamz6j6r8l2ad1cy0ab";
+ sha256 ="0p0bp3jll9v2094a8908vk82m7j7qkjqzkngm1r9qj1v6l6j5z6c";
};
prePatch = ''
diff --git a/pkgs/development/libraries/webkit2-sharp/default.nix b/pkgs/development/libraries/webkit2-sharp/default.nix
new file mode 100644
index 00000000000..b8a476b3b33
--- /dev/null
+++ b/pkgs/development/libraries/webkit2-sharp/default.nix
@@ -0,0 +1,49 @@
+{
+ stdenv,
+ autoreconfHook,
+ fetchFromGitHub,
+ gtk-sharp-3_0,
+ lib,
+ libxslt,
+ mono,
+ pkg-config,
+ webkitgtk,
+}:
+
+stdenv.mkDerivation rec {
+ pname = "webkit2-sharp";
+ version = "a59fd76dd730432c76b12ee6347ea66567107ab9";
+
+ src = fetchFromGitHub {
+ owner = "hbons";
+ repo = "webkit2-sharp";
+ rev = version;
+ sha256 = "sha256:0a7vx81zvzn2wq4q2mqrxvlps1mqk28lm1gpfndqryxm4iiw28vc";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook
+ libxslt
+ mono
+ pkg-config
+ ];
+
+ buildInputs = [
+ gtk-sharp-3_0
+ webkitgtk
+ ];
+
+ ac_cv_path_MONODOCER = "no";
+ installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"];
+
+ passthru = {
+ inherit webkitgtk;
+ };
+
+ meta = {
+ description = "C# bindings for WebKit 2 with GTK+ 3";
+ homepage = "https://github.com/hbons/webkit2-sharp";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ kevincox ];
+ };
+}
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 2815520f517..30fc90ec8c0 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wolfssl";
- version = "4.4.0";
+ version = "4.5.0";
src = fetchFromGitHub {
owner = "wolfSSL";
repo = "wolfssl";
rev = "v${version}-stable";
- sha256 = "1bgkxqgxwa5dvi7fkna64wpcs552f3yxvs6fh6d32v7vg88vpfx9";
+ sha256 = "138ppnwkqkfi7nnqpd0b93dqaph72ma65m9286bz2qzlis1x8r0v";
};
configureFlags = [ "--enable-all" ];
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix
index 98cf0d58479..deb7d19c0de 100644
--- a/pkgs/development/libraries/wxwidgets/2.8/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
-, gstreamer, gst-plugins-base, GConf, libX11, cairo
+, libX11, cairo
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, libGLU ? null, libGL ? null
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz";
};
- buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf libX11 cairo ]
+ buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ]
++ optional withMesa libGLU;
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix
index 3812c81a519..5db7cfc26ba 100644
--- a/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
-, gstreamer, gst-plugins-base, GConf, setfile
+, setfile
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, libGLU ? null, libGL ? null
@@ -32,8 +32,7 @@ stdenv.mkDerivation {
];
buildInputs =
- [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer
- gst-plugins-base GConf ]
+ [ gtk2 libXinerama libSM libXxf86vm xorgproto ]
++ optional withMesa libGLU
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
@@ -42,7 +41,7 @@ stdenv.mkDerivation {
propagatedBuildInputs = optional stdenv.isDarwin AGL;
configureFlags =
- [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
+ [ "--enable-gtk2" "--disable-precomp-headers"
(if compat24 then "--enable-compat24" else "--disable-compat24")
(if compat26 then "--enable-compat26" else "--disable-compat26") ]
++ optional unicode "--enable-unicode"
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index f125ac9dca0..df90342a972 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig
, libXinerama, libSM, libXxf86vm
-, gtk2, GConf ? null, gtk3
+, gtk2, gtk3
, xorgproto, gst_all_1, setfile
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? libGLSupported
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base
- ] ++ optionals withGtk2 [ gtk2 GConf ]
+ ] ++ optionals withGtk2 [ gtk2 ]
++ optional (!withGtk2) gtk3
++ optional withMesa libGLU
++ optional withWebKit webkitgtk
diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix
index 0f30deb6c52..44e6fe49b48 100644
--- a/pkgs/development/libraries/wxwidgets/3.1/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig
, libXinerama, libSM, libXxf86vm
-, gtk2, GConf ? null, gtk3
+, gtk2, gtk3
, xorgproto, gst_all_1, setfile
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? libGLSupported, libGLU ? null, libGL ? null
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base
- ] ++ optionals withGtk2 [ gtk2 GConf ]
+ ] ++ optionals withGtk2 [ gtk2 ]
++ optional (!withGtk2) gtk3
++ optional withMesa libGLU
++ optional withWebKit webkitgtk
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 33a4fb93cba..195aea5c2f1 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -38,5 +38,5 @@ let
};
};
in {
- xapian_1_4 = generic "1.4.16" "4937f2f49ff27e39a42150e928c8b45877b0bf456510f0785f50159a5cb6bf70";
+ xapian_1_4 = generic "1.4.17" "0bjpaavdckl4viznr8gbq476fvg648sj4rks2vacmc51vrb8bsxm";
}
diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix
index eb1aec37c63..608d9dc4269 100644
--- a/pkgs/development/python-modules/catalogue/default.nix
+++ b/pkgs/development/python-modules/catalogue/default.nix
@@ -2,26 +2,30 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
+, pytestCheckHook
, importlib-metadata
}:
buildPythonPackage rec {
pname = "catalogue";
- version = "2.0.0";
+ version = "2.0.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "34f8416ec5e7ed08e55c10414416e67c3f4d66edf83bc67320c3290775293816";
+ sha256 = "0d01077dbfca7aa53f3ef4adecccce636bce4f82e5b52237703ab2f56478e56e";
};
propagatedBuildInputs = [ importlib-metadata ];
+ checkInputs = [ pytestCheckHook ];
+
meta = with stdenv.lib; {
description = "Tiny library for adding function or object registries";
homepage = "https://github.com/explosion/catalogue";
+ changelog = "https://github.com/explosion/catalogue/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ danieldk ];
- };
+ };
}
diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index 79e5c3288b7..07ceea731b9 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "certbot";
- version = "1.6.0";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1y0m5qm853i6pcpb2mrf8kjkr9wr80mdrx1qmck38ayvr2v2p5lc";
+ sha256 = "1fx29gsa3glwh0ik5k2gynwdz6i3ckq9aakf6ip92n3qyh6l08a8";
};
sourceRoot = "source/${pname}";
diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix
new file mode 100644
index 00000000000..59ebd4ef114
--- /dev/null
+++ b/pkgs/development/python-modules/databricks-connect/default.nix
@@ -0,0 +1,32 @@
+{ lib, jdk, buildPythonPackage, fetchPypi, six, py4j }:
+
+buildPythonPackage rec {
+ pname = "databricks-connect";
+ version = "7.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "996a9d0f271f6c7edbd2d85b2efb6ff4e58d15222e80f87ca17fdbf224e17056";
+ };
+
+ sourceRoot = ".";
+
+ propagatedBuildInputs = [ py4j six jdk ];
+
+ # requires network access
+ doCheck = false;
+
+ preFixup = ''
+ substituteInPlace "$out/bin/find-spark-home" \
+ --replace find_spark_home.py .find_spark_home.py-wrapped
+ '';
+
+ pythonImportsCheck = [ "pyspark" "six" "py4j" ];
+
+ meta = with lib; {
+ description = "Client for connecting to remote Databricks clusters";
+ homepage = "https://pypi.org/project/databricks-connect";
+ license = licenses.databricks;
+ maintainers = with maintainers; [ kfollesdal ];
+ };
+}
diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix
index a57d8307551..027500ff2ab 100644
--- a/pkgs/development/python-modules/dlib/default.nix
+++ b/pkgs/development/python-modules/dlib/default.nix
@@ -1,4 +1,6 @@
-{ buildPythonPackage, dlib, python, pytest, more-itertools, avxSupport ? true, lib }:
+{ buildPythonPackage, stdenv, lib, dlib, python, pytest, more-itertools
+, avxSupport ? stdenv.hostPlatform.avxSupport
+}:
buildPythonPackage {
inherit (dlib) name src nativeBuildInputs buildInputs meta;
diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix
index 93db5f48e40..83f340fc8d8 100644
--- a/pkgs/development/python-modules/howdoi/default.nix
+++ b/pkgs/development/python-modules/howdoi/default.nix
@@ -2,27 +2,37 @@
, buildPythonPackage
, fetchPypi
, six
-, requests-cache
, pygments
, pyquery
, cachelib
, appdirs
+, keep
}:
buildPythonPackage rec {
pname = "howdoi";
- version = "2.0.3";
+ version = "2.0.4";
src = fetchPypi {
inherit pname version;
- sha256 = "ed8acb75779f598a831224f33fa991c51764872574a128e9b2f11b83fcace010";
+ sha256 = "0hq5biy0mpycbji2mikfbflw4r39prylr47iqhlz234kvwdy0jsg";
};
- propagatedBuildInputs = [ six requests-cache pygments pyquery cachelib appdirs ];
+ postPatch = ''
+ substituteInPlace setup.py --replace 'cachelib==0.1' 'cachelib'
+ '';
+ propagatedBuildInputs = [ six pygments pyquery cachelib appdirs keep ];
+
+ # author hasn't included page_cache directory (which allows tests to run without
+ # external requests) in pypi tarball. github repo doesn't have release revisions
+ # clearly tagged. re-enable tests when either is sorted.
+ doCheck = false;
preCheck = ''
+ mv howdoi _howdoi
export HOME=$(mktemp -d)
'';
+ pythonImportsCheck = [ "howdoi" ];
meta = with lib; {
description = "Instant coding answers via the command line";
diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix
new file mode 100644
index 00000000000..6108ea50689
--- /dev/null
+++ b/pkgs/development/python-modules/keep/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, PyGithub
+, terminaltables
+, click
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "keep";
+ version = "2.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0902kcvhbmy5q5n0ai1df29ybf87qaljz306c5ssl8j9xdjipcq2";
+ };
+
+ propagatedBuildInputs = [
+ click
+ requests
+ terminaltables
+ PyGithub
+ ];
+
+ # no tests
+ pythonImportsCheck = [ "keep" ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/orkohunter/keep";
+ description = "A Meta CLI toolkit: Personal shell command keeper and snippets manager";
+ platforms = platforms.all;
+ license = licenses.mit;
+ maintainers = with maintainers; [ ris ];
+ };
+}
diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix
index 41459a8f4a1..08f482e6221 100644
--- a/pkgs/development/python-modules/pdfminer_six/default.nix
+++ b/pkgs/development/python-modules/pdfminer_six/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "pdfminer_six";
- version = "20200720";
+ version = "20200726";
disabled = !isPy3k;
@@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "pdfminer";
repo = "pdfminer.six";
rev = version;
- sha256 = "19cnl1b6mrk9i18a1k4vdl5k85ww8yhfq89w3fxh6rb0fla5d71i";
+ sha256 = "1hlaz7ax1czb028x3nhk3l2jy07f26q5hbhmdirljaaga24vd96z";
};
propagatedBuildInputs = [ chardet cryptography sortedcontainers ];
diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix
index c0f536480da..88fb6e3abf9 100644
--- a/pkgs/development/python-modules/pre-commit/default.nix
+++ b/pkgs/development/python-modules/pre-commit/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "pre-commit";
- version = "2.6.0";
+ version = "2.7.1";
disabled = isPy27;
src = fetchPypi {
inherit version;
pname = "pre_commit";
- sha256 = "05d9635v0yzrj2848m2hn9axbvds0dymv49rlyj238v3vlzncmqn";
+ sha256 = "0w2a104yhbw1z92rcwpq0gdjsxvr2bwx5ry5xhlf2psnfkjx6ky5";
};
patches = [
diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix
index 1b1896187f9..0ce6e338e61 100644
--- a/pkgs/development/python-modules/solo-python/default.nix
+++ b/pkgs/development/python-modules/solo-python/default.nix
@@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "solo-python";
- version = "0.0.23";
+ version = "0.0.26";
format = "flit";
disabled = pythonOlder "3.6"; # only python>=3.6 is supported
@@ -11,7 +11,7 @@
owner = "solokeys";
repo = pname;
rev = version;
- sha256 = "0r9cq0sd8pqnavgwa5cqgdxzbgly2baq8fpclnnz6anb2974kg3f";
+ sha256 = "05rwqrhr1as6zqhg63d6wga7l42jm2azbav5w6ih8mx5zbxf61yz";
};
# replaced pinned fido, with unrestricted fido version
diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix
index 4dc5c57070d..5f65004b3d6 100644
--- a/pkgs/development/python-modules/tensorflow/1/default.nix
+++ b/pkgs/development/python-modules/tensorflow/1/default.nix
@@ -23,9 +23,9 @@
, xlaSupport ? cudaSupport
# Default from ./configure script
, cudaCapabilities ? [ "3.5" "5.2" ]
-, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"]
-, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"]
-, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"]
+, sse42Support ? stdenv.hostPlatform.sse4_2Support
+, avx2Support ? stdenv.hostPlatform.avx2Support
+, fmaSupport ? stdenv.hostPlatform.fmaSupport
# Darwin deps
, Foundation, Security
}:
diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix
index 4dd378d1410..eedd6e6d0df 100644
--- a/pkgs/development/python-modules/tensorflow/2/default.nix
+++ b/pkgs/development/python-modules/tensorflow/2/default.nix
@@ -23,9 +23,9 @@
, xlaSupport ? cudaSupport
# Default from ./configure script
, cudaCapabilities ? [ "3.5" "5.2" ]
-, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"]
-, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"]
-, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"]
+, sse42Support ? stdenv.hostPlatform.sse4_2Support
+, avx2Support ? stdenv.hostPlatform.avx2Support
+, fmaSupport ? stdenv.hostPlatform.fmaSupport
# Darwin deps
, Foundation, Security
}:
diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index eb7c1c2aa48..aa6db6a7353 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "transformers";
- version = "3.0.2";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "v${version}";
- sha256 = "0rdlikh2qilwd0s9f3zif51p1q7sp3amxaccqic8p5qm6dqpfpz6";
+ sha256 = "0wg36qrcljmpsyhjaxpqw3s1r6276yg8cq0bjrf52l4zlc5k4xzk";
};
propagatedBuildInputs = [
@@ -44,16 +44,23 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
- --replace "tokenizers == 0.8.1.rc1" "tokenizers>=0.8"
+ --replace "tokenizers == 0.8.1.rc2" "tokenizers>=0.8"
'';
preCheck = ''
export HOME="$TMPDIR"
cd tests
+
+ # This test requires the nlp module, which we haven't
+ # packaged yet. However, nlp is optional for transformers
+ # itself
+ rm test_trainer.py
'';
# Disable tests that require network access.
disabledTests = [
+ "PegasusTokenizationTest"
+ "T5TokenizationTest"
"test_all_tokenizers"
"test_batch_encoding_is_fast"
"test_batch_encoding_pickle"
@@ -63,6 +70,7 @@ buildPythonPackage rec {
"test_hf_api"
"test_outputs_can_be_shorter"
"test_outputs_not_longer_than_maxlen"
+ "test_padding_accepts_tensors"
"test_pretokenized_tokenizers"
"test_tokenizer_equivalence_en_de"
"test_tokenizer_from_model_type"
@@ -74,6 +82,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
homepage = "https://github.com/huggingface/transformers";
description = "State-of-the-art Natural Language Processing for TensorFlow 2.0 and PyTorch";
+ changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ danieldk pashashocky ];
diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix
index 70c9061d366..1fbed4ad1aa 100644
--- a/pkgs/development/python-modules/ufonormalizer/default.nix
+++ b/pkgs/development/python-modules/ufonormalizer/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "ufonormalizer";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0nv80x7l7sya5wzyfk9ss93r6bjzjljpkw4k8gibxp1rqrzkdms4";
+ sha256 = "1rn64a0i151qk6h5f9pijcmja195i2d6f8jbi5h4xkgkinm9wwzj";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix
index e36f0f7b03c..09b75e0c777 100644
--- a/pkgs/development/python-modules/unicodedata2/default.nix
+++ b/pkgs/development/python-modules/unicodedata2/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
checkPhase = "pytest tests";
meta = with lib; {
- description = "";
+ description = "Backport and updates for the unicodedata module";
homepage = "http://github.com/mikekap/unicodedata2";
license = licenses.asl20;
maintainers = [ maintainers.sternenseemann ];
diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix
index 0ac36c4c200..9b7cf3f1de8 100644
--- a/pkgs/development/tools/ameba/default.nix
+++ b/pkgs/development/tools/ameba/default.nix
@@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec {
pname = "ameba";
- version = "0.13.1";
+ version = "0.13.2";
src = fetchFromGitHub {
owner = "crystal-ameba";
repo = "ameba";
rev = "v${version}";
- sha256 = "0myy11g62pa1yh9szj03v2lhc5s9xwzr76v4x6hznidpq1b67jn8";
+ sha256 = "0wyfx9nwda0s3arpdalz5zgh83v6wfz1a3l2k5v0jglpczq3m04m";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 4b11dd13983..ed1a4361120 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "merlin";
- version = "3.3.6";
+ version = "3.3.8";
minimumOCamlVersion = "4.02.1";
src = fetchurl {
url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";
- sha256 = "1360cm0jkn2v2y5p3yzdyw9661a1vpddcibkbfblmk95qafx4civ";
+ sha256 = "0j27piq9hqhr2jp89ni73kchw33pcx7gnjkh8rd6qa8hc12xd794";
};
buildInputs = [ yojson ];
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index 655d726e66e..62b9a616644 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rust-cbindgen";
- version = "0.14.3";
+ version = "0.14.4";
src = fetchFromGitHub {
owner = "eqrion";
repo = "cbindgen";
rev = "v${version}";
- sha256 = "0pw55334i10k75qkig8bgcnlsy613zw2p5j4xyz8v71s4vh1a58j";
+ sha256 = "06bis9kk3r0gishzmsq5wk3vv8r78ggk4m800562q2yhnhc37lfd";
};
- cargoSha256 = "0088ijnjhqfvdb1wxy9jc7hq8c0yxgj5brlg68n9vws1mz9rilpy";
+ cargoSha256 = "0x8lxlik4n8rmlydcp0vqyiqwqm98cgwvw3h5hm2zviv8v0y8jnr";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix
index a5087b3b52c..96f232304aa 100644
--- a/pkgs/development/tools/tracy/default.nix
+++ b/pkgs/development/tools/tracy/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk2, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }:
+{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }:
stdenv.mkDerivation rec {
pname = "tracy";
- version = "0.7";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "wolfpld";
repo = "tracy";
rev = "v${version}";
- sha256 = "07cmz2w7iv10f9i9q3fhg80s6riy9bxnk9xvc3q4lw47mc150skp";
+ sha256 = "13zg3ijzhh7qkhgqff2ca23nd4gj7ac8jr0bp9w1gjf2cpgqkm40";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glfw capstone ]
++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ]
- ++ lib.optionals stdenv.isLinux [ gtk2 tbb ];
+ ++ lib.optionals stdenv.isLinux [ gtk3 tbb ];
NIX_CFLAGS_COMPILE = [ ]
++ lib.optional stdenv.isLinux "-ltbb"
@@ -35,11 +35,15 @@ stdenv.mkDerivation rec {
install -D ./update/build/unix/update-release $out/bin/update
'';
+ fixupPhase = lib.optionalString stdenv.isDarwin ''
+ install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/Tracy
+ '';
+
meta = with stdenv.lib; {
description = "A real time, nanosecond resolution, remote telemetry frame profiler for games and other applications.";
homepage = "https://github.com/wolfpld/tracy";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.bsd3;
- maintainers = with maintainers; [ mpickering ];
+ maintainers = with maintainers; [ mpickering nagisa ];
};
}
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index 01ee818f256..b59ed85f6bc 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -2,11 +2,11 @@
, libXdmcp, libXt }:
stdenv.mkDerivation rec {
- name = "xlockmore-5.64";
+ name = "xlockmore-5.65";
src = fetchurl {
url = "http://sillycycle.com/xlock/${name}.tar.xz";
- sha256 = "0fbh6avdzsm1prafglr2xdd8c4ibkddi6xxywvqgvzp0zb2kqimr";
+ sha256 = "0d4l8ibbvc62whlq8rrbvqr3011a7h21l9na93r579g0dfwdbh6d";
curlOpts = "--user-agent 'Mozilla/5.0'";
};
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 85df90a9fe1..66f41962666 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -271,6 +271,13 @@ in {
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
+ ubootPinebookPro = buildUBoot {
+ defconfig = "pinebook-pro-rk3399_defconfig";
+ extraMeta.platforms = ["aarch64-linux"];
+ BL31 = "${armTrustedFirmwareRK3399}/bl31.elf";
+ filesToInstall = [ "u-boot.itb" "idbloader.img"];
+ };
+
ubootQemuAarch64 = buildUBoot {
defconfig = "qemu_arm64_defconfig";
extraMeta.platforms = ["aarch64-linux"];
diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/misc/vim-plugins/deprecated.json
index 218a1ab622f..b95e91a19b2 100644
--- a/pkgs/misc/vim-plugins/deprecated.json
+++ b/pkgs/misc/vim-plugins/deprecated.json
@@ -3,6 +3,10 @@
"date": "2020-03-27",
"new": "vim-gist"
},
+ "nvim-lsp": {
+ "date": "2020-08-31",
+ "new": "nvim-lspconfig"
+ },
"vim-jade": {
"date": "2020-03-27",
"new": "vim-pug"
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index f555e25dca2..77b1777ab63 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2020-08-24";
+ version = "2020-08-31";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "3e2abe3f25493af63af91a6013447e378e09f6ec";
- sha256 = "1lxcwvjxrr2wdz5rzai2wd96zxhxmf81jyd62pcqhr5l9jil9ry7";
+ rev = "d4a14746cdcda99ec70915c5540962c85e33f661";
+ sha256 = "1k93gab46y3ld9s3h3ha3vmdfy37vhb3px79p5a62b21jwma9mxc";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -185,12 +185,12 @@ let
awesome-vim-colorschemes = buildVimPluginFrom2Nix {
pname = "awesome-vim-colorschemes";
- version = "2020-08-15";
+ version = "2020-08-26";
src = fetchFromGitHub {
owner = "rafi";
repo = "awesome-vim-colorschemes";
- rev = "0e04854da7695854e7df7c3c771e72ac55a60040";
- sha256 = "1i6y0p7fcvzgxkm82xrypwh7xgp1ywyvqlpglf93bgq8ygsll0v9";
+ rev = "b89e17b44dc1bcc189298882a4cb6e3252c2fb4c";
+ sha256 = "0grgii328c4y086par9l3f2cq2xh47dqv2w2f4lwd5z9zmnxkv4f";
};
meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/";
};
@@ -425,12 +425,12 @@ let
coc-fzf = buildVimPluginFrom2Nix {
pname = "coc-fzf";
- version = "2020-08-25";
+ version = "2020-08-27";
src = fetchFromGitHub {
owner = "antoinemadec";
repo = "coc-fzf";
- rev = "606b437c4b6de1910c325eb631ee6b0f9bff8dd6";
- sha256 = "0a3vrimi87i6y6nc79smh2jiya2ciafxj0aifn6xhqnklj46isdh";
+ rev = "085e54bf91b7f6ce19be9c2801ad4e69b15c24f9";
+ sha256 = "0dfpl26jn6gc3nswbz0nclzr0s58fhmrhqvmknssg600wgnrd12v";
};
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
};
@@ -641,12 +641,12 @@ let
coc-rust-analyzer = buildVimPluginFrom2Nix {
pname = "coc-rust-analyzer";
- version = "2020-08-25";
+ version = "2020-08-31";
src = fetchFromGitHub {
owner = "fannheyward";
repo = "coc-rust-analyzer";
- rev = "fff876cee397d0d696cba74907e33aadfba4d601";
- sha256 = "0318a19qbp3rpcgqwqshzhrpcbsqcskl993yjxmgmpjxh4r85kh2";
+ rev = "d66f9a5744477b317423d06463331df7b80a0a7f";
+ sha256 = "0vlbyjz09n0zvkbx1kks44mawn21xr24ry28z21zgcv6r0clh1xk";
};
meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/";
};
@@ -882,24 +882,24 @@ let
committia-vim = buildVimPluginFrom2Nix {
pname = "committia-vim";
- version = "2020-08-26";
+ version = "2020-08-27";
src = fetchFromGitHub {
owner = "rhysd";
repo = "committia.vim";
- rev = "6c8e22b24283a4cc3f05339520e990af8e803915";
- sha256 = "05rjwn6fjwxd07c5imddkmxxpl8gq09iys385drrsvsqdx9f93vw";
+ rev = "1d288281586d1e6b52646a4c412df3dd3a2fe231";
+ sha256 = "11ik72qi7fvxkz7fnyisaa0xscy4pksq8l2pvclywzg3lcclhxp1";
};
meta.homepage = "https://github.com/rhysd/committia.vim/";
};
completion-nvim = buildVimPluginFrom2Nix {
pname = "completion-nvim";
- version = "2020-08-13";
+ version = "2020-08-29";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "completion-nvim";
- rev = "43cb0b123544b602bd31747a3d8cf52ef0660723";
- sha256 = "0qllj4zqbw2fhp17lqk0xmbraq86gl9gjp9vszpd9jbw7h4lh168";
+ rev = "ade764f6937721493cbfdc21b5b7e44ba71ee5cc";
+ sha256 = "1abdgqpnljy17wfx3ixa73hyzhf3rixmnb2b8h8iyks3hgv9i36r";
};
meta.homepage = "https://github.com/nvim-lua/completion-nvim/";
};
@@ -1086,12 +1086,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
- version = "2020-08-19";
+ version = "2020-08-28";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "1cfffcff2aba8a7b819f8b27414021d451abb4ce";
- sha256 = "0ysnkwv9hk84i4rdglrmjms24nh9i5x5qvr8lyzrjzzp8zj7qs2l";
+ rev = "e4ea8290eba832997eaa36b6810e8ecc15ca1151";
+ sha256 = "063vy5kl8vz9c3nnz7g8yw1f1v1vcmxfg4p59mzsfrqf93fs2y30";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@@ -1386,6 +1386,18 @@ let
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
+ devdocs-vim = buildVimPluginFrom2Nix {
+ pname = "devdocs-vim";
+ version = "2018-08-27";
+ src = fetchFromGitHub {
+ owner = "rhysd";
+ repo = "devdocs.vim";
+ rev = "1c91c619874f11f2062f80e6ca4b49456f21ae91";
+ sha256 = "1nxww2mjabl2g2wchxc4h3a58j64acls24zb5jmfi71b8sai8a9b";
+ };
+ meta.homepage = "https://github.com/rhysd/devdocs.vim/";
+ };
+
dhall-vim = buildVimPluginFrom2Nix {
pname = "dhall-vim";
version = "2020-08-19";
@@ -1643,12 +1655,12 @@ let
fruzzy = buildVimPluginFrom2Nix {
pname = "fruzzy";
- version = "2019-10-28";
+ version = "2020-08-31";
src = fetchFromGitHub {
owner = "raghur";
repo = "fruzzy";
- rev = "b312ae79db98cf6939c8319f2511efa06889e8e3";
- sha256 = "01iisbawq2w7yw866qvv109amnvyaymzyz9nqal3cjrrcwk6mmdk";
+ rev = "4cdfee7b828a5cace22bfd93cf23fee0b2b233c4";
+ sha256 = "1dmxz283ypz1klcmdf4jk699aifr3dywkh9y8v8v8vyflampqwwp";
};
meta.homepage = "https://github.com/raghur/fruzzy/";
};
@@ -1787,12 +1799,12 @@ let
goyo-vim = buildVimPluginFrom2Nix {
pname = "goyo-vim";
- version = "2020-06-08";
+ version = "2020-08-29";
src = fetchFromGitHub {
owner = "junegunn";
repo = "goyo.vim";
- rev = "3e129198bba7d6b50406902002ad7d213a6cccaa";
- sha256 = "1b2wsxbg27nmwxrncwddkl2ck8hbiqdqi821vl9d1fl5nx042y2b";
+ rev = "a865dec7ca7616dbbd69315ad1417b84d0c411f8";
+ sha256 = "09mqmcz79dwcc5mv0p2wc84jc20ipa0vv2yckp4la4xh909ph4hm";
};
meta.homepage = "https://github.com/junegunn/goyo.vim/";
};
@@ -2856,26 +2868,26 @@ let
nvim-hs-vim = buildVimPluginFrom2Nix {
pname = "nvim-hs-vim";
- version = "2019-04-14";
+ version = "2020-08-29";
src = fetchFromGitHub {
owner = "neovimhaskell";
repo = "nvim-hs.vim";
- rev = "5bc177a87c9575c4995df90a098d330fe6e02f75";
- sha256 = "14jgvkvakpy36md5si2a3rf2w869snb65inriq68xbk32bg5pg8q";
+ rev = "30baacd3c7a10625cb2d4dd64ae3bbfc4fe3f8c6";
+ sha256 = "1w6cr6j77nwxszm1d0y4phvjsz9q4aw214xkscw6izakfmk06h1x";
};
meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/";
};
- nvim-lsp = buildVimPluginFrom2Nix {
- pname = "nvim-lsp";
- version = "2020-08-10";
+ nvim-lspconfig = buildVimPluginFrom2Nix {
+ pname = "nvim-lspconfig";
+ version = "2020-08-30";
src = fetchFromGitHub {
owner = "neovim";
- repo = "nvim-lsp";
- rev = "fc9d94ef006e082596c2e8724eb3f1c92ff203c7";
- sha256 = "1byji4p0xigyp8y71s00fs2vrhgz3xkf51mmyz489pp52c7nfx4v";
+ repo = "nvim-lspconfig";
+ rev = "b7b311e22a0b071dfb43aa6a9ccc0ed92e5eab3d";
+ sha256 = "1q9z5hryjm6j2bb6iy57bwadm45m402k2bq1w0dkn1bgsnfkbsg3";
};
- meta.homepage = "https://github.com/neovim/nvim-lsp/";
+ meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
nvim-terminal-lua = buildVimPluginFrom2Nix {
@@ -2892,12 +2904,12 @@ let
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2020-08-26";
+ version = "2020-08-31";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "e8fa0d0b31954314528bb88de3b8357af75d21fd";
- sha256 = "0rczmzzcc82499bbbvz4bfpv8llkzz21hx7i2pz3471c2c97s3hn";
+ rev = "5948aba886e8aad26043402684cf85c307813c4d";
+ sha256 = "1x9pmxwm3lh5w7d22danp8r8g5hycxl1w8q8d1milx882qsjwnqa";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -2988,12 +3000,12 @@ let
palenight-vim = buildVimPluginFrom2Nix {
pname = "palenight-vim";
- version = "2020-08-10";
+ version = "2020-08-30";
src = fetchFromGitHub {
owner = "drewtempelmeyer";
repo = "palenight.vim";
- rev = "9637fc4b6dc8ba852d5ec21c2c54851d81576490";
- sha256 = "1im9iggwiz86h0rydaz73482q8ildhd81hscq8czwigb03pslyxg";
+ rev = "677745d52c4c03b344cd382dab0554a1d63b0692";
+ sha256 = "0av2if81vcknv3w74h5y1mbip8y8i0kif94v5mdc17cfi6d5ngks";
};
meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/";
};
@@ -3394,6 +3406,18 @@ let
meta.homepage = "https://github.com/vim-scripts/ShowMultiBase/";
};
+ sideways-vim = buildVimPluginFrom2Nix {
+ pname = "sideways-vim";
+ version = "2020-08-31";
+ src = fetchFromGitHub {
+ owner = "AndrewRadev";
+ repo = "sideways.vim";
+ rev = "c81d2cabc1ada11f1531b05669fd07f52c75da22";
+ sha256 = "042safg5i1f7rnfwlf37ic40rg6s5svsjci3cp06lzy3v9r8n2qf";
+ };
+ meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
+ };
+
SimpylFold = buildVimPluginFrom2Nix {
pname = "SimpylFold";
version = "2017-06-13";
@@ -3637,12 +3661,12 @@ let
tagbar = buildVimPluginFrom2Nix {
pname = "tagbar";
- version = "2020-08-26";
+ version = "2020-08-29";
src = fetchFromGitHub {
owner = "majutsushi";
repo = "tagbar";
- rev = "40413d8760146471757c69f08be68b24431f9474";
- sha256 = "1194kp8qzpjvv64lplb49n64ksyv5dbn25sng448b2fgd6wqk9ji";
+ rev = "e5c864738db6135a27b6373585d6f4987ffdddb5";
+ sha256 = "0zqmh4lrlb8v1l17789dbl2rj9i0ywcjdpjxzpikiajnsd8q4yl6";
};
meta.homepage = "https://github.com/majutsushi/tagbar/";
};
@@ -4152,26 +4176,38 @@ let
meta.homepage = "https://github.com/MarcWeber/vim-addon-xdebug/";
};
+ vim-after-object = buildVimPluginFrom2Nix {
+ pname = "vim-after-object";
+ version = "2018-09-17";
+ src = fetchFromGitHub {
+ owner = "junegunn";
+ repo = "vim-after-object";
+ rev = "7f52106df8a05e9bc1c53960c31a55f77e303903";
+ sha256 = "13726m0c73n5pw9gil4ahbg71ibklrwkw9yvbr6qxxvn6qyijpdy";
+ };
+ meta.homepage = "https://github.com/junegunn/vim-after-object/";
+ };
+
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2020-08-25";
+ version = "2020-08-27";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "5d3cfa40453fd8216be6ca68e9bd3846eed05176";
- sha256 = "150mdgmbyqp263rzmhp09a07547whalkbvzr9mi4jaq7paj21762";
+ rev = "c77d89046e5dc66438190e2261fb2197df2a8932";
+ sha256 = "009n427sgjmc12rvamda70marjaqpzi9zlddk5d1yim61qvh7djh";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
vim-airline-themes = buildVimPluginFrom2Nix {
pname = "vim-airline-themes";
- version = "2020-08-25";
+ version = "2020-08-27";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline-themes";
- rev = "fd855c601c3d53b68f3971e1191f84c728d4d651";
- sha256 = "07s45ck4001lxrzpxcvqsyqfg6j61js4131gxi150y7jb2wwyjjd";
+ rev = "155bce6665ab8c83447102e8402cc9d3b7c3b3f3";
+ sha256 = "1qavi386va4wnalaf03b19lfxypbkjcjdiiasbdzfnlqpz7d4rwy";
};
meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";
};
@@ -4370,12 +4406,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2020-08-20";
+ version = "2020-08-31";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "e690bde9e7838894b68f9d3d4d1a131e86c13ffb";
- sha256 = "1pl32zgwn7ffyfn8xqqlck48sqv78jv8v4pfjay0rgr3jvaxis1v";
+ rev = "3850f5aebffeddf3f1a9dfcd8430e8d0b1413480";
+ sha256 = "1ivrsiqid4g89vb0kz3mdmlmar4m5irbnqb5j2lnaxbr7dfl7w3c";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -4658,12 +4694,12 @@ let
vim-dirvish = buildVimPluginFrom2Nix {
pname = "vim-dirvish";
- version = "2020-06-30";
+ version = "2020-08-31";
src = fetchFromGitHub {
owner = "justinmk";
repo = "vim-dirvish";
- rev = "7c4dc5945b15a6b97ebef860070d30e36da01788";
- sha256 = "0mg8fdfsr59015m309kr9v5akwc3zfwfygn36x47c8q2bwjjr052";
+ rev = "b136fd27a0afaee8306655eca7ac19d0e780faa3";
+ sha256 = "0b6cjxjzkqsrip8b8glwgjam17hjrpk21pgyikfhdrv2cxqvil9z";
};
meta.homepage = "https://github.com/justinmk/vim-dirvish/";
};
@@ -4874,12 +4910,12 @@ let
vim-fireplace = buildVimPluginFrom2Nix {
pname = "vim-fireplace";
- version = "2020-08-04";
+ version = "2020-08-28";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fireplace";
- rev = "8963dd3b385410e27752fb859bd5cecdd22b5f71";
- sha256 = "0ax42ilx24cagy0m6ryda6h0fn7l8g1ckry24vfz2zp7d8y14hah";
+ rev = "9e62520397f6e98c6031aba4cb63e611abe4583b";
+ sha256 = "144qiari81xwaxw9rd5mh4g1ywn2r141438r3km6dh3acx18f6ij";
};
meta.homepage = "https://github.com/tpope/vim-fireplace/";
};
@@ -4934,12 +4970,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
- version = "2020-08-25";
+ version = "2020-08-31";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
- rev = "cc2ff0a07af75cd752afebbf3be62e6ebe234f2d";
- sha256 = "1q1jmbmx79ii5g991hcp6xd2nzcdqlv4m065vwc8hdpk3ghgc9d4";
+ rev = "ff4c8b634676e67bf089e936c9afb1d308d594dc";
+ sha256 = "1vj0qvbxsp6r4g8v2xwpgmswy54l4lvphzmmvkxp58cpwj7cc10w";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@@ -4982,12 +5018,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2020-07-31";
+ version = "2020-08-26";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "260182c65cae653ac20e6a69ba8cc6124e7ba6c2";
- sha256 = "14dmar7d9qajjk2vy223mw7gwdcz548lcj5jg8pg7j4cyc6ffbyp";
+ rev = "511d3035d4da2453a9cb0188b6020ed7bc8fc18f";
+ sha256 = "003k746mqasd64yca0ay4lzbif7jx0p6ivs2g2f3mlnvpwiiim23";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -5042,12 +5078,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2020-08-07";
+ version = "2020-08-31";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "8005f71aabef13f5872b3ef4802f36503a16c451";
- sha256 = "0ns33dbkw8lc6rj6mvkgymdsl3i4g8slbh06g8h4rfn8qq5wjxbw";
+ rev = "098b9c82e9ac39b0d203635a8041bb1aceb8426c";
+ sha256 = "1d0shs6q509zwfpp0dqffhh5fm8fr8x6km6w8mf4m9p1fkxyaz1g";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@@ -5078,12 +5114,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2020-08-19";
+ version = "2020-08-30";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "7c14e8ae5de7f4562c365249c83abc4d0e0d906c";
- sha256 = "1l96mlkfvpsa2bw9rc4m8s7abjvcfyy05gsm445rzbijqxigkknk";
+ rev = "bf2dd524a7d7a2c6f50642ec3dae2bc1506b5c94";
+ sha256 = "0d1gnszjppp4p1b39jxa19fdg77iq6baxm5hbjiinidmhgbal35w";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -5102,12 +5138,12 @@ let
vim-graphql = buildVimPluginFrom2Nix {
pname = "vim-graphql";
- version = "2020-08-17";
+ version = "2020-08-31";
src = fetchFromGitHub {
owner = "jparise";
repo = "vim-graphql";
- rev = "1b9db5b2089751dc80a5dab9fa976a9750c3066c";
- sha256 = "14bp6knckqa8rc9xwd5cnd6cnfhi0j6vgv0yl5nin47yzv0navha";
+ rev = "e64fba4ee17fa8dd391405982500c72d68fc50b9";
+ sha256 = "1pf0lpjy88hwmxn3lybjkq10w6s666wmpbzsfkjbp8xmqhzlvaf6";
};
meta.homepage = "https://github.com/jparise/vim-graphql/";
};
@@ -5475,12 +5511,12 @@ let
vim-jsdoc = buildVimPluginFrom2Nix {
pname = "vim-jsdoc";
- version = "2020-07-23";
+ version = "2020-08-31";
src = fetchFromGitHub {
owner = "heavenshell";
repo = "vim-jsdoc";
- rev = "ed31c776d1da96ed8d950aef5ffba3f767f2acb4";
- sha256 = "1qp5n04igirkqzqh7vfw0jnb31p36h356nc4n1kzna4zyqndzk9s";
+ rev = "5bbe872ee41e50bd5b99bf6204d6147dab39cdc5";
+ sha256 = "0jmmkqzan5mkc0j05243f5layqj7fny92rl1vlj32ipv8wgdmczn";
};
meta.homepage = "https://github.com/heavenshell/vim-jsdoc/";
};
@@ -5667,24 +5703,24 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
- version = "2020-07-12";
+ version = "2020-08-29";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
- rev = "632d49bf7a227e13bea6ef341de35f89e45c55b0";
- sha256 = "1an37vkr9di0abxfnidlbij37xxy5z1cwnvpcnink4gman1msyzy";
+ rev = "ab952d62a3c57d176e6c63b3f3c95b8ba37b0630";
+ sha256 = "07caiz9k3bx5qn5kg5hbh2a2d77bfvyfg9rx7s7zkavpz312r4kc";
};
meta.homepage = "https://github.com/natebosch/vim-lsc/";
};
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2020-08-24";
+ version = "2020-08-31";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "69dc272277da464242bf729eb3b57ad79c5a0aed";
- sha256 = "0vxkfwdsfsfc91vjhdfbph2287hhr14jr5kzyblk5f1aldgr8901";
+ rev = "1230ae8fa3d7004e6c3d74c1a5aa6c17acaf9f74";
+ sha256 = "1q08h0in1x4hhhvpjx379qw07ghinrxizzvr8f7xxsgg9lpdjxji";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@@ -5713,6 +5749,18 @@ let
meta.homepage = "https://github.com/lambdalisue/vim-manpager/";
};
+ vim-markbar = buildVimPluginFrom2Nix {
+ pname = "vim-markbar";
+ version = "2020-08-31";
+ src = fetchFromGitHub {
+ owner = "Yilin-Yang";
+ repo = "vim-markbar";
+ rev = "df13c3abe88c01a716b1099de953dcfa1679e663";
+ sha256 = "1y5w182d57z1nl8c7ng25m88by88pnxqdsxmcnnygdfjmvbv8jl9";
+ };
+ meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/";
+ };
+
vim-markdown = buildVimPluginFrom2Nix {
pname = "vim-markdown";
version = "2020-07-14";
@@ -5749,6 +5797,18 @@ let
meta.homepage = "https://github.com/samoshkin/vim-mergetool/";
};
+ vim-merginal = buildVimPluginFrom2Nix {
+ pname = "vim-merginal";
+ version = "2020-01-29";
+ src = fetchFromGitHub {
+ owner = "idanarye";
+ repo = "vim-merginal";
+ rev = "02ac69b0468b7aec437df48df07f939558e85c9a";
+ sha256 = "0m5lym56xzp1gnwb79vjmigfi6ar0iqbzaydv2r8c47jj7xyxiz6";
+ };
+ meta.homepage = "https://github.com/idanarye/vim-merginal/";
+ };
+
vim-metamath = buildVimPluginFrom2Nix {
pname = "vim-metamath";
version = "2017-02-10";
@@ -5775,12 +5835,12 @@ let
vim-monokai = buildVimPluginFrom2Nix {
pname = "vim-monokai";
- version = "2020-08-08";
+ version = "2020-08-30";
src = fetchFromGitHub {
owner = "crusoexia";
repo = "vim-monokai";
- rev = "85b18e98a22b17f9e01867988c18cf396316c20f";
- sha256 = "1vzllvq1ncq4qyqbkp8z26sr4n9kpqv35zkfjas3r2jqbn958a93";
+ rev = "e0714a6e21dfba55b1af202d09f8f50d27b00e85";
+ sha256 = "0q1sxla2s381yjsyjjcd77pp4s98s0579mpr4iln59z60ysayc95";
};
meta.homepage = "https://github.com/crusoexia/vim-monokai/";
};
@@ -6159,12 +6219,12 @@ let
vim-plug = buildVimPluginFrom2Nix {
pname = "vim-plug";
- version = "2020-08-08";
+ version = "2020-08-29";
src = fetchFromGitHub {
owner = "junegunn";
repo = "vim-plug";
- rev = "13ea184015c30be5160ae285aedc0eaec0c72e6c";
- sha256 = "19vd5cmshlwrrf5ncgkny9p478d7bhjjwwjv71xb2adyfc9r1rv6";
+ rev = "a9bf5bd72212ff7cf9e9e863c365a3464faa2426";
+ sha256 = "0rrmz7vn3kxgrbwmil3vlddq13sy9wbgmn5kgz1r12wcbwf1sb56";
};
meta.homepage = "https://github.com/junegunn/vim-plug/";
};
@@ -6183,12 +6243,12 @@ let
vim-polyglot = buildVimPluginFrom2Nix {
pname = "vim-polyglot";
- version = "2020-08-25";
+ version = "2020-08-29";
src = fetchFromGitHub {
owner = "sheerun";
repo = "vim-polyglot";
- rev = "f0d6ecff07c88e7a406bc082d1ce98a5282b451c";
- sha256 = "1a8z7753a4g4zyi9dr24mkwhpi18r2wbnf9djjl4r4hr0hc7qcc1";
+ rev = "d4fcef1aa835f20f4f9df41eceb406b66f446f70";
+ sha256 = "1jn0581k1xcsvl0nz0q3qbz2k4cpzn9bjw77fn86xx3v9pg55szh";
};
meta.homepage = "https://github.com/sheerun/vim-polyglot/";
};
@@ -6411,12 +6471,12 @@ let
vim-ruby = buildVimPluginFrom2Nix {
pname = "vim-ruby";
- version = "2020-08-22";
+ version = "2020-08-28";
src = fetchFromGitHub {
owner = "vim-ruby";
repo = "vim-ruby";
- rev = "35dce70cdc2d7bf3c2031cc5eac2a47ddfb8c17b";
- sha256 = "0cc36cnqaz2q45287pfdkfxpb91dlhqi5a8kf8ghz61dny2xnv8r";
+ rev = "e367f7b33fe9159c943963f3f839e4d08b74090e";
+ sha256 = "1pngmr6ww4fmn71rshi1npyswp48dq3p7m02s6s703bg83smvmc8";
};
meta.homepage = "https://github.com/vim-ruby/vim-ruby/";
};
@@ -6627,12 +6687,12 @@ let
vim-sneak = buildVimPluginFrom2Nix {
pname = "vim-sneak";
- version = "2020-06-29";
+ version = "2020-08-30";
src = fetchFromGitHub {
owner = "justinmk";
repo = "vim-sneak";
- rev = "afe94543bb3bb95ef9ae2a58eebcbc17d69eb304";
- sha256 = "0iaksyh77xahg5cp0q9x5c14jdklsrgy9400jp4xjb83qgg6d7qq";
+ rev = "7d82982e3858a6a514525acbba8bf2dff7da6c64";
+ sha256 = "124iqc9vdaa4ms03v20d9np95dizbp23gs3680dws1gjskq9z2pv";
};
meta.homepage = "https://github.com/justinmk/vim-sneak/";
};
@@ -6651,12 +6711,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2020-08-19";
+ version = "2020-08-30";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "c093074fec6ba83aced4958ea44af11c5e5dff30";
- sha256 = "0919fhzpg7scm7idq4vh7kqjvlmc4037cn5d24ggsvziybi07k9p";
+ rev = "c609efe753ccc2f2631908149e94febc0b257052";
+ sha256 = "00m2kjkqyz1s36hn2m7qd98ms26cxhcbh1qhpnzbhfldz0wq9dd5";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@@ -6868,12 +6928,12 @@ let
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
- version = "2020-08-25";
+ version = "2020-08-31";
src = fetchFromGitHub {
owner = "vim-test";
repo = "vim-test";
- rev = "45c495d78143f73fc034781601ff44ca90e05687";
- sha256 = "0h3yjc5g8cklq988bilqjp8wv19yb16rmjphjhifa1c2fp23n7nk";
+ rev = "d1b82e939135bbfc928d2fe54382631f20c6cbb3";
+ sha256 = "1avlh0srwi0xyawp24s1s2hlzs1pj83d5wsn5ha8y9hd96byaxja";
};
meta.homepage = "https://github.com/vim-test/vim-test/";
};
@@ -7070,6 +7130,18 @@ let
meta.homepage = "https://github.com/lumiliet/vim-twig/";
};
+ vim-twiggy = buildVimPluginFrom2Nix {
+ pname = "vim-twiggy";
+ version = "2019-06-24";
+ src = fetchFromGitHub {
+ owner = "sodapopcan";
+ repo = "vim-twiggy";
+ rev = "962b181f402f05b66641308fe1b3538d5f863ab8";
+ sha256 = "0cqarsvdw9gr8pqp1gjy4rb6aaifjyb7iaaa2g8msr1ps0ihs3gd";
+ };
+ meta.homepage = "https://github.com/sodapopcan/vim-twiggy/";
+ };
+
vim-unimpaired = buildVimPluginFrom2Nix {
pname = "vim-unimpaired";
version = "2020-04-26";
@@ -7144,12 +7216,12 @@ let
vim-vsnip = buildVimPluginFrom2Nix {
pname = "vim-vsnip";
- version = "2020-08-23";
+ version = "2020-08-31";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "vim-vsnip";
- rev = "28867f3dd99efdae7f56b18f6555fc78f30e043b";
- sha256 = "1av7cvpb8iqnpjbq1cg667k5yhgr8m4vkj6c030a82cy1j49m931";
+ rev = "7bdd786c0ffe1f0876eabcd70daa15f82dc07af9";
+ sha256 = "1bab231y2fcdnpi3fi3as79m2cx28d2drpy5iv77h5q1xgpz2jak";
};
meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
};
@@ -7394,14 +7466,27 @@ let
meta.homepage = "https://github.com/Shougo/vimshell.vim/";
};
+ vimspector = buildVimPluginFrom2Nix {
+ pname = "vimspector";
+ version = "2020-08-29";
+ src = fetchFromGitHub {
+ owner = "puremourning";
+ repo = "vimspector";
+ rev = "e634982d78573cf0d678b2981b9ac59cd99126cb";
+ sha256 = "09ifckx1rks7qdj6zq7vqw3acfx6bxqa6ylsls1rnckn0fnn6li4";
+ fetchSubmodules = true;
+ };
+ meta.homepage = "https://github.com/puremourning/vimspector/";
+ };
+
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2020-08-21";
+ version = "2020-08-30";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "e27836fdf5b919ba8f4357abe16561ca4d0f60b1";
- sha256 = "1i5w7yijxa37jpn7k4whr3ri2d4nrmlrv94inanlpff006938fdd";
+ rev = "5ff0ed043eefba26f93883759204e86d25323253";
+ sha256 = "0nhxcfkr9f1svjki8m85if8acanw06ki1gax8x47sr43xns1i92r";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@@ -7614,24 +7699,24 @@ let
zenburn = buildVimPluginFrom2Nix {
pname = "zenburn";
- version = "2020-08-24";
+ version = "2020-08-30";
src = fetchFromGitHub {
owner = "jnurmine";
repo = "zenburn";
- rev = "de2cc6c93593938b9628e03eb424e318e5ec7959";
- sha256 = "17kvlbb49l3alqdd2bf6llvvhs0c9p75qn7i1kb1qavyipxi38a3";
+ rev = "94b8319a881b0d2dfe738bae23dbc2129f0e78db";
+ sha256 = "1js7zadw2y2gml3h1z5nqsjw8jafhgw4f2ajplr5nvai8j89j983";
};
meta.homepage = "https://github.com/jnurmine/zenburn/";
};
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
- version = "2020-07-20";
+ version = "2020-08-30";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig.vim";
- rev = "079985534a5f2795bfaf549f276d4a1c213bfcb1";
- sha256 = "173yx5nv9pnjm1qxcfkgbf4yfbjyifqjn5qvk8ibdvdxrhyvbrdn";
+ rev = "3c95b67a76934959f9124e39e64eb14f65f14dc9";
+ sha256 = "0m152kf9yw7q2slci2bzsqmycl9nxawhhclr4r9k5q87xdrzjqk0";
};
meta.homepage = "https://github.com/ziglang/zig.vim/";
};
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index c8b3f9cfa90..0b367bd4bb1 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -11,6 +11,7 @@ alx741/vim-stylishask
amiorin/ctrlp-z
andrep/vimacs
andreshazard/vim-logreview
+AndrewRadev/sideways.vim
AndrewRadev/splitjoin.vim
andsild/peskcolor.vim
andviro/flake8-vim
@@ -155,6 +156,7 @@ hsitz/VimOrganizer
iamcco/coc-spell-checker
iamcco/coc-vimlsp
ianks/vim-tsx
+idanarye/vim-merginal
idris-hackers/idris-vim
ihsanturk/neuron.vim
Inazuma110/deoplete-greek
@@ -205,6 +207,7 @@ junegunn/gv.vim
junegunn/limelight.vim
junegunn/seoul256.vim
junegunn/vader.vim
+junegunn/vim-after-object
junegunn/vim-easy-align
junegunn/vim-github-dashboard
junegunn/vim-peekaboo
@@ -381,7 +384,7 @@ neoclide/denite-extra
neoclide/denite-git
neoclide/vim-easygit
neomake/neomake
-neovim/nvim-lsp
+neovim/nvim-lspconfig
neovim/nvimdev.nvim
neovimhaskell/haskell-vim
neovimhaskell/nvim-hs.vim
@@ -426,6 +429,7 @@ preservim/nerdcommenter
preservim/nerdtree
psliwka/vim-smoothie
ptzz/lf.vim
+puremourning/vimspector
purescript-contrib/purescript-vim
python-mode/python-mode
qnighy/lalrpop.vim
@@ -442,6 +446,7 @@ rbgrouleff/bclose.vim
reedes/vim-pencil
reedes/vim-wordy
rhysd/committia.vim
+rhysd/devdocs.vim
rhysd/git-messenger.vim
rhysd/vim-clang-format
rhysd/vim-grammarous
@@ -493,6 +498,7 @@ sjl/gundo.vim
sjl/splice.vim
sk1418/last256
slashmili/alchemist.vim
+sodapopcan/vim-twiggy
solarnz/arcanist.vim
sonph/onehalf
stefandtw/quickfix-reflector.vim
@@ -631,6 +637,7 @@ xolox/vim-misc
xuhdev/vim-latex-live-preview
ycm-core/YouCompleteMe
Yggdroot/indentLine
+Yilin-Yang/vim-markbar
yuki-ycino/ncm2-dictionary
zah/nim.vim
ziglang/zig.vim
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index f8e9a4135a3..de02ffb30a3 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, makeWrapper, cmake, llvmPackages, kernel
+{ stdenv, fetchurl, fetchpatch
+, makeWrapper, cmake, llvmPackages, kernel
, flex, bison, elfutils, python, luajit, netperf, iperf, libelf
, systemtap, bash
}:
@@ -23,6 +24,12 @@ python.pkgs.buildPythonApplication rec {
# This is needed until we fix
# https://github.com/NixOS/nixpkgs/issues/40427
./fix-deadlock-detector-import.patch
+
+ # This is already upstream; remove it on the next release
+ (fetchpatch {
+ url = "https://github.com/iovisor/bcc/commit/60de17161fe7f44b534a8da343edbad2427220e3.patch";
+ sha256 = "0pd5b4vgpdxbsrjwrw2kmn4l9hpj0rwdm3hvwvk7dsr3raz7w4b3";
+ })
];
propagatedBuildInputs = [ python.pkgs.netaddr ];
diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix
index 0c360e60b7e..fc7c8ecba2d 100644
--- a/pkgs/os-specific/linux/bpftrace/default.nix
+++ b/pkgs/os-specific/linux/bpftrace/default.nix
@@ -1,17 +1,18 @@
{ stdenv, fetchFromGitHub
, cmake, pkgconfig, flex, bison
-, llvmPackages, kernel, elfutils, libelf, bcc
+, llvmPackages, kernel, elfutils
+, libelf, libbfd, libbpf, libopcodes, bcc
}:
stdenv.mkDerivation rec {
pname = "bpftrace";
- version = "0.9.4";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "iovisor";
repo = "bpftrace";
rev = "refs/tags/v${version}";
- sha256 = "00fvkq3razwacnpb82zkpv63dgyigbqx3gj6g0ka94nwa74i5i77";
+ sha256 = "02f2r731yj3fdc8341id1ksk4dma9rwm2765n2xgx2ldrrz5823y";
};
enableParallelBuilding = true;
@@ -19,6 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = with llvmPackages;
[ llvm clang-unwrapped
kernel elfutils libelf bcc
+ libbpf libbfd libopcodes
];
nativeBuildInputs = [ cmake pkgconfig flex bison ]
@@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
#
cmakeFlags =
[ "-DBUILD_TESTING=FALSE"
- "-DLIBBCC_INCLUDE_DIRS=${bcc}/include/bcc"
+ "-DLIBBCC_INCLUDE_DIRS=${bcc}/include"
];
# nuke the example/reference output .txt files, for the included tools,
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
new file mode 100644
index 00000000000..b59a367c4ad
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
@@ -0,0 +1,41 @@
+{ lib, buildLinux, fetchurl
+, kernelPatches ? [ ]
+, structuredExtraConfig ? {}
+, extraMeta ? {}
+, argsOverride ? {}
+, ... } @ args:
+
+let
+ version = "5.4.61-rt37"; # updated by ./update-rt.sh
+ branch = lib.versions.majorMinor version;
+ kversion = builtins.elemAt (lib.splitString "-" version) 0;
+in buildLinux (args // {
+ inherit version;
+
+ src = fetchurl {
+ url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
+ sha256 = "197y2yb60m1k8i7mig4pa9wsrklfxq81ba3zfahwb2b31w2kvwc6";
+ };
+
+ kernelPatches = let rt-patch = {
+ name = "rt";
+ patch = fetchurl {
+ url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
+ sha256 = "1qgd55x62pczgmxcxbigkg6f622ma5a6mz4gi55a8mlbxzh2pddj";
+ };
+ }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
+
+ structuredExtraConfig = with lib.kernel; {
+ PREEMPT_RT = yes;
+ # Fix error: unused option: PREEMPT_RT.
+ EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt)
+ # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n').
+ PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it.
+ # Fix error: unused option: RT_GROUP_SCHED.
+ RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch.
+ } // structuredExtraConfig;
+
+ extraMeta = extraMeta // {
+ inherit branch;
+ };
+} // argsOverride)
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix
new file mode 100644
index 00000000000..7c77454040d
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix
@@ -0,0 +1,41 @@
+{ lib, buildLinux, fetchurl
+, kernelPatches ? [ ]
+, structuredExtraConfig ? {}
+, extraMeta ? {}
+, argsOverride ? {}
+, ... } @ args:
+
+let
+ version = "5.6.19-rt12"; # updated by ./update-rt.sh
+ branch = lib.versions.majorMinor version;
+ kversion = builtins.elemAt (lib.splitString "-" version) 0;
+in buildLinux (args // {
+ inherit version;
+
+ src = fetchurl {
+ url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
+ sha256 = "1s0yc1138sglbm4vyizl4r7hnc1l7nykdjp4063ad67yayr2ylv2";
+ };
+
+ kernelPatches = let rt-patch = {
+ name = "rt";
+ patch = fetchurl {
+ url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
+ sha256 = "0ia8rx0615x0z2s4ppw1244crg7c5ak07c9n3wbnz7y8bk8hyxws";
+ };
+ }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
+
+ structuredExtraConfig = with lib.kernel; {
+ PREEMPT_RT = yes;
+ # Fix error: unused option: PREEMPT_RT.
+ EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt)
+ # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n').
+ PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it.
+ # Fix error: unused option: RT_GROUP_SCHED.
+ RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch.
+ } // structuredExtraConfig;
+
+ extraMeta = extraMeta // {
+ inherit branch;
+ };
+} // argsOverride)
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index cf2ca99f6f5..a78d853bb7f 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.9-rc2";
+ version = "5.9-rc3";
extraMeta.branch = "5.9";
# modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
- sha256 = "0mdh6gsd305kcgfqzyfgl5m886asjm5030ahg63gyias3ywzn5wd";
+ sha256 = "1byckdxy0y5i3lgw3f3n7b4r3v1xb4g1z3ffiq3hp4ga4nf5xzw3";
};
# Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/os-specific/linux/kernel/update-rt.sh b/pkgs/os-specific/linux/kernel/update-rt.sh
new file mode 100755
index 00000000000..bcfa494d7e7
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/update-rt.sh
@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# To update all rt kernels run: ./update-rt.sh
+
+# To update just one ./linux-rt-5.X.nix run: ./update-rt.sh ./linux-rt-5.X.nix
+
+# To add a new kernel branch 5.Y run: ./update-rt.sh ./linux-rt-5.Y.nix
+# (with nonexistent .nix file) and update all-packages.nix.
+
+# To commit run with: env COMMIT=1
+
+mirror=https://kernel.org/pub/linux/kernel
+
+main() {
+ if [ $# -ge 1 ]; then
+ update-if-needed "$1"
+ else
+ update-all-if-needed
+ fi
+}
+
+update-all-if-needed() {
+ for f in "$(dirname "$0")"/linux-rt-*.nix; do
+ update-if-needed "$f"
+ done
+}
+
+file-version() {
+ file="$1" # e.g. ./linux-rt-5.4.nix
+ if [ -e "$file" ]; then
+ grep ' version = ' "$file" | grep -o '[0-9].[^"]*'
+ fi
+}
+
+latest-rt-version() {
+ branch="$1" # e.g. 5.4
+ curl -sL "$mirror/projects/rt/$branch/sha256sums.asc" |
+ sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/; p; q }'
+}
+
+update-if-needed() {
+ file="$1" # e.g. ./linux-rt-5.4.nix (created if does not exist)
+ branch=$(basename "$file" .nix) # e.g. linux-rt-5.4
+ branch=${branch#linux-rt-} # e.g. 5.4
+ cur=$(file-version "$file") # e.g. 5.4.59-rt36 or empty
+ new=$(latest-rt-version "$branch") # e.g. 5.4.61-rt37
+ kversion=${new%-*} # e.g. 5.4.61
+ major=${branch%.*} # e.g 5
+ nixattr="linux-rt_${branch/./_}"
+ if [ "$new" = "$cur" ]; then
+ echo "$nixattr: $cur (up-to-date)"
+ return
+ fi
+ khash=$(nix-prefetch-url "$mirror/v${major}.x/linux-${kversion}.tar.xz")
+ phash=$(nix-prefetch-url "$mirror/projects/rt/${branch}/older/patch-${new}.patch.xz")
+ if [ "$cur" ]; then
+ msg="$nixattr: $cur -> $new"
+ else
+ msg="$nixattr: init at $new"
+ prev=$(ls "$(dirname "$0")"/linux-rt-*.nix | tail -1)
+ cp "$prev" "$file"
+ cur=$(file-version "$file")
+ fi
+ echo "$msg"
+ sed -i "$file" \
+ -e "s/$cur/$new/" \
+ -e "s|kernel/v[0-9]*|kernel/v$major|" \
+ -e "1,/.patch.xz/ s/sha256 = .*/sha256 = \"$khash\";/" \
+ -e "1,/.patch.xz/! s/sha256 = .*/sha256 = \"$phash\";/"
+ if [ "${COMMIT:-}" ]; then
+ git add "$file"
+ git commit -m "$msg"
+ fi
+}
+
+return 2>/dev/null || main "$@"
diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh
index 55fdce06c97..560edced36e 100755
--- a/pkgs/os-specific/linux/kernel/update.sh
+++ b/pkgs/os-specific/linux/kernel/update.sh
@@ -58,6 +58,9 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do
echo "Updated $OLDVER -> $V"
done
+# Update linux-rt
+COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-rt.sh
+
# Update linux-libre
COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index 0a98475384d..0f2f9aa86f4 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -6,13 +6,13 @@ with builtins;
stdenv.mkDerivation rec {
pname = "libbpf";
- version = "0.0.9";
+ version = "0.1.0";
src = fetchFromGitHub {
- owner = "libbpf";
- repo = "libbpf";
- rev = "v${version}";
- sha256 = "18l0gff7nm841mwhr7bc7x863xcyvwh58zl7mc0amnsjqlbrvqg7";
+ owner = "libbpf";
+ repo = "libbpf";
+ rev = "v${version}";
+ sha256 = "1wi3a795jq0smqg1c5ml2ghai47n1m5ijmch017wscybx4jdlynv";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index 4c0df659f3e..53ad0d6ed24 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "etcd";
- version = "3.3.22";
+ version = "3.3.25";
goPackagePath = "github.com/coreos/etcd";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "etcd-io";
repo = "etcd";
rev = "v${version}";
- sha256 = "1rd390qfx9k20j9gh1wp1g9ygc571f2kv1dg2wvqij3kwydhymcj";
+ sha256 = "10cyy6jr2xzmla5yyn850cv323ixrk70fjpk8lxjjjvy0ffmb6hj";
};
buildPhase = ''
@@ -24,10 +24,7 @@ buildGoPackage rec {
install -Dm755 bin/* bin/functional/cmd/* -t $out/bin
'';
- passthru.tests = with nixosTests; {
- etcd = etcd;
- etcd-cluster = etcd-cluster;
- };
+ passthru.tests = { inherit (nixosTests) etcd etcd-cluster; };
meta = with lib; {
description = "Distributed reliable key-value store for the most critical data of a distributed system";
diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index 6b3bcdf72d1..2298ecc84ce 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
- version = "0.36.2";
+ version = "0.36.4";
src = fetchurl {
url = "http://downloads.metabase.com/v${version}/metabase.jar";
- sha256 = "1m3wafv6fh3ivxi474bf0in3wryyimv27pqv3920ryvwkawz7gyi";
+ sha256 = "1k6f22ii9vga8j9jxipl1r55msxgag0lbkjxw7vf285z1hdhwylq";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index f867c819d07..2552964fe88 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -1,12 +1,12 @@
generic: {
v50 = generic {
- version = "5.0.2";
- sha256 = "1cnns7ixqi7ank3cbvcs7d8rb5zh9qiqbmgivazr83jnz81qg46w";
+ version = "5.0.3";
+ sha256 = "1dc3fb9pa2cr6mfwgfyy1hpx26pbrws7989wj2kiiilmvimvrz1l";
};
v40 = generic {
- version = "4.0.20";
- sha256 = "0h6qx4imrf5inmmczxir81a9xhra8a1dxxv538mqhxhbpqn1yh3w";
+ version = "4.0.24";
+ sha256 = "01nm0pqsb168qawm1j7b3lixbwkz6hi8hd2052q6dlzqm7s2mi2s";
};
v30 = generic {
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 54d5e8484bc..4d5c24c7304 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -32,15 +32,9 @@ let
# do not set GCC's -march=xxx based on builder's /proc/cpuinfo
"-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF"
# also avoid using builder's /proc/cpuinfo
- ] ++
- { westmere = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- sandybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- ivybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- haswell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- broadwell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- skylake = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- skylake-avx512 = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- }.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ];
+ "-DHAVE_SSE42=${if stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}"
+ "-DASM_OPTIMIZATIONS=${if stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}"
+ ];
enableParallelBuilding = true;
diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix
index 4ab3a4ee167..a418417ce2f 100644
--- a/pkgs/servers/pounce/default.nix
+++ b/pkgs/servers/pounce/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pounce";
- version = "1.3p1";
+ version = "1.4p2";
src = fetchzip {
url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz";
- sha256 = "1ab4pz7gyvlms00hcarcmsljkn0whwqxfck8b343l4riai2rj9xv";
+ sha256 = "0fpnj9yvmj4gbbfpya4i0lyin56r782pz19z3pgd8xgs22gd48cc";
};
buildInputs = [ libressl ];
diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix
index 88a84dd6191..b5390d1537d 100644
--- a/pkgs/servers/search/solr/default.nix
+++ b/pkgs/servers/search/solr/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "solr";
- version = "8.5.2";
+ version = "8.6.1";
src = fetchurl {
url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
- sha256 = "1kvd0vfic9h3glhz8dz5c1n8mmb9yv339pz1878wlh9j4k3xcmy4";
+ sha256 = "0ds6zjsnwgpcmivzi7d6yqdmyn2mhf3k8g7xp26yfpm7f12gpq4g";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix
index 9f82a76c323..ef592420b11 100644
--- a/pkgs/servers/ser2net/default.nix
+++ b/pkgs/servers/ser2net/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ser2net";
- version = "4.2.0";
+ version = "4.2.1";
src = fetchFromGitHub {
owner = "cminyard";
repo = "${pname}";
rev = "v${version}";
- sha256 = "154sc7aa74c2vwfwan41qwqxckp36lw9wf3qydamsyvd9ampjf5x";
+ sha256 = "01w82nrgffsfz2c80p4cyppg3bz56d90jm6i6356j0nva3784haw";
};
buildInputs = [ pkgconfig autoreconfHook gensio libyaml ];
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index 852f1ea61dd..a5071efb486 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -14,13 +14,13 @@ let
in
buildGoPackage rec {
pname = "cockroach";
- version = "20.1.3";
+ version = "20.1.4";
goPackagePath = "github.com/cockroachdb/cockroach";
src = fetchurl {
url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";
- sha256 = "0bg60rcfn2d4awg5al8d5xvk8h7bab986qlbpl9bkv6zpw9wipfb";
+ sha256 = "1m82m776axyf7b5f1lzlv5y7zslyhikfxjgagqy7ci5zwn8j4i0n";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ];
diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix
new file mode 100644
index 00000000000..09021317cd1
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/age.nix
@@ -0,0 +1,65 @@
+{ stdenv, fetchFromGitHub, bison, flex, postgresql }:
+
+stdenv.mkDerivation rec {
+ pname = "age";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "bitnine-oss";
+ repo = "AgensGraph-Extension";
+ rev = "v${version}";
+ sha256 = "0way59lj30727jlz2qz6rnw4fsxcd5028xcwgrwk7jxcaqi5fa17";
+ };
+
+ buildInputs = [ postgresql ];
+
+ makeFlags = [
+ "BISON=${bison}/bin/bison"
+ "FLEX=${flex}/bin/flex"
+ ];
+
+ installPhase = ''
+ install -D -t $out/lib *.so
+ install -D -t $out/share/postgresql/extension *.sql
+ install -D -t $out/share/postgresql/extension *.control
+ '';
+
+ passthru.tests = stdenv.mkDerivation {
+ inherit version src;
+
+ pname = "age-regression";
+
+ dontConfigure = true;
+
+ buildPhase = let
+ postgresqlAge = postgresql.withPackages (ps: [ ps.age ]);
+ in ''
+ # The regression tests need to be run in the order specified in the Makefile.
+ echo -e "include Makefile\nfiles:\n\t@echo \$(REGRESS)" > Makefile.regress
+ REGRESS_TESTS=$(make -f Makefile.regress files)
+
+ ${postgresql}/lib/pgxs/src/test/regress/pg_regress \
+ --inputdir=./ \
+ --bindir='${postgresqlAge}/bin' \
+ --encoding=UTF-8 \
+ --load-extension=age \
+ --inputdir=./regress --outputdir=./regress --temp-instance=./regress/instance \
+ --port=61958 --dbname=contrib_regression \
+ $REGRESS_TESTS
+ '';
+
+ installPhase = ''
+ touch $out
+ '';
+ };
+
+ meta = with stdenv.lib; {
+ description = "A graph database extension for PostgreSQL";
+ homepage = "https://github.com/bitnine-oss/AgensGraph-Extension";
+ changelog = "https://github.com/bitnine-oss/AgensGraph-Extension/releases/tag/v${version}";
+ maintainers = with maintainers; [ danieldk ];
+ platforms = postgresql.meta.platforms;
+ license = licenses.asl20;
+ broken = versionOlder postgresql.version "11.0";
+ };
+}
diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix
index 44e560a5f83..6dbb7a8ed11 100644
--- a/pkgs/servers/sql/postgresql/packages.nix
+++ b/pkgs/servers/sql/postgresql/packages.nix
@@ -1,5 +1,7 @@
self: super: {
+ age = super.callPackage ./ext/age.nix { };
+
periods = super.callPackage ./ext/periods.nix { };
postgis = super.callPackage ./ext/postgis.nix {
diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix
index d14252da999..ad7d534103c 100644
--- a/pkgs/servers/squid/default.nix
+++ b/pkgs/servers/squid/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "squid";
- version = "4.12";
+ version = "4.13";
src = fetchurl {
url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz";
- sha256 = "05z34ysy2zn7as11vd365xxhh36bm1ysiwcbr0i0f0nwng406apl";
+ sha256 = "1q1ywpic6s7dfjj3cwzcfgscc4zq0aih462gyas7j1z683ss14b8";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 33a32b48c30..b8a3a7c5fdc 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,15 +4,15 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- version = "2020-08-28";
+ version = "2020-08-31";
pname = "oh-my-zsh";
- rev = "4ed6fd2b8b6a0efb2f84f00a64503282aca260e7";
+ rev = "a7f5170d68c0b75a9864763a90ac11e51ec67c81";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
- sha256 = "0f2f1k6s28lgxpjdgl4s7jisw6dgva9mcsqlsq0wg6041p246nai";
+ sha256 = "03k1918cakqmg3x7kkiffdz1zwd86bipypkfigq3pgalh5zkyny9";
};
installPhase = ''
diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix
index 65482fabb11..dba42e4bfea 100644
--- a/pkgs/tools/misc/cpuminer-multi/default.nix
+++ b/pkgs/tools/misc/cpuminer-multi/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, curl, jansson, autoconf, automake
-, aesni ? true }:
+, aesni ? stdenv.hostPlatform.aesSupport }:
let
rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4";
@@ -28,6 +28,6 @@ stdenv.mkDerivation {
license = licenses.gpl2;
maintainers = [ maintainers.ehmry ];
# does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27
- platforms = [ "x86_64-linux" ];
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix
index 7a8b16c55e0..34548abd818 100644
--- a/pkgs/tools/misc/git-town/default.nix
+++ b/pkgs/tools/misc/git-town/default.nix
@@ -2,23 +2,22 @@
buildGoPackage rec {
pname = "git-town";
- version = "7.3.0";
-
- goPackagePath = "github.com/Originate/git-town";
+ version = "7.4.0";
+ goPackagePath = "github.com/git-town/git-town";
src = fetchFromGitHub {
- owner = "Originate";
+ owner = "git-town";
repo = "git-town";
rev = "v${version}";
- sha256 = "166g9i79hqga8k5wvs0b84q6rqniizzsd39v37s9w16axgdrm6nb";
+ sha256 = "05s2hp4xn0bs3y6rgqkpgz0k8q8yfpwkw5m8vwim95hk6n41ps18";
};
- buildFlagsArray = [ "-ldflags=-X github.com/Originate/git-town/src/cmd.version=v${version} -X github.com/Originate/git-town/src/cmd.buildDate=nix" ];
+ buildFlagsArray = [ "-ldflags=-X github.com/git-town/git-town/src/cmd.version=v${version} -X github.com/git-town/git-town/src/cmd.buildDate=nix" ];
meta = with stdenv.lib; {
description = "Generic, high-level git support for git-flow workflows";
homepage = "http://www.git-town.com/";
- maintainers = [ maintainers.allonsy ];
+ maintainers = [ maintainers.allonsy maintainers.blaggacao ];
license = licenses.mit;
};
}
diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix
deleted file mode 100644
index 53b1763ad6a..00000000000
--- a/pkgs/tools/misc/kdecoration-viewer/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchFromGitHub, mkDerivation
-, cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }:
-
-mkDerivation {
- name = "kdecoration-viewer-2018-07-24";
-
- src = fetchFromGitHub {
- owner = "KDE";
- repo = "kdecoration-viewer";
- rev = "6e50b39c651bbf92fd7e7116d43bf57288254288";
- sha256 = "01v6i081vx0mydqvnj05xli86m52v6bxxc3z1zlyyap9cfhag7lj";
- };
-
- nativeBuildInputs = [ cmake extra-cmake-modules ];
- buildInputs = [ qtquickcontrols kconfigwidgets kdeclarative kdecoration ];
-
- meta = with stdenv.lib; {
- description = "Allows to preview a KDecoration plugin";
- longDescription = ''
- kdecoration-viewer allows to preview a KDecoration plugin. Put your plugins under
- $QT_PLUGIN_PATH/org.kde.kdecoration2 to preview.
- '';
- homepage = "https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/";
- license = licenses.gpl2;
- maintainers = [ maintainers.gnidorah ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
index e04d37ba3c6..d1aaf23a6ec 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -40,13 +40,13 @@
stdenv.mkDerivation rec {
pname = "rpm-ostree";
- version = "2020.2";
+ version = "2020.4";
outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchurl {
url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
- sha256 = "nuEBEVFqr9J+Nf98GZkvNNYOtpMUjKzYrzCc1T2cR3A=";
+ sha256 = "019hjmfjhnvlrnb056fvznnsasnyw5awd594aa2126nbsi1j45dc";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 0aba67647e0..8df030eafad 100644
--- a/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix
@@ -1,33 +1,19 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost }:
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost, binutils }:
stdenv.mkDerivation rec {
pname = "thin-provisioning-tools";
- version = "0.7.6";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "jthornber";
repo = "thin-provisioning-tools";
rev = "v${version}";
- sha256 = "175mk3krfdmn43cjw378s32hs62gq8fmq549rjmyc651sz6jnj0g";
+ sha256 = "1iwg04rhmdhijmlk5hfl8wvv83115lzb65if6cc1glkkfva8jfjp";
};
nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ expat libaio boost ];
-
- patches = [
- (fetchpatch {
- # a) Fix build if limits.h provides definition for PAGE_SIZE, as musl does w/musl per XSI[1] although it's apparently optional [2].
- # This value is only provided when it's known to be a constant, to avoid the need to discover the value dynamically.
- # b) If not using system-provided (kernel headers, or libc headers, or something) use the POSIX approach of querying the value
- # dynamically using sysconf(_SC_PAGE_SIZE) instead of hardcoded value that hopefully is correct.
- # [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html
- # [2] http://www.openwall.com/lists/musl/2015/09/11/8
- url = "https://raw.githubusercontent.com/void-linux/void-packages/a0ece13ad7ab2aae760e09e41e0459bd999a3695/srcpkgs/thin-provisioning-tools/patches/musl.patch";
- sha256 = "1m8r3vhrnsy8drgs0svs3fgpi3mmxzdcqsv6bmvc0j52cvfqvhvy";
- extraPrefix = ""; # empty means add 'a/' and 'b/'
- })
- ];
+ buildInputs = [ expat libaio boost binutils ];
enableParallelBuilding = true;
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index b686ea4d04f..5f9f3ceef07 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub
, boost, zlib, openssl
, upnpSupport ? true, miniupnpc ? null
-, aesniSupport ? false
-, avxSupport ? false
+, aesniSupport ? stdenv.hostPlatform.aesSupport
+, avxSupport ? stdenv.hostPlatform.avxSupport
}:
assert upnpSupport -> miniupnpc != null;
diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix
index 21b6bd346fd..7e85973cbdb 100644
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, zlib }:
stdenv.mkDerivation rec {
- name = "siege-4.0.6";
+ name = "siege-4.0.7";
src = fetchurl {
url = "http://download.joedog.org/siege/${name}.tar.gz";
- sha256 = "03w0iska74nb6r8wnljn7inasbq7qflf55vjmxnb9jrc4pi7mpnw";
+ sha256 = "1y3dnl1ziw0c0d4nw30aj0sdmjvarn4xfxgfkswffwnkm8z5p9xz";
};
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 39a7b11f09f..4ee330eb918 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
"--with-rootkey-file=${dns-root-data}/root.key"
"--enable-pie"
"--enable-relro-now"
+ ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic [
+ "--disable-flto"
];
installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix
index ee0bee8b8b7..91052f945ed 100644
--- a/pkgs/tools/security/1password-gui/default.nix
+++ b/pkgs/tools/security/1password-gui/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "1password";
- version = "0.8.3-1";
+ version = "0.8.4";
src = fetchurl {
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
- sha256 = "06kzvdqsd7viaj7qz0ywi4k85662084cx73psk1b2hphklvdl24c";
+ sha256 = "04rjlyi465pkg75pql3rfzmfj9zf8pfnxynz110x1wkqnvqmsxgw";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix
index b637eacd3da..847d5d0cafb 100644
--- a/pkgs/tools/security/doppler/default.nix
+++ b/pkgs/tools/security/doppler/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "doppler";
- version = "3.10.1";
+ version = "3.10.3";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
- sha256 = "0wzs480dg6q6j8jzhk5lkf5hs53jf7ljmnyw3i9xwqm9sxq7dsfx";
+ sha256 = "15wmg67wwwgrs8q45r1z98k9v7mf2bfgsa40gcf8dr18ilnfpbn4";
};
vendorSha256 = "0wqbwk72k4r30a3vnf0gnx3k97y8xgnr2iavk5bc8f8vkjv0bsv6";
diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index 6377e829aa6..c27f82d7053 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3, gamin }:
+{ stdenv, fetchFromGitHub, python3 }:
let version = "0.11.1"; in
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index a9d72f33161..eb999b5cedc 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "vault";
- version = "1.5.2";
+ version = "1.5.3";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
- sha256 = "0a16slrg0kx7i1xwixc920lkgbbywvb6wpmkbqjvz1xx72nq9ap4";
+ sha256 = "149if5s4rdpxgzakh8s79j1fcfcqk1w7gvgchc044xlicl1r49ic";
};
goPackagePath = "github.com/hashicorp/vault";
diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
index 315cd5ab077..b8a70eb82f9 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -1,30 +1,30 @@
{ stdenv, fetchurl, unzip }:
let
- version = "1.5.2";
+ version = "1.5.3";
sources = let
base = "https://releases.hashicorp.com/vault/${version}";
in {
x86_64-linux = fetchurl {
url = "${base}/vault_${version}_linux_amd64.zip";
- sha256 = "1m9svs1ncgdwwh16xavwikq4ji9rzkb2wlr59sx61rlz0l18mknd";
+ sha256 = "1chhi7piq04j8rgk15rcszqqp37xd9cjj67plr5pgvdps3s1zihy";
};
i686-linux = fetchurl {
url = "${base}/vault_${version}_linux_386.zip";
- sha256 = "0hd6gsrmjfly3075kq0rsxhgy927g1462qih0iiwphrhik7l0pwr";
+ sha256 = "0jbnvypapang025wfyj6i70jdz3g29ggg7rzmg8xh6gfyhwk3vmb";
};
x86_64-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_amd64.zip";
- sha256 = "092xqjm69ljn70hn9f93qkc0ila0hgj2l14plhsza52d924qnq3l";
+ sha256 = "1m54258lfdr79p2j8janbkhp0a8bs8xbrcr51lqx2s620n7sfbya";
};
i686-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_386.zip";
- sha256 = "161j15n6kfd3m5hakc0qn824kp0nwdghcm81j9vqzpq900sbg6ak";
+ sha256 = "038qkkhlwj86fz9vpcycvv5nb41y8mqypqvhfp0ia11birp8xlsr";
};
aarch64-linux = fetchurl {
url = "${base}/vault_${version}_linux_arm64.zip";
- sha256 = "1f6ckfqqj9gsaizwxa7xrjgkkj3nd6m1md7smz0xnxgnc4f7g4z0";
+ sha256 = "1vivkwcy9j9zs7w65k7y8chix8jnii5pz8zck6rlpwgz5vs0h04k";
};
};
diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 4bbe2bdcee0..1814d4b9765 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
+{ stdenv, fetchurl, pkgconfig, zlib, kmod, which
+, static ? stdenv.targetPlatform.isStatic
+}:
stdenv.mkDerivation rec {
name = "pciutils-3.7.0"; # with release-date database
@@ -12,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib kmod which ];
makeFlags = [
- "SHARED=yes"
+ "SHARED=${if static then "no" else "yes"}"
"PREFIX=\${out}"
"STRIP="
"HOST=${stdenv.hostPlatform.system}"
diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix
index b7864b05b6e..bfa22a4fd18 100644
--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ b/pkgs/tools/text/ocrmypdf/default.nix
@@ -29,14 +29,14 @@ let
in
buildPythonApplication rec {
pname = "ocrmypdf";
- version = "10.3.0";
+ version = "11.0.1";
disabled = ! python3Packages.isPy3k;
src = fetchFromGitHub {
owner = "jbarlow83";
repo = "OCRmyPDF";
rev = "v${version}";
- sha256 = "0c6v7846lmkmbyfla07s35mpba4h09h0fx6pxqf0yvdjxmj46q8c";
+ sha256 = "194ds9i1zd80ynzwgv7kprax0crh7bbchayawdcvg2lyr64a82xn";
};
nativeBuildInputs = with python3Packages; [
@@ -76,8 +76,6 @@ buildPythonApplication rec {
src = ./liblept.patch;
liblept = "${stdenv.lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}";
})
- # https://github.com/jbarlow83/OCRmyPDF/pull/596
- ./0001-Make-compatible-with-pdfminer.six-version-20200720.patch
];
makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ];
diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
index 9180573541d..852175c4f21 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, wget, bash }:
stdenv.mkDerivation rec {
- version = "2.29";
+ version = "2.30";
pname = "wgetpaste";
src = fetchurl {
url = "http://wgetpaste.zlin.dk/${pname}-${version}.tar.bz2";
- sha256 = "1rp0wxr3zy7y2xp3azaadfghrx7g0m138f9qg6icjxkkz4vj9r22";
+ sha256 = "14k5i6j6f34hcf9gdb9cnvfwscn0ys2dgd73ci421wj9zzqkbv73";
};
# currently zsh-autocompletion support is not installed
diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix
index 7a4b8010f04..b97652bb4a6 100644
--- a/pkgs/tools/typesetting/satysfi/default.nix
+++ b/pkgs/tools/typesetting/satysfi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, fetchFromGitHub, ruby, dune, ocamlPackages
+{ stdenv, fetchzip, fetchFromGitHub, ruby, dune_2, ocamlPackages
, ipaexfont, junicode, lmodern, lmmath
}:
let
@@ -6,8 +6,8 @@ let
src = fetchFromGitHub {
owner = "gfngfn";
repo = "camlpdf";
- rev = "v2.2.2+satysfi";
- sha256 = "1dkyibjd8qb9fzljlzdsfdhb798vc9m8xqkd7295fm6bcfpr5r5k";
+ rev = "v2.3.1+satysfi";
+ sha256 = "1s8wcqdkl1alvfcj67lhn3qdz8ikvd1v64f4q6bi4c0qj9lmp30k";
};
});
otfm = ocamlPackages.otfm.overrideAttrs (o: {
@@ -18,23 +18,29 @@ let
sha256 = "0y8s0ij1vp1s4h5y1hn3ns76fzki2ba5ysqdib33akdav9krbj8p";
};
});
- yojson = ocamlPackages.yojson.overrideAttrs (o: {
+ yojson-with-position = ocamlPackages.buildDunePackage {
+ pname = "yojson-with-position";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "gfngfn";
- repo = "yojson";
- rev = "v1.4.1+satysfi";
- sha256 = "06lajzycwmvc6s26cf40s9xn001cjxrpxijgfha3s4f4rpybb1mp";
+ repo = "yojson-with-position";
+ rev = "v1.4.2+satysfi";
+ sha256 = "17s5xrnpim54d1apy972b5l08bph4c0m5kzbndk600fl0vnlirnl";
};
- });
+ useDune2 = true;
+ nativeBuildInputs = [ ocamlPackages.cppo ];
+ propagatedBuildInputs = [ ocamlPackages.biniou ];
+ inherit (ocamlPackages.yojson) meta;
+ };
in
stdenv.mkDerivation rec {
pname = "satysfi";
- version = "0.0.4";
+ version = "0.0.5";
src = fetchFromGitHub {
owner = "gfngfn";
repo = "SATySFi";
rev = "v${version}";
- sha256 = "0ilvgixglklqwavf8p9mcbrjq6cjfm9pk4kqx163c0irh0lh0adv";
+ sha256 = "1y72by6d15bc6qb1lv1ch6cm1i74gyr0w127nnvs2s657snm0y1n";
fetchSubmodules = true;
};
@@ -44,11 +50,11 @@ in
$out/share/satysfi
'';
- nativeBuildInputs = [ ruby dune ];
+ nativeBuildInputs = [ ruby dune_2 ];
- buildInputs = [ camlpdf otfm ] ++ (with ocamlPackages; [
+ buildInputs = [ camlpdf otfm yojson-with-position ] ++ (with ocamlPackages; [
ocaml findlib menhir
- batteries camlimages core_kernel ppx_deriving uutf yojson omd cppo re
+ batteries camlimages core_kernel ppx_deriving uutf omd cppo re
]);
installPhase = ''
diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix
index 31baa431bfc..76b9b285d15 100644
--- a/pkgs/tools/typesetting/tikzit/default.nix
+++ b/pkgs/tools/typesetting/tikzit/default.nix
@@ -2,13 +2,13 @@
mkDerivation {
pname = "tikzit";
- version = "2.1.5";
+ version = "2.1.6";
src = fetchFromGitHub {
owner = "tikzit";
repo = "tikzit";
- rev = "v2.1.5";
- sha256 = "1xrx7r8b6nb912k91pkdwaz2gijfq6lzssyqxard0591h2mycbcg";
+ rev = "v2.1.6";
+ sha256 = "0ba99pgv54pj1xvhrwn9db2w0v4h07vsjajcnhpa2smy88ypg32h";
};
nativeBuildInputs = [ qmake qttools flex bison ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index da3d3bdfc6d..d36f73e2f86 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -104,6 +104,7 @@ mapAliases ({
deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23
deadpixi-sam = deadpixi-sam-unstable;
debian_devscripts = debian-devscripts; # added 2016-03-23
+ deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31
desktop_file_utils = desktop-file-utils; # added 2018-02-25
devicemapper = lvm2; # added 2018-04-25
digikam5 = digikam; # added 2017-02-18
@@ -218,6 +219,7 @@ mapAliases ({
jikes = throw "deprecated in 2019-10-07: jikes was abandoned by upstream";
joseki = apache-jena-fuseki; # added 2016-02-28
json_glib = json-glib; # added 2018-02-25
+ kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
kdiff3-qt5 = kdiff3; # added 2017-02-18
keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
keepassx-community = keepassxc; # added 2017-11
@@ -326,6 +328,7 @@ mapAliases ({
nagiosPluginsOfficial = monitoring-plugins;
ncat = nmap; # added 2016-01-26
netcat-openbsd = libressl.nc; # added 2018-04-25
+ netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # added 2020-08-31
networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25
networkmanager_iodine = networkmanager-iodine; # added 2018-02-25
networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1140be1057..ae612d83797 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -123,6 +123,8 @@ in
appimageTools = callPackage ../build-support/appimage { };
+ appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { };
+
ensureNewerSourcesHook = { year }: makeSetupHook {}
(writeScript "ensure-newer-sources-hook.sh" ''
postUnpackHooks+=(_ensureNewerSources)
@@ -1372,6 +1374,11 @@ in
then python.pkgs.tensorflow.libtensorflow
else libtensorflow-bin;
+ libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix {
+ inherit (linuxPackages) nvidia_x11;
+ cudaSupport = pkgs.config.cudaSupport or false;
+ };
+
behdad-fonts = callPackage ../data/fonts/behdad-fonts { };
bless = callPackage ../applications/editors/bless { };
@@ -4550,7 +4557,9 @@ in
buildGoModule = buildGo114Module;
};
ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
- ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { };
+ ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {
+ buildGoModule = buildGo114Module;
+ };
ipget = callPackage ../applications/networking/ipget { };
@@ -10228,6 +10237,8 @@ in
spark = callPackage ../applications/networking/cluster/spark { };
+ sparkleshare = callPackage ../applications/version-management/sparkleshare { };
+
spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({
inherit (darwin) libobjc;
@@ -14848,8 +14859,9 @@ in
knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner
kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland
kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
- networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet syntax-highlighting
- syndication threadweaver kirigami2 kholidays kpurpose kcontacts;
+ networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet
+ syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose
+ kcontacts kquickcharts;
### KDE PLASMA 5
@@ -15705,19 +15717,15 @@ in
wxGTK30 = wxGTK30-gtk2;
wxGTK31 = wxGTK31-gtk2;
- wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 {
- inherit (gnome2) GConf;
- };
+ wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { };
wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 {
- inherit (gnome2) GConf;
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
};
wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 {
withGtk2 = true;
- inherit (gnome2) GConf;
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
};
@@ -15730,7 +15738,6 @@ in
wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 {
withGtk2 = true;
- inherit (gnome2) GConf;
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
};
@@ -17575,6 +17582,22 @@ in
];
};
+ linux-rt_5_4 = callPackage ../os-specific/linux/kernel/linux-rt-5.4.nix {
+ kernelPatches = [
+ kernelPatches.bridge_stp_helper
+ kernelPatches.request_key_helper
+ kernelPatches.export_kernel_fpu_functions."5.3"
+ ];
+ };
+
+ linux-rt_5_6 = callPackage ../os-specific/linux/kernel/linux-rt-5.6.nix {
+ kernelPatches = [
+ kernelPatches.bridge_stp_helper
+ kernelPatches.request_key_helper
+ kernelPatches.export_kernel_fpu_functions."5.3"
+ ];
+ };
+
linux_5_7 = callPackage ../os-specific/linux/kernel/linux-5.7.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -17817,12 +17840,20 @@ in
linuxPackages_latest = linuxPackages_5_8;
linux_latest = linuxPackages_latest.kernel;
- # Build the kernel modules for the some of the kernels.
+ # Realtime kernel packages.
+ linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4;
+ linuxPackages-rt = linuxPackages-rt_5_4;
+ linux-rt = linuxPackages-rt.kernel;
+ linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6;
+ linuxPackages-rt_latest = linuxPackages-rt_5_6;
+ linux-rt_latest = linuxPackages-rt_latest.kernel;
+
linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp;
linuxPackages_rpi1 = linuxPackagesFor pkgs.linux_rpi1;
linuxPackages_rpi2 = linuxPackagesFor pkgs.linux_rpi2;
linuxPackages_rpi3 = linuxPackagesFor pkgs.linux_rpi3;
linuxPackages_rpi4 = linuxPackagesFor pkgs.linux_rpi4;
+ # Build kernel modules for some of the kernels.
linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
@@ -17831,7 +17862,7 @@ in
linuxPackages_5_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_7);
linuxPackages_5_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_8);
- # When adding to this list:
+ # When adding to the list above:
# - Update linuxPackages_latest to the latest version
# - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one.
@@ -18383,6 +18414,7 @@ in
ubootPine64
ubootPine64LTS
ubootPinebook
+ ubootPinebookPro
ubootQemuAarch64
ubootQemuArm
ubootRaspberryPi
@@ -19980,9 +20012,7 @@ in
buildServerGui = false;
};
- droopy = callPackage ../applications/networking/droopy {
- inherit (python3Packages) wrapPython;
- };
+ droopy = python37Packages.callPackage ../applications/networking/droopy { };
drumgizmo = callPackage ../applications/audio/drumgizmo { };
@@ -21259,8 +21289,6 @@ in
kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
- kdecoration-viewer = libsForQt5.callPackage ../tools/misc/kdecoration-viewer { };
-
inherit (kdeFrameworks) kdesu;
kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
@@ -23107,6 +23135,11 @@ in
surf-display = callPackage ../desktops/surf-display { };
+ surge = callPackage ../applications/audio/surge {
+ inherit (gnome3) zenity;
+ git = gitMinimal;
+ };
+
sunvox = callPackage ../applications/audio/sunvox { };
swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
@@ -23388,6 +23421,10 @@ in
tudu = callPackage ../applications/office/tudu { };
+ tunefish = callPackage ../applications/audio/tunefish {
+ stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4
+ };
+
tut = callPackage ../applications/misc/tut { };
tuxguitar = callPackage ../applications/editors/music/tuxguitar { };
@@ -24627,7 +24664,6 @@ in
fsg = callPackage ../games/fsg {
wxGTK = wxGTK28.override {
unicode = false;
- gst-plugins-base = null;
};
};
@@ -27147,9 +27183,7 @@ in
sanoid = callPackage ../tools/backup/sanoid { };
- satysfi = callPackage ../tools/typesetting/satysfi {
- ocamlPackages = ocaml-ng.ocamlPackages_4_07;
- };
+ satysfi = callPackage ../tools/typesetting/satysfi { };
sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller {
inherit libusb1; # Shadow python.pkgs.libusb1.
@@ -27344,6 +27378,8 @@ in
webfs = callPackage ../servers/http/webfs { };
+ webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { };
+
websocketd = callPackage ../applications/networking/websocketd { };
wikicurses = callPackage ../applications/misc/wikicurses {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 611717b60f5..d6ce5710f8a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1412,6 +1412,8 @@ in {
databricks-cli = callPackage ../development/python-modules/databricks-cli { };
+ databricks-connect = callPackage ../development/python-modules/databricks-connect { inherit (pkgs) jdk; };
+
dataclasses = callPackage ../development/python-modules/dataclasses { };
dataclasses-json = callPackage ../development/python-modules/dataclasses-json { };
@@ -3104,6 +3106,8 @@ in {
kconfiglib = callPackage ../development/python-modules/kconfiglib { };
+ keep = callPackage ../development/python-modules/keep { };
+
keepalive = callPackage ../development/python-modules/keepalive { };
keepkey_agent = callPackage ../development/python-modules/keepkey_agent { };
@@ -5815,6 +5819,9 @@ in {
pywavelets = callPackage ../development/python-modules/pywavelets { };
+ # We need "normal" libxml2 and not the python package by the same name.
+ pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; };
+
PyWebDAV = callPackage ../development/python-modules/pywebdav { };
pywebpush = callPackage ../development/python-modules/pywebpush { };
@@ -6987,6 +6994,12 @@ in {
else
callPackage ../development/python-modules/tornado/5.nix { };
+ # Used by circus and grab-site, 2020-08-29
+ tornado_4 = callPackage ../development/python-modules/tornado/4.nix { };
+
+ # Used by luigi, 2020-08-29
+ tornado_5 = callPackage ../development/python-modules/tornado/5.nix { };
+
towncrier = callPackage ../development/python-modules/towncrier { inherit (pkgs) git; };
tox = callPackage ../development/python-modules/tox { };
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 9e07d2bf061..58b0300cc79 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -215,6 +215,7 @@ let
crossOverlays = [ (import ./static.nix) ];
} // lib.optionalAttrs stdenv.hostPlatform.isLinux {
crossSystem = {
+ isStatic = true;
parsed = stdenv.hostPlatform.parsed // {
abi = {
gnu = lib.systems.parse.abis.musl;