;' jni/com_myJava_file_metadata_posix_jni_wrapper_FileAccessWrapper.c
+ substituteInPlace jni/com_myJava_file_metadata_posix_jni_wrapper_FileAccessWrapper.c --replace attr/xattr.h sys/xattr.h
+
sed -i "s#^PROGRAM_DIR.*#PROGRAM_DIR=$out#g" bin/areca_run.sh
sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=$out/lib:${stdenv.lib.makeLibraryPath [ swt acl ]}#g" bin/areca_run.sh
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index cb0aa393380..1e9cd4857bc 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,19 +8,19 @@ let
inherit (gnome2) GConf gnome_vfs;
};
stableVersion = {
- version = "3.3.1.0"; # "Android Studio 3.3.1"
- build = "182.5264788";
- sha256Hash = "0fghqkc8pkb7waxclm0qq4nlnsvmv9d3fcj5nnvgbfkjyw032q42";
+ version = "3.3.2.0"; # "Android Studio 3.3.2"
+ build = "182.5314842";
+ sha256Hash = "0smh3d3v8n0isxg7fkls20622gp52f58i2b6wa4a0g8wnvmd6mw2";
};
betaVersion = {
- version = "3.4.0.13"; # "Android Studio 3.4 Beta 4"
- build = "183.5304277";
- sha256Hash = "01x7xba0f5js213wgw0h1vw297vwz5q7dprnilcdydfjxwqsbr8f";
+ version = "3.4.0.15"; # "Android Studio 3.4 RC 1"
+ build = "183.5341121";
+ sha256Hash = "0s7wadnzbrd031ls43b5nbh1nx0paj74bxy2yiczr4qb9n562zzy";
};
latestVersion = { # canary & dev
- version = "3.5.0.3"; # "Android Studio 3.5 Canary 4"
- build = "183.5290690";
- sha256Hash = "0d1cl78b25pksaj0scv3hxb14bjxk3591zbc0v7dykk1gf4pvxd1";
+ version = "3.5.0.5"; # "Android Studio 3.5 Canary 6"
+ build = "183.5326993";
+ sha256Hash = "06d43qw0p6zpy6vmriiihql5vgc6c4darplc2148y616hx0whrql";
};
in rec {
# Old alias (TODO @primeos: Remove after 19.03 is branched off):
diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix
index 1c2e3a42578..f78f7fbf914 100644
--- a/pkgs/applications/editors/bluefish/default.nix
+++ b/pkgs/applications/editors/bluefish/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
- buildInputs = [ gnome3.defaultIconTheme gtk libxml2
+ buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2
enchant gucharmap python ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
index 389608ad824..6ae9eb078e2 100644
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.eclipse.org/;
inherit description;
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 55bbc778e3a..3fa46fc4d92 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -11,7 +11,14 @@ assert stdenv ? glibc;
# http://download.eclipse.org/eclipse/downloads/ is the main place to
# find the downloads needed for new versions
-rec {
+let
+ platform_major = "4";
+ platform_minor = "10";
+ year = "2018";
+ month = "12";
+ timestamp = "201812060815";
+
+in rec {
buildEclipse = import ./build-eclipse.nix {
inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
@@ -21,133 +28,43 @@ rec {
### Eclipse CPP
- eclipse-cpp = eclipse-cpp-47; # always point to latest
-
- eclipse-cpp-47 = buildEclipse {
- name = "eclipse-cpp-4.7.0";
+ eclipse-cpp = buildEclipse {
+ name = "eclipse-cpp-${platform_major}.${platform_minor}";
description = "Eclipse IDE for C/C++ Developers, Oxygen release";
src =
- if stdenv.hostPlatform.system == "x86_64-linux" then
- fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk-x86_64.tar.gz;
- sha512 = "813c791e739d7d0e2ab242a5bacadca135bbeee20ef97aa830353cd90f63fa6e9c89cfcc6aadf635c742befe035bd6e3f15103013f63c419f6144e86ebde3ed1";
- }
- else if stdenv.hostPlatform.system == "i686-linux" then
- fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk.tar.gz;
- sha512 = "2b50f4a00306a89cda1aaaa606e62285cacbf93464a9dd3f3319dca3e2c578b802e685de6f78e5e617d269e21271188effe73d41f491a6de946e28795d82db8a";
- }
- else throw "Unsupported system: ${stdenv.hostPlatform.system}";
+ fetchurl {
+ url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
+ sha512 = "1f5yr7cydz4iw8c14yn713d44f1g1wkiqiwmb4ikdfx4l70rc5xxsdxv9b4mhm89b02cqnxdh9p5hivkssmnzg0km3ab5bx9mvzgzx7";
+ };
};
- eclipse-cpp-37 = buildEclipse {
- name = "eclipse-cpp-3.7";
- description = "Eclipse IDE for C/C++ Developers";
- src =
- if stdenv.hostPlatform.system == "x86_64-linux" then
- fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk-x86_64.tar.gz;
- sha256 = "14ppc9g9igzvj1pq7jl01vwhzb66nmzbl9wsdl1sf3xnwa9wnqk3";
- }
- else
- fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk.tar.gz;
- sha256 = "1cvg1vgyazrkinwzlvlf0dpl197p4784752srqybqylyj5psdi3b";
- };
- };
- eclipse_cpp_37 = eclipse-cpp-37; # backward compatibility, added 2016-01-30
-
### Eclipse Modeling
- eclipse-modeling = eclipse-modeling-47; # always point to latest
-
- eclipse-modeling-47 = buildEclipse {
- name = "eclipse-modeling-4.7";
+ eclipse-modeling = buildEclipse {
+ name = "eclipse-modeling-${platform_major}.${platform_minor}";
description = "Eclipse Modeling Tools";
src =
- if stdenv.hostPlatform.system == "x86_64-linux" then
- fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk-x86_64.tar.gz;
- sha512 = "3b9a7ad4b5d6b77fbdd64e8d323e0adb6c2904763ad042b374b4d87cef8607408cb407e395870fc755d58c0c800e20818adcf456ebe193d76cede16c5fe12271";
- }
- else
- fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk.tar.gz;
- sha512 = "b8597c1dec117e69c72a5e1a53e09b1f81a7c9de86ed7e71a9d007664603202df301745f186ded02b2e76410345863e80a2ba40867d6848e5375601289999206";
- };
+ fetchurl {
+ url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
+ sha512 = "18psh1lgqg21dmndyc0yr6rz7piqyk861j9mlhgv9xaq8nz11fb6lil594sk64yyv0qbgi98vp03f1p06zvhgs37k9rjkfjmzl7n97k";
+ };
};
- eclipse-modeling-36 = buildEclipse {
- name = "eclipse-modeling-3.6.2";
- description = "Eclipse Modeling Tools (includes Incubating components)";
- src =
- if stdenv.hostPlatform.system == "x86_64-linux" then
- fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk-x86_64.tar.gz;
- sha1 = "e96f5f006298f68476f4a15a2be8589158d5cc61";
- }
- else
- fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk.tar.gz;
- sha1 = "696377895bb26445de39d82a916b7e69edb1d939";
- };
- };
- eclipse_modeling_36 = eclipse-modeling-36; # backward compatibility, added 2016-01-30
-
### Eclipse Platform
- eclipse-platform = eclipse-platform-49; # always point to latest
-
- eclipse-platform-47 = buildEclipse {
- name = "eclipse-platform-4.7.3a";
- description = "Eclipse Platform Oxygen";
- sources = {
- "x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz;
- sha512 = "caf86cd6efaf66258c75434f1adf552587a7395d57dba4cfd20f86196308cf942866d931f4b352f9d39a6fbf14444fcd2167e6bfd146a28c96c229bb9988156a";
- };
- "i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk.tar.gz;
- sha512 = "c633da467774e4ab40f8d51d07b8e7d8403f26f23365c3c3ceeaeec1039b8c23c7508cee1f786bf52db64c7b84e0f91cb31a2848a74ac8271f8504934407bd5c";
- };
- };
- };
-
- eclipse-platform-48 = buildEclipse {
- name = "eclipse-platform-4.8";
- description = "Eclipse Platform Photon";
- sources = {
- "x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk-x86_64.tar.gz;
- sha512 = "ccce2b954938479e42ef3f9b78f74b24ae4cae7499546fa4f9a55ec1849e1acfd06315d4529b11474a8b3d1142c9409c581edfa571baaf1342ab062f02467af2";
- };
- "i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk.tar.gz;
- sha512 = "f5f407727e22b848931cf38f71b1a0c30a9778aa227c3df137dcceec2fba2ecc309cbfa8b4a660b814d2edb60f65110381497b4325781cab4d6402784139e32b";
- };
- };
- };
-
- eclipse-platform-49 = buildEclipse {
- name = "eclipse-platform-4.9";
- description = "Eclipse Platform 2018-09";
- sources = {
- "x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-platform-4.9-linux-gtk-x86_64.tar.gz;
- sha512 = "875714bb411145c917fccedf2f7c4fd2757640b2debf4a18f775604233abd6f0da893b350cc03da44413d7ec6fae3f773ef08634e632058e4b705e6cda2893eb";
- };
- "i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-platform-4.9-linux-gtk.tar.gz;
- sha512 = "758bc0de30fa5c4b76b343ea0325611d87b6928ef5002244f2f1ba2a9fa937de89b2a94ce2c8d33d79344fd574d6e8a72c5d127fe416d785f48600e9e85fce86";
- };
- };
+ eclipse-platform = buildEclipse {
+ name = "eclipse-platform-${platform_major}.${platform_minor}";
+ description = "Eclipse Platform ${year}-${month}";
+ src =
+ fetchurl {
+ url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
+ sha512 = "2zdvbjk05a00lbcad9v30rcr93j03d2pycdhpwrvrakr8z4yrxs6svamq9s294ry1w3lw04pgsnqklw6zjx6iil1kp51f374lkfpxn7";
+ };
};
### Eclipse Scala SDK
- eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest
-
- eclipse-scala-sdk-441 = buildEclipse {
+ eclipse-scala-sdk = buildEclipse {
name = "eclipse-scala-sdk-4.4.1";
description = "Eclipse IDE for Scala Developers";
src =
@@ -165,88 +82,26 @@ rec {
### Eclipse SDK
- eclipse-sdk = eclipse-sdk-49; # always point to latest
-
- eclipse-sdk-47 = buildEclipse {
- name = "eclipse-sdk-4.7.3a";
- description = "Eclipse Oxygen Classic";
- sources = {
- "x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk-x86_64.tar.gz;
- sha512 = "d77e42aca16d26526cef32e363d038258bb8a4616d9dbe6e76dd3656dc2217369436390a82555bde4566bbbdb631813bbaca08602f7bb885cb30e8a26a14873f";
- };
- "i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk.tar.gz;
- sha512 = "b0b936fd4142ae86ec5c30535cd5e4caf6fe313d814ae5b16f300635e4163a79b748b1eee11792a135114f2265678a74821ec80c2bfd69872769b6d0ccbcde3a";
- };
- };
+ eclipse-sdk = buildEclipse {
+ name = "eclipse-sdk-${platform_major}.${platform_minor}";
+ description = "Eclipse ${year}-${month} Classic";
+ src =
+ fetchurl {
+ url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
+ sha512 = "1kq14vhzcngfhl8kjs722rshny81gxv6wcgln46x7lnpg2274sb9dprhns62fpq97l0355cmg8mnny6fsd1nqibrw09xq932v86cfm8";
+ };
};
- eclipse-sdk-48 = buildEclipse {
- name = "eclipse-sdk-4.8";
- description = "Eclipse Photon Classic";
- sources = {
- "x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk-x86_64.tar.gz;
- sha512 = "357ea9e7f426c68ced693f1c7b76eae23f9e3c7893de1f12d17994ec17b447896b5daa7292d5fbf6d9c4e5b7fd637ca5b2a6ba8ce40a2a7c2fe06f2124d31b75";
- };
- "i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk.tar.gz;
- sha512 = "c7cae7baa3978d48477090bb9941e85b4c7484021ece9c5c77a7e859e57e5c1f13556262f92b561cfb11f828b934bad7a6018be7b8fd9454e3991e8d5cae9917";
- };
- };
- };
-
- eclipse-sdk-49 = buildEclipse {
- name = "eclipse-sdk-4.9";
- description = "Eclipse 2018-09 Classic";
- sources = {
- "x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-SDK-4.9-linux-gtk-x86_64.tar.gz;
- sha512 = "5e74a0411f56b3973b7c6d8c3727392297d55ad458a814b4cc3f2f6a57dbeebc64852d1a6a958db5c3b08c620093bfb5bcc0d2c6a400f5594b82c2ef5d5fa9fb";
- };
- "i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-SDK-4.9-linux-gtk.tar.gz;
- sha512 = "b1861bd99c8e43f1d04247226584246aa7844af5e2da820fe98a51018dbe8ff4c25dbb9fa655f56e103f95c0696f40a65dcce13430c63aa080f786738e70eb8b";
- };
- };
- };
-
- eclipse-sdk-37 = buildEclipse {
- name = "eclipse-sdk-3.7";
- description = "Eclipse Classic";
- sources = {
- "x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk-x86_64.tar.gz;
- sha256 = "0nf4nv7awhp1k8b1hjb7chpjyjrqnyszsjbc4dlk9phpjv3j4wg5";
- };
- "i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk.tar.gz;
- sha256 = "1isn7i45l9kyn2yx6vm88jl1gnxph8ynank0aaa218cg8kdygk7j";
- };
- };
- };
- eclipse_sdk_37 = eclipse-sdk-37; # backward compatibility, added 2016-01-30
-
### Eclipse Java
- eclipse-java = eclipse-java-49;
-
- eclipse-java-49 = buildEclipse {
- name = "eclipse-java-4.9.0";
+ eclipse-java = buildEclipse {
+ name = "eclipse-java-${platform_major}.${platform_minor}";
description = "Eclipse IDE for Java Developers";
src =
- if stdenv.system == "x86_64-linux" then
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/2018-09/R/eclipse-java-2018-09-linux-gtk-x86_64.tar.gz;
- sha512 = "9dac5d040cdabf779de3996de87290e352130c7e860c1d0a98772f41da828ad45f90748b68e0a8a4f8d1ebbbbe5fdfe6401b7d871b93af34103d4a81a041c6a5";
- }
- else if stdenv.system == "i686-linux" then
- fetchurl {
- url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/2018-09/R/eclipse-java-2018-09-linux-gtk.tar.gz;
- sha512 = "24208e95b972e848d6b65ed8108d9e81584cf051397f2f43fb6269f5a625b8d7552ad77c7980a1a5653c87f06776e2926fd85607aae44e44657b4f6cc9b3e2e3";
- }
- else throw "Unsupported system: ${stdenv.system}";
+ fetchurl {
+ url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
+ sha512 = "2xd5q7kg3aly7jnz2fijn06ljmnnd7ggwwzmndfhqwfzxpyjg1lnlln76pcd6chx7gnwdrl7khg0fs566ddabfjv17c46dj5fpw9y6j";
+ };
};
### Environments
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 8a5991cc7cd..4dc4aebe8fd 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -254,12 +254,12 @@ rec {
cdt = buildEclipseUpdateSite rec {
name = "cdt-${version}";
- version = "9.0.1";
+ version = "9.6.0";
src = fetchzip {
stripRoot = false;
- url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.0/${name}.zip";
- sha256 = "0vdx0j9ci533wnk7y17qjvjyqx38hlrdw67z6pi05vfv3r6ys39x";
+ url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.6/${name}/${name}.zip";
+ sha256 = "08rk3b1va57jcy4s161fx0xmb8dn47akhhxd2f28hspq6i2jqicm";
};
meta = with stdenv.lib; {
@@ -497,12 +497,12 @@ rec {
jdt = buildEclipseUpdateSite rec {
name = "jdt-${version}";
- version = "4.9";
+ version = "4.10";
src = fetchzip {
stripRoot = false;
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/org.eclipse.jdt-4.9.zip;
- sha256 = "144rqrw0crxd2v862dqxm2p5y60n4pbzdryv709xnhcw54rycm7n";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.10-201812060815/org.eclipse.jdt-4.10.zip;
+ sha256 = "1h11w3zd6xy5w4sk6xnyb2a27wxwhp83qfx67ji7bzdrwbvljqkz";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix
index 091635feda6..b8c61bb97af 100644
--- a/pkgs/applications/editors/emacs-modes/calfw/default.nix
+++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3Plus;
- maintainers = with stdenv.lib.maintainers; [ chaoflow ];
- platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ ];
+ platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix
index 884d1724ef8..17cf213a799 100644
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix
@@ -2,28 +2,28 @@
let
modules = [
- { name = "icicles.el"; sha256 = "0wxak7wh0rrb3h77ay2vypbb53skcfbrv71xkajhax0w12q6zpaj"; }
- { name = "icicles-chg.el"; sha256 = "0qavq9vy566l3qi9n8akrqjcgy8n6k0j8d7vsc7p1jhqvvq812gh"; }
- { name = "icicles-cmd1.el"; sha256 = "0lgk6ngl9090iqvvw1c227q7p37mr73cc6ap3ky6b0nv3ql8rkyi"; }
- { name = "icicles-cmd2.el"; sha256 = "15swxk7fr7wsqpf26xzbvyk12ikkvfcyh9w8wmnpc38dmpyq79rb"; }
+ { name = "icicles.el"; sha256 = "1744n5g2kmv3r261ipa0fhrgnapl0chxz57bbbls3bp30cnnfrs7"; }
+ { name = "icicles-chg.el"; sha256 = "058sxa8wh3vqr3zy677q6m2lfx4n477rnb8921s1p6wgs55v7dp4"; }
+ { name = "icicles-cmd1.el"; sha256 = "064hyy8nxvlg298s5qnmk7aczbasfpddhx57jxaldyyzkca3n2h5"; }
+ { name = "icicles-cmd2.el"; sha256 = "0a77fx0pxyfrg9nxvqvzz247v6cljjfz9dnfs7lc8qgdvksxs261"; }
{ name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; }
{ name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; }
{ name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; }
- { name = "icicles-fn.el"; sha256 = "05v7sc2k2mjm1mbnlkpi01aaxnxnb40540y7g70dg534scjd7w36"; }
- { name = "icicles-mac.el"; sha256 = "0nhbwswz6xz7q4g8flszgx12q4gi4nx1d3n4jgz6svr2kk2vmlb4"; }
- { name = "icicles-mcmd.el"; sha256 = "05dniz6337v9r15w8r2zad0n2h6jlygzjp7vw75vvq8mds0acmia"; }
+ { name = "icicles-fn.el"; sha256 = "02vwa9dx9393d7kxrf443r1lj7y9ihkh25cmd418pwfgmw2yd5s7"; }
+ { name = "icicles-mac.el"; sha256 = "13nxgg9k5w39lga90jwn1c7v756dqlfln2qh312vfaxfjfijfv9r"; }
+ { name = "icicles-mcmd.el"; sha256 = "17d4zlf3r09wmarwyc1cbjv0pyklg4cdhwh3h643d4v8mhs5hnil"; }
{ name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; }
- { name = "icicles-opt.el"; sha256 = "10n4p999ylkapirs75y5fh33lpiyx42i3ajzl2zjfwyr1zksg1iz"; }
- { name = "icicles-var.el"; sha256 = "1r5gb01zg8nf2qryq9saxfpnzlymmppsk7w1g09lac35c87vh8yl"; }
+ { name = "icicles-opt.el"; sha256 = "154mgcd1ksnmlyb4ijy2njqq75i8cj4k47phplxsi648pzqnda77"; }
+ { name = "icicles-var.el"; sha256 = "0f94299q1z0va4v1s5ijpksaqlaz88ay1qbmlzq0i2wnxnsliys8"; }
];
forAll = f: map f modules;
in
stdenv.mkDerivation rec {
- version = "2018-07-02";
+ version = "2019-02-22";
name = "icicles-${version}";
- srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });
+ srcs = forAll ({name, sha256}: fetchurl { url = "https://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });
buildInputs = [ emacs ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/";
meta = {
- homepage = http://www.emacswiki.org/emacs/Icicles;
+ homepage = https://www.emacswiki.org/emacs/Icicles;
description = "Enhance Emacs minibuffer input with cycling and powerful completion";
license = stdenv.lib.licenses.gpl2Plus;
platforms = emacs.meta.platforms;
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index bfc6c26ea09..636e24464f8 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -60583,7 +60583,7 @@
owner = "immerrr";
repo = "lua-mode";
rev = "99312b8d6c500ba3067da6d81efcfbbea05a1cbd";
- sha256 = "04m9njcpdmar3njjz4x2qq26xk0k6qprcfzx8whlmvapqf8w19iz";
+ sha256 = "1gi8k2yydwm1knq4pgmn6dp92g97av4ncb6acrnz07iba2r34dyn";
};
recipe = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode";
@@ -107584,4 +107584,4 @@
license = lib.licenses.free;
};
}) {};
- }
\ No newline at end of file
+ }
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index 99ecddcb264..a8250ead7b4 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3Plus;
- maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ];
+ maintainers = with stdenv.lib.maintainers; [ pSub ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix
index d9f0b211f15..852faeb7918 100644
--- a/pkgs/applications/editors/emacs/25.nix
+++ b/pkgs/applications/editors/emacs/25.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
description = "The extensible, customizable GNU text editor";
homepage = https://www.gnu.org/software/emacs/;
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
+ maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ];
platforms = platforms.all;
longDescription = ''
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 4a48cde571a..2f7a4233656 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -10,6 +10,7 @@
, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null
, withCsrc ? true
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
+, siteStart ? ./site-start.el
}:
assert (libXft != null) -> libpng != null; # probably a bug
@@ -100,7 +101,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/share/emacs/site-lisp
- cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
+ cp ${siteStart} $out/share/emacs/site-lisp/site-start.el
$out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el
rm -rf $out/var
@@ -133,7 +134,7 @@ stdenv.mkDerivation rec {
description = "The extensible, customizable GNU text editor";
homepage = https://www.gnu.org/software/emacs/;
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
+ maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ];
platforms = platforms.all;
longDescription = ''
diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix
index b1e26910f1f..89e10ea25fa 100644
--- a/pkgs/applications/editors/featherpad/default.nix
+++ b/pkgs/applications/editors/featherpad/default.nix
@@ -3,13 +3,13 @@
with qt5;
stdenv.mkDerivation rec {
- version = "0.9.2";
+ version = "0.9.4";
name = "featherpad-${version}";
src = fetchFromGitHub {
owner = "tsujan";
repo = "FeatherPad";
rev = "V${version}";
- sha256 = "1kpv8x3m4hiz7q9k7qadgbrys5nyzm7v5mhjyk22hawnp98m9x4q";
+ sha256 = "18zna6rx2qyiplr44wrkvr4avk9yy2l1s23fy3d7ql9f1fq12z3w";
};
nativeBuildInputs = [ qmake pkgconfig qttools ];
buildInputs = [ qtbase qtsvg qtx11extras ];
diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix
index 71d0f9450f2..ff6439c8654 100644
--- a/pkgs/applications/editors/gnome-latex/default.nix
+++ b/pkgs/applications/editors/gnome-latex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, wrapGAppsHook
+{ stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee
, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
let
version = "3.30.2";
@@ -21,9 +21,9 @@ in stdenv.mkDerivation {
intltool
];
- buildInputs = with gnome3; [
+ buildInputs = [
amtk
- defaultIconTheme
+ gnome3.adwaita-icon-theme
glib
gsettings-desktop-schemas
gspell
diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
index a95ced76371..6a3f581c4e8 100644
--- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
+++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
@@ -1,10 +1,10 @@
GEM
remote: https://rubygems.org/
specs:
- msgpack (1.2.4)
+ msgpack (1.2.6)
multi_json (1.13.1)
- neovim (0.7.0)
- msgpack (~> 1.0)
+ neovim (0.8.0)
+ msgpack (~> 1.1)
multi_json (~> 1.0)
PLATFORMS
@@ -14,4 +14,4 @@ DEPENDENCIES
neovim
BUNDLED WITH
- 1.14.6
+ 1.17.2
diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
index af887161ea6..28a53cc590f 100644
--- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
+++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
@@ -2,10 +2,10 @@
msgpack = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864";
+ sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13";
type = "gem";
};
- version = "1.2.4";
+ version = "1.2.6";
};
multi_json = {
source = {
@@ -19,9 +19,9 @@
dependencies = ["msgpack" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0b487dzz41im8cwzvfjqgf8kkrp6mpkvcbzhazrmqqw8gxyvfbq4";
+ sha256 = "07scrdfk7pyn5jgx5m2yajdqpbdv42833vbw568qqag6xp99j3yk";
type = "gem";
};
- version = "0.7.0";
+ version = "0.8.0";
};
}
diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix
index 9edac16507c..9cdaeb043c3 100644
--- a/pkgs/applications/editors/quilter/default.nix
+++ b/pkgs/applications/editors/quilter/default.nix
@@ -1,39 +1,36 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, meson, ninja, python3
, gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon
-, gnome3, discount, gobject-introspection, wrapGAppsHook }:
+, libgee, discount, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "quilter";
- version = "1.6.8";
-
- name = "${pname}-${version}";
+ version = "1.7.5";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
- sha256 = "07i9pivpddgixn1wzbr15gvzf0n5pklx0gkjjaa35kvj2z8k31x5";
+ sha256 = "0czf6rm908pz6zwiaq2phci923q8xa8x7q7kvdk6s3km4i1rrgkn";
};
nativeBuildInputs = [
desktop-file-utils
- gobject-introspection
meson
ninja
+ pantheon.vala
pkgconfig
python3
- pantheon.vala
wrapGAppsHook
];
buildInputs = [
discount
- pantheon.elementary-icon-theme
- pantheon.granite
- gnome3.libgee
gtk3
gtksourceview
gtkspell3
+ libgee
+ pantheon.elementary-icon-theme
+ pantheon.granite
webkitgtk
];
diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index ef0d98455f2..142b6fbd142 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -6,10 +6,10 @@
stdenv.mkDerivation rec {
name = "sigil-${version}";
- version = "0.9.10";
+ version = "0.9.12";
src = fetchFromGitHub {
- sha256 = "11r7043kbqv67z1aqk929scsg6yllldpl8icl32dw3dai7f1c658";
+ sha256 = "0zlm1jjk91cbrphrilpvxhbm26bbmgy10n7hd0fb1ml8q70q34s3";
rev = version;
repo = "Sigil";
owner = "Sigil-Ebook";
diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix
index 0787250fece..454b7ad554b 100644
--- a/pkgs/applications/editors/standardnotes/default.nix
+++ b/pkgs/applications/editors/standardnotes/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, appimage-run, fetchurl }:
+{ stdenv, appimage-run, fetchurl, runtimeShell }:
let
- version = "2.3.12";
+ version = "3.0.6";
plat = {
"i386-linux" = "i386";
@@ -9,8 +9,8 @@ let
}.${stdenv.hostPlatform.system};
sha256 = {
- "i386-linux" = "0q7izk20r14kxn3n4pn92jgnynfnlnylg55brz8n1lqxc0dc3v24";
- "x86_64-linux" = "0myg4qv0vrwh8s9sckb12ld9f86ymx4yypvpy0w5qn1bxk5hbafc";
+ "i386-linux" = "0czhlbacjks9x8y2w46nzlvk595psqhqw0vl0bvsq7sz768dk0ni";
+ "x86_64-linux" = "0haji9h8rrm9yvqdv6i2y6xdd0yhsssjjj83hmf6cb868lwyigsf";
}.${stdenv.hostPlatform.system};
in
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/{bin,share}
cp $src $out/share/standardNotes.AppImage
- echo "#!${stdenv.shell}" > $out/bin/standardnotes
+ echo "#!${runtimeShell}" > $out/bin/standardnotes
echo "${appimage-run}/bin/appimage-run $out/share/standardNotes.AppImage" >> $out/bin/standardnotes
chmod +x $out/bin/standardnotes $out/share/standardNotes.AppImage
'';
diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix
index 71bd3544feb..8f304524dff 100644
--- a/pkgs/applications/editors/sublime/3/common.nix
+++ b/pkgs/applications/editors/sublime/3/common.nix
@@ -1,8 +1,9 @@
-{buildVersion, x32sha256, x64sha256}:
+{buildVersion, x32sha256, x64sha256, dev ? false}:
-{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2,
+{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, runtimeShell,
pkexecPath ? "/run/wrappers/bin/pkexec", libredirect,
- gksuSupport ? false, gksu, unzip, zip, bash}:
+ gksuSupport ? false, gksu, unzip, zip, bash,
+ writeScript, common-updater-scripts, curl, gnugrep}:
assert gksuSupport -> gksu != null;
@@ -26,7 +27,7 @@ in let
# package with just the binaries
sublime = stdenv.mkDerivation {
- name = "sublimetext3-${buildVersion}-bin";
+ name = "sublimetext3-bin-${buildVersion}";
src =
fetchurl {
name = "sublimetext-${buildVersion}.tar.bz2";
@@ -115,7 +116,7 @@ in stdenv.mkDerivation (rec {
mkdir -p $out/bin
cat > $out/bin/subl <<-EOF
- #!${stdenv.shell}
+ #!${runtimeShell}
exec $sublime/sublime_text "\$@"
EOF
chmod +x $out/bin/subl
@@ -127,6 +128,22 @@ in stdenv.mkDerivation (rec {
ln -s $sublime/Icon/256x256/ $out/share/icons
'';
+ passthru.updateScript = writeScript "sublime3-update-script" ''
+ #!${stdenv.shell}
+ set -o errexit
+ PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]}
+
+ latestVersion=$(curl https://www.sublimetext.com/3${stdenv.lib.optionalString dev "dev"} | grep -Po '(?<=Version: Build )([0-9]+)')
+
+ for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do
+ package=sublime3${stdenv.lib.optionalString dev "-dev"}
+ # The script will not perform an update when the version attribute is up to date from previous platform run
+ # We need to clear it before each run
+ update-source-version ''${package}.sublime 0 0000000000000000000000000000000000000000000000000000000000000000 --file=pkgs/applications/editors/sublime/3/packages.nix --version-key=buildVersion --system=$platform
+ update-source-version ''${package}.sublime $latestVersion --file=pkgs/applications/editors/sublime/3/packages.nix --version-key=buildVersion --system=$platform
+ done
+ '';
+
meta = with stdenv.lib; {
description = "Sophisticated text editor for code, markup and prose";
homepage = https://www.sublimetext.com/;
diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix
index 2d214f18e9f..6d4b511e598 100644
--- a/pkgs/applications/editors/sublime/3/packages.nix
+++ b/pkgs/applications/editors/sublime/3/packages.nix
@@ -6,6 +6,7 @@ in
rec {
sublime3-dev = common {
buildVersion = "3184";
+ dev = true;
x32sha256 = "1b6f1fid75g5z247dbnyyj276lrlv99scrdk1vvfcr6vyws77vzr";
x64sha256 = "03127jhfjr17ai96p3axh5b5940fds8jcw6vkid8y6dmvd2dpylz";
} {};
diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix
index ba68a5420a8..5f87aad8a87 100644
--- a/pkgs/applications/editors/thonny/default.nix
+++ b/pkgs/applications/editors/thonny/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromBitbucket, python3 }:
+{ stdenv, fetchFromGitHub, python3 }:
with python3.pkgs;
buildPythonApplication rec {
pname = "thonny";
- version = "3.0.5";
+ version = "3.1.2";
- src = fetchFromBitbucket {
- owner = "plas";
+ src = fetchFromGitHub {
+ owner = pname;
repo = pname;
- rev = "e5a1ad4ae9d24066a769489b1e168b4bd6e00b03";
- sha256 = "1lrl5pj9dpw9i5ij863hd47gfd15nmvglqkl2ldwgfn7kgpsdkz5";
+ rev = "v${version}";
+ sha256 = "1simqqxm72k5zhavhllkinsyw8ggy6fjs5ppj82g3l5g3919pfna";
};
propagatedBuildInputs = with python3.pkgs; [
@@ -21,6 +21,7 @@ buildPythonApplication rec {
pylint
mypy
pyperclip
+ asttokens
];
preInstall = ''
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 7ee28adfa47..3b75d08787e 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -7,6 +7,7 @@
, vimPlugins
, makeWrapper
, wrapGAppsHook
+, runtimeShell
# apple frameworks
, CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private
@@ -157,22 +158,22 @@ in stdenv.mkDerivation rec {
rewrap () {
rm -f "$out/bin/$1"
- echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1"
+ echo -e '#!${runtimeShell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1"
chmod a+x "$out/bin/$1"
}
- rewrap ex -e
- rewrap view -R
- rewrap gvim -g
- rewrap gex -eg
- rewrap gview -Rg
- rewrap rvim -Z
- rewrap rview -RZ
- rewrap rgvim -gZ
+ rewrap ex -e
+ rewrap view -R
+ rewrap gvim -g
+ rewrap gex -eg
+ rewrap gview -Rg
+ rewrap rvim -Z
+ rewrap rview -RZ
+ rewrap rgvim -gZ
rewrap rgview -RgZ
rewrap evim -y
rewrap eview -yR
- rewrap vimdiff -d
+ rewrap vimdiff -d
rewrap gvimdiff -gd
'';
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 78d7d96d396..0506250766b 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -18,16 +18,16 @@ let
}.${system};
sha256 = {
- "i686-linux" = "04kbx1cx40lsy9irxy1arp1rixzk49ldhg34w3llmfbx63a4hchf";
- "x86_64-linux" = "1plvx0mjcbizl6iffib95p5224r9frf0mn6c5xp14p3qnrp32jhm";
- "x86_64-darwin" = "14h9gs6jpxydgd1h16ybq3ifw5jc7k83yg22pw3sk6vhy7hx7pxr";
+ "i686-linux" = "0iqsbny25946fyvrm8qwgbd1xmwb8psg2n2c4wdk8x52259pxfvq";
+ "x86_64-linux" = "0v1gbaqlaismrykl8igks5dl9bh5xh56v5aw8mffg8wxdr0alrvv";
+ "x86_64-darwin" = "0awq1jgqbpirrhs09x7hn4m96idb4lazm053nf5jf5yrx8pq1l9i";
}.${system};
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
in
stdenv.mkDerivation rec {
name = "vscode-${version}";
- version = "1.31.1";
+ version = "1.32.1";
src = fetchurl {
name = "VSCode_${version}_${plat}.${archive_fmt}";
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index efbf5864faa..f8753ecd1eb 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -84,6 +84,7 @@ stdenv.mkDerivation rec {
description = "A software suite to create, edit, compose, or convert bitmap images";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.asl20;
+ broken = ghostscript != null; # https://github.com/NixOS/nixpkgs/issues/55118
maintainers = with maintainers; [ the-kenny ];
};
}
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index b3a1b64cae9..7981403eb75 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -100,6 +100,7 @@ stdenv.mkDerivation rec {
description = "A software suite to create, edit, compose, or convert bitmap images";
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ the-kenny ];
+ broken = ghostscript != null; # https://github.com/NixOS/nixpkgs/issues/55118
license = licenses.asl20;
};
}
diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix
index 30223658f53..09664889f35 100644
--- a/pkgs/applications/graphics/alchemy/default.nix
+++ b/pkgs/applications/graphics/alchemy/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, jre}:
+{ stdenv, fetchurl, jre, runtimeShell }:
stdenv.mkDerivation rec {
name = "alchemy-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin $out/share
cp -a . $out/share/alchemy
cat >> $out/bin/alchemy << EOF
- #!${stdenv.shell}
+ #!${runtimeShell}
cd $out/share/alchemy
${jre}/bin/java -jar Alchemy.jar "$@"
EOF
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index 2e7435b48bb..0257a109568 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -4,19 +4,19 @@
}:
let
- gitRev = "60a58688e552f12501980c4bdab034ab0f2ba059";
+ gitRev = "c0038e3ea82fec6119de364bcbc3370955ed46a2";
gitBranch = "develop";
gitTag = "0.9.3";
in
stdenv.mkDerivation rec {
name = "antimony-${version}";
- version = "2018-07-17";
+ version = "2018-10-20";
src = fetchFromGitHub {
owner = "mkeeter";
repo = "antimony";
rev = gitRev;
- sha256 = "0pgf6kr23xw012xsil56j5gq78mlirmrlqdm09m5wlgcf4vr6xnl";
+ sha256 = "01cjcjppbb0gvh6npcsaidzpfcfzrqhhi07z4v0jkfyi0fl125v4";
};
patches = [ ./paths-fix.patch ];
diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix
index 7af7c8986f2..cc08dce906c 100644
--- a/pkgs/applications/graphics/autotrace/default.nix
+++ b/pkgs/applications/graphics/autotrace/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, callPackage, libpng12, imagemagick,
- autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin }:
+{ stdenv, fetchurl, callPackage, libpng12, imagemagick
+, autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin
+, runtimeShell }:
# TODO: Figure out why the resultant binary is somehow linked against
# libpng16.so.16 rather than libpng12.
@@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
# pstoedit-config no longer exists, it was replaced with pkg-config
mkdir wrappers
cat >wrappers/pstoedit-config <<'EOF'
- #!${stdenv.shell}
+ #!${runtimeShell}
# replace --version with --modversion for pkg-config
args=''${@/--version/--modversion}
exec pkg-config pstoedit "''${args[@]}"
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 7777be91897..962940d076b 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2";
};
- libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [
+ libPath = stdenv.lib.makeLibraryPath (with xorg; [
stdenv.cc.cc.lib
gdk_pixbuf
glib
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 7fcdb46e32e..cc2b955fcc2 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -23,6 +23,7 @@
, boost
, eigen
, exiv2
+, ffmpeg
, flex
, jasper
, lcms2
@@ -66,6 +67,7 @@ mkDerivation rec {
boost
eigen
exiv2
+ ffmpeg
flex
jasper
lcms2
diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix
index d45d6c3a62e..cf5ecfdd043 100644
--- a/pkgs/applications/graphics/dosage/default.nix
+++ b/pkgs/applications/graphics/dosage/default.nix
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591";
sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh";
};
- buildInputs = with pythonPackages; [ pytest responses ];
+ checkInputs = with pythonPackages; [ pytest responses ];
propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ];
disabled = pythonPackages.pythonOlder "3.3";
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 9ef70dff766..6fdc4f741ac 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "feh-${version}";
- version = "3.1.2";
+ version = "3.1.3";
src = fetchurl {
url = "https://feh.finalrewind.org/${name}.tar.bz2";
- sha256 = "0qjhlrgr606gc9h96w9piyd13mx63jqfbxxnan41nrh76m8d0dka";
+ sha256 = "1vsnxf4as3vyzjfhd8frzb1a8i7wnq7ck5ljx7qxqrnfqvxl1s4z";
};
outputs = [ "out" "man" "doc" ];
diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix
new file mode 100644
index 00000000000..87c161b9aee
--- /dev/null
+++ b/pkgs/applications/graphics/fondo/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, glib, gsettings-desktop-schemas, gtk3, libgee, json-glib, glib-networking, libsoup, libunity, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ pname = "fondo";
+ version = "1.2.1";
+
+ src = fetchFromGitHub {
+ owner = "calo001";
+ repo = pname;
+ rev = version;
+ sha256 = "0xczqkkq54gjay7wdl8mpil7klfrpvcw2a0n1brq7qrfhsmhc7pc";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pantheon.vala
+ pkgconfig
+ python3
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ glib-networking
+ gsettings-desktop-schemas
+ gtk3
+ json-glib
+ libgee
+ libsoup
+ libunity
+ pantheon.granite
+ ];
+
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Find the most beautiful wallpapers for your desktop";
+ homepage = https://github.com/calo001/fondo;
+ license = licenses.agpl3Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index e8f831a21c2..e88c9222b87 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool,
exiv2, libjpeg, libtiff, gst_all_1, libraw, libsoup, libsecret,
+ glib, gtk3, gsettings-desktop-schemas,
libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison,
flex, wrapGAppsHook, shared-mime-info }:
@@ -16,10 +17,10 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ];
- buildInputs = with gnome3; [
- glib gtk gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base
+ buildInputs = [
+ glib gtk3 gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base
exiv2 libjpeg libtiff libraw libsoup libsecret libchamplain
- librsvg libwebp json-glib webkitgtk lcms2 defaultIconTheme
+ librsvg libwebp json-glib webkitgtk lcms2 gnome3.adwaita-icon-theme
];
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 140227eb9ec..d30f8c209c5 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz";
- sha256 = "0rm31kvyg30452bz12yi49bkhdmi4bjdx6zann5cdlbi0pvmx7xh";
+ sha256 = "0gw45d0albrsa0pbc5g4w3fmmjfxrdbpzyc7723ncbhncdyda01h";
};
sourceRoot = "${name}/src";
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 03cac9114af..354e9725a43 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas
libraw json-glib glib gdk_pixbuf librsvg gnome3.rest
- gcr gnome3.defaultIconTheme libgdata
+ gcr gnome3.adwaita-icon-theme libgdata
];
postPatch = ''
diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix
index ac3de4a4e14..d0f2a48c589 100644
--- a/pkgs/applications/graphics/swingsane/default.nix
+++ b/pkgs/applications/graphics/swingsane/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeDesktopItem, unzip, jre }:
+{ stdenv, fetchurl, makeDesktopItem, unzip, jre, runtimeShell }:
stdenv.mkDerivation rec {
name = "swingsane-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
installPhase = let
execWrapper = ''
- #!${stdenv.shell}
+ #!${runtimeShell}
exec ${jre}/bin/java -jar $out/share/java/swingsane/swingsane-${version}.jar "$@"
'';
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index 63d35cc5453..b399dd2d228 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3
, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
-, imagemagick, intltool, autoreconfHook, which, defaultIconTheme
+, imagemagick, intltool, autoreconfHook, which, gnome3
}:
let
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
buildInputs = [
ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool
libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5
- synfig which defaultIconTheme
+ synfig which gnome3.adwaita-icon-theme
];
postInstall = ''
diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix
index e790ef49acb..5fc7e309f4d 100644
--- a/pkgs/applications/graphics/vimiv/default.nix
+++ b/pkgs/applications/graphics/vimiv/default.nix
@@ -1,5 +1,5 @@
{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead
-, hicolor-icon-theme, defaultIconTheme
+, hicolor-icon-theme, gnome3
# Test requirements
, dbus, xvfb_run, xdotool
@@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
'';
checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];
- buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ];
+ buildInputs = [ hicolor-icon-theme gnome3.adwaita-icon-theme librsvg ];
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
makeWrapperArgs = [
diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix
index e27f074b21b..891f3586fa5 100644
--- a/pkgs/applications/graphics/wings/default.nix
+++ b/pkgs/applications/graphics/wings/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, erlang, cl, libGL, libGLU }:
+{ fetchurl, stdenv, erlang, cl, libGL, libGLU, runtimeShell }:
stdenv.mkDerivation rec {
name = "wings-2.2.1";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
cp ebin/* $out/lib/${name}/ebin
cp -R textures shaders plugins $out/lib/$name
cat << EOF > $out/bin/wings
- #!${stdenv.shell}
+ #!${runtimeShell}
${erlang}/bin/erl \
-pa $out/lib/${name}/ebin -run wings_start start_halt "$@"
EOF
@@ -43,4 +43,3 @@ stdenv.mkDerivation rec {
platforms = with stdenv.lib.platforms; linux;
};
}
-
diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix
new file mode 100644
index 00000000000..30a8907275b
--- /dev/null
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@@ -0,0 +1,74 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, fetchpatch
+
+, cmake
+, gettext
+, wrapGAppsHook
+, pkgconfig
+
+, glib
+, gsettings-desktop-schemas
+, gtk3
+, hicolor-icon-theme
+, libsndfile
+, libxml2
+, pcre
+, poppler
+, portaudio
+, zlib
+
+# Plugins don't appear to be working in this version, so disable them by not
+# building with Lua support by default. In a future version, try switching this
+# to 'true' and seeing if the top-level Plugin menu appears.
+, withLua ? false, lua
+}:
+
+stdenv.mkDerivation rec {
+ name = "xournalpp-${version}";
+ version = "1.0.8";
+
+ src = fetchFromGitHub {
+ owner = "xournalpp";
+ repo = "xournalpp";
+ rev = version;
+ sha256 = "01q84xjp9z1krna10gjj562km6i3wdq8cg7paxax1k6bh52ryvf6";
+ };
+
+ patches = [
+ # This patch removes the unused 'xopp-recording.sh' file which breaks the
+ # cmake build; this patch isn't in a release yet, and should be removed at
+ # or after 1.0.9 is released.
+ (fetchpatch {
+ name = "remove-xopp-recording.sh.patch";
+ url = "https://github.com/xournalpp/xournalpp/commit/a17a3f2c80c607a22d0fdeb66d38358bea7e4d85.patch";
+ sha256 = "10pcpvklm6kr0lv2xrsbpg2037ni9j6dmxgjf56p466l3gz60iwy";
+ })
+ ];
+
+ nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ];
+ buildInputs =
+ [ glib
+ gsettings-desktop-schemas
+ gtk3
+ hicolor-icon-theme
+ libsndfile
+ libxml2
+ pcre
+ poppler
+ portaudio
+ zlib
+ ]
+ ++ lib.optional withLua lua;
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Xournal++ is a handwriting Notetaking software with PDF annotation support";
+ homepage = https://github.com/xournalpp/xournalpp;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ andrew-d ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix
index c60d4b7b904..ac3d303a7a6 100644
--- a/pkgs/applications/graphics/zgrviewer/default.nix
+++ b/pkgs/applications/graphics/zgrviewer/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, jre, unzip}:
+{ stdenv, fetchurl, jre, unzip, runtimeShell }:
stdenv.mkDerivation rec {
version = "0.9.0";
pname = "zgrviewer";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
cp -r target/* "$out/share/java/zvtm/"
- echo '#!${stdenv.shell}' > "$out/bin/zgrviewer"
+ echo '#!${runtimeShell}' > "$out/bin/zgrviewer"
echo "${jre}/lib/openjdk/jre/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer"
chmod a+x "$out/bin/zgrviewer"
'';
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 0822e65c7c0..b9b318e75c3 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -124,6 +124,7 @@ let
kmbox = callPackage ./kmbox.nix {};
kmime = callPackage ./kmime.nix {};
kmix = callPackage ./kmix.nix {};
+ kmplot = callPackage ./kmplot.nix {};
kolourpaint = callPackage ./kolourpaint.nix {};
kompare = callPackage ./kompare.nix {};
konsole = callPackage ./konsole.nix {};
diff --git a/pkgs/applications/kde/kmplot.nix b/pkgs/applications/kde/kmplot.nix
new file mode 100644
index 00000000000..c0c00f21340
--- /dev/null
+++ b/pkgs/applications/kde/kmplot.nix
@@ -0,0 +1,15 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools
+, kcrash, kguiaddons, ki18n, kparts, kwidgetsaddons, kdbusaddons
+}:
+
+mkDerivation {
+ name = "kmplot";
+ meta = {
+ license = with lib.licenses; [ gpl2Plus fdl12 ];
+ maintainers = [ lib.maintainers.orivej ];
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ kcrash kguiaddons ki18n kparts kwidgetsaddons kdbusaddons
+ ];
+}
diff --git a/pkgs/applications/kde/ktouch.nix b/pkgs/applications/kde/ktouch.nix
index 75e72c0ba18..64179f2e64d 100644
--- a/pkgs/applications/kde/ktouch.nix
+++ b/pkgs/applications/kde/ktouch.nix
@@ -3,7 +3,7 @@
, kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n
, kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons
, kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts
-, qtx11extras, qtgraphicaleffects, xorg
+, qtx11extras, qtgraphicaleffects, qtxmlpatterns, xorg
}:
@@ -19,7 +19,8 @@
kconfig kconfigwidgets kcoreaddons kdeclarative ki18n
kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons
kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts
- qtx11extras qtgraphicaleffects xorg.libxkbfile xorg.libxcb
+ qtx11extras qtgraphicaleffects qtxmlpatterns
+ xorg.libxkbfile xorg.libxcb
];
enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index ef0b49f8d7b..327272ae39c 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -17,6 +17,8 @@
libXrandr,
libGL,
xclip,
+ wayland,
+ libxkbcommon,
# Darwin Frameworks
cf-private,
AppKit,
@@ -40,6 +42,9 @@ let
libXrandr
libGL
libXi
+ ] ++ lib.optionals stdenv.isLinux [
+ wayland
+ libxkbcommon
];
in buildRustPackage rec {
name = "alacritty-${version}";
diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix
new file mode 100644
index 00000000000..0530ec9c1b8
--- /dev/null
+++ b/pkgs/applications/misc/appeditor/default.nix
@@ -0,0 +1,56 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkgconfig
+, pantheon
+, python3
+, gettext
+, glib
+, gtk3
+, hicolor-icon-theme
+, libgee
+, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ pname = "appeditor";
+ version = "1.1.0";
+
+ src = fetchFromGitHub {
+ owner = "donadigo";
+ repo = "appeditor";
+ rev = version;
+ sha256 = "04x2f4x4dp5ca2y3qllqjgirbyl6383pfl4bi9bkcqlg8b5081rg";
+ };
+
+ nativeBuildInputs = [
+ gettext
+ meson
+ ninja
+ pantheon.vala
+ pkgconfig
+ python3
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ gtk3
+ hicolor-icon-theme
+ pantheon.granite
+ libgee
+ ];
+
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Edit the Pantheon desktop application menu";
+ homepage = https://github.com/donadigo/appeditor;
+ maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
+ platforms = platforms.linux;
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix
index 2f38307ca1e..2dd151c1a6c 100644
--- a/pkgs/applications/misc/autospotting/default.nix
+++ b/pkgs/applications/misc/autospotting/default.nix
@@ -24,7 +24,7 @@ buildGoPackage rec {
description = "Automatically convert your existing AutoScaling groups to up to 90% cheaper spot instances with minimal configuration changes";
license = licenses.free;
maintainers = [ maintainers.costrouc ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix
index 1144d515284..4227b4155ac 100644
--- a/pkgs/applications/misc/avrdudess/default.nix
+++ b/pkgs/applications/misc/avrdudess/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }:
+{ stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }:
stdenv.mkDerivation rec {
name = "avrdudess-2.2.20140102";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
unzip "$src" -d "$out/avrdudess"
cat >> "$out/bin/avrdudess" << __EOF__
- #!${stdenv.shell}
+ #!${runtimeShell}
export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}"
# We need PATH from user env for xdg-open to find its tools, which
# typically depend on the currently running desktop environment.
diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index 0a1275cb17a..bde8fab8144 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -69,7 +69,7 @@ with python3.pkgs; buildPythonApplication rec {
homepage = https://github.com/jarun/Buku;
license = licenses.gpl3;
platforms = platforms.linux;
- maintainers = with maintainers; [ infinisil ];
+ maintainers = with maintainers; [ matthiasbeyer infinisil ];
};
}
diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
index fd65fcd2260..e6dafe4d08a 100644
--- a/pkgs/applications/misc/calcurse/default.nix
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "calcurse-${version}";
- version = "4.3.0";
+ version = "4.4.0";
src = fetchurl {
url = "https://calcurse.org/files/${name}.tar.gz";
- sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i";
+ sha256 = "0vw2xi6a2lrhrb8n55zq9lv4mzxhby4xdf3hmi1vlfpyrpdwkjzd";
};
buildInputs = [ ncurses gettext python3 ];
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index b52156beac6..39b4dbe0fe5 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
- version = "3.39.1";
+ version = "3.40.1";
name = "calibre-${version}";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
- sha256 = "08c1wsdn0giv9zfb6bis9bbrw687rci8fs26qsal8ijmjk55dfsh";
+ sha256 = "1s1kq8axfymr7agg7dqw47kanlrkzzhsy8pcj1fs5644zjp5n0bq";
};
patches = [
diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix
index f2aac4326cb..e48b32a783d 100644
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/pkgs/applications/misc/cataract/build.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
homepage = http://cgg.bzatek.net/;
description = "a simple static web photo gallery, designed to be clean and easily usable";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ ];
+ maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index 1a162aca0d7..41660bc7f2b 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -1,30 +1,37 @@
-{ stdenv, python3Packages, fetchFromGitHub }:
+{ stdenv, python3, fetchFromGitHub }:
-with python3Packages;
+with python3.pkgs;
buildPythonApplication rec {
name = "${pname}-${version}";
pname = "cheat";
- version = "2.3.1";
+ version = "2.5.1";
- propagatedBuildInputs = [ docopt pygments ];
+ propagatedBuildInputs = [ docopt pygments termcolor ];
src = fetchFromGitHub {
owner = "chrisallenlane";
repo = "cheat";
rev = version;
- sha256 = "1dcpjvbv648r8325qjf30m8b4cyrrjbzc2kvh40zy2mbjsa755zr";
+ sha256 = "1i543hvg1yizamfd83bawflfcb500hvc72i59ikck8j1hjk50hsl";
};
# no tests available
doCheck = false;
postInstall = ''
install -D man1/cheat.1.gz $out/share/man/man1/cheat.1.gz
+ mv $out/${python3.sitePackages}/etc $out/
+ mv $out/${python3.sitePackages}/usr/share/* $out/share/
+ rm -r $out/${python3.sitePackages}/usr
'';
+ makeWrapperArgs = [
+ "--suffix" "CHEAT_PATH" ":" "$out/share/cheat"
+ ];
+
meta = with stdenv.lib; {
description = "cheat allows you to create and view interactive cheatsheets on the command-line";
maintainers = with maintainers; [ mic92 ];
- license = with licenses; [gpl3 mit];
+ license = with licenses; [ gpl3 mit ];
homepage = https://github.com/chrisallenlane/cheat;
};
}
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 78059191c2c..0578393dfca 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "cherrytree-${version}";
- version = "0.38.7";
+ version = "0.38.8";
src = fetchurl {
url = "https://www.giuspen.com/software/${name}.tar.xz";
- sha256 = "1ls7vz993hj5gd99imlrzahxznfg6fa4n77ikkj79va4csw9b892";
+ sha256 = "1ns87xl2sgrf3nha4xkhp0xcxlycqszlp6xdrn95lg6vzm0fa8dg";
};
buildInputs = with pythonPackages;
diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
index 7aecc8f823e..e0d284c838e 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/dpayne/cli-visualizer;
description = "CLI based audio visualizer";
license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ ];
+ maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix
index 23d76afff0c..e1fcbbfe13c 100644
--- a/pkgs/applications/misc/cointop/default.nix
+++ b/pkgs/applications/misc/cointop/default.nix
@@ -24,7 +24,7 @@ buildGoPackage rec {
The interface is inspired by htop and shortcut keys are inspired by vim.
'';
homepage = https://cointop.sh;
- platforms = stdenv.lib.platforms.linux; # cannot test others
+ platforms = stdenv.lib.platforms.unix; # cannot test others
maintainers = [ ];
license = stdenv.lib.licenses.asl20;
};
diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix
index f8927319a01..0123e0c38d7 100644
--- a/pkgs/applications/misc/ctodo/default.nix
+++ b/pkgs/applications/misc/ctodo/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
homepage = http://ctodo.apakoh.dk/;
description = "A simple ncurses-based task list manager";
license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ ];
+ maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix
index 1ea106d6a18..4e620425d5c 100644
--- a/pkgs/applications/misc/curabydagoma/default.nix
+++ b/pkgs/applications/misc/curabydagoma/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, python, pythonPackages, unzip }:
+{ stdenv, runtimeShell, lib, fetchurl, python, pythonPackages, unzip }:
# This package uses a precompiled "binary" distribution of CuraByDagoma,
# distributed by the editor.
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
mkdir $out/bin
cat > $out/bin/curabydago < $out/bin/hello-unfree << EOF
- #!${stdenv.shell}
+ #!${runtimeShell}
echo "Hello, you are running an unfree system!"
EOF
chmod +x $out/bin/hello-unfree
diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix
index 6b0926db047..2fd56e3c555 100644
--- a/pkgs/applications/misc/hr/default.nix
+++ b/pkgs/applications/misc/hr/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/LuRsT/hr;
description = "A horizontal bar for your terminal";
license = licenses.mit;
- maintainers = [ ];
+ maintainers = [ maintainers.matthiasbeyer ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index 026cf9ecc14..1eae8c57fc4 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/dvorka/hstr;
description = "Shell history suggest box - easily view, navigate, search and use your command history";
license = stdenv.lib.licenses.asl20;
- maintainers = with stdenv.lib.maintainers; [ ];
+ maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
platforms = with stdenv.lib.platforms; linux; # Cannot test others
};
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 22badfc8cdd..8473e997e7a 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "hugo-${version}";
- version = "0.50";
+ version = "0.54.0";
goPackagePath = "github.com/gohugoio/hugo";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "gohugoio";
repo = "hugo";
rev = "v${version}";
- sha256 = "1shrw7pxwrz9g5x9bq6k5qvhn3fqmwznadpw7i07msh97p8b3dyn";
+ sha256 = "01grfbr3kpd4qf5cbcmzc6yfq34cm0nkak4pqzgrn46r254y0ymv";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index d5c24d69048..d3d300db85b 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -1,5 +1,23 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
-
+ {
+ goPackagePath = "github.com/gobuffalo/envy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gobuffalo/envy";
+ rev = "v1.6.8";
+ "sha256" = "1xh26j9bji8c4hr05f89kbc4fhqniba00bdcic4gs5xfnp2vj7gk";
+ };
+ }
+ {
+ goPackagePath = "github.com/joho/godotenv";
+ fetch = {
+ type = "git";
+ url = "https://github.com/joho/godotenv";
+ rev = "v1.3.0";
+ "sha256" = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm";
+ };
+ }
{
goPackagePath = "github.com/BurntSushi/locker";
fetch = {
@@ -9,7 +27,6 @@
sha256 = "1xak4aync4klswq5217qvw191asgla51jr42y94vp109lirm5dzg";
};
}
-
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
@@ -19,7 +36,6 @@
sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
};
}
-
{
goPackagePath = "github.com/PuerkitoBio/purell";
fetch = {
@@ -29,7 +45,6 @@
sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91";
};
}
-
{
goPackagePath = "github.com/PuerkitoBio/urlesc";
fetch = {
@@ -39,7 +54,6 @@
sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw";
};
}
-
{
goPackagePath = "github.com/alecthomas/assert";
fetch = {
@@ -49,17 +63,15 @@
sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l";
};
}
-
{
goPackagePath = "github.com/alecthomas/chroma";
fetch = {
type = "git";
url = "https://github.com/alecthomas/chroma";
- rev = "v0.5.0";
- sha256 = "150jv4vhsdi1gj3liwkgicdrwnzgv5qkq2fwznlnzf64vmfb0b9f";
+ rev = "v0.6.2";
+ sha256 = "1bcppy1s148iikr78qjm0akahn01ywh83a8pw544prr9yc16jvmz";
};
}
-
{
goPackagePath = "github.com/alecthomas/colour";
fetch = {
@@ -69,17 +81,33 @@
sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs";
};
}
-
+ {
+ goPackagePath = "github.com/alecthomas/kong";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/kong";
+ rev = "v0.1.15";
+ sha256 = "1llxabcdzlb2hard0h931knqkdnyjyz8dp3k0nli0m0mags7l31b";
+ };
+ }
{
goPackagePath = "github.com/alecthomas/repr";
fetch = {
type = "git";
url = "https://github.com/alecthomas/repr";
- rev = "117648cd9897";
- sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp";
+ rev = "d37bc2a10ba1";
+ sha256 = "0jnx1ypdl4zi010ds2z857ajkr5cx51wkx950rfqb126hvql7svx";
+ };
+ }
+ {
+ goPackagePath = "github.com/armon/consul-api";
+ fetch = {
+ type = "git";
+ url = "https://github.com/armon/consul-api";
+ rev = "eb2c6b5be1b6";
+ sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
};
}
-
{
goPackagePath = "github.com/bep/debounce";
fetch = {
@@ -89,7 +117,6 @@
sha256 = "1sh4zv0hv7f454mhzpl2mbv7ar5rm00wyy5qr78x1h84bgph87wy";
};
}
-
{
goPackagePath = "github.com/bep/gitmap";
fetch = {
@@ -99,17 +126,15 @@
sha256 = "0zqdl5h4ayi2gi5aqf35f1sjszhbcriksm2bf84fkrg7ngr48jn6";
};
}
-
{
goPackagePath = "github.com/bep/go-tocss";
fetch = {
type = "git";
url = "https://github.com/bep/go-tocss";
- rev = "v0.5.0";
- sha256 = "12q7h6nydklq4kg65kcgd85209rx7zf64ba6nf3k7y16knj4233q";
+ rev = "v0.6.0";
+ sha256 = "0w5i3ig3bbdrwbrcwzx8xsxhlb8xr17jj3wdcb6klqglg7551yvm";
};
}
-
{
goPackagePath = "github.com/chaseadamsio/goorgeous";
fetch = {
@@ -119,7 +144,42 @@
sha256 = "07qdqi46klizq3wigxqbiksnlgbrdc8hvmizgzg0aas5iqy88dcb";
};
}
-
+ {
+ goPackagePath = "github.com/cheekybits/is";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cheekybits/is";
+ rev = "68e9c0620927";
+ sha256 = "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/etcd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/etcd";
+ rev = "v3.3.10";
+ sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-etcd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-etcd";
+ rev = "v2.0.0";
+ sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-semver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-semver";
+ rev = "v0.2.0";
+ sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
+ };
+ }
{
goPackagePath = "github.com/cpuguy83/go-md2man";
fetch = {
@@ -129,7 +189,6 @@
sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2";
};
}
-
{
goPackagePath = "github.com/danwakefield/fnmatch";
fetch = {
@@ -139,7 +198,6 @@
sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz";
};
}
-
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
@@ -149,7 +207,6 @@
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
-
{
goPackagePath = "github.com/disintegration/imaging";
fetch = {
@@ -159,7 +216,6 @@
sha256 = "1laxccmzi7q51zxn81ringmdwp8iaipivrl375yc3gq56d70sp0r";
};
}
-
{
goPackagePath = "github.com/dlclark/regexp2";
fetch = {
@@ -169,7 +225,15 @@
sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5";
};
}
-
+ {
+ goPackagePath = "github.com/dustin/go-humanize";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dustin/go-humanize";
+ rev = "v1.0.0";
+ sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
+ };
+ }
{
goPackagePath = "github.com/eknkc/amber";
fetch = {
@@ -179,7 +243,6 @@
sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9";
};
}
-
{
goPackagePath = "github.com/fortytw2/leaktest";
fetch = {
@@ -189,7 +252,6 @@
sha256 = "1lf9l6zgzjbcc7hmcjhhg3blx0y8icyxvjmjqqwfbwdk502803ra";
};
}
-
{
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
@@ -199,7 +261,6 @@
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
-
{
goPackagePath = "github.com/gobwas/glob";
fetch = {
@@ -209,7 +270,6 @@
sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z";
};
}
-
{
goPackagePath = "github.com/gorilla/websocket";
fetch = {
@@ -219,7 +279,6 @@
sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
};
}
-
{
goPackagePath = "github.com/hashicorp/go-immutable-radix";
fetch = {
@@ -229,7 +288,6 @@
sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6";
};
}
-
{
goPackagePath = "github.com/hashicorp/go-uuid";
fetch = {
@@ -239,7 +297,6 @@
sha256 = "1jflywlani7583qm4ysph40hsgx3n66n5zr2k84i057fmwa1ypfy";
};
}
-
{
goPackagePath = "github.com/hashicorp/golang-lru";
fetch = {
@@ -249,7 +306,6 @@
sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
};
}
-
{
goPackagePath = "github.com/hashicorp/hcl";
fetch = {
@@ -259,7 +315,6 @@
sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
};
}
-
{
goPackagePath = "github.com/inconshreveable/mousetrap";
fetch = {
@@ -269,7 +324,6 @@
sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
};
}
-
{
goPackagePath = "github.com/jdkato/prose";
fetch = {
@@ -279,7 +333,6 @@
sha256 = "1gjqgrpc7wbqvnhgwyfhxng24qvx37qjy0x2mbikiw1vaygxqsmy";
};
}
-
{
goPackagePath = "github.com/kr/pretty";
fetch = {
@@ -289,7 +342,6 @@
sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
};
}
-
{
goPackagePath = "github.com/kr/pty";
fetch = {
@@ -299,7 +351,6 @@
sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
};
}
-
{
goPackagePath = "github.com/kr/text";
fetch = {
@@ -309,7 +360,6 @@
sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
};
}
-
{
goPackagePath = "github.com/kyokomi/emoji";
fetch = {
@@ -319,7 +369,6 @@
sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a";
};
}
-
{
goPackagePath = "github.com/magefile/mage";
fetch = {
@@ -329,7 +378,6 @@
sha256 = "177hzmmzhk7bcm3jj2cj6d5l9h5ql3cikvndhk4agkslrhwr3xka";
};
}
-
{
goPackagePath = "github.com/magiconair/properties";
fetch = {
@@ -339,17 +387,33 @@
sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
};
}
-
{
goPackagePath = "github.com/markbates/inflect";
fetch = {
type = "git";
url = "https://github.com/markbates/inflect";
- rev = "a12c3aec81a6";
- sha256 = "0mawr6z9nav4f5j0nmjdxg9lbfhr7wz8zi34g7b6wndmzyf8jbsd";
+ rev = "v1.0.0";
+ sha256 = "072a73ij23mp8vabr8xwga2kj8dimya44ciiy9g4x4r9imm86psw";
+ };
+ }
+ {
+ goPackagePath = "github.com/matryer/try";
+ fetch = {
+ type = "git";
+ url = "https://github.com/matryer/try";
+ rev = "9ac251b645a2";
+ sha256 = "19fnqmpl3p54vmxgm1hmqvdc87brqx754wf3cdhq1bj04fcbb5h9";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "v0.0.9";
+ sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
};
}
-
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
@@ -359,7 +423,6 @@
sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
};
}
-
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
@@ -369,7 +432,6 @@
sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
};
}
-
{
goPackagePath = "github.com/miekg/mmark";
fetch = {
@@ -379,7 +441,6 @@
sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m";
};
}
-
{
goPackagePath = "github.com/mitchellh/hashstructure";
fetch = {
@@ -389,17 +450,15 @@
sha256 = "0zgl5c03ip2yzkb9b7fq9ml08i7j8prgd46ha1fcg8c6r7k9xl3i";
};
}
-
{
goPackagePath = "github.com/mitchellh/mapstructure";
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
- rev = "v1.0.0";
- sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm";
+ rev = "v1.1.2";
+ sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
};
}
-
{
goPackagePath = "github.com/muesli/smartcrop";
fetch = {
@@ -409,7 +468,6 @@
sha256 = "0xbv5wbn0z36nkw9ay3ly6z23lpsrs0khryl1w54fz85lvwh66gp";
};
}
-
{
goPackagePath = "github.com/nfnt/resize";
fetch = {
@@ -419,7 +477,6 @@
sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya";
};
}
-
{
goPackagePath = "github.com/nicksnyder/go-i18n";
fetch = {
@@ -429,7 +486,6 @@
sha256 = "1nlvq85c232z5yjs86pxpmkv7hk6gb5pa6j4hhzgdz85adk2ma04";
};
}
-
{
goPackagePath = "github.com/olekukonko/tablewriter";
fetch = {
@@ -439,7 +495,6 @@
sha256 = "1274k5r9ardh1f6gsmadxmdds7zy8rkr55fb9swvnm0vazr3y01l";
};
}
-
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {
@@ -449,7 +504,6 @@
sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
};
}
-
{
goPackagePath = "github.com/pkg/errors";
fetch = {
@@ -459,7 +513,6 @@
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
};
}
-
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
@@ -469,7 +522,6 @@
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
-
{
goPackagePath = "github.com/russross/blackfriday";
fetch = {
@@ -479,7 +531,6 @@
sha256 = "01z1jsdkac09cw95lqq4pahkw9xnini2mb956lvb772bby2x3dmj";
};
}
-
{
goPackagePath = "github.com/sanity-io/litter";
fetch = {
@@ -489,7 +540,6 @@
sha256 = "09nywwxxd6rmhxc7rsvs96ynjszmnvmhwr7dvh1n35hb6h9y7s2r";
};
}
-
{
goPackagePath = "github.com/sergi/go-diff";
fetch = {
@@ -499,7 +549,6 @@
sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
};
}
-
{
goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
fetch = {
@@ -509,17 +558,15 @@
sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h";
};
}
-
{
goPackagePath = "github.com/spf13/afero";
fetch = {
type = "git";
url = "https://github.com/spf13/afero";
- rev = "v1.1.2";
- sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
+ rev = "v1.2.1";
+ sha256 = "14qqj0cz6a595vn4dp747vddx05fd77jdsyl85qjmf9baymaxlam";
};
}
-
{
goPackagePath = "github.com/spf13/cast";
fetch = {
@@ -529,7 +576,6 @@
sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
};
}
-
{
goPackagePath = "github.com/spf13/cobra";
fetch = {
@@ -539,7 +585,6 @@
sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
};
}
-
{
goPackagePath = "github.com/spf13/fsync";
fetch = {
@@ -549,7 +594,6 @@
sha256 = "1vvbgxbbsc4mvi1axgqgn9pzjz1p495dsmwpc7mr8qxh8f6s0nhv";
};
}
-
{
goPackagePath = "github.com/spf13/jwalterweatherman";
fetch = {
@@ -559,7 +603,6 @@
sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b";
};
}
-
{
goPackagePath = "github.com/spf13/nitro";
fetch = {
@@ -569,57 +612,51 @@
sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib";
};
}
-
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
- rev = "v1.0.2";
- sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2";
+ rev = "v1.0.3";
+ sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
};
}
-
{
goPackagePath = "github.com/spf13/viper";
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
- rev = "v1.2.0";
- sha256 = "0klv7dyllvv9jkyspy4ww5nrz24ngb3adlh884cbdjn7562bhi47";
+ rev = "v1.3.1";
+ sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl";
};
}
-
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
- rev = "f2347ac6c9c9";
- sha256 = "0ns8zc2n8gpcsd1fdaqbq7a8d939lnaxraqx5nr2fi2zdxqyh7hm";
+ rev = "04af85275a5c";
+ sha256 = "1al7hgvg34xbajds99ss5wmlndxbzzmz5l0wrg6wchvvfaiwxlx0";
};
}
-
{
goPackagePath = "github.com/tdewolff/minify";
fetch = {
type = "git";
url = "https://github.com/tdewolff/minify";
- rev = "v2.3.6";
- sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb";
+ rev = "v2.3.7";
+ sha256 = "1mj1lmd8s0mrg9cfj1ihvsqrbsbpzh3icm0pmayd2r6jp6rbffw6";
};
}
-
{
goPackagePath = "github.com/tdewolff/parse";
fetch = {
type = "git";
url = "https://github.com/tdewolff/parse";
- rev = "fced451e0bed";
- sha256 = "1n6wcapk8xbck2zjxd4l5cgfn1v12rr7znrdpd5y2xp1nc3739c3";
+ rev = "v2.3.5";
+ sha256 = "05w859s31dx6525wrjryby601z9c0xpncilznk6shgqygpxda6cz";
};
}
-
{
goPackagePath = "github.com/tdewolff/test";
fetch = {
@@ -629,17 +666,33 @@
sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj";
};
}
-
+ {
+ goPackagePath = "github.com/ugorji/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ugorji/go";
+ rev = "d75b2dcb6bc8";
+ sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps";
+ };
+ }
{
goPackagePath = "github.com/wellington/go-libsass";
fetch = {
type = "git";
url = "https://github.com/wellington/go-libsass";
- rev = "615eaa47ef79";
- sha256 = "0imjiskn4vq7nml5jwb1scgl61jg53cfpkjnb9rsc6m8gsd8s16s";
+ rev = "c63644206701";
+ sha256 = "1ml0fk4wldnjlkmliydnig9f3rpp3cdzwgz331mlqyadvma3c0lf";
+ };
+ }
+ {
+ goPackagePath = "github.com/xordataexchange/crypt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xordataexchange/crypt";
+ rev = "b2862e3d0a77";
+ sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";
};
}
-
{
goPackagePath = "github.com/yosssi/ace";
fetch = {
@@ -649,7 +702,15 @@
sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f";
};
}
-
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "505ab145d0a9";
+ sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s";
+ };
+ }
{
goPackagePath = "golang.org/x/image";
fetch = {
@@ -659,7 +720,6 @@
sha256 = "1kkafy29vz5xf6r29ghbvvbwrgjxwxvzk6dsa2qhyp1ddk6l2vkz";
};
}
-
{
goPackagePath = "golang.org/x/net";
fetch = {
@@ -669,7 +729,6 @@
sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv";
};
}
-
{
goPackagePath = "golang.org/x/sync";
fetch = {
@@ -679,17 +738,15 @@
sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
};
}
-
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "d0be0721c37e";
- sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12";
+ rev = "b4a75ba826a6";
+ sha256 = "0kzrd2wywkcq35iakbzplqyma4bvf2ng3mzi7917kxcbdq3fflrj";
};
}
-
{
goPackagePath = "golang.org/x/text";
fetch = {
@@ -699,7 +756,6 @@
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
-
{
goPackagePath = "gopkg.in/check.v1";
fetch = {
@@ -709,14 +765,13 @@
sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
};
}
-
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
- rev = "v2.2.1";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ rev = "v2.2.2";
+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
};
}
]
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index 04c3e0320f6..2fd7e2f94af 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -11,11 +11,11 @@ let
];
in
stdenv.mkDerivation rec {
- version = "2.1.1";
+ version = "2.1.2";
name = "hyper-${version}";
src = fetchurl {
url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb";
- sha256 = "1vr4j2vb2wpn8qzgq30l8kfck2an03jwchwywyx4zsl2vz3qp70x";
+ sha256 = "1n4qlbk7q9zkhhg72mdks95g15xgyrc6ixf882ghvrqghd4zxplm";
};
buildInputs = [ dpkg ];
unpackPhase = ''
diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
index 2c46ea3ac9a..72a24026a89 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, java }:
+{ stdenv, fetchurl, java, runtimeShell }:
stdenv.mkDerivation rec {
pname = "jbidwatcher";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p "$out/bin"
- echo > "$out/bin/${pname}" "#!${stdenv.shell}"
+ echo > "$out/bin/${pname}" "#!${runtimeShell}"
echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}"
chmod +x "$out/bin/${pname}"
install -D -m644 ${src} ${jarfile}
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index d6e05056e1c..61eb959a1dd 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -50,6 +50,6 @@ in with python.pkgs; buildPythonApplication rec {
homepage = https://github.com/scheibler/khard;
description = "Console carddav client";
license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ ];
+ maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
};
}
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 845de8b0388..58b6ae9aae8 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -7,8 +7,8 @@
with python3Packages;
buildPythonApplication rec {
+ pname = "kitty";
version = "0.13.3";
- name = "kitty-${version}";
format = "other";
src = fetchFromGitHub {
@@ -24,7 +24,7 @@ buildPythonApplication rec {
wayland-protocols wayland dbus
];
- nativeBuildInputs = [ pkgconfig which sphinx ];
+ nativeBuildInputs = [ pkgconfig which sphinx ncurses ];
outputs = [ "out" "terminfo" ];
@@ -36,7 +36,7 @@ buildPythonApplication rec {
];
buildPhase = ''
- python3 setup.py linux-package
+ ${python.interpreter} setup.py linux-package
'';
installPhase = ''
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index ed3aca996e1..5ae652d750d 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11,
-libGLU_combined, freetype, xclip }:
+libGLU_combined, freetype, xclip, inotify-tools, procps }:
assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";
@@ -34,11 +34,17 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
- install -d $out/bin $out/lib
+ install -d $out/bin
install build/llpp $out/bin
+ install misc/llpp.inotify $out/bin/llpp.inotify
+
wrapProgram $out/bin/llpp \
- --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \
--prefix PATH ":" "${xclip}/bin"
+
+ wrapProgram $out/bin/llpp.inotify \
+ --prefix PATH ":" "$out/bin" \
+ --prefix PATH ":" "${inotify-tools}/bin" \
+ --prefix PATH ":" "${procps}/bin"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index cd7bdd1fe7e..6c58dde00d3 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://github.com/visit1985/mdp;
description = "A command-line based markdown presentation tool";
- maintainers = with maintainers; [ vrthra ];
+ maintainers = with maintainers; [ matthiasbeyer vrthra ];
license = licenses.gpl3;
platforms = with platforms; unix;
};
diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix
index 88a7b94897d..a2678d6067f 100644
--- a/pkgs/applications/misc/multibootusb/default.nix
+++ b/pkgs/applications/misc/multibootusb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5 }:
+{ stdenv, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5, runtimeShell }:
python36Packages.buildPythonApplication rec {
pname = "multibootusb";
name = "${pname}-${version}";
@@ -40,7 +40,7 @@ python36Packages.buildPythonApplication rec {
mkdir "$out/bin"
cat > "$out/bin/${pname}" < $out/bin/nix-tour
+ echo "#!${runtimeShell}" > $out/bin/nix-tour
echo "cd $out/share/" >> $out/bin/nix-tour
echo "${electron}/bin/electron $out/share/electron-main.js" >> $out/bin/nix-tour
chmod 0755 $out/bin/nix-tour
diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index 9eb5382cde9..c1bdc1bcfef 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchFromGitHub, pkgconfig, ncurses, conf ? null }:
+{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "nnn-${version}";
- version = "2.2";
+ version = "2.3";
src = fetchFromGitHub {
owner = "jarun";
repo = "nnn";
rev = "v${version}";
- sha256 = "01y2vkw1wakpnpzhzia3d44iir060i8vma3b3ww5wgwg7bfpzs4b";
+ sha256 = "0953l4wa4dnsq9aj50anjrww64413dxv25xx3kjwnqz2ag7zdyy7";
};
configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} nnn.h";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ncurses ];
+ buildInputs = [ readline ncurses ];
makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ];
diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix
index a79c63db163..a732a5ed536 100644
--- a/pkgs/applications/misc/notejot/default.nix
+++ b/pkgs/applications/misc/notejot/default.nix
@@ -1,36 +1,33 @@
{ stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3, pantheon
-, gtk3, gtksourceview, json-glib, gnome3, gobject-introspection, wrapGAppsHook }:
+, gtk3, gtksourceview, json-glib, gnome3, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "notejot";
- version = "1.5.4";
-
- name = "${pname}-${version}";
+ version = "1.5.5";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
- sha256 = "1lv4s2mqddi6lz414kqpp4vcwnkjibc0k2xhnczaa1wf3azlxjgf";
+ sha256 = "0khf6mwidybfgnq4zmhf3af4w6aicipmi12fvs722fqlf1lrkdmd";
};
nativeBuildInputs = [
- gobject-introspection
meson
ninja
+ pantheon.vala
pkgconfig
python3
- pantheon.vala
wrapGAppsHook
];
buildInputs = [
- pantheon.elementary-icon-theme
- pantheon.granite
gnome3.libgee
gtk3
gtksourceview
json-glib
+ pantheon.elementary-icon-theme
+ pantheon.granite
];
postPatch = ''
diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index 40432c18aa3..a604349afb0 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -18,12 +18,12 @@ let
in
pythonPackages.buildPythonApplication rec {
- name = "ocropus-${version}";
- version = "20170811";
+ pname = "ocropus";
+ version = "1.3.3";
src = fetchFromGitHub {
- sha256 = "0qx0d8yj0w66qglkrmfavp5dh1sky72njfaqii7bnrpv5n4j3q39";
- rev = "ae84a8edaf0b76135f749ba66fc30c272d0726d0";
+ sha256 = "02p1334mic5cfhvpfphfrbim4036yfd8s2zzpwm0xmm829z71nr7";
+ rev = "v${version}";
repo = "ocropy";
owner = "tmbdev";
};
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 9622689199a..e173f6d0d7d 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -32,14 +32,17 @@ let
"flask"
"future"
"futures"
+ "monotonic"
"pkginfo"
"psutil"
"pyserial"
"python-dateutil"
"requests"
"rsa"
+ "sarge"
"scandir"
"semantic_version"
+ "watchdog"
"websocket-client"
"werkzeug"
"wrapt"
@@ -47,13 +50,13 @@ let
in py.pkgs.buildPythonApplication rec {
pname = "OctoPrint";
- version = "1.3.9";
+ version = "1.3.10";
src = fetchFromGitHub {
owner = "foosel";
repo = "OctoPrint";
rev = version;
- sha256 = "1yqbsfmkx4wiykjrh66a05lhn15qhpc9ay67l37kv8bhdqf2xkj4";
+ sha256 = "1pvh7ay76zrvfzcsadh3sl48sgf3by9vpiaqlrkscsw02zirx9r7";
};
propagatedBuildInputs = with py.pkgs; [
@@ -75,7 +78,9 @@ in py.pkgs.buildPythonApplication rec {
setup.py
'';
- checkPhase = "nosetests";
+ checkPhase = ''
+ HOME=$(mktemp -d) nosetests
+ '';
meta = with stdenv.lib; {
homepage = https://octoprint.org/;
diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix
index 09ec3433862..c98defee57a 100644
--- a/pkgs/applications/misc/openjump/default.nix
+++ b/pkgs/applications/misc/openjump/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl, unzip, runtimeShell }:
stdenv.mkDerivation {
name = "openjump-1.3.1";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
s=$out/bin/OpenJump
dir=$(echo $out/openjump-*)
cat >> $s << EOF
- #!${stdenv.shell}
+ #!${runtimeShell}
cd $dir/bin
exec ${stdenv.shell} openjump.sh
EOF
diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
index 2649c7cbd6a..633c1d82159 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138";
};
- buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ];
+ buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
configureFlags = optional withGtk3 "--with-gtk=3";
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index c31d442d2d6..3cb9bc8c979 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -19,6 +19,7 @@
, pkgsi686Linux
, which
, curl
+, jq
}:
let
@@ -41,6 +42,7 @@ let
xterm
which
curl
+ jq
];
ld32 =
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 05b19bbbff9..a3be9cad3ae 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -2,14 +2,14 @@
with python3Packages;
buildPythonApplication rec {
- version = "1.24.0";
+ version = "1.25.1";
pname = "rtv";
src = fetchFromGitHub {
owner = "michael-lazar";
repo = "rtv";
rev = "v${version}";
- sha256 = "0vzhnqys8nr6ymsi1mnv092z3i7nwyhgnj4jv6mjifak9j3164fw";
+ sha256 = "0pfsf17g37d2v1xrsbfdbv460vs7m955h6q51z71rhb840r9812p";
};
# Tests try to access network
@@ -41,6 +41,6 @@ buildPythonApplication rec {
homepage = https://github.com/michael-lazar/rtv;
description = "Browse Reddit from your Terminal";
license = licenses.mit;
- maintainers = with maintainers; [ jgeerds wedens ];
+ maintainers = with maintainers; [ matthiasbeyer jgeerds wedens ];
};
}
diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix
index e99b305b2b3..f4918565f35 100644
--- a/pkgs/applications/misc/safeeyes/default.nix
+++ b/pkgs/applications/misc/safeeyes/default.nix
@@ -17,7 +17,7 @@ in buildPythonApplication rec {
buildInputs = [
gtk3
gobject-introspection
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
gnome3.adwaita-icon-theme
];
diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix
index a10b58d00b6..978ac2b7035 100644
--- a/pkgs/applications/misc/sigal/default.nix
+++ b/pkgs/applications/misc/sigal/default.nix
@@ -29,6 +29,6 @@ python3Packages.buildPythonApplication rec {
description = "Yet another simple static gallery generator";
homepage = http://sigal.saimon.org/en/latest/index.html;
license = licenses.mit;
- maintainers = with maintainers; [ domenkozar ];
+ maintainers = with maintainers; [ domenkozar matthiasbeyer ];
};
}
diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix
index 6d6382faccd..ebb50e685da 100644
--- a/pkgs/applications/misc/stag/default.nix
+++ b/pkgs/applications/misc/stag/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
homepage = https://github.com/seenaburns/stag;
description = "Terminal streaming bar graph passed through stdin";
license = stdenv.lib.licenses.bsdOriginal;
- maintainers = with stdenv.lib.maintainers; [ ];
+ maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix
index bf0e964d591..7ca421b49a3 100644
--- a/pkgs/applications/misc/tasknc/default.nix
+++ b/pkgs/applications/misc/tasknc/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://github.com/lharding/tasknc;
description = "A ncurses wrapper around taskwarrior";
- maintainers = with maintainers; [ infinisil ];
+ maintainers = with maintainers; [ matthiasbeyer infinisil ];
platforms = platforms.linux; # Cannot test others
license = licenses.mit;
};
diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix
index dac447edd7d..6a30adb23da 100644
--- a/pkgs/applications/misc/tasksh/default.nix
+++ b/pkgs/applications/misc/tasksh/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
description = "REPL for taskwarrior";
homepage = http://tasktools.org;
license = licenses.mit;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ matthiasbeyer ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
index b05c8a80399..3599bd0030b 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip }:
+{ stdenv, runtimeShell, lib, fetchzip }:
stdenv.mkDerivation rec {
name = "terminal-notifier-${version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp -r terminal-notifier.app $out/Applications
cat >$out/bin/terminal-notifier <> $out/bin/thinkingrock << EOF
- #!${stdenv.shell}
+ #!${runtimeShell}
exec $out/nix-support/tr-files/bin/tr "$@"
EOF
chmod +x $out/bin/thinkingrock
'';
-
+
installPhase = ":";
- meta = {
+ meta = {
description = "Task management system";
homepage = http://www.thinkingrock.com.au/;
license = "CDDL"; # Common Development and Distribution License
diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix
index 4ca7a86e6f7..ca049ba04c9 100644
--- a/pkgs/applications/misc/timewarrior/default.nix
+++ b/pkgs/applications/misc/timewarrior/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
description = "A command-line time tracker";
homepage = https://taskwarrior.org/docs/timewarrior;
license = licenses.mit;
- maintainers = with maintainers; [ mrVanDalo ];
+ maintainers = with maintainers; [ matthiasbeyer mrVanDalo ];
platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix
index c6ee7508890..127d9f21d99 100644
--- a/pkgs/applications/misc/toot/default.nix
+++ b/pkgs/applications/misc/toot/default.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
description = "Mastodon CLI interface";
homepage = "https://github.com/ihabunek/toot";
license = licenses.mit;
- maintainers = [ ];
+ maintainers = [ maintainers.matthiasbeyer ];
};
}
diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix
index 5a856a5f2b2..413f082fb22 100644
--- a/pkgs/applications/misc/tootle/default.nix
+++ b/pkgs/applications/misc/tootle/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
-, meson, ninja, pkgconfig, python3
+, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas
, gnome3, pantheon, gobject-introspection, wrapGAppsHook
, gtk3, json-glib, glib, glib-networking, hicolor-icon-theme
}:
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
gtk3 pantheon.granite json-glib glib glib-networking hicolor-icon-theme
- gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas
+ libgee gnome3.libsoup gsettings-desktop-schemas
];
postPatch = ''
diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index 5d96918e42d..459104aba63 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -1,33 +1,41 @@
{ stdenv, fetchFromGitHub, asciidoc-full, gettext
, gobject-introspection, gtk3, hicolor-icon-theme, libappindicator-gtk3, libnotify, librsvg
, udisks2, wrapGAppsHook
-, buildPythonApplication
-, docopt
-, pygobject3
-, pyyaml
+, python3Packages
}:
-buildPythonApplication rec {
- name = "udiskie-${version}";
- version = "1.7.5";
+python3Packages.buildPythonApplication rec {
+ pname = "udiskie";
+ version = "1.7.7";
src = fetchFromGitHub {
owner = "coldfix";
repo = "udiskie";
rev = version;
- sha256 = "1mcdn8ha5d5nsmrzk6xnnsqrmk94rdrzym9sqm38zk5r8gpyl1k4";
+ sha256 = "1j17z26vy44il2s9zgchvhq280vq8ag64ddi35f35b444wz2azlb";
};
- buildInputs = [
+ nativeBuildInputs = [
+ gettext
asciidoc-full # For building man page.
- hicolor-icon-theme
+ gobject-introspection
wrapGAppsHook
- librsvg # required for loading svg icons (udiskie uses svg icons)
];
- propagatedBuildInputs = [
- gettext gobject-introspection gtk3 libnotify docopt
- pygobject3 pyyaml udisks2 libappindicator-gtk3
+ buildInputs = [
+ hicolor-icon-theme
+ librsvg # required for loading svg icons (udiskie uses svg icons)
+ gobject-introspection
+ libnotify
+ gtk3
+ udisks2
+ libappindicator-gtk3
+ ];
+
+ propagatedBuildInputs = with python3Packages; [
+ docopt
+ pygobject3
+ pyyaml
];
postBuild = "make -C doc";
@@ -37,8 +45,14 @@ buildPythonApplication rec {
cp -v doc/udiskie.8 $out/share/man/man8/
'';
- # tests require dbusmock
- doCheck = false;
+ checkInputs = with python3Packages; [
+ nose
+ keyutils
+ ];
+
+ checkPhase = ''
+ nosetests
+ '';
meta = with stdenv.lib; {
description = "Removable disk automounter for udisks";
diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index c568a056514..b61864e026a 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A vi-like file manager";
maintainers = with maintainers; [ raskin garbas ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
license = licenses.gpl2;
downloadPage = "https://vifm.info/downloads.shtml";
homepage = https://vifm.info/;
diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix
index a448d35485a..1feec9e4550 100644
--- a/pkgs/applications/misc/vue/default.nix
+++ b/pkgs/applications/misc/vue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre }:
+{ stdenv, fetchurl, jre, runtimeShell }:
stdenv.mkDerivation rec {
name = "vue-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p "$out"/{share/vue,bin}
cp ${src} "$out/share/vue/vue.jar"
- echo '#!${stdenv.shell}' >> "$out/bin/vue"
+ echo '#!${runtimeShell}' >> "$out/bin/vue"
echo '${jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"
chmod a+x "$out/bin/vue"
'';
diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix
index 544c1252ff4..90fa0166154 100644
--- a/pkgs/applications/misc/weather/default.nix
+++ b/pkgs/applications/misc/weather/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
homepage = http://fungi.yuggoth.org/weather;
description = "Quick access to current weather conditions and forecasts";
license = stdenv.lib.licenses.isc;
- maintainers = with stdenv.lib.maintainers; [ ];
+ maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
platforms = with stdenv.lib.platforms; linux; # my only platform
};
}
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index f9267411dda..f5c92592cd1 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "worker-${version}";
- version = "3.15.2";
+ version = "3.15.3";
src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
- sha256 = "0km17ls51vp4nxlppf58vvxxymyx6w3xlzjc8wghxpjj098v4pp8";
+ sha256 = "03dv50h68grscxiaxslzv486v1bfi8y81vrjr2gs39svw7bwz5d4";
};
buildInputs = [ libX11 ];
diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index 6878bc5ab03..d33135ccad7 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -12,13 +12,13 @@ in
stdenv'.mkDerivation rec {
name = "xmr-stak-${version}";
- version = "2.8.2";
+ version = "2.8.3";
src = fetchFromGitHub {
owner = "fireice-uk";
repo = "xmr-stak";
rev = "${version}";
- sha256 = "0z0fdh5fmiisx5dgfyyin3ddl8g28fpd64gn8nl8dd6sf3iw8z7p";
+ sha256 = "1yanyaz6gh5wbccj9mfd39pyrg69gb4jn6sjvx1k63pkjrwr2ap3";
};
NIX_CFLAGS_COMPILE = "-O3";
diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index cb2b682a952..22ababbca3b 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "xmrig-${version}";
- version = "2.11.0";
+ version = "2.13.1";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
- sha256 = "0k897lx60gjf464j2ndindxhr6x3l90fv81bcqyglsv47danivlc";
+ sha256 = "1s6hz9r0079r9sd1wgd1nm6wn1dmix4smz7174g9a29z2zcqr160";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index 7e0369b277d..eb76448391e 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -44,8 +44,20 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = https://www.xpdfreader.com;
description = "Viewer for Portable Document Format (PDF) files";
+ longDescription = ''
+ XPDF includes multiple tools for viewing and processing PDF files.
+ xpdf: PDF viewer (with Graphical Interface)
+ pdftotext: converts PDF to text
+ pdftops: converts PDF to PostScript
+ pdftoppm: converts PDF pages to netpbm (PPM/PGM/PBM) image files
+ pdftopng: converts PDF pages to PNG image files
+ pdftohtml: converts PDF to HTML
+ pdfinfo: extracts PDF metadata
+ pdfimages: extracts raw images from PDF files
+ pdffonts: lists fonts used in PDF files
+ pdfdetach: extracts attached files from PDF files
+ '';
license = with licenses; [ gpl2 gpl3 ];
platforms = platforms.unix;
- maintainers = [ maintainers.peti ];
};
}
diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/applications/misc/xteddy/default.nix
new file mode 100644
index 00000000000..6f67ed96c57
--- /dev/null
+++ b/pkgs/applications/misc/xteddy/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchzip, pkg-config, xorg, imlib2, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "xteddy-${version}";
+ version = "2.2";
+ src = fetchzip {
+ url = "https://deb.debian.org/debian/pool/main/x/xteddy/xteddy_${version}.orig.tar.gz";
+ sha256 = "0sap4fqvs0888ymf5ga10p3n7n5kr35j38kfsfd7nj0xm4hmcma3";
+ };
+ nativeBuildInputs = [ pkg-config makeWrapper ];
+ buildInputs = [ imlib2 xorg.libX11 xorg.libXext ];
+
+ makeFlags = [ "LIBS=-lXext" ];
+
+ postPatch = ''
+ sed -i 's/man 1 xteddy/man 6 xteddy/' xteddy.c
+ sed -i "s:/usr/games/xteddy:$out/bin/xteddy:" xtoys
+ sed -i "s:/usr/share/xteddy:$out/share/xteddy:" xtoys
+ '';
+
+ postInstall = ''
+ cp -R images $out/share/images
+ # remove broken test script
+ rm $out/bin/xteddy_test
+ '';
+
+ postFixup = ''
+ # this is needed, because xteddy expects images to reside
+ # in the current working directory
+ wrapProgram $out/bin/xteddy --run "cd $out/share/images/"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Cuddly teddy bear for your X desktop";
+ homepage = https://weber.itn.liu.se/~stegu/xteddy/;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.xaverdh ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index ee267c1ec7c..25d2e090580 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- name = "xterm-342";
+ name = "xterm-344";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/xterm/${name}.tgz"
"https://invisible-mirror.net/archives/xterm/${name}.tgz"
];
- sha256 = "1y8ldzl4h1872fxvpvi2zwa9y3d34872vfdvfasap79lpn8208l0";
+ sha256 = "1xfdmib8n6gw5s90vbvdhm630k8i2dbprknp4as4mqls27vbiknc";
};
buildInputs =
diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix
index 0794b2b6dbe..d273d27944a 100644
--- a/pkgs/applications/misc/yaft/default.nix
+++ b/pkgs/applications/misc/yaft/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/uobikiemukot/yaft;
description = "Yet another framebuffer terminal";
license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ ];
+ maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix
index dec861009eb..6b3a4f747f4 100644
--- a/pkgs/applications/misc/yokadi/default.nix
+++ b/pkgs/applications/misc/yokadi/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, buildPythonApplication, dateutil,
- sqlalchemy, setproctitle, icalendar, pycrypto }:
+ sqlalchemy, setproctitle, icalendar }:
buildPythonApplication rec {
pname = "yokadi";
- version = "1.1.1";
+ version = "1.2.0";
src = fetchurl {
- url = "https://yokadi.github.io/download/${pname}-${version}.tar.bz2";
- sha256 = "af201da66fd3a8435b2ccd932082ab9ff13f5f2e3d6cd3624f1ab81c577aaf17";
+ url = "https://yokadi.github.io/download/${pname}-${version}.tar.gz";
+ sha256 = "681c8aa52b2e4b5255e1311e76b4b81dcb63ee7f6ca3a47178e684c06baf330f";
};
propagatedBuildInputs = [
@@ -15,7 +15,6 @@ buildPythonApplication rec {
sqlalchemy
setproctitle
icalendar
- pycrypto
];
# Yokadi doesn't have any tests
diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index bdf6d0da145..d4afe4ea9e1 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
name = "zola-${version}";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "getzola";
repo = "zola";
rev = "v${version}";
- sha256 = "0as8nrzw9zz10w4xxiibgz8ylghc879b2pwaxnw8sjbji2d9qv63";
+ sha256 = "1jj6yfb3qkfq3nwcxfrc7k1gqyls873imxgpifbwjx9slg6ssis9";
};
- cargoSha256 = "0a14hq8d3xjr6yfg5qn5r7npqivm816f1p53bbm826igvpc9hsxa";
+ cargoSha256 = "1hn2l25fariidgdr32mfx2yqb3g8xk4qafs614bdjiyvfrb7j752";
nativeBuildInputs = [ cmake pkgconfig openssl ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ];
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 44313fa1ea2..d146cd81782 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -76,11 +76,11 @@ let rpath = lib.makeLibraryPath [
in stdenv.mkDerivation rec {
pname = "brave";
- version = "0.59.35";
+ version = "0.60.45";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "0z0fmgmfayappncixrnz7g42mcrm907lsvgynbklq2gjcxpsfp8k";
+ sha256 = "0c3jfiswbma53lkngndqrcagvhld7q7hqhk9wpm4r6z9y1kskjwy";
};
dontConfigure = true;
@@ -89,7 +89,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ dpkg wrapGAppsHook ];
- buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ];
+ buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.adwaita-icon-theme ];
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index f31ff05a42b..faa5bc121cb 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -47,7 +47,7 @@ mkChromiumDerivation (base: rec {
meta = {
description = "An open source web browser from Google";
homepage = http://www.chromium.org/;
- maintainers = with maintainers; [ chaoflow bendlas ];
+ maintainers = with maintainers; [ bendlas ];
license = licenses.bsd3;
platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 5d59f7514c6..36576df4b73 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -11,7 +11,7 @@
, nspr, systemd, kerberos
, utillinux, alsaLib
, bison, gperf
-, glib, gtk2, gtk3, dbus-glib
+, glib, gtk3, dbus-glib
, glibc
, libXScrnSaver, libXcursor, libXtst, libGLU_combined
, protobuf, speechd, libXdamage, cups
@@ -104,7 +104,7 @@ let
else result;
base = rec {
- name = "${packageName}-${version}";
+ name = "${packageName}-unwrapped-${version}";
inherit (upstream-info) version;
inherit packageName buildType buildPath;
@@ -120,7 +120,7 @@ let
nspr nss systemd
utillinux alsaLib
bison gperf kerberos
- glib gtk2 gtk3 dbus-glib
+ glib gtk3 dbus-glib
libXScrnSaver libXcursor libXtst libGLU_combined
pciutils protobuf speechd libXdamage at-spi2-core
] ++ optional gnomeKeyringSupport libgnome-keyring3
@@ -132,6 +132,8 @@ let
patches = optional enableWideVine ./patches/widevine.patch ++ [
./patches/nix_plugin_paths_68.patch
./patches/remove-webp-include-69.patch
+ ./patches/jumbo-sorted.patch
+ ./patches/no-build-timestamps.patch
# Unfortunately, chromium regularly breaks on major updates and
# then needs various patches backported in order to be compiled with GCC.
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index c7917e923d4..4b9a747811f 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -84,7 +84,7 @@ in stdenv.mkDerivation {
gsettings-desktop-schemas glib gtk3
# needed for XDG_ICON_DIRS
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
outputs = ["out" "sandbox"];
diff --git a/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch b/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch
new file mode 100644
index 00000000000..cdf0f695f76
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch
@@ -0,0 +1,11 @@
+--- chromium-70.0.3538.67/build/config/merge_for_jumbo.py.old 2018-10-25 19:15:54.578222230 +0300
++++ chromium-70.0.3538.67/build/config/merge_for_jumbo.py 2018-10-25 19:20:44.397613032 +0300
+@@ -132,6 +132,8 @@
+ assert not inputs
+ continue
+
++ inputs.sort()
++ outputs.sort()
+ write_jumbo_files(inputs, outputs, written_input_set, written_output_set)
+
+ assert set(args.outputs) == written_output_set, "Did not fill all outputs"
diff --git a/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch b/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch
new file mode 100644
index 00000000000..e06d848095c
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch
@@ -0,0 +1,17 @@
+--- chromium-70.0.3538.67/build/compute_build_timestamp.py.orig 2018-11-02 16:00:34.368933077 +0200
++++ chromium-70.0.3538.67/build/compute_build_timestamp.py 2018-11-08 04:06:21.658105129 +0200
+@@ -94,6 +94,14 @@
+ 'build_type', help='The type of build', choices=('official', 'default'))
+ args = argument_parser.parse_args()
+
++ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here
++ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None)
++ if SOURCE_DATE_EPOCH is not None:
++ print SOURCE_DATE_EPOCH
++ return 0
++ else:
++ raise RuntimeError("SOURCE_DATE_EPOCH not set")
++
+ # The mtime of the revision in build/util/LASTCHANGE is stored in a file
+ # next to it. Read it, to get a deterministic time close to "now".
+ # That date is then modified as described at the top of the file so that
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 62858904ffc..322f75d9e78 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "0gd426a9xcgs8a9286gavziysq6fw1ilaifsna396dbdm8b571wi";
- sha256bin64 = "05p20l0969rppbyn7965k78ccynng47rg7d7h7piqiwnm6ffg9yx";
- version = "73.0.3683.39";
+ sha256 = "00vh4vgkg4dc9vw6slgb086420l2sc6sykr15zw29jhnxaa7b1ij";
+ sha256bin64 = "0vpwsgz71ykaid240241f7jzsm4d46wad00vvrd4fh9224q4h6ww";
+ version = "73.0.3683.56";
};
dev = {
- sha256 = "1yyzhw5zv803ysdj7zf0imdw9cf0mdlw30vphcb59a93nnvhkbb7";
- sha256bin64 = "1a1dswkfc4x2rslkb899fgywv5mfrmcp1d8wxy7h034504r8gy87";
- version = "74.0.3702.0";
+ sha256 = "1cfy6m1ijqh7b8rlrjym8igpm5i549kz1h3jwbpxn52zy3mlk7jr";
+ sha256bin64 = "02bgg20rh50lsz2ay4p7bkjfb18ay01hj0bcbd3g29valddr35p8";
+ version = "74.0.3717.0";
};
stable = {
- sha256 = "0bcc0iksk2v30drwd5zbw7v6sfbw16jqllc12ks2nifrvh058jjp";
- sha256bin64 = "0azyhnmdg3grladpkpsv67zxqiqf5a3x9qjfj8h831kh7i7m3gy8";
- version = "72.0.3626.109";
+ sha256 = "07xwmlvmzfga61nrimqmzl7s29jb4kc94nkzwwlb7sh6nr55a7jc";
+ sha256bin64 = "1jdj2jp4jvzi5a24dm56ls5kx6xpiiv98yx4si9z19lm5srrji8j";
+ version = "72.0.3626.121";
};
}
diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index ded2b688815..be1389c2121 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://conkeror.org/;
license = with licenses; [ mpl11 gpl2 lgpl21 ];
- maintainers = with maintainers; [ astsmtl chaoflow ];
+ maintainers = with maintainers; [ astsmtl ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 12a6c64c7ae..5b3e8d727d0 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = with gst_all_1; [
glib-networking
+ gobject-introspection
gst-libav
gst-plugins-base
gst-plugins-ugly
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 2d9692c0528..fab98ad2e2b 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -31,7 +31,7 @@
, libgnome
, libgnomeui
, libnotify
-, defaultIconTheme
+, gnome3
, libGLU_combined
, nspr
, nss
@@ -49,6 +49,7 @@
, gnugrep
, gnupg
, ffmpeg
+, runtimeShell
}:
let
@@ -141,7 +142,7 @@ stdenv.mkDerivation {
inherit gtk3;
- buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ];
+ buildInputs = [ wrapGAppsHook gtk3 gnome3.adwaita-icon-theme ];
# "strip" after "patchelf" may break binaries.
# See: https://github.com/NixOS/patchelf/issues/10
@@ -191,7 +192,7 @@ stdenv.mkDerivation {
# update with:
# $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped
passthru.updateScript = import ./update.nix {
- inherit stdenv name channel writeScript xidel coreutils gnused gnugrep gnupg curl;
+ inherit stdenv name channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
baseUrl =
if channel == "devedition"
then "http://archive.mozilla.org/pub/devedition/releases/"
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index e5e94559af2..9bba010866a 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,995 +1,995 @@
{
- version = "65.0";
+ version = "65.0.2";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ach/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ach/firefox-65.0.2.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "3bdf982f4646a019f2dc11f5367ab0c23695c9c8fced02927c2d9a862e15f6a1c9c1ef63da3ef6539d802095d0b8b48d6f55a9961a453ddd4a97d828e9372aaa";
+ sha512 = "f9853b728990499933b8741103454a8e68b17fa3653917e82cfeb3a66c8221f6d0be5e4aefc230fe2040a2fa10b5eb6f465b1c2099bcec667807e040243bb266";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/af/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/af/firefox-65.0.2.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "2a010ce94b6f0108cfed973dd9c632691d4d2558ed006184ba9ded8ea89933fcc77d21f82fe3add259409861cb65dd12e48aed592fc932411ddc3226c0085d31";
+ sha512 = "1db183c4f5a5628fc084a2d8a049a50f9df14f012dffaf7030c7ba3934df847aeb5089cc11882fefa0cf50d278268e9568a9b06b6cef11295282fecf6966c99b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/an/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/an/firefox-65.0.2.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "30f2cd15a3d43c4228aa8b49b44aa4716ce35968cfb63d57141a3c3027e95242f4c724aee50b6d7ffcf77384e101a17cd252beaec75840f59400e0db2c111f95";
+ sha512 = "ab56dfd7dab068d7844f24ca839c570cbeaace249ed80b53c1cbde283d89a8e2cabf4d1fca7db626942e5c7296668f21262e7218c85ae1357f48bcd477c811dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ar/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ar/firefox-65.0.2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "ad9846180c953ffdb73d519f1090a420deefd8b4bea531038318237ad639258bb05f4d9f88cf23650f1507034ce0700cc9e2bdda4ec02eb6e02c2d795b552cfd";
+ sha512 = "4448c98b798851bb8456f2c112c3552968317ebb6c76b324c2a0148866c708d032d43134403832d6fd190f676c46203c84cd57c81b355c9b4ef6ec41ad0f3ea5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/as/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/as/firefox-65.0.2.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "a9babea676451cb0f0126711592d3d94f57865c520de370194023157a65d5633d26f63aba9aa71472e40885d67de98a694d0bc4b65f4c1c933e3e4feb0e6be71";
+ sha512 = "637184eec62bcbf580943e03384c38effe81e2562ee454c97a416f7084fdc20b53de19979c96ebc3d73792b5d01f15b862b8d42f69b29c4b1ecc91b27216a70a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ast/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ast/firefox-65.0.2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "03bfbb6635c587c356fe622757b2b7f6e3b85fb04c7477857074cc198efa4e97e960e4d3b7c5d60aa9fda8639e605ae00d398899fdb2d05bd5fcf5dc494f4ded";
+ sha512 = "9a41f53d4a4176b9158f09aade515dcd525c07e47d58b1814e9e9b698db5c45a5d25d7d5dde3855875d1853609fd55cbd16ab8756600d807f8575022cdb4356e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/az/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/az/firefox-65.0.2.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "5201abfc1e7333acf0bb8967ba667742dacb2cdb8cab6b3ae60ec3d15cf756a1b48f6bc0904e02d433df5ab80440fe3cdcf4e260c4cd1c1f3da16f51c00c2962";
+ sha512 = "8e7b4b17dd122706d194e57db7ca8be4633976d29f8d97c9f6079d062b228cfccdd9566172af8c341f8f95846140c05550184bb1386559ea58fba95d15f35f06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/be/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/be/firefox-65.0.2.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "68f400d8640620f2af6ccf5a3b8e4fe2c94e7169e1b258d875b693dfecb4dbe070a9bd6a97b9fd668362783b73cc2eb21925bbf0159b41c4df910946bbae3f3d";
+ sha512 = "16ffc474db3700184f81e6c4172b638826049656ecb7628ebd8fac3186c63ebf0b0b8b6d483f85c0f9a318e841669b7352f1e327c922996f336517769091e3fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/bg/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/bg/firefox-65.0.2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "6a7b6997b1efb726dfbda25e7f7eb024013ab1c782912e03e258c4fe72adf26ab926a05f88e62255c682e6352ed88b2158f1bc12ce9c8b91714291783397c379";
+ sha512 = "9c566822ed36ac32057e0549c2e68cc436e9a65b49a9f8e099ecca64f649667337bf90e196b4eb0b3e88b3be474f0bbae4c73c821249e83353dc3f4fb7fc08f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/bn-BD/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/bn-BD/firefox-65.0.2.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "1fe6f67067cc27f4d8b13eaa22a8ef2ca23fd3971a3140432ee389327fd97faf97be802add562b2f4ced0fc83f75b8c8c8c707c160e0ce3ec50648735704f9cd";
+ sha512 = "9a071ef0998e6130590126b67d529beb6fd70cf4387e84a7638b579e885e0a3fa6d92208f960c22d99250d067e6db1ea774fba02fd79deea0f336b639d55ecfa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/bn-IN/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/bn-IN/firefox-65.0.2.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "d5ad4b8673ab8c136e3aaf5c2627c7210d670351744d486a896d40dd1599ee17a5cf90fe2c967d1c70989ac644f180c0efe23fa25f5f76ea4ba4f0ca0f3492c2";
+ sha512 = "d0821d3d18e633631fa61384aae77d5ddbc7dd0db66e57d41405446a0ca38914c60aea886a2cf7d22800de239544cf7b67b9d2ba31723db210c4cdfb0730ed12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/br/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/br/firefox-65.0.2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "ca1196a2f2875b86c315a32d9c0091d0c72d8e2dd00d788f24000644028dc0d1f5eba7f9b2888353a2c5fbd16273412cf3737d39fd63ffeff7d0c5bfb7829922";
+ sha512 = "9ad730f0426bd6f7cb8530f5199f7c62547c3b82f8ce1e6e92b49e9bf5fc01b9bc8588c527f4dcc832d5c0e4f60636c2f53f5e2b16751ec9a34ab8c81a656563";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/bs/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/bs/firefox-65.0.2.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "7fc343375a6f2947d2604d14a764d5cdce77209c6a1770f69cda713fc03662a7e84a6c656d1262148b57c4ec3c9c5172fd910ba424854f35b3b7fe7ce148b699";
+ sha512 = "6a7d1d1ce532964185e53b23f736ced1d776d65d06655d402ce56ad91ba835375fa157188b6f387fc61dccbb79ca341e15b8ea0ab1218f8b884401f0c54989d9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ca/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ca/firefox-65.0.2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "d62cfcfa8c575c905fe904f6819e5f82bc139d91186db956050dd82ed3ce65ca4eb407efab9b26049cb28d806c76d9c2516a176157b26608418f06d66167b13f";
+ sha512 = "ce26a6163e5bd9a35e5ae6ec07f9e3309e6575891a75b416c582116e41e0c0724e70bd85300a00812cfd8ac32f6a2c4af6717075c1b88fc9cb7ae25d489664a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/cak/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/cak/firefox-65.0.2.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "b1f4bbdf515d8ba548b0e915a53d212e74d099da64631b8f05f21b9914ca2545b4092291d21b28bfdcba75be6eba02b79cdcd57ea4b39a1c05a856aa73134e5c";
+ sha512 = "0e751b138716be6b80a9f5a9321cbb89b0a6bd27381e59e5fd8ac259a6a0947c040606686d4884c51adc6371431ca2f6b424115ff8a0023aa9974547a9402221";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/cs/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/cs/firefox-65.0.2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "a98915ea6d8a5e1a374e34b836563ad450a48816d374917562078ade754dfb1cd5cfb6cef73de942fbb1c1c1abe41871ec3b9ff17a3a6a6bb2bb36df3a6c3763";
+ sha512 = "43e53539cb2628eefc457add31d3293748abbb857e0494915b54224f60e516137464e078d913ef2de7a06a68563767d2a3936caf651bafe7fca049aa0d75c8a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/cy/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/cy/firefox-65.0.2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "ad1e6640cb799acf17b8e151b26e78a86ce21960f2f8b5baca4890e7da2fe1d4739357058a551c161e31c1685d99d988d9715b6eb6a39d785e9e526f60c65009";
+ sha512 = "feb39033055f8f0c1bee933b46ad5a2d56a60c0f64d513bd606432beafe27c53a0580760ce0c0e27c92079e5727ae7844f68752cd0567239cb7d24a18b836635";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/da/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/da/firefox-65.0.2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "983fbde10f8ed3971b2ddc8161d6387b56d8c94ef3724f7db2febcb7160d17b20a6cf406e48c3a266d0e1a74f024faf4950f8dee0bd60967ff1c1ec7bde21450";
+ sha512 = "4e9873d01621fb514ff4e18b1f9eb263792ea7976fb19ca89bdfcff9511d006537963fae16abf7ee950f5a846816993eacc1b0e86924678b4af2a985b67f24a2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/de/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/de/firefox-65.0.2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "59aa726477553aa261fa473b56e610807070999a1b120a3fd82a678ed029fcf2b541a71ec89f1d1a176bd40deda1cd659cc0bc1f486a283f2563a0a0236fe2ea";
+ sha512 = "5300f5eb7e373ed692daf8376ef0e2767112aabf02f913778309ee21ae08d2d0d2e39ea6d37c76ae4e005b2c40c45e0902385e19daf024d4866373379d9cca9b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/dsb/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/dsb/firefox-65.0.2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "cc270b9e372b799e6867a93dc1148e9929d67f4fd9a8b2a1fbf4c0c95b23c6f6fa0444efa95dc545c4906b488f44c1a2eee8d9a8b6c6c5a8a3322f1a9c9cf553";
+ sha512 = "8dbb65a7383d3eabfdbc6c7b5879439d91adae82349c49ca6e503b4e48595db4fd4e6ac0487cc365b969bca20ed973387dcef80a4d0d21012d865ffd2440e920";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/el/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/el/firefox-65.0.2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "170719eb9cac9d1d49be16609e5728bdf9773195196c51c6d4d6c6a1f18f72ab96b4f3124de258186f39a1b1e3a849b5de73d4b5ee48007b22a5e84370d694fc";
+ sha512 = "fcd27e62f0759df47bf340bf4179e3ab0030d88ed0fe2b4b15bc9d312ad5ae44eabaa38e7684e13b3e9ec07a7b4e3fb4ec75b2d797c9793121af7a2c9d218063";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/en-CA/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/en-CA/firefox-65.0.2.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha512 = "df694bf1dac6656b802285b91ce5fa5fb39e9ae6d4fced3054c7ff3c474aeec8679745f5a820b0975320bfd74108ebac83e5ca33f914c9f0be992295fd7556ed";
+ sha512 = "e71448bd1edc8302f411cdf3fbc2e5b4209722828c94fab5a2317b701541df70c2b5bcbc8a5845a519021ddaac7260d673bf6d2d4d0ccc13d06be173c9e95530";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/en-GB/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/en-GB/firefox-65.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "f7953b8c20891907e7cfc45d7399be70b58c66710f6070f18c493b5c668d4576919af7dffbe36172ca3d01d711992749201c66457803fdd7a3068e2d7f6be60e";
+ sha512 = "8dc6882d7f33b883a2bc554b2e790fb26283ee1096503ac081fdcfd59d8e21d7420ade1f0e18a4b840473bfa220f757154ca76f04d205f8ef142032306952402";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/en-US/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/en-US/firefox-65.0.2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "482bc1726399663532000749e600ea5c9c490022696b40d869e851951a9983745b26a7c4ec7f306bf174479e4213103996d075c11e2e1f9a721d392c7c615933";
+ sha512 = "e3dc6d07baa53a15254042c546a4ad5f463a180bed6ec14c091627bd9f8863050a58b0e0820b24ab57c35cb3eb02438095a248f8ac7548160e73c841fc48412c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/en-ZA/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/en-ZA/firefox-65.0.2.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "bf721a577a1a916779ebf0d8c0f673d0b4d1c0230b776b2045c976ebca96baa4a6856109a837d40f301465d921bbf4622cc4609f31624551cdb056284cb36644";
+ sha512 = "6d8f8e9b32e1b9abe5b3bece5d3518e7a2feda818292d2d9f1c543eafd33dabcd19fd5d49e7d21b5b73cfac791b4ec76348f90f87405a1e293c50d5e92f3b27e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/eo/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/eo/firefox-65.0.2.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "ddeb25f719dee34c186fd1831c1fc5166ce17a413325cda1a3be97b4a1a65b302b84bd9162ef91577fdfb7b82180267026039cbb49d0ee434497eb23ace6ab98";
+ sha512 = "0fea003c6f04f76ea03d3722c6fe16124a3de5a19c8f10225643989713fbd5489ae74a7dad0006376a72ba88dd0323d44049b9ba785d0439d98fa160611005bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/es-AR/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/es-AR/firefox-65.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "a81f7e9aa65e516632ecbea14dda6ccd65405388dfac801e179ced1caa9a1da4c671ac7a42c3337907af85612eea46730760707d3f12376d504fc2b1c629aceb";
+ sha512 = "5c4386c4751f090cc7871fdadfd110f9127261c751350cd1296b1cd93f7586c72cf86555d37d231ed4190c73199281cdb41fed8680ca6b67c90742179e4e7d1b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/es-CL/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/es-CL/firefox-65.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "1243a4a02d82fc97bc760197c33c1e4e705ed8c47dd565a725e1c105b22e42b89b19824f7e35e844b4c5c52c78b3fde512a50d3f655ba548144ac2b6d73efa9b";
+ sha512 = "c8adb9298f1f122a074d3dd19eb4dc961029c80d28642ba2c6c86c294dbdf274c4a60dafb73e200d2c62e97b8dee5a6c3cec1a51dd2edbee023770cd0fa55e79";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/es-ES/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/es-ES/firefox-65.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "c44b3a7b0fc6a13ffc075b7f282fa0ab1be16f98df872a7a168c3d479fd701d7e14502215ca6e211deb99c1b38bdb38ff0f4068eb978aad8d1f80b682839fd88";
+ sha512 = "dcee10166566b10440e180a0ce62ce619d68ecbad4e106a82d516420f873fb4df5d20acfd27ea4e34bed46c7db7b67ccc3d7eef825e3b1f9bc1e714f69799072";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/es-MX/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/es-MX/firefox-65.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "3b376e854a2498101fea9de4117f970bf41185b9ce74254d64088a58c77d21845c5a4ebee07c923cc6d8e616922b109cce0d25df9e2d47cf3dc62b726480dbfa";
+ sha512 = "756f7a42368a4c2d3b4ce533c16aac26944896c2f56f6234e21f837afbe3a5f5104bcabf9e65fd9be472787c2b931ebfeac28dabd3e295a2fb856970a7113791";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/et/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/et/firefox-65.0.2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "c55706aa897afee00d58741191dc4ef4ef9a0f4296c407770089e488449d95044bd4dc422c3fd79ada093abceea1e649b59a9f5f4e51738617716f497c6753ca";
+ sha512 = "dd0e42dc3dcc435c257b9c054fd943c96ceee2eb0e0d203d9ed9673e42eebe3716fb7ee0ee43973f9233462ac614e5696d8b323139e9ef9a02306b04edb89d78";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/eu/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/eu/firefox-65.0.2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "5384aa5496a9e2e40acf0b014ef71e2e06b45bd9968441715cf38f5c9212c35dd1a5fe3bece97168870dce45bb1a91390fc172c2c170307b543d29d2a7ce6220";
+ sha512 = "92442103506c85868636e68d2415118c9b61aab6b8161911a9153549367bb3dfff0a269c762d1f64c84c4f08c23ea900903a7a54c725a0914cd602421745df7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/fa/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/fa/firefox-65.0.2.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "9b83dad076df5af63d4434dee22730770d94747b29ce13e551653b5d008b3741f33aa9819547527654c9667fc79f47d73633a384174cd92d786a02ffeefd5ef5";
+ sha512 = "ec3ffd6a34a2be18920bbd0cac69c160f5929698e5da3ec76d9362d50a178ee8399f418322f29bf86c7207f21e5d7c92fe170782554a68855e71469e751b26a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ff/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ff/firefox-65.0.2.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "fbe80240ac2347c05bde0a3240df050034777ee52e129165c5d8b11fac94bf9421c3ce413e9d3dd71643e2710b0328096d602795079bdcacf98bdb1fed8cf318";
+ sha512 = "cfc3fc0d7d5994c4cff26eaef8e19ed7316270ddb52e91ef66cd73bd05d53b2ae7b6e10822f2ee69a7b353e3f9cd99ee4ae61d8b4833fe7b2d69e8e7a825968f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/fi/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/fi/firefox-65.0.2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "809ebc16baa79ed287b980e211cd7ca3991057b538f70877f599df9447f1f787f9c0fa4fd4f54d12834ddbe35bd9d1162777ff579cc5703ea907cc70f08c93d9";
+ sha512 = "4eb0acb6e7def2df35d96a3c2b54da8fa82f92374f3c8239c521096bdef2a0770e05904cce082d11d156f3fcb1770ad64aa0fae2c692c5933d891ae57b2f313f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/fr/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/fr/firefox-65.0.2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "98a6dada770067be7cf651b7f2d6e6bb57a0358b6ee54af47003a153844d521b15dbff65afd1ee0b05c23ec9e91aaf434d90065a21d3e729b9abc48fe27bb8b2";
+ sha512 = "52c789e07bafecc8451fc542cbac58a699351ff4e72feef4ced11016dbc60079255dc29f5cbd3d46996c8caf6fb536134ee569f3a9deab9839d513dfe1343a82";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/fy-NL/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/fy-NL/firefox-65.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "2d49ea99934ed637a2e2c90a15c3be55f9470d275af6d1ed9f5868bf3b3eb7c8871728811dba87458c59a843b310f491712d61063b43d36409e8c8d7d5567e75";
+ sha512 = "379b60a22aad8e9ed6036f7365fe857ede4c8ebd149a73d103babea55b86314a9d6daa2c327c66f306a85726fa7153c6cb28f012ed1992793237ab33a124d0bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ga-IE/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ga-IE/firefox-65.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "2a68fee8dcccb45f9f849eb61d54629a1216a247c246565516425e072387a7e1fd9e382c799e32884d681888563c982ef894276e84ac9e537a008fcd39ced893";
+ sha512 = "70120f523729356ab0a55a02e3ebe422be6ef7a73d54cfdb7d9268ce21b03d793a8ed703b814ab4b1611c2d10fe3f59d9cb0b0823a2b526ef7dc31dc56506361";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/gd/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/gd/firefox-65.0.2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "a97c08e8632147d4b2a30ba63295e1d080e97d561163a4e87240667ca69f9094f98a8ebaeca8aa75b4d344e315ab4e72d605e06b800d4156c38fd1deb83b45b6";
+ sha512 = "2758eb96b0976857a201d12a34f57de92124376d58ecaeadf3c6748b02a40460d7bd40d1070aaa8e665f33abd1ae570bcd0e70bf4a5790feae6d997ed1259b92";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/gl/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/gl/firefox-65.0.2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "49d4d0afda162e23437f44a5b5ee9a43e1643c0e739bf6b74e662c79b4cd63f7bbbe9c56c73381e0a3756360b03ffef01eb73be1c1b506d20bf4cd4f968b2d47";
+ sha512 = "a92d0a372c62d054afd84de8a0c7a35a2d14a7ba4d4083709ff36e703e1efe69529c48b4affeccc48a2b7c98610be607da71a6c706a44d07c85b8ff27bf322fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/gn/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/gn/firefox-65.0.2.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "7fc62ff745bc14419ecdc11e0cb880cc28f54cadbdb19980f87162e463eb97911858fb7673c2a9c1026ff6b786c01058c975c53c16644881e2a0b0d604a098ae";
+ sha512 = "d02c1f1634c1d0d9edb18cbcbee4e582786d8f9503c276ef64671b86c91c39616f33c66a7e845acfddaa206071d3af5d43cc78d6d7055e13c6b5db151835f4b3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/gu-IN/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/gu-IN/firefox-65.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "22a36860d0ed79f36ad804b636cf892c45b7dafe948df151a8a384c6400523617e1a191157f099ee26ae42d06b3ba3ef508f9ab5a4ff6f819f21ecf74f9c3296";
+ sha512 = "4e7d9ce0f0ecf451a9a24eb12073d674b5249b554df2892bc710a0175d77a9026618137e8ca77aa029b7d94691fbac2e6b9ed4673443f7e14b6910c6928a762d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/he/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/he/firefox-65.0.2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "2c46bf74a8053337958d37389f1fb457b814d18d27a337bed84d250acdde8c7a445b8dcde8507c1c502a13dea718f1df01895d76b3725e5ebd65290e1e6ce477";
+ sha512 = "d4a852d54d5265e8da07ed9434f9dc990076cec88c1a9db601183cdc62a28093799f4fdb05f09306f5a75ccd08ad30ea88c4f7011483daca58f15d9f864d822d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hi-IN/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/hi-IN/firefox-65.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "ba1724eb10d76c3a70a58c72b5f5a6482fd6f5e7e3b4c04283a03765e75eaba9abbd5c6e2d3e350f36d82909078987a4c1a6073d67e2e56456e1954e291fa3ef";
+ sha512 = "459f43e3cf8b4a5e6dca2308d7b2c8e8aba9005ebc6be7f4e6df07f6f43b573f1d1f88a9553935daa6d85f7089301526c9b0b58c7f32daf5be24699cfc4ee973";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hr/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/hr/firefox-65.0.2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "5fbe87ccc58b16725c10835ecd54d825f71099ab37eb2e4eca343c6cec5f8caa5f40ce8a5b2c6989c36a10a903378e69543d1b9e157f677032c47362db144d5f";
+ sha512 = "b835d360ac80a8e188e76f8f105c63015e2b698d6d2e8d82c294b372adf351d320d5b3465fd834538f6977ea76cb1bfa075dc79f891e4079787aefc629771c60";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hsb/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/hsb/firefox-65.0.2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "9bf744b38cac34785f56bc308b2a4024b4973e7f489d4f9f3929fe42aad2872facd967fd35bce452beb40e7c936bf400f1022e0091a375a6c7aaeac2bedeb3a0";
+ sha512 = "859d24e084ab5cf552c25d29a08b3385bd99e907d596936b07cba426c39fc12ffb36905cdbbd876f589f37725161e206660bf52ec5baf7d76b896d84c54b6bf7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hu/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/hu/firefox-65.0.2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "11ead0e258d6a81d5a2b8d3bbbfc5cab8bad7d35e7ec853280f7d559650d121b56bbc66ca8a25416100506300b5ef148fde573609c4a922c775abc106ca59f1a";
+ sha512 = "14591b0ff0f2d4c819ccc207f95e3a25941eb5a4ea213373c018f0b567e8660abffb09a3edf3516fbcd6f64041cc466d8f80ace6ca552eb71818cdeb7e384cc5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hy-AM/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/hy-AM/firefox-65.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "67a6084fda25da7db2ade9596c6fccbb0cc191a748c8ba089bba68e1c498774a4d309680c8d36b61a49e7bb0795bfbf48d853df1a7846eda65e752d791394079";
+ sha512 = "c5f11c0ef58a31258a109ace64ad512734bb48be9513e824f501f5c83c192b959cb7eaf7a3370ccb34e2c930e6938c90d48af4073dcd2e3b370bf715b0864988";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ia/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ia/firefox-65.0.2.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "fc2ba7e0c87c610018bf1c0705c7d263e301c6b0dfe080f44cb0708bff59e955754b4d0ea167eb5066f38a72c44312fecb13d7fcf855ac6125a7f6a833dff176";
+ sha512 = "c14eea63bd43d7156173cecbee397553120db5468c7e7cf8dbd989e1dadfafce01f8f8effd942dee45c252dfa38e0d46918cd9138b1679fce03d29b0a1b504ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/id/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/id/firefox-65.0.2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "c678461c38462616f731c2d0aab9c56f5963546f434e4ebcd2fb7b48aa94bdf7d4a7f14481cc4a17ebcea1decb767b27dae914fc3bb2503180106fda7adb74d8";
+ sha512 = "b107159000a9adcc10fecf2379f9cee80dd822dba4c8702137fac7b159bd24aea69a2b8b0db9db6acca773cecce9307d0e158a327263e35ee2f353782ed0ac10";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/is/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/is/firefox-65.0.2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "00e1c27374e5b174ed5bcb335b2b8a0ef8638afbaa707df46952eff48ed94fa9a021af709d8f99169e3ab33c6c763af0673b3a33c30881e09bb12b541dce575a";
+ sha512 = "788f7e3bcdb419ded54fe81a16654aaba7b1901e3bf2edcad663daa46c31ac0581d051ded58626d002184378d32efc74161574c5ba91991e51331be346c13cd0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/it/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/it/firefox-65.0.2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "19d34371b514f718a6710aa9d00ed1c1b61db770b7974b50702e3a1845cb0e23a9606a3e5714d1dd4dbc13315508b266d1ac9b2876a3fd5311762462aea48b82";
+ sha512 = "87ec9dfee79b511d02f3ceb1d66ed6cb802e1e3e08c7a78785437af3c4af883b4d157840f0951e8bf7a90c04aa3ebfa462d7425ebcc3273e472c501a1074c05e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ja/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ja/firefox-65.0.2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "a909971593687b5b20f614ca51e6e3f37f4fa8bf9464cf714473950ec1f73912f3c3f1bb79410698511f38e86f743705d6cb8a60be6d9e2266464bc301785537";
+ sha512 = "724ffcdfa355341db0c083f35c94fa8157fed7899d87f66314251c6c9ea354ff46b479b195b1ec6181ade5ec9d513e0f7a8343c90df783d43ddaed90731bf299";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ka/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ka/firefox-65.0.2.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "8eeeebb0fc993caf80c088d96e2e31e579edfcca5225f622e3b0a592318308f2578998668638594a6f32cb0a984d4cf534532ae2a9418e32cc750df3c33c5361";
+ sha512 = "646e7c34d99184eec939ae7a55b42a7c5018d679d1b2f72b2a6dc3e8360e4b6e5770711e3fdca5c93a7014e2b92adffb415f6f7ed39a518cde67de963c75b92a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/kab/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/kab/firefox-65.0.2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "cbb17638c972bda6fe83460dcd5d320c03888527b56b7d49e929f6ccb0edcc54251aa0a45162457a09929b7640c588aa210cd969ea43c1f9dbd68fc0ab60c55d";
+ sha512 = "d090c138f5a9353e6739cc8bf21c3bd1bef4048a2331ff8f33f5b8fe1578028e770933caa8a0fc923f6d8f1138ab606eae1bfe5fcb164e69260405e5ff2051ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/kk/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/kk/firefox-65.0.2.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "d3306176c90902b4b2739ff52cbad140bcbb6cc0ae39e9f820781490a35a69428c2cc3b0204c23832bca62833523ba0975d39b3c30d8504301fe64cf7a5af969";
+ sha512 = "db271af0ea767d20aa21060c96a448141440e09f247bae771c405edff460aa22319dbfbba6055a1f5255d4828cda669ce96d563d83bfac3c4e7d8fccab8d9dfb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/km/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/km/firefox-65.0.2.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "f36fab6bdade43429941dd43da65a961dfe006001ed8d7a53041e6bdec0d668edbe09d96e383e76fe8d107e87122abda704b9aa14f7d6fa060bcdb283f30643d";
+ sha512 = "3a7b5bbd8bd2fffe5b820db930f383969e1db1b567bcf4a92d29646add140cc3e941852e5e5f12527935a16ebc6e7474d3408f5b2b274b50aba8b27b075b368c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/kn/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/kn/firefox-65.0.2.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "89c40234a72938d441704c4b03af679085294f20cb0065863fab92ab03446b01b7afa3d004a5b3330439682b6f9b44ac078fec3906b5f99b4a07427419442dd9";
+ sha512 = "2a2951c3df5641d641f7ee760db6d4a3c7fd2dde0d096300a8c9662facdafe5e39db2cdfc06b716a5af7acfd31571112b6fd615755ddddca01ee0984bd9067c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ko/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ko/firefox-65.0.2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "17d890cd0ebffcc24eb8b7abb4c9e29063bf8b784e0c603f4b69e3988aaf7c77cf864efc19d9774d94ad9a9610bad27a1adde53efe41240dbaad2b6a8d0ab1bd";
+ sha512 = "2f870b939ed6f796b8e156030149585338d305ce2f957771b95c0ca6dacf72ff88dc8e21b903c4f48b6a89ba05c0b652314879da1c1db683be4f26648eb36fd6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/lij/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/lij/firefox-65.0.2.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "31265524009f12d22551c5d52cf158a3f7ae0068d10cc744ba18ea3c90e1835d2119951fe11d736809369ab4358f6415e9da7103eddfa90e415c1d721980100a";
+ sha512 = "4be3638df349fa2c9b40f3e8af9a58158c6eccbc7255cac19f193a224cc6e1ae9ec4976dd54180e74712e95f290bd3474935e629398d159b39601060551e7b19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/lt/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/lt/firefox-65.0.2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "fd5c8a9cc4cfc5cd9e6539f0482c2dfb413a287811860a6658533865bf71b1d3c60c92c615fe588b982d2f021682776474b1420865eba66bac16cf3495747642";
+ sha512 = "faea90c5ef3a206c0b36b3e7549bc95f5b46f4e7903113103699b1d8a3c1ba9765c2fc20dd3e8bab9a86b20a67f8d821d6b462db41a80cb241a8419dc2d53461";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/lv/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/lv/firefox-65.0.2.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "6dc4c5caf27b7ab2191f1e2ca4b22b7ed87b7387759139e4688da174d3382af2cc971fb5735fdbce400c53ff8d9bf294512b173920e2c4a62cb5fdb4e6ceec3b";
+ sha512 = "43d995dc5494e33f0d9d6144f0abf6e9a6e1558412ff62e32e1377adac1e3512908f27395c17e1e75616802b5ec5547ffa785c750f4f3498ba9bd910d6444dfe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/mai/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/mai/firefox-65.0.2.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "afea8c98a60408823d246c4d09d2b9a0ba4c974b02e2e9088e91872d9d4da98d82924c6f486a32274e8a8f99572ee563756c9c9f0596c1d72913a9536c8261e8";
+ sha512 = "8550cc53fc836e93d567a2901468c3cb5f940a3a29f4f4d8648981c819273462b77ad2fbd9c8078a74b9c4c31700220bdbded7bfbe1d731ab108a37670db077e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/mk/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/mk/firefox-65.0.2.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "2d5cec8d0917694c3bac304454aa1770940310f9bfbf6ec233214989577e1f83c1f81326fbebf77fbcd880b3b03c3fb1928a0078925ac343c4b51ff72c481cee";
+ sha512 = "55418cc75c8f965949fac5532478a70b406d3a7aaf21ae1e7a027a191fe052a4f75e8871ac2335434fa444e8a3994ae77152d3ce56d08a851a8af304566cadc4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ml/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ml/firefox-65.0.2.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "86585195d41312e5a990a388c14de87fda05c75c3cee02f0af40367a9cda9ec1034f21c4627da5c2fec020850ed94dcbafcbdb0f52302862ab23e8218e715c08";
+ sha512 = "e64280160c8709ccb15bc92d0b1a4594a4bf1f1bc324eb5ec2a1abfabac6eb523e0c832f5bdfe6da027cf7f77d9a90c3c1a15a2b8f2117cfd26cac12ac9c30a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/mr/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/mr/firefox-65.0.2.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "f996ec4bd929311cfe481e45813deb1a6fb8667564ed2d63d0d4d2a814ee9f8c5671fce760fade3d6d9ac76e33772e09b5f1ac80e6afb1e4edd4c22c5cc69942";
+ sha512 = "2b4aa35a251ba21883f3a54dbee092e7ffacae4fd1eb9f0aadafece9871c837193ba201c1f5e32227a7609ad646fd08fea3c3ee8795eb093fc34c16dc460092c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ms/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ms/firefox-65.0.2.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "da9b9b272dc5d33910cf014005b19db7a17fb7306c55cbf77030b1cbac9d9dadebf0ab64845b232c9f9afdd7a47d85b52db9264021e45f5a172dcc2b74c32459";
+ sha512 = "32b5db1d6bb9c9a22b725f5d9a4e257ab885bfc11625f4b0329dd167039fae51405d1f41813b40d3faee8ce56c2dd8a2219eed92757d9742d8c89a01bdc4f704";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/my/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/my/firefox-65.0.2.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "70c33d409656fb6e9b0c3fd5af1c9411ae6084339bc2c9eac55bd2e9d5d8e0811630e9f3ac5556b816c6fc3518657073f6786134299f5cdd9b3dc0f2c11792a7";
+ sha512 = "9af2dabe0a0c745b199af599b1d5ddeca52c1b7dd89a0cd4fd7a2e4770974a56bf1ac831fc4ea8df2cfa5fadb06a8fa24188e9ea2ed8124219c7621a3565c819";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/nb-NO/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/nb-NO/firefox-65.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "8dcf198e0b120fa5a10e661c83b604a85333699a6a524b340f736e5cfe21ed9a96c9b009db625db0160c9a79c65b62b28a8a44957c07b05b6e576a0280beca84";
+ sha512 = "d9ec1330d92994bfe52d9561c1ad0221a1e71e5e1314cd41948bccf03f5176216b96eae7445eadb51f19e685baf2cb1b1a6bd22916c87d1da922f1b7f585019b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ne-NP/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ne-NP/firefox-65.0.2.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "fede145ef4f444a28d3d10339134b9dfbdfa8bc5be8a8c390c64ff797e5b38d24cc8a242f64d86b0091b4015a75fbd9589627aa0038da534600a9c68d06dae6d";
+ sha512 = "f9cf43d7ddf7d7e6aaa80739beb7519c0fc9ceb1e9a05086d001a1cc968c27c82ccd27eb15f7f0083bf110abeda847cef15ebdbfd8685402f5db1be608ee29fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/nl/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/nl/firefox-65.0.2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "c128881c182fd29eddde5047623902c3943cc9100add237dbc8f289a1476acd6cb45f82b8e88adfa21ec2e25f111d4dd3ed772c4cd711aad1a4b040e36a9da5b";
+ sha512 = "229b35ea9660dfbcbde47c208248a4c2b54cd322dffab9c7c86a7899b879ca58ed7058a2e21f1e384f89871419d4416cb8c7e66b62b0df3ad90a52644efba10b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/nn-NO/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/nn-NO/firefox-65.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "48c706cde9c4f2f521d0e2b1d4ee6a8eb47f5afea1cea8e7424aae816f81d156a1fc08d0e315b5fbb47d9a44d329c458333b333b6c63467460d4e97c49ede199";
+ sha512 = "d5175fa614e2874e6c6be16f80afadeecaef63f58af252a2cd24e6a4cdd07c5f1209c1b540254757e0b108020554fb16997eafa315f79acd20c589b74a465454";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/oc/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/oc/firefox-65.0.2.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "88f91a0ef6dc1a234ee2e3ed4bb32bc12feb4dd368805bc837b8bd3f049ebccff535f6f02d2806276d43ba471620a274a51e35edfa8f195e043e85930bd44821";
+ sha512 = "3aec5e9302d7feb57138af5f8ac2a151986ac4cf73e49fcf887b54f0f3863b3a0f0f12c399408ae4bda857f3dc7e08fada5da631a9c071d41e80f18cb01ad440";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/or/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/or/firefox-65.0.2.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "13c5f6c63bac0acc226e92207ba8c8c6ab06e0c99135965fc9ffec46f2a6867136a42ec488bfad411412a761dd7cbaccc08062376197217eb1d640028ced18bb";
+ sha512 = "de32f800e461d76480619cb254c96fd288f959270dad06c580ef8385fc3662a1f81a28c1adb14b6f367d4ddf64b413d69223dca6300f8fd2f2fe07369c8f6960";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/pa-IN/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/pa-IN/firefox-65.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "89222f8b28198b53dcffcdcc58e5331b6bd6e099cb4b860b1f4a7804486c741109164f11e0950456b2ab61a4be8db8a81eb67ae3655ae361801835951cbb1890";
+ sha512 = "26e53ca9a8047c2032398824986e8bf1d25530493404ad530225d5bf39f0f311d2824a14f0a5e72f77d1964837896a533db02a95b6af1f61f6649aa5f5df3d50";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/pl/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/pl/firefox-65.0.2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "780c81135a0e1c2e843518e6690b9e5ea472d90b985bd51588f8bbdf1f920bc07af75d8f294c5b30b627b48319fc89316667fa55e94a8531d5af65369af3e633";
+ sha512 = "b2dfb9fb2cdd01be8baddadc7227d077275e6bb0df4314b9694b70885b6b27d5cfc303b2429dc22117a8e45a8d8d27e97941a13a5456a09ab2413ac41290c713";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/pt-BR/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/pt-BR/firefox-65.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "213c00695d9b40bb35a02c1ad006da9f42551af1554324df8524318956b9c46f6cb772e6bf7d90c883f97df6be78d527af1601eee42bfc8a5014e46c44af3af5";
+ sha512 = "9a0de29b1d33e5e34811ed03c5343cc64b68fc265b0e2c530860a0fd0aed02d88e69eff56503d9688b41fa3667eff36ebeeb0db5e72434c6eb15d0bfab21a2e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/pt-PT/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/pt-PT/firefox-65.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "56ee6d56f036925be13282db7edd518524b499810ba31289d287d7b6e3e5355cc1b944d1ecca7aab9d37ab55141fe94c3af3f23f175b2136f2ad3c099f201f67";
+ sha512 = "9aa8c09805ab86cdd759d4f3760133c64ca76aaf3879189e91f69769b834384d8be05a1f77d8d0afabd5960d1a001ada23cc49af24aaf18dd10d6a0f33689f80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/rm/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/rm/firefox-65.0.2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "33821af846c772f6601429a983365f4f79b3fc2df2cd20cb23f61219f544a4520fde8c4e5ec1b4474336c52a2063cfce6660928b0d0aa6336db41055f562c8e6";
+ sha512 = "2042e7d66450cdcc4b3d3e07dc44503535668b24e694238b8bf0f8242f9dc41d4742fac125c2c0c85f140e12d1afe191ef1fc50dd3b5bb278204b5ce25d92b42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ro/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ro/firefox-65.0.2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "bdf7a957ba453a1f50ca1831ec30c2ad3d2620e506ac6b5575304235764593ff9b545719a45f4c1143dc5e4a6e91c6024531be28bfe74904beb2f61f29db7b7e";
+ sha512 = "9b28ad45768b8fc128bfa0c10e565616a824a97bbfa4b0706117b65c22e131f825eedf3acfe92965e457f9fe5e02a05ccb7135316f2fb1ecd5a95948d94ef8fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ru/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ru/firefox-65.0.2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "f77d8516b50dbe597ceb21cc5e643bd0b701718a2a88013338981cc8b7855e601884154fdd3ecc2b1edcd8b19e396d05979039ec7060f70f786aa263d9044a4d";
+ sha512 = "b106e94e42edbf521aca7813ea3347afea8df9c1109f3869d2efa3fddbee9b9718eec882dfe34f5b9caf5b55bf0c6eb5cf5985ab6ae60fa3d22f7575d37e72eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/si/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/si/firefox-65.0.2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "ff747f4502626af21eaf008080477b1f19c4a2c6f6303ad96c65eb597b12e10bf1519bcdb09b79775b9e0247b521d73ab390f4930c3b2b174362b705dc65bdd2";
+ sha512 = "3d5c02029bfd16d94611cf86bb23e519d892f30eac5ba0f64045839ca1eeeb3b92c5dfa640fb5b132f2a16c4cac81db989c6d89283e20ec63b444285f85aa72f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sk/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/sk/firefox-65.0.2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "ebf11e1a59e06b7394abc671deb59677c4850f9060d8f2c5381cf72c1f7e59079b669b9748bcd13af5b936f7bc49b9f4cbb798f402f47cff48c8631ae77b5c77";
+ sha512 = "b15c2dc19cee03213c89a50ec2405a3dad2d18003fd10a2427d8e00d230b13408c62aaa9b41378ca7272d9a9337b303649fffb9654f36fb0bfaca17ff54129ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sl/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/sl/firefox-65.0.2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "b31834f097a8089adebb0f60f70803b74d65e824ef63c71a5db57ae1e25efec86e3e31fded1dfdf94f688817c0367c0c3118f15bf8fb01a0de8dd4992f689327";
+ sha512 = "bd49129a77c5dad5467f0e0af2c64678afb305d8d37e43d956d66038b305f179a8a290c798a3ac675791a9d318b76f7b39da04dbd3b46a93f4ad49847434f746";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/son/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/son/firefox-65.0.2.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "c706f1c88cde86e2d66ba8ceedae19ef0d8fedd4dadce72df47b827b8ee8a0cd9da6c05951021b70e0329b2356ab63c35640065a61f5dc85ac2feefe612acc3d";
+ sha512 = "e8b54d425f4e589a16a4432c57fab9712961432f02d41f93dc0ec8715e81859361c1db8ba8239cc3f0371f16ca60ba90d4307c5b8c5f77bc222982e03dbf1459";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sq/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/sq/firefox-65.0.2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "ca15bb1c507726920c1d1c554da2c0644c388858e02b6d85407a589d6027391c1145b01bb18cb1bef1cddcec987d5445056b51cb21584e5d9ce41b9540198ce0";
+ sha512 = "ab56c45406a753bd207e442677e84bf78768d0e99f2478ce85146427ce986f709fd228ee75eef1e82b1b0a15572a08128b1e069c5182a06beaed82afb3f5996d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sr/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/sr/firefox-65.0.2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "256b7b6526a9a80faf9bc754c65d2552572595c53322dd5a9b9ee04e923d2bdc42762990cc86b5cd9505d30952d311a9082bffbc90bb8e1538f93e43fdc36655";
+ sha512 = "81b012abc78bfd115305e177690d9bf1128ee82100c1c0a52abf96addd8dd2e5ac43cd37e4734e830585fcc57a15c28dea7fca34f029140caa172b3a314312ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sv-SE/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/sv-SE/firefox-65.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "66295fecef20013a4499f0641d0da2e691cfbe166a5c03734fdbf364717fa8c2b6434a86f2bae48485aa42aa74aa802f743a37c5d9c60218298449d7a8529341";
+ sha512 = "eb5d0367686ab57303ad0809b1f4254ca00a7fd4096a2b989609d72a0c913817f15da8047fc4144e565610b3fb65e77981c08ae8cf2f6b70af8d3d1e6ab2b681";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ta/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ta/firefox-65.0.2.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "a021bcf2be37488d6c03ada0f7e8662fc57163d64c51aa17b72bc0e23c56d0be1dccb7f1699735908455ff23d62988f6541cb265050612ffe3782129f0a7d65d";
+ sha512 = "6f295b7c238dd7be10cc8369a0d864aa6df6e80ca0ac02c112188c7d5401b914b450ee2a6c27c50ec16c762b21f6fe0fb2db6da98c064b54709c32fa638e2b90";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/te/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/te/firefox-65.0.2.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "140d7b57909bc2f1eb34c88c8283b66183aed6647bea6164582ae45fc9a54c43b18a7455b60df37a2f7ef6028c92668810cb98d4a1bf3d9e6006a85ed2dc391a";
+ sha512 = "52c4e3f37109bfa334001d887a0fec4d10f68c4b8d656358c3f9b0ac3b2c016fb6af7db63014319c1e83245fc6adf3dff2b1e7bedbc439a5079943768c4b7e87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/th/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/th/firefox-65.0.2.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "ef73b5976507930a1290b2e7b09c90da219dd376f6e838fd821992cfd1973e4e0c1a21b6da523b050acfb303d8bc28bf29c15e517f36096a88888498a243f7e2";
+ sha512 = "9f7329d3a5daa37bdd4561a46e44d80a9ee440b524f2a593836f2d8fa6b0ff4e9b8caade42dfae49d4c0a18a77fd94a2d12c4a2b4d06a8a248cca9fa6cc096d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/tr/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/tr/firefox-65.0.2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "00bfe75ff631f08452e3ecec45df2623a15c69ac1e3985b1765f61ba34a7e4ba1bffd62e3f004da83d101a1f78900938472203f3a3d0df3c694ce24e17bf55e8";
+ sha512 = "f12aaf0932af544b72b0f5fe98c994940b247fb6ac1750f3018a641bd02a60e85a557a64b14ec0154e7f8bc78d6b20fdcdcc41e2df5de8d8887caa66fabeebc0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/uk/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/uk/firefox-65.0.2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "8cab20c1a4cc960d15899d165ce0340e8f347155ce131d449dba8cc21bc9c882f8209b109330409eeab5ea149926eba6d0a2eb3a6689f98e4b99af1b4f7d6313";
+ sha512 = "9dbb0a7d34692881a2adea48927dc30299e8165ae240fbbe4b45dd25e1266bcd3ac92b686ccaefdeff44667037053ffe38c65aa5c26840fe05ee5f1f31d300cd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ur/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ur/firefox-65.0.2.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "2265739a66dfd03ce0187decdc5472c2d773590314815e07f445e934ea8dddaea38c3fa44b7d05dd16bb21a0f6034ceaac5e7d277176503836165c6da04d4c8e";
+ sha512 = "0d95db751ba90eafaf500577571710664a576a8314bea2d913c21c534d8e66f9fa7febaa1f25bc870c65ba551a601fde2bd24732e31f0279f7812ef799359f89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/uz/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/uz/firefox-65.0.2.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "226ed729da52643b6ba1728e761e69e6f6cd6949f394a18e67bd8b11558d87f15e7ff8a7c6e73eaa402c6839b1a78c34de8fa6a9a10b4f6d52b2a3e44cbad099";
+ sha512 = "20a72a684afe12fff4f917e0b4f64fda015972dcf9eebbe710ca2b08e0c460c95f8a2392f71f5d88ebfb45e9c8d55b88e50459c7f4773601660172dceef8acdc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/vi/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/vi/firefox-65.0.2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "ed82e87e9afb51d1a4ca78905cc672279877b3dd221e97df245b9ba30e77ee01e48111efbb6b1a21c652802339efdcd979d9d3372fcc18490e86c46e87a7f3fc";
+ sha512 = "6b633da4795fee729a6ad1cec0773430b717642ca17af514c70c76cd867bf7619413c81742dd03fbbbcf16c74ed330bff850088ae5f0ee60538b4b14664ed6a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/xh/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/xh/firefox-65.0.2.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "e3554422c28e6e571cf77b2db704f447e0120429d859150a5f1061dbcffc0227e9f1909bbd38aadee61bbc090f6316192948970531fab9388e15d92d581ae27a";
+ sha512 = "06754a3151e2ed3d44973e1352577234711b4a48917c32270f537ff1c504ce5f494c57c7bc2610e2bfb5f7489dca8954545485b2b436c190be90f6c6cfd384e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/zh-CN/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/zh-CN/firefox-65.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "3ec0e98f1b346a9a79c04e86f260f7fafd6fb4f3e71cd5c9de0f8a6f4854c5a67fe694cd2a10deae5f6e4b4e48da320b71b3b925413d6def030b00c7ba3bf60a";
+ sha512 = "b821661db136549c2653321e60d78438e2e28b2fface6c456dd6a587b8344f720aae13c21684109c058d3273a9c522bcaffca32e9a8e424b544276c407869a37";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/zh-TW/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/zh-TW/firefox-65.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "84cd355bbf75a2d51f7014ad0d407664a5daf5bc5594e9f7a5e1b5cd1c3b5abc91e8acfa8b8972fea94c49149d6227320861d8e2751ae644893167c210360784";
+ sha512 = "edd2b9c4e343ea7eda411c7fb2d13fbacc0d06e4d2821dd09dacf17cfd5a0bc948073cb1e7cdcc1a6298c18e3b12fc1bce04e95de48f44ec2c97c5cf638bd0a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ach/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ach/firefox-65.0.2.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "a0aaa0d89be1c32f1f211e813bf42c3cdc1aa21f0980b2a13463227141f92293e05d144cf861b28dd66bf296b39f3c939c951c6997aaa9ab1c984e1adaf5422e";
+ sha512 = "2cf4bb119fa3c8ea4bdf06646bfe423f8b78ba78bbcc4b3d2e659aaa5a1ef6ff10e25b2241f70dfb680c63f8964f6f32912aaf5f5124ecfc31eac804681b01e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/af/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/af/firefox-65.0.2.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "4a2d43d08a608a7f91370bed59a57a80359e7cfbf71141a1c960fa035a93fcfa2b2f06711dc2523a9d4aae85f9d23a886930922c9ecd717c45afee17a68317f9";
+ sha512 = "7d6ba5912a022dbb2e567897d4ba544c55dfea0aae4cad5c6b3b9a9a09c7a96f2deab479817c64b9ac489e5bafaa38358e5129dd7e89cfc649b37ad04258899b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/an/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/an/firefox-65.0.2.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "94cb4579e466e44c134308d9e8bc87fdeffc69f149a31e39d8e185aa86d14932bd41920a6106011a5420bd89b0d639d6fc7416caa53e701373d69a52eac4ceb4";
+ sha512 = "b31b10f893c7c481fd198a905cf6b1785819be1642a51eebfa1eefa9719ead33638e46cb80847c6beb6c6d26db3fe2d78ce32e80076883ba03d497d779a539d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ar/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ar/firefox-65.0.2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "953c47a4585da68f7385f1de7e788fbd0f025434f6f7fee3cc4f8ecb2fa5ef4d711b856fad368fd58b9a655a74e178b29cf5e40403571e36fabebae22d825071";
+ sha512 = "8392022e368d7dd3b298fd611a87d0b3184bdbd86d66cbd7b90da728a8bff76bec924f360a5bbef078f1e1863cad1f6e33891740a0c991ea59a14995f42b7083";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/as/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/as/firefox-65.0.2.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "27008ad76e1a6dc3165a65fa4f3ec6570b21ed17761878bd51c6eb2d0f9592f482ac2ae77c85dde2794ac2398a87bf7b6857d241ba6f70507e322a47b5ba879c";
+ sha512 = "4d784986c66cea77b6d3934de48b53ef7c4e1b9d006b8e345204d2fd5d4513f2a9460f8ee990a5b64d2e87830d5f3fa4c39c25f8b4d4dc4a193666315e416907";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ast/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ast/firefox-65.0.2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "a6ad5ec3380bc571d4b9bf486d07933996ef12d0fe18030e0decc9b30a3a1827c4ef41d48bb576ac18b5f498e3286aeb8facfc15e76f763bfba5756a4dee34e5";
+ sha512 = "9fb264076f32676095f073760bf0159772959250db8cf0bb9b17f4e43fddf856450813723138c776bbdb971edf747ae509923c6852c6ae67c1267a2a555c55b3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/az/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/az/firefox-65.0.2.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "d78e00aca8eadbf3008ee89d10495a2dc462598bf3b7a508c4147c97c77861b60681ceb8238c9b22d65498d177b0c230584cf2b9a3d9f0da31a6197254b64c56";
+ sha512 = "ab2146095b2ec9abdea36c7d195f10f19a08d9048ba36908c9dbfcfde7ed50f99145eefa4c144791e8b3af740fdcf7099b87affa49ab95f0def752fc3c420d09";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/be/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/be/firefox-65.0.2.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "2585be70036521dd83f68f6f4fb4cf19713c2ff26a4f6907ff01dd0a8216127037f754041637608f715ef14cfbfe7271b4e0632dc26e351b50c00e8eb08358c8";
+ sha512 = "3728b7e679c7c45b99a627cf7890d6e25d5706050f09806bf4f00e1241182afbe1af31e40023ce121221992700107d505c34a0ecd6f196d62a332b7294953fb9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/bg/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/bg/firefox-65.0.2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "54d4b4096c679f10f7fcea13302eac7119e4a02f693a8c4880bebc5e4fd331ddef7f66ed67a7585f47f302274e977df237b25c2e0c41bae244e18a4d32f2f0ca";
+ sha512 = "185fa90fcaac84a2aa3b6e88db7d487bbfc1f9ff76d7194f49d2e0cb5d1cae5ae4bec8b425133d570675a34d6b18c65813b503b925ba24c1367fbbc95cdc5302";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/bn-BD/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/bn-BD/firefox-65.0.2.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "9564b72566f535061c5ce2d7acffeaa049e8021adc6dce964c035c55cc5d118565dad54c933db771757429bcb81412a71421cbd52ec2f939bc47957f3e05d623";
+ sha512 = "12c914e036850915af83d2c3a87a624d7868377ecb8b8fbe3e7ff7fcc3971e1c42b5414090f5231a94520cc69b10b5eeb99ec47793bb1217fd617fb23dfa5833";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/bn-IN/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/bn-IN/firefox-65.0.2.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "e43676d023a668d215f39b084007812514ff663063b3a16fec72aa79e801a2463d93b292924687341be96101c58954465762dd68a4f44bb18c5f322f59beee3f";
+ sha512 = "a0478e32cc60539a3da86ab01bfc3236b54936663fe446d9d520a80644d08880d04b331464a78b80a0772895ca577e5c7c12477a61eda50a77460a599fdf6520";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/br/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/br/firefox-65.0.2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "a1321fd5a1940f50eb7dc98feb6ca2795ff6710b8de7874d0726465b66ca5e1c668ec32da3f946511a21e96db8a3851cafd3ff8fe395accd68a3fe730069c6a5";
+ sha512 = "a8953022563c976ed1b75d18f3dc62516b2a15b34c85b87c22279d783a61b6980ff1bd241afc062511568b2e1b397a6fe6e27dc602ee2bf5f2be6abed2269316";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/bs/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/bs/firefox-65.0.2.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "c3dec84a9a667046d0509e4c09f8a17209753969c6d0d6aae56fb718f53c700a7d360759a0f04aaa1a575961e1fc70136478ae652b8e6d845f1b5df61c8b4dfa";
+ sha512 = "740b97e9e259707c13461181f51853ac1f5c392e645d5e9b9c9ff3e3133957b033ec9dbf2dfe016d5ebbff258dbf8a0eca2c3c03172c7391169af7d2662749ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ca/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ca/firefox-65.0.2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "6cebac4c11740848e36dfbb1237816aa1c9c7a698423c7d73e268c74a7407e10107ff8cc8802fcc0bae8c327b4ee6e559067fb78c81866de753ea781fcc10cde";
+ sha512 = "2f50f8b15b0d68e069ebd34723215ed0b602f977f3858b63914cbdcb8e9fd8a67444b3bfb20dec375e6268132fc83e6608766ad6c331ae4cf54702d8b18528cf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/cak/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/cak/firefox-65.0.2.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "af6623230ae20f3dd7915cb395a200dbc7a5a7358bfd634e4428f978da46ac245b2c8faf0b6f2c0655b377f4472d67b8ce8bd6383cb1993dfcb407604f916413";
+ sha512 = "f17206396704de2fe60ed793e77691c36e9c95e8fa1944b9754684303742721a0916ce2e124569321fb65b2a305e14aa1d3b01450cb85af7b8d5c6485c4387ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/cs/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/cs/firefox-65.0.2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "854636af5f2a07f2c9cf86549c59f76df6d338f44c02970ed8024519fd8d7ed4e8f2746f62f009fe7cf8d72dc8a57fbb9b62fe8cb3f7f9218e8ef7f47f674730";
+ sha512 = "9f2f1d9c7946cf73745f0d421d994a8ae80cf8288717396b7d3208127e2c01ac652e15dec55fef61147b08d411b67e25f39013079856f4af7ac4df1185006fa2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/cy/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/cy/firefox-65.0.2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "6ec88891cce5878022e377da336010c8818271a4cc543341d2c0585a76184d5ea80f0712bc6a9fa18008670603103136da3195ddb2f7be6d94b4940e3307cb9d";
+ sha512 = "b54bddaea5e428c831e643f16a3b069b82196c5dc586f8c554545c64c493ac94e30841062d4c0bde59f392188aab9c53591f7a43d2e185c4398baf6c938cf590";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/da/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/da/firefox-65.0.2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "d6db78a1e930304bf3629a02637cc2ae375d486654fdc4ed9e4d995049aaae402c9781ac72c6764084df3c87247fa8ba0ded438dc44955e84d90735733e84e89";
+ sha512 = "6fec82f8d2be71709f6d8ee48d1343797cd261ff444e915444838d492a8e2336aab13139c2bc4e60f82c72093f9330f6de4b33f0585900c001c1a02d8f3fb97e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/de/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/de/firefox-65.0.2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "5e5a817987239c402d141cc7d42a334355b00facc68be1b89c2ca271dc1e9d79de5953dbc1da49254c1c03fc8afbd02cb1258cd2a238007ccb69601c860137b9";
+ sha512 = "3ef922f039856a46a9e3647775315f0e91d007ec34cba95bfd70c813b1f983402267994469d147dc9a5b18dc5fd3edc1afa4c8eb90f644948776ba9cfabecee1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/dsb/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/dsb/firefox-65.0.2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "6eda625b31d0ee8f7a245b6a0e769a4a35fff4352d1b33c668a0187708db892a317150d8744d65912f265cc68d72e981f6f26b781782a18f3c7691f746f0cb3c";
+ sha512 = "56b66537704492890779c130ac88bc54bb8708cfdfedf946d3c940fb6bd4a309a9fd3751ced2778da7fd7b83fe3b7605129aa54ac0f9699fec742ed42a77ce67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/el/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/el/firefox-65.0.2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "d9cbd4b31b216ae65c6cbcb633965fed19010d5b26fb7f1e35c5459cd1bf31b1ceab572056b00bbfd72b5a0d2f126fa3ebc2bf05acd7216e1470370075f6eb0b";
+ sha512 = "58c4280f87c6f47b458d6cbce70400cfdd6f4786526e926e56e90e5a2099dae2ac651bbd7678221271fbd3a9d29b3dadbc780e12775741da96ee9edaee7831ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/en-CA/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/en-CA/firefox-65.0.2.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha512 = "b69b7033af141d38377d76202683a5ce362cd8f52f7d01d8d04482908279029a9fe4fb7129e4ccf409eab1eb081d24764a9ae1519796612ac524857a3fc37499";
+ sha512 = "6cf531ae9fed2eea5aa5e7285ef17023ffa203017ab19a85043c514856d14cd3344e5d16ad8e29e27a05c5e760d80f93aba16c29a7611116d1cf6e33759954d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/en-GB/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/en-GB/firefox-65.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "3eaa085b84924d24c3e4726fc2e7084cae6a90dbc784d157b7f94b50fd49b02e49d736ae49330a2795938487842a4a8e128ee95d876e73cfdd1ec3c959205bf8";
+ sha512 = "b254123edb635c0630baf0781f1f0b9fd98c0141bb25af7acf94bc5a23eaa1bd2398a014e929e2b1abb8ef4f7250a518f11021be892a4ea3913777030f421e49";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/en-US/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/en-US/firefox-65.0.2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "d7d8d14d25e4864fe3707d4d2ba7895556b92e2f375b237c73aa011afd952d3163e8492db8ec150337bdcb440c935917b3586240b44c9a5beeecbde545ec2821";
+ sha512 = "41b7b2013b76dafc977c4d583e5094f2a7b10e27bea63dacb5e29e31bf323332965cfaa3ea23e4c75c6001b76f93bfe417b4567afa908e218d1c8ea6662b0651";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/en-ZA/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/en-ZA/firefox-65.0.2.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "ea47abb33631e7d32288a9610d1c9d86f6414867206ad4923d23e8bd2107105a786570e1ef0f253a2ffb90fdbd890c033dcef0302a2a3145d77af51a0f11c0d0";
+ sha512 = "628bbc34b70ef97fafb7783dc0fbe3232617de448e2b40d616a7fad34bbf484dcb405c73b850083807b833ef3ffecfc255bd21fef82b859328dd22bd08d92ff2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/eo/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/eo/firefox-65.0.2.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "a656bddeab181d503342d0015ab1feaca887894c3335a39f1b4fb3f53c6dbed4ed7ba867e51b478ed651e86e152c7135fbd4419a451a35a5e8c11c82887ea1f4";
+ sha512 = "5069085f1948e55701955ace57b2803a8051ca8abf48c97aa43a9c4c693d711014176de7839b4e3594151c1dc47d49f0891a90882a6849bd92ca47c662c5e0c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/es-AR/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/es-AR/firefox-65.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "404ef7313904ccd11b8f4885bbf13f3f9c2123fc3789bf983ee225cbee9542b796e700bee82dbb7b32b11f3222e1ac9a39b8a0712a6746e6557eabf7979740db";
+ sha512 = "09ac4e045b054c9208c2de854078351a8ebbd426b0099cfa14edab26d147c33240bd0f987e5193150a6a10fedc9e32bd854f94c0d362ceab9ec7242529a4ec7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/es-CL/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/es-CL/firefox-65.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "88b89da9b2d529cf7be8c9fa464fb17717e3f40f8b77bb47843957731aae4e59dd63f691af8fe863d74cb2db6e1fc9e66b514920dd50cedbb6e2a1646ce92df8";
+ sha512 = "ff978bb6b1aff04f49d0ee6dde1b469b6f5f506c2212334de1e67c0d4ae78aa96dacfca680efc0f08ad1fe0f9c6e9836d9e3e95feb9af98652479d0d705adc17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/es-ES/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/es-ES/firefox-65.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "33444d60e3366d9875b22b2e99fa8ec674446f78a122c3b0719373a7abc55848bdadcb9f800ef1790531c9b76993ecd80d473dadd838867870f105b5b36a0d7e";
+ sha512 = "faeea7da93774a1bdb8e8af888b1ea4d8fd3373f43cfbec489559f1030d6e037db1d2bde5283824b55cc7fc0ad9c05636d16beb8249f1058ba89832ad4f8f638";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/es-MX/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/es-MX/firefox-65.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "f7d1e5a691a8e629e11059a9bc367c1e91c525a0ed69d88bfbecc3aeb22ebe668c1bb20f307f2256d3782f804490a77ce45cd2a8f55cb547e314b327973b8d74";
+ sha512 = "2f92d439bb3ef70d11eff857d3a77b9a123bf3361e7db2258d9a2b8bcc1b3277f4a8825db8771c9214ccf347e35b7d9d2d667258f329c36f38f1ba8844948eb8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/et/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/et/firefox-65.0.2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "2399846600fe912de3b057a18b857f688ffd39692b9db5d2a7f70cd31dd35d8c1e09f4b73f058ce61808e22a61033963ed97e029a5170662043f684985e1a82d";
+ sha512 = "7c35b814d91a310151a6e4e3958b9d0f243e4a49ee66ee2e66d3c8240c820426bc50d9ed33fe86fb8a2cbd18e54d01d4f51b8e453be97168ccdc7f82840b02d4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/eu/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/eu/firefox-65.0.2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "ffcce3c779c0f139bc47eb1b9782436db17977c6e3b340d0996d228a746d843a1927cdbebbe11955d659b1d39ca285e357e6e41cde09652dd762192dac641ffd";
+ sha512 = "3c525a897873d354dd6e6d3180c84f41f98b5b707036467e1b0ee2be49179457238844ccb3b3aca37393c042d7ba42fc7a68c2514316ab2d70291f2776882a5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/fa/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/fa/firefox-65.0.2.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "a875e2a656a375f4ccd370078c73e72f8c6a1cf629db277b18928af35be74e10724f7bed1846d418266dd8cba1808a54108aa2a14acbe49a60b8c6d2ec6cd9f5";
+ sha512 = "c3b5c4353474fa6300ab91948dfbae69a452f873e441139e2d3c0f221119ec9471ac34df1d8c7d9b3ced6aa494db8d35504ef150672afa47370c04b2cf393e86";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ff/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ff/firefox-65.0.2.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "da41d26230041bcebda837d8d4c871f199b1ccdf6d872fb8024bcc4caafa57c2e409977d7c99b443eed8e2ea003210bb6564d8cd3666775cfa88336122b82b74";
+ sha512 = "da475aef7a7915bf9e3710163b5c4923091d98c904c5f5527ba1398e57bd7946613e71339550986c7dca26d0b6830ee35beb0fa085b9df3de88492daa76c5706";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/fi/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/fi/firefox-65.0.2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "bbb3feeb706693a9f9f9733f9fd3b02aa8114b313af2a40ca00e22a30e8046aec58f91a0d47d6b3b83bec33f118dcf5f0b9f097560f32324ea9deed23b673ea0";
+ sha512 = "82a47919d917d3d614b87b1d5975a15c328f37f44b64dee4689c16df2b24d2c8414a4966a918f5d45443d0d1074574c60a55ce75dc018ebf03a3e1184b39918e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/fr/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/fr/firefox-65.0.2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "877f704b152b18163d4dd4962b634b9ac3e8bc218ec8e6a53ae6c13991a06c84727c20012e820213a3698257f53d6007c992e7cf9885503358a46d236a8b18d6";
+ sha512 = "359d6edb4551e372ba9c5fe8d41e5fe6b1fade343394a3b78bb12b4bc04a0467c52e1abf615b5618942e82b8cab888d1cdbcd8c912641a3be8361ad17b7b034f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/fy-NL/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/fy-NL/firefox-65.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "494c5ae227db4c468e5b66fdc480ae0d9adb25f28d76ebd94fb630c096eded631e44af6efd5586aecd5ebdf62f1ed307086f9bf7af0395ca6cb599a2eb9d77d0";
+ sha512 = "c11429298425aca937f2a17c7e5d3694af6e30ab86f830fcbd4589115a4d1404590bdcacca2d55fffd36dfef8e2c07299045a66268f504107361ba4f36f0c78c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ga-IE/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ga-IE/firefox-65.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "3e9e921fbaac835dc8745d3e3b46914fa79f64e65d412a39b659ede44ff9810298c8240966440e82a949191ace2207b7e7684530d930d0d1913913a320419c81";
+ sha512 = "8455bc4817e172c778068ef7eb9933add0ac885cbc2a814799ceaa8f742873d60f679082946b29eb17139f7a83b22918d1ddf9a0412bc7b04e1385520174d5cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/gd/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/gd/firefox-65.0.2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "b71e3a6f1f060b3132034c435b54a735f8fff377646420b408482cd6dc5440957782aa530285f8bf7d51c56d5df8532cd0fdd826fd8f1faa06ad0badb48fd35f";
+ sha512 = "475b39cc16099f22844ac42acf4908934150ebca132377b5fe3bfb8af7a3e5e57f3bd5ace7973884bca07e4b16678b74728bd7301056e74e6328bd1ee60c4bb6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/gl/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/gl/firefox-65.0.2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "ba2dfa015a3de26750c8b59f3bac8ae395bb36435b4b00b0f30a6a09012c36986c6ab0a7a33d74def2e3cc89c04d34d0d9b65e830502f59b7028fcccdbb43519";
+ sha512 = "233587a44b26fdfb728ff6102c56f2cfdb91167283029f8eb41956cfd0bbe6388770b47c5a20d61ab4a5745b9cdf33d425f0455675cdf101ab7a0e500524f22f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/gn/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/gn/firefox-65.0.2.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "24735e13619217c444d6ef5e89f765baaec014a56a5929b0cf4df1d5401a673965bc058d440d80cfef9efb0112cee600ea8e0e030c2f5c40ad738e0c8243a6fc";
+ sha512 = "ba00d9399e9ffcf42a9ee0e1f326b69471e23a6e15724e8ce1153385c1d01ca1d3a100a728367b9b7046d956bb18bfd0b78bf5066712ec6c132f9e31de0030f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/gu-IN/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/gu-IN/firefox-65.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "e32a73588df2630bdb6e36186eddc7920e5866d1293f9bd7b8a4ecdb9a2d504e4a46810856a731bcdf5bd7852ce6193694330804a58daf82029a9070d2d58542";
+ sha512 = "e25ece6adaf47b357be37eed29b75f80294b4b5e99bb3b3bb528c2bf3faa92125cd26f60825bf3006f96f6c7c8f1f8f8f2555e58b4d8c0a7e675cb4d8f940b48";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/he/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/he/firefox-65.0.2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "467c77c045760b7de01d0bc25c36527c0cebefb627346359f8b1fbc67d0678d31fdb3339998a596bf183e12378124479b171bcb4b6b8f2f7d10e3215f17e7f42";
+ sha512 = "75a797b2091e91b33714023273eff77d1327037d184b00feb5f0579f33ababf5e51960926b1b016331008c9d152263115e86b0c1184124a93b55376637676bae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hi-IN/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/hi-IN/firefox-65.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "d879dc631888b32ae06b5f99f1adbdde32e76a5bc3150bffe8f326d0728acf2d9d1b8443657194f2d5c26819017365be6af5525ca9d1b4324eff57b43eb77790";
+ sha512 = "7cc281969b23652509ec3b622896b2e0090168e1d9b40fc4554bb4496e6db2164ad2b10e028bddba803fd3bf8c468902ed0b641ecfa93493a660fcf9c31350da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hr/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/hr/firefox-65.0.2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "dec69bf3795f99a070ad268e62414d7ae63f8c747a205289600c4ec4feda63aeffa6398802cddf6787fd17e735f376ca4842457ff45a9cb72c912a2b3cdc6cfe";
+ sha512 = "86eaff0c5dd24464641c635e0287c1b7f807264defa33a4731ec66ef5a26045f1bce6b5fee0268f0bb8bcd3b6f8e2a4fb8a589889b61ddd2cc9e484144c97b9f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hsb/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/hsb/firefox-65.0.2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "120247d2c6bbf44a453a9afcd9175a41c2ba2b927286b33f749f51b6ef4aaa993f6a6d4662ad1eff56ae736ca91d742ce64260de12b493c9dbfc52621dc81b3b";
+ sha512 = "6b09444c0b7c97aa7738f091db78cf2ba4ff73aba581a4e3aa9f84785525d01b97d3045627efba3ad0b6a3817cedf718b5f75c150c0ff99f7e029ab17fa4e8e8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hu/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/hu/firefox-65.0.2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "fb9579d7abaab1208ec5a8a8172d57801789eac83445413cd2133c5785515ebec01824dcb76685d5c8507048025c4f9a16fe7f47233a4c5dbb0bd76fe74b6484";
+ sha512 = "bdce28957e11019117231e9c47e615da082f43859aa39de9c7e0e12e70d25ca1ac6ebb660db687a80a07e56931b178b07826e417bbed85f4d949a5e43e3bcf55";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hy-AM/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/hy-AM/firefox-65.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "28f4436f9a977edd4b30519b98c1842724323df3fe638979839a87153400e806e22d73c9203eb0a2191bfaf4a389d6ea26bd81d498963aae59c926375a61cfa4";
+ sha512 = "9f79f5f9b19a8eca929c86e882015daebc892a71d60db28c3656d47abfe5b9919a5838dffc25f1144d390f3b5bfcb15dc230129f021468bfa73a269159e09e8f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ia/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ia/firefox-65.0.2.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "1bb69219eb12abe2d731d600dfe35511cde083de13d2277868970a52a77a558d5dedac074a45f3bed3d01e18e2b7c5695d4831638ad194217f977efdc38f3e6b";
+ sha512 = "4a1de2a8f3adebd03ba066701ef92fb4b77913f2e881c3fe0a2f62977642317bfab73f083393028e2d335e005698ba04dcaa4e3ea0742a6d96f4b6fa55b125f5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/id/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/id/firefox-65.0.2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "87698f7d5ce9f074b2dbcdce00fe864f36621107df7422e053b0db6ae76947238784f7ca0a045517800d3a936e065cca3e74e6bd9cd04a265d7eac3cf2e0ce4e";
+ sha512 = "c29b87e448765bd1073ca54a507c38abb6fd3780d98200de4b63c224073df2229a9d1e1e5494afaf3b6b591b0521efaaa197da9a134103094fbedd38f9e019df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/is/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/is/firefox-65.0.2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "b1ef9f02c286a0ca274367394f72b980b9c59d45e4c629611c3c7dc55677e90bf9f44003038740b22d660e5e950c489acc18ef7317e67f211c629f0b86017264";
+ sha512 = "ae28a51d0f6ed7eab333bac1c780e18d3c68036984dfd87613a807822a07879ca0ddbd83c4b745a887c1d67228f542b363db7f9a51968b3cc9412e7bb6f21e8f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/it/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/it/firefox-65.0.2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "8507dba0adcf5ecee9224e0b8cc20b5f57ce1392affde80486a3389e04b1cb1543208cbaf151b56ed26e6124af863365805a242c6d1106842fee8547363ba11e";
+ sha512 = "0fbc4de6977212bf316fd31130abc18354965c430802c42431eeea5ea3ac146d17acaa65e5b37b4fec0ec6237766f710f3c9e57870c60fde3b015fc7eb6024e5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ja/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ja/firefox-65.0.2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "ea41d66d37174c936b56a3bb86d707657814eba1e99daff7be915a4ce53e35ee64d7ce6c2da0d640fd101b7cb79ea41bb49b4dac144d8741b9f217a2a042f85f";
+ sha512 = "d79530f80bf872aaa53abaff3bd8ab134f0b05610e0b03545016b35b375dba5e9b8fba929964a7ec8fbfc0bc0500075112db6d7d5e3780a876c34ee45db4b268";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ka/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ka/firefox-65.0.2.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "793cfb78a809f8e7acefba260197665980b8b5aef599d9a3a2dceb4e8dc83034c98ed04561abf9e4e6740859ce07f647e544d2bb4244b505ba248c8af3147403";
+ sha512 = "cdf6e3bd125a0cda7819f98dac0af463ffbd826bd8b4deb0cef3f232c8e8e9d80fe2dd940b912db7ea4e04eb54e7cbc93ae1a31502a20def9efc393d67cdf9c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/kab/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/kab/firefox-65.0.2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "50ce6f27b5ca77048600db7d1f50c04a363dbf5118dc23b06395ec2fee401a205725aaa99dac3b21b5660fabca3ed3bff2a996a15ccbca4d35e73553f46a97a9";
+ sha512 = "738b850e92b9ec6ac23f6b0621f9a81c4d9dd79229270cfe6313f71051a7eea2e738cef6b871e4795dd045a79e1b03084042ebc1d90ff7941e24bd913abf3c90";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/kk/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/kk/firefox-65.0.2.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "8b5de334b237751201679b8d54f2de5ee384182395cfec120bc2eddaf443e0fd896c1594e92e2ba71943f2020fefe44b691e2286fe9ed1c21d3fc9e11c763300";
+ sha512 = "f66911c4b350f7e469eef17c803d07c6c905391127bde2c8ef6a2591c9092da798a2fbd18541627362e608abb83e9fc3758e474033bedafb0e75d1b23055ec68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/km/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/km/firefox-65.0.2.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "1a64f732f2c19858cba7e109beb86726d1e51dd2a2b5a09aa380fc515041aada110eb90649c4c6ece5aa8a5857072968f4a2d43f3484dc2e311c61eeb4fb49ee";
+ sha512 = "28c0dc6cc942b7833ebba96931961bfd16fc5a5d7aba1c311db327c621b2ecb246f745ff59acfe6bf2cba6d5fe511d001656f25db6aa38739b0f92c473f09452";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/kn/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/kn/firefox-65.0.2.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "149029ae8bd3a81151a17c00b7166e02e22bb9f737bae1150ed8f3fbc28becf19234a1a874ca0aa6400e1b0eb75f14465546ec7e0c5bf09b8c434a5ed9f651da";
+ sha512 = "66c71467634d4bb32149841035d2227510cc1c67e4fab5c4c11db980068236a5e7b7d40c0927108b8d67597cc66ef5dd44b56e315e2dfcc2b275f42260eec99c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ko/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ko/firefox-65.0.2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "f7433f3da565969ae1e92ffb4d2fb48a2b513214b08e611de2b8cb3efadf16fc6af871b470916b0611d10eb616fec09e37648c98366ec0f6211693a9f3434df2";
+ sha512 = "8a36baa9d9d3666633e986bd8cff1e48efcf1f5c6b68ef44bf6d8963d108e7448d0822fc57a080a520408010dbe277ed31fe2bf6ed0ce755acae2b8759e90ab5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/lij/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/lij/firefox-65.0.2.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "6b20b466ae15b9484c427a65388d099073eabd54f938c75eeaa886ba5db73bd1f91ba207308941b2229ee38f8dee4201599d1c11e228ef6a2e13ba0d74f7c427";
+ sha512 = "c3e63189717a28f66cb6847c5aa5cc141e859b62bdda44961e9eca029ca421ac03dcc5088141f967e05b1feb80e619b0c6fd55e12e9a3a2375d209242a83213a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/lt/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/lt/firefox-65.0.2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "61a85a29003930d8deca7ba76269f437ccb47680ce8ae12b9c9913e79d6c6e6594297f890eb5a5e641610a38c1016a1947a866b8f79ca83ff316e925df8a8bd6";
+ sha512 = "197fa46065d0944c6807769cae3548bc43954a7ee1644218e6ba0cbaba40abe64053cbfc50d757b673329602990246603f8936d6ed6c286830845dfc4717f19a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/lv/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/lv/firefox-65.0.2.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "21ca42042d0695c9a7c5c5b5866b1fb54e65f76543f42c45efd0436fba73f5989894e0d7b67e496b101674fe3e7f0c1c374c903c9b6bcf9f9a1c6730c5c865a8";
+ sha512 = "939fac5ddbd33e444b03b539beeca76819a45522c823a99b926cce1a024cb3fe65cb6cc178b0ff5f4dda950513819dc19d363af6d53177e377b3209f70a3b3a9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/mai/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/mai/firefox-65.0.2.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "7108acddbab96033cf9cf822d93f0ef3c3ba46e75ebe09f5f1d211b7c5cce12fdf7e7bcf06621b1bbde3478441893fae8ff919a0952d76fc0f8e482a2bcd811a";
+ sha512 = "b9ee674712bc6954e2f02609e4cea04a8fa9cd7aa10042431acf18f9f2f4cbe8ce0ae98de96bc1af99fb6ec838539ed5e23127ed1b0ba406b69bcdd47995d706";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/mk/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/mk/firefox-65.0.2.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "6e0c7a12413d351ff5cc95ce56df95e6f1bc4ae320db45dd988d0dd488f525820c62387aa43003744e3cf4040f91497d4f36b4bbe4a636f1a2d010d0a9479d32";
+ sha512 = "402b063500a6233e262d75555fbcb71d3076883f5080980a01bb7545496e9adf397803c260a107a3384d7631727a2dd1d10e671f93cd3408f82b441b7d34e203";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ml/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ml/firefox-65.0.2.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "03e6525cc76cc4a1f2333dbb67a3f29976d3d9068d73054711f561bdad0a8da9d14abc3f79df596696ff2c28fb51147010b7351052f3b3a8d0913b94e17b022c";
+ sha512 = "19990cc41390d20ad39c0fd6bd81eb40487bc7346b4a33c5aa292d90113be7763d606417fdbb3a7879b41f90399cd3e5cc0c13caf2f953d743a655ee3de2c12b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/mr/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/mr/firefox-65.0.2.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "43ef1fa19c05096b3465f985ebcd91e7581a29a380574cfa763269ab6c7f760241645d18e9475757069b7680e696be17c2e92028874c57c31b8bc2d1fc5d8be6";
+ sha512 = "8d07b3f8725c7bd663d20ed84620d949b370d58c95958df79977206347e3e32d58112865e6008b948c4a41efbea046260f00d5fdcf8eeb2187113f0f3977c9e8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ms/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ms/firefox-65.0.2.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "ad84ff57cd2a3048862f8572c3084c2fdacf04dfd080f4679cbe5b6cd1efd9535d4fc8298aa1225067f5a3e79a9d512d933e9257d1db2df0875dab8d9259352d";
+ sha512 = "e2b409e47a639717ca764c3993c2f8d993deda328c6b663f9e18ad791261a749d5d7da7ee42d76f22ecf71f4bcfd1c3d2a32f645def4bad5a91e3ddee8d31d35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/my/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/my/firefox-65.0.2.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "f6b51ce2a6f67193d3410bcf5210fba114d2b4a626bf2cc98930143679cb72e00657ae44116295d3fae92aaa63dbf5393a52b8d2123d024089c5efd0737200da";
+ sha512 = "2124ac6ef5b1cc0644f09dd328afd51657c20847fa6efc7df2455ddcca2f122589beae86ae528d0443bfac7b0abb2d67156a67adbf8c377376d8619bc49dc0cf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/nb-NO/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/nb-NO/firefox-65.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "8b416187023963128779f06cfd28db4a7bd6bed7b7bdaadc8396c51acf0964c8a1e1230082c9528e0f3ce2ff54a84383daa36e72bdacb6bf5768214b7a497edf";
+ sha512 = "3a6e82a8b1a7967449ceb5f145b732d7b3eb1f74043cb4808a74ada4c1f1867d220b43bf7b6dd8bf7b9ce950c0f6ab53d3140dbaea5c8b9be23661c6af11f0c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ne-NP/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ne-NP/firefox-65.0.2.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "0fec4f2b6b6944a29ef2ff0ca30c4d770d2a956564b697fcfb7a72517c488a252d990a31e9dea6ba36d9b5ee9c38f39dc8446edf2ec7caf946244bff3f1d18b8";
+ sha512 = "e500aca0da755266b001dbedab47e5a1ba3c937f18a24cc3daf6e44b3130cb6d9cd350b413ca34e0d469b1567a802d3b2e2bcc3e2989ae52012270b5c070822a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/nl/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/nl/firefox-65.0.2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "7fb3c8c0e441ec55c9a79ba13ac1f7d17ce3612ae6f6ba7e23a31bc2d854fc41abd38a4caa1991b9b45fd58bc2d8386c2875adfcbf40b07cbc8bf0641a4b8b10";
+ sha512 = "3846cb62c54ab4835eb9c7162bf67706d1beec912a757ad7b5fee4f99cafbac51bf9809ef0681ea41f71c5761d942e0225cd3f75b5db0227a692438404f8dabe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/nn-NO/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/nn-NO/firefox-65.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "744f32b81f4a4287abc812ebe7209082c4c2f8637c0a135a9ce83377903e97e3d938037827283160a141ab89b51060313bac82fb93af8f24c71b3aabdce9a293";
+ sha512 = "1e886f4f478944bb2e7d2d20d96bd23a2c06e4c0ac1de2e627aaf8207235f94ebfae6179fe52536290c0e84a485ed2abf7a8349ae430b46e4d99dce10bae3938";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/oc/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/oc/firefox-65.0.2.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "2722d769575b28e581da820a3a6bf8b407a1c4018d97c2e7315b15642f4165efcc44860710141c50829a8d5d57429e9fc47565852ea9c2c018504f3a4f11739e";
+ sha512 = "77c97eab7181f13d4ad8cfaccf0a17c365e1459d7a49ba69feb39c512237397e785d01578482600008be69f273258828790628f6d7f27c3e1540b92f087b5091";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/or/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/or/firefox-65.0.2.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "3f757e2d19540ac963cf14d884079fc648f1ea4c1281c86ff342971fab250c4ec09708c54ce0fef7eb343db057bc6bf5e15971e70123212d8a1a90bdaebcde8d";
+ sha512 = "ec9cdce4bddfb5a3d0146f0d4a93a2ca0393581b15a74eb6e2bce2821f98ce099cf0c9f1236f0a2fcb78379b05f722becae27c69da0932ae9838b5235bc098de";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/pa-IN/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/pa-IN/firefox-65.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "35bd0bc1938d6fec372356721236afa3d1a794bda57eb11d7bc86601951825a143c1ff028ad6f0b4cd50e068a5a233a08108d71035abf2cd69213b3af794849f";
+ sha512 = "926744b4b6596fabbe5108070a8811ed08e8a2e44a24a87602167e9579d1252ee8af2239f2ad38985bc7a5630c9e620688c1519fcc65b037db2ae2b68394bb24";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/pl/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/pl/firefox-65.0.2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "34c91e7c2434a233a6f458b28806ac110e4382a1f685d485a2f338d66e27ec362b0424a107c8bb17dbd22ba58c0a1bded15e1bbe5ee1de76a460aaf2dce9334c";
+ sha512 = "5dfdd109a63b12a68bd1bb0f12a124b3c0826fd632ca2a9bcdd8940473ee0a42619ff662b9c99b4e2d0ab703d1dbac88ec76a1154784571450d8dca59a97477b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/pt-BR/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/pt-BR/firefox-65.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "09e247ab05f9c02bb2ede75cc46e321a518629dfe2395be8536af77601a91d4acd1df4c1a34b54193aeaf24b0cda54582ed204258e9754126dc021e04066fe7f";
+ sha512 = "eca892c2cda97e754ac060ad2e88eac96de5beec780cc6701135aa6ac5da302a0a07d4d7a8f9eb7ce94aba2e94f8979fc9fdba5906c8bfffb5b214c5c9a00458";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/pt-PT/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/pt-PT/firefox-65.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "3ac57c58851403af43cc01010cf8e55b734b5d1d2db60c3b6457dfc1def483d6918ccb0eb6cdc3c4a552ed8cc5975b8534bac3e644a5f7d08fb9f2b168c7c3b4";
+ sha512 = "e768e680f61c5d53474ad1bd3bbd5955cb20837048b4b0cf93bf30263a0fdd3b706d36f74f7c321fb79dd64287a8fe1440678c909ea8d26d92060e6c91d9d634";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/rm/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/rm/firefox-65.0.2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "b73742b939435bbb8d2a0d307abff82f777ba015b808eb2e7e6789ca93d33f658ed2e550ce917f5318ffd9ee72d92b2a47b43e564a4a79f0293560555a69cf76";
+ sha512 = "70a86d99e075656c5a4286cfca9a3c64ecc316a97f2d6735066bc2a17eeec028b1355407fe8e9328a58d6e10fdf71fe30e68feb0dff6125e9ed54c4afa90aa15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ro/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ro/firefox-65.0.2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "e53fbee87ed143d5f2f7c4190b648dfebf44881beac3ee866fbac2bb8170d08c2333b8ed634696c08dd18d26acc5bbf80b5dbe9544c5a6da48175acf4708d408";
+ sha512 = "d0ca0a38493323c2a68d9145ae230137fc7767f3efaa237a6a4f254d4a7acdb66bf7bbc729ba2be040096d4da7c51bd716ddd677eb0d5cfd06c4033f69c2cc25";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ru/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ru/firefox-65.0.2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "9a05d119cebb97b022ac038c36dbfd6ecf13054027b419ad37d07d6b6cb84e4bdf77c651603f88da62d116a046dec77e43c333ee370514ddcb63d53b1754c00c";
+ sha512 = "a01b2db8278a15aa826aafece46b42c3ac2b784dd763901d11826dc59b4083e5e888c21b3ddc95e4264e8dbc1bae4c87c6a5768ec69b86bd174b1c1f40ee976a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/si/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/si/firefox-65.0.2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "fe70747cdf4329fd860a05ad8f69e452dce9a8a0a4e65c9ab84348b870a628746de1a74f66db42caa15da7ac5d34b071aba6095aacaa818859b041052f8b4df4";
+ sha512 = "b44c1371e349995753a9a393ab9f1dcd6784854005bdf78c4c06650cfb8525544c8e3790affa0dc329989ba4c4e14887b836903b458351be073df44eae20ab7f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sk/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/sk/firefox-65.0.2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "8c76b164b6c2e9431dd23131a46fc613e24896cc2d02d67dde78ad4f7d2dce4baa1e08bb9120c02a243743231a54eeea68e10f2d0e1c44442e53533482afde13";
+ sha512 = "552bda0818ff1a71a1f3e92b308a2aa878ffd217612dc3b98efd58855532f5f1acbae6a69e54999d200bba5fffa8729ca000f91c75eac78158c4dac46ce6597a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sl/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/sl/firefox-65.0.2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "26ed90dc4b5e1dcff81301eeb75fd6729b0a94ad0993b438867b8ae4287a03c20efbc425b8130c948bba46e71c654e6aa410a28a20fd407ca922b77f166e0feb";
+ sha512 = "7feea9e50311ba00e7e94c04b6ab080721c2183ca3806b1fa5a4d9cbef131d18a1b26ab8796c311c98cf8a9032ee7a77b86a4a8b902fe319fccda5ffb15a7ffb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/son/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/son/firefox-65.0.2.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "11809822767088ab739e47b6774374d619384e4ee2a69690fa5624a6168c0a3fa763b85b573a1bbbd0b97f50c5738999307d91880cde14a4fb3c6ae17b484224";
+ sha512 = "a63e189b71a8c648ce105094e8e568814d22ee2d9159434844adff845ef8478ca965f032f5929ed143b70fae58b22bc9d5733e2d1102933887cec364b6130053";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sq/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/sq/firefox-65.0.2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "22f699cc9a59332582149087418596dd8e6b138b1c7010344f4471396b3a69ebede79d924dfe5e025d82054f20f240356d4232e284d33f8805e4891bc7b30459";
+ sha512 = "88885c52ed7cfd802de8743fee04583e67cae8b9fc550ff857943adbf608408d0f8320cd1c75216b1c0f919fa4a0d7203da7957c160d02d3ef4982389e03d1c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sr/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/sr/firefox-65.0.2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "b2431890e7cdf5e1563387d9c566beb3c083d81a0f11c5c1843788b7bceec927cc55bda1a92f605210aaf2960ab4bd0fd42e4d558749b5623eb7f3fab0d7800d";
+ sha512 = "cf58c2724181499ec5ea4f55d0f9f8a42bd5322d0f80631dc3c76dbeaaa587a5b8d3b46f7e2bb85f312530f7f3cba717bf97edba17954dcc1cbd61346b5c9bd0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sv-SE/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/sv-SE/firefox-65.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "c2b7399f1b6f75440a725289df834af2defc77c773ba73f0b330689244167abcc32190e185ade9dd3c8340f6a06fa2e026c0d4c426e90471a75cb1e79b45a086";
+ sha512 = "7935e8bd4678de9a5be1a126e3c659e64a556144252befc3b76736483bfc256cf1781c0848be5e2744291753766d85f050073ced0c029b968cf0d17d6a5b845d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ta/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ta/firefox-65.0.2.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "b29e0db021afcfb246f980a2f5afb434c52be5324985877d2ee547a097d17ec77a7ea3e2ac9c2dc558236090954b1cba4a0fcaa10698da1425dbd5e31406aa4d";
+ sha512 = "6674fb96ab6cb16f20bf366014b48743423bef5b0c81a8804457679d951576c91283d1485dca513c9549bd7df38f3489bc5447d37852ab1a007804adde77f1cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/te/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/te/firefox-65.0.2.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "709ae0eeec912c6349bd2b41a5cd10bd58ee5279e50e70623be93d0fef1655c5e0ff74df47d60c6ecae5883c5b6102ad0a4d61924cd848973fbc10bbe112c18e";
+ sha512 = "e4eeae5c22eca77d3d50ce3938ae6e1faf7d038a8739a8104827f90e648527c87a4f9ed11d23d078b9ca162b5f19d109f8c6f31eb60a5dd7458d884cd95ba63e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/th/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/th/firefox-65.0.2.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "032fb59d5a502d593c1ee5f05d51d0d2a88bd3dd081857e27c9d429ae337b37252a0f0bc0c261adc71b8b2b57aa7b4321ed8ce3bac04eeefabcf97ccec4b2f78";
+ sha512 = "f74865112284bd0a45b08c7982a6d70351b21628bed386081baaf525b765bcd25d889b194a3a032752ad9c79b7f2ed3e491a97da318c600b116e735f2d0468b2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/tr/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/tr/firefox-65.0.2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "3ace64d030e0012f9acd06e242c52408f6b8407f65834d34b203910a18c459c6dd8a23e80d4b11b4d4792edb2ff71769c75e90ff919e80d7da71a2341115e571";
+ sha512 = "9de57aa1d84ca0b1e4e3e2a25e503a1bde99f0d3a86fe0dec4391146e45ab17215752e96293047445398a65e0829ed9041182d5a7849382ac6a9d92713178685";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/uk/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/uk/firefox-65.0.2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "730b747ccdb0b31738e2272f9763b9aad992e241dfee8d067122886b625a5b7f83d53fdcb8052a00ee68ac76512c8ab97097a640cbad0f308dcec1f4cd040503";
+ sha512 = "534ff926aa034821381b8bcfbad9ea70604e37145cb8044f0aeeb5206c8e864d42158e8f65c0ca573abc6c9412431fcad97b7b81a2078a6ef9c5c24d44e9024a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ur/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ur/firefox-65.0.2.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "d10f6a9f708f27c7d935f190332c7db7d789f72a005a6474e127e6061a1e49776734c6e1a90e84213d8734c2ba1ec39063cafd5518ba482dd82bac323034b883";
+ sha512 = "27daf1e7164f5078d07096a007759525b5d0dae832738dd7601eee9fa1ef6a53e54919b080b9cc7ae888582b8fb4deb5faf844366846e24e73ed5686eed5fadf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/uz/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/uz/firefox-65.0.2.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "223fa76b020c0cb9aa9fc59344b0cb103088f2ae0c3fc8037f8a6c3055898312638769b51e98107864850b1286d11e711d4225b5bf570e0fb3f7c59ee740b197";
+ sha512 = "fd88f7f92aa0896f44f8e879ce83a874a0554f66ad5ceb9a67f4541531fae916c2ed01157adfaf618b152c51e53056be638d3c460975ca8551c34b649217c94b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/vi/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/vi/firefox-65.0.2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "e3d1a93bea5f9b7b02e43a54f36544e0e7f6cf5553c5d3e42ff5227396eb66e62570917c5a6317fa21da3510251efc9d3d3524bc64f19fcae590825c75ce6896";
+ sha512 = "5aff724ddea005bdbeeae23094fc7035058ce0064f01689ffc6d769b7bde5c9d74db25fb68da8c5a64002c0fb7eb35fd0f55455a16b9723ca586f24a2c1cc141";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xh/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/xh/firefox-65.0.2.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "661183377c558e2355b9ce220f73807818d25b82e9bfc05c013cd58bd35234d73d979a42542b16c46b1c3c3efac0d9524ca28bb9874ad9c969b24c2a96d601e9";
+ sha512 = "d513238017581d22d34d0b4a29c1f0a7b19c390e1bdfbf1179171437debc8a52055259eabc00e0ce57b7584629b01b22f063799fac4e304e3eae229c620f6fcf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/zh-CN/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/zh-CN/firefox-65.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "227ce1a00441fd3e5914143b00c2815544f989cc918e978700133c1232170a145fc2f0ce139989f3b9857387928439282f44bb735f4ee8dc7ed881fd006dfc62";
+ sha512 = "9e55a33ebc04d333018160707352d9bfe24b6fef6b264009058e0ac49b9389586014f74311d00120f0827ba42a070b8699ef4a5f627b1f7996b102a8a16cf0c5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/zh-TW/firefox-65.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/zh-TW/firefox-65.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "211b738aaeb0716ab60cf2923be9a4cf6bc38f8536a32c05cf713f987249ed3a735fc6ce07689fd8181230039a4b2e2a367b72743730672856fe4b02e41444cd";
+ sha512 = "e91388f5ce47c36776ef425a11fea05356581c2064d271b17a82aa1c934b2073662317c6b597d0798287a2cf57cda8ba1a2c72617d36c020c4b20c435eb4ef00";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index ee022e329f9..97163ffa762 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -8,6 +8,7 @@
, gnugrep
, curl
, gnupg
+, runtimeShell
, baseName ? "firefox"
, basePath ? "pkgs/applications/networking/browsers/firefox-bin"
, baseUrl
@@ -18,7 +19,7 @@ let
channel != "release";
in writeScript "update-${name}" ''
- #!${stdenv.shell}
+ #!${runtimeShell}
PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin
set -eux
pushd ${basePath}
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 09c1e5dd8f8..15764e05d85 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -10,10 +10,10 @@ rec {
firefox = common rec {
pname = "firefox";
- ffversion = "65.0.1";
+ ffversion = "65.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "2crb46l5r0rwmzr1m8cn9f6xgajwcvansnplqg4kg91rf6x8q0zqzfnmyli9ccsbqvh7bqd31dmy14gwjskasqc4v103x9hchzshxnc";
+ sha512 = "2qai7krlc5whsbnwbn67d63lbm7j8mnx8nq0cw44j9nf5gnqx80afqcs08705xlf0n350xa5iif6b9m4nw0jwikps25cirwavrra348";
};
patches = [
@@ -67,10 +67,10 @@ rec {
firefox-esr-60 = common rec {
pname = "firefox-esr";
- ffversion = "60.5.1esr";
+ ffversion = "60.5.2esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "0fvjw5zd8a9ki0a8phavi6xxfxbck21vj0k8415c5sxv48fwhqdhlnv3wx7riss4rjy9dylhr5xpa99dj9q98z735r8fxb7s3x3vrjz";
+ sha512 = "36yzxf0ac5kf8y0z7v14dryw29zn06nm2g8brzrm1ggbsbasmki5cb9kkmvcpxs8w2h26ldnjnybzlnwx14002rd0xbhf6hzjpfbrsv";
};
patches = [
diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix
index 07ae2c040e6..0ead6de123a 100644
--- a/pkgs/applications/networking/browsers/firefox/update.nix
+++ b/pkgs/applications/networking/browsers/firefox/update.nix
@@ -8,13 +8,14 @@
, gnugrep
, curl
, attrPath
+, runtimeShell
, baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/"
, versionSuffix ? ""
, versionKey ? "version"
}:
writeScript "update-${attrPath}" ''
- #!${stdenv.shell}
+ #!${runtimeShell}
PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]}
url=${baseUrl}
@@ -31,5 +32,5 @@ writeScript "update-${attrPath}" ''
sort --version-sort | \
tail -n 1`
- update-source-version ${attrPath} "$version" "" "" ${versionKey}
+ update-source-version ${attrPath} "$version" "" "" --version-key=${versionKey}
''
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index bc3a1ed844a..90df5c40395 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -131,7 +131,7 @@ let
--set GDK_BACKEND "wayland" \
''}${lib.optionalString (browser ? gtk3)
''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
- --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share'
+ --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share'
''
}
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 6043744f296..b0ae61c761d 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -77,7 +77,7 @@ in stdenv.mkDerivation rec {
gsettings-desktop-schemas glib gtk
# needed for XDG_ICON_DIRS
- gnome.defaultIconTheme
+ gnome.adwaita-icon-theme
];
unpackPhase = ''
diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix
index f55d129df21..60e9c603e29 100644
--- a/pkgs/applications/networking/browsers/luakit/default.nix
+++ b/pkgs/applications/networking/browsers/luakit/default.nix
@@ -1,6 +1,7 @@
-{stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook, makeWrapper
-,help2man, lua5, luafilesystem, luajit, sqlite
-,webkitgtk, gtk3, gst_all_1, glib-networking}:
+{ stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook
+, help2man, lua5, luafilesystem, luajit, sqlite
+, webkitgtk, gtk3, gst_all_1, glib-networking
+}:
let
lualibs = [luafilesystem];
@@ -11,51 +12,56 @@ let
luaCPath = stdenv.lib.concatStringsSep ";" (map getLuaCPath lualibs);
in stdenv.mkDerivation rec {
+ pname = "luakit";
+ version = "2.1";
- name = "luakit-${version}";
- version = "2017.08.10";
src = fetchFromGitHub {
owner = "luakit";
repo = "luakit";
- rev = "${version}";
- sha256 = "09z88b50vf2y64vj79cymknyzk3py6azv4r50jng4cw9jx2ray7r";
+ rev = version;
+ sha256 = "05mm76g72fs48410pbij4mw0s3nqji3r7f3mnr2fvhv02xqj05aa";
};
- nativeBuildInputs = [pkgconfig help2man wrapGAppsHook makeWrapper];
+ nativeBuildInputs = [
+ pkgconfig help2man wrapGAppsHook
+ ];
- buildInputs = [webkitgtk lua5 luafilesystem luajit sqlite gtk3
+ buildInputs = [
+ webkitgtk lua5 luafilesystem luajit sqlite gtk3
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav
glib-networking # TLS support
];
- postPatch =
- #Kind of ugly seds here. There must be a better solution.
- ''
- patchShebangs ./build-utils
- sed -i "2 s|require \"lib.lousy.util\"|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/docgen/gen.lua;
- sed -i "3 s|require \"lib.markdown\"|dofile(\"./lib/markdown.lua\")|" ./build-utils/docgen/gen.lua;
- sed -i "1,2 s|require(\"lib.lousy.util\")|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/find_files.lua;
+ preBuild = ''
+ # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found
+ # TODO: why is not this the default?
+ LUA_PATH=?.lua
'';
- buildPhase = ''
- make DEVELOPMENT_PATHS=0 USE_LUAJIT=1 INSTALLDIR=$out PREFIX=$out USE_GTK3=1
- '';
+ makeFlags = [
+ "DEVELOPMENT_PATHS=0"
+ "USE_LUAJIT=1"
+ "INSTALLDIR=${placeholder "out"}"
+ "PREFIX=${placeholder "out"}"
+ "USE_GTK3=1"
+ "XDGPREFIX=${placeholder "out"}/etc/xdg"
+ ];
- installPhase = let
+ preFixup = let
luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua";
in ''
- make DEVELOPMENT_PATHS=0 INSTALLDIR=$out PREFIX=$out XDGPREFIX=$out/etc/xdg USE_GTK3=1 install
- wrapProgram $out/bin/luakit \
- --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" \
- --set LUA_PATH '${luaKitPath};${luaPath};' \
+ gappsWrapperArgs+=(
+ --prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
+ --set LUA_PATH '${luaKitPath};${luaPath};'
--set LUA_CPATH '${luaCPath};'
+ )
'';
meta = with stdenv.lib; {
description = "Fast, small, webkit based browser framework extensible in Lua";
- homepage = "http://luakit.org";
+ homepage = http://luakit.org;
license = licenses.gpl3;
platforms = platforms.linux; # Only tested linux
};
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index 290810198ad..13120903383 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr
+{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas
, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr
- (libsoup.override { gnomeSupport = true; }) gnome3.libpeas
+ (libsoup.override { gnomeSupport = true; }) libpeas
glib-networking
];
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 1be4f1c4c52..2f8f020dd9b 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -21,12 +21,12 @@ let
in python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
- version = "1.5.2";
+ version = "1.6.0";
# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "0ki19mynq91aih3kxhipnay3jmn56s7p6rilws0gq0k98li6a4my";
+ sha256 = "1pkbzhd5syn7m8q0i7zlxjdgd693z0gj0h22nkc48zjkn214w236";
};
# Needs tox
@@ -53,7 +53,13 @@ in python3Packages.buildPythonApplication rec {
pyreadability pykeepass stem
];
+ patches = [
+ ./fix-restart.patch
+ ];
+
postPatch = ''
+ substituteInPlace qutebrowser/app.py --subst-var-by qutebrowser "$out/bin/qutebrowser"
+
sed -i "s,/usr/share/,$out/share/,g" qutebrowser/utils/standarddir.py
'' + lib.optionalString withPdfReader ''
sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py
diff --git a/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch b/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch
new file mode 100644
index 00000000000..56f6bcebf28
--- /dev/null
+++ b/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch
@@ -0,0 +1,29 @@
+diff --git a/qutebrowser/app.py b/qutebrowser/app.py
+index 2b6896b76..ee05f379d 100644
+--- a/qutebrowser/app.py
++++ b/qutebrowser/app.py
+@@ -555,22 +555,8 @@ class Quitter:
+ args: The commandline as a list of strings.
+ cwd: The current working directory as a string.
+ """
+- if os.path.basename(sys.argv[0]) == 'qutebrowser':
+- # Launched via launcher script
+- args = [sys.argv[0]]
+- cwd = None
+- elif hasattr(sys, 'frozen'):
+- args = [sys.executable]
+- cwd = os.path.abspath(os.path.dirname(sys.executable))
+- else:
+- args = [sys.executable, '-m', 'qutebrowser']
+- cwd = os.path.join(
+- os.path.abspath(os.path.dirname(qutebrowser.__file__)), '..')
+- if not os.path.isdir(cwd):
+- # Probably running from a python egg. Let's fallback to
+- # cwd=None and see if that works out.
+- # See https://github.com/qutebrowser/qutebrowser/issues/323
+- cwd = None
++ args = ['@qutebrowser@']
++ cwd = None
+
+ # Add all open pages so they get reopened.
+ page_args = []
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index cdee8111b54..3c127387600 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -39,7 +39,7 @@
# Wrapper runtime
, coreutils
, glibcLocales
-, defaultIconTheme
+, gnome3
, runtimeShell
, shared-mime-info
, gsettings-desktop-schemas
@@ -252,7 +252,7 @@ stdenv.mkDerivation rec {
EOF
WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [
- defaultIconTheme
+ gnome3.adwaita-icon-theme
shared-mime-info
]}
WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index 12cf108355c..1d08895f1b0 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, python3, makeWrapper
-, webkit, glib-networking, gsettings-desktop-schemas, python2Packages
+, webkitgtk, glib-networking, gsettings-desktop-schemas, python2Packages
}:
# This package needs python3 during buildtime,
# but Python 2 + packages during runtime.
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig python3 makeWrapper ];
- buildInputs = [ gsettings-desktop-schemas webkit ];
+ buildInputs = [ gsettings-desktop-schemas webkitgtk ];
propagatedBuildInputs = with python2Packages; [ pygtk six ];
}
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 569a4593dfe..cc9bc38bc4d 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libsoup, webkit, gtk3, glib-networking
+{ stdenv, fetchFromGitHub, pkgconfig, libsoup, webkitgtk, gtk3, glib-networking
, gsettings-desktop-schemas, wrapGAppsHook
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ wrapGAppsHook pkgconfig ];
- buildInputs = [ gtk3 libsoup webkit glib-networking gsettings-desktop-schemas ];
+ buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 9de7518677d..678f226816a 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, glib-networking, gtk2, libsoup, libX11, perl,
- pkgconfig, webkit, gsettings-desktop-schemas }:
+ pkgconfig, webkitgtk, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
version = "1.4.2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings-desktop-schemas ];
+ buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkitgtk gsettings-desktop-schemas ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index ad145583d49..9537f1365bd 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "vivaldi";
- version = "2.3.1440.41-1";
+ version = "2.3.1440.60-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
- sha256 = "0wrq7c0sw1b41bshwgzji4pwl0raj0l5h2r7gkcg952rcn0wl9bs";
+ sha256 = "1vw4lyqs87cw7v1jy3dcsgnb56s61zl21q95a3kiavqw7412sips";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index b303bf2188b..ec2646440b3 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "vivaldi-ffmpeg-codecs";
- version = "72.0.3626.96";
+ version = "72.0.3626.122";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
- sha512 = "2hawkyydcd0b6ipfigkf5n6c1ha1vknaqd4mgw381pi0ayq8skxbjazqabfcg9gcj84cnksi8j4dylfcrbgrmlnmc479fix0m0xx7cl";
+ sha512 = "1477g5dgi4m0zbiqwm9w6jqkmjfmgjlbl3qs9ljldx8bif8my1jbz4hzws954aqxyxdbf5rjpvmrrqqppk5347prvsyl37rbsndaaqf";
};
buildInputs = [ ];
diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix
index 3f019d17702..98d4e25ef87 100644
--- a/pkgs/applications/networking/charles/default.nix
+++ b/pkgs/applications/networking/charles/default.nix
@@ -1,48 +1,68 @@
-{ stdenv, fetchurl, makeDesktopItem, jre, makeWrapper }:
+{
+stdenv
+, makeWrapper
+, makeDesktopItem
+, fetchurl
+, jre
+}:
let
- desktopItem = makeDesktopItem {
- categories = "Network;Development;WebDevelopment;Java;";
- desktopName = "Charles";
- exec = "charles %F";
- genericName = "Web Debugging Proxy";
- icon = "charles-proxy";
- mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace";
- name = "Charles";
- startupNotify = "true";
- };
+ generic = { version, sha256, ... }@attrs:
+ let
+ desktopItem = makeDesktopItem {
+ categories = "Network;Development;WebDevelopment;Java;";
+ desktopName = "Charles";
+ exec = "charles %F";
+ genericName = "Web Debugging Proxy";
+ icon = "charles-proxy";
+ mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace";
+ name = "Charles";
+ startupNotify = "true";
+ };
-in stdenv.mkDerivation rec {
- name = "charles-${version}";
- version = "4.2.7";
+ attrs' = builtins.removeAttrs attrs ["version" "sha256"];
+ in stdenv.mkDerivation rec {
+ name = "charles-${version}";
+ inherit version;
- src = fetchurl {
- url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz";
+ src = fetchurl {
+ url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz";
+ inherit sha256;
+ };
+ buildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ makeWrapper ${jre}/bin/java $out/bin/charles \
+ --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar"
+
+ for fn in lib/*.jar; do
+ install -D -m644 $fn $out/share/java/$(basename $fn)
+ done
+
+ mkdir -p $out/share/applications
+ ln -s ${desktopItem}/share/applications/* $out/share/applications/
+
+ mkdir -p $out/share/icons
+ cp -r icon $out/share/icons/hicolor
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Web Debugging Proxy";
+ homepage = https://www.charlesproxy.com/;
+ maintainers = [ maintainers.kalbasit ];
+ license = stdenv.lib.licenses.unfree;
+ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+ };
+ };
+
+in rec {
+ charles4 = (generic {
+ version = "4.2.7";
sha256 = "1nycw3wpbfwj4ijjaq5k0f4xipj8j605fs0yjzgl66gmv7r583rd";
- };
-
- buildInputs = [ makeWrapper ];
-
- installPhase = ''
- makeWrapper ${jre}/bin/java $out/bin/charles \
- --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar"
-
- for fn in lib/*.jar; do
- install -D -m644 $fn $out/share/java/$(basename $fn)
- done
-
- mkdir -p $out/share/applications
- ln -s ${desktopItem}/share/applications/* $out/share/applications/
-
- mkdir -p $out/share/icons
- cp -r icon $out/share/icons/hicolor
- '';
-
- meta = with stdenv.lib; {
- description = "Web Debugging Proxy";
- homepage = https://www.charlesproxy.com/;
- maintainers = [ maintainers.kalbasit ];
- license = stdenv.lib.licenses.unfree;
- platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
- };
+ });
+ charles3 = (generic {
+ version = "3.12.3";
+ sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss";
+ });
}
+
diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix
index 27e0a038310..6d50c598de7 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -13,10 +13,9 @@ stdenv.mkDerivation rec {
buildInputs = [ removeReferencesTo go ];
- GOCACHE = "off";
-
buildPhase = ''
patchShebangs build.sh
+ export "GOCACHE=$TMPDIR/go-cache"
./build.sh
'';
diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix
index 6a83ac34f3f..cd0ef728f83 100644
--- a/pkgs/applications/networking/cluster/heptio-ark/default.nix
+++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "heptio-ark-${version}";
- version = "0.9.6";
+ version = "0.10.0";
goPackagePath = "github.com/heptio/ark";
@@ -10,10 +10,10 @@ buildGoPackage rec {
rev = "v${version}";
owner = "heptio";
repo = "ark";
- sha256 = "0q353a6f3hvg1gr6rmg8pbqnkrbgjchdr7f6f9503l1qbyyf95fz";
+ sha256 = "18h9hvp95va0hyl268gnzciwy1dqmc57bpifbj885870rdfp0ffv";
};
- postInstall = "rm $bin/bin/generate";
+ postInstall = "rm $bin/bin/issue-template-gen";
meta = with stdenv.lib; {
description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes";
diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
index fe2420a719d..2c7d9c1d5a1 100644
--- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix
+++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
@@ -1,18 +1,19 @@
{ lib, buildGoPackage, fetchFromGitHub, ... }:
-let version = "0.3.1"; in
-
-buildGoPackage {
- name = "hetzner-kube-${version}";
+buildGoPackage rec {
+ pname = "hetzner-kube";
+ version = "0.3.2-rc1";
src = fetchFromGitHub {
owner = "xetys";
repo = "hetzner-kube";
- rev = "${version}";
- sha256 = "1xldh1ca8ym8cg3w5cxizmhqxwi5kmiin28f320mxdr28fzljc2w";
+ rev = version;
+ sha256 = "16pzcpcr98rcrv5k57fa7h9a82wiv4p2ckhkmisynkr7f1xk60mw";
};
goPackagePath = "github.com/xetys/hetzner-kube";
+ subPackages = ["."];
+ goDeps = ./deps.nix;
meta = {
description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud";
diff --git a/pkgs/applications/networking/cluster/hetzner-kube/deps.nix b/pkgs/applications/networking/cluster/hetzner-kube/deps.nix
new file mode 100644
index 00000000000..7b4328eddfc
--- /dev/null
+++ b/pkgs/applications/networking/cluster/hetzner-kube/deps.nix
@@ -0,0 +1,255 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+ {
+ goPackagePath = "github.com/Pallinder/go-randomdata";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Pallinder/go-randomdata";
+ rev = "15df0648130a623e418886f81b2aaecd0a00547b";
+ sha256 = "1kdrchnhp71spz6amcbxr5m0pdksbqx8jjydvxb82pw43rrbx6s7";
+ };
+ }
+ {
+ goPackagePath = "github.com/andreyvit/diff";
+ fetch = {
+ type = "git";
+ url = "https://github.com/andreyvit/diff";
+ rev = "c7f18ee00883bfd3b00e0a2bf7607827e0148ad4";
+ sha256 = "1s4qjkxig5yqahpzfl4xqh4kzi9mymdpkzq6kj3f4dr5dl3hlynr";
+ };
+ }
+ {
+ goPackagePath = "github.com/fsnotify/fsnotify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-kit/kit";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kit/kit";
+ rev = "ca4112baa34cb55091301bdc13b1420a122b1b9e";
+ sha256 = "0vsqmjnd3zj3qxg455kz27fjd9zh2vx5x17hfgzjv2pqsg3jas13";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-logfmt/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-logfmt/logfmt";
+ rev = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5";
+ sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-stack/stack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-stack/stack";
+ rev = "259ab82a6cad3992b4e21ff5cac294ccb06474bc";
+ sha256 = "0irkqifyj84cbnq4n66ax2r591id2285diw5hzcz2k3bga8d8lqr";
+ };
+ }
+ {
+ goPackagePath = "github.com/gosuri/uilive";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gosuri/uilive";
+ rev = "ac356e6e42cd31fcef8e6aec13ae9ed6fe87713e";
+ sha256 = "1k28zbc14p1yqzhamp9rcagjdw6wsdb55m08nx758jwlr31az6jy";
+ };
+ }
+ {
+ goPackagePath = "github.com/gosuri/uiprogress";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gosuri/uiprogress";
+ rev = "d0567a9d84a1c40dd7568115ea66f4887bf57b33";
+ sha256 = "1m7rxf71mn8w2yysc8wmf2703avhci6f4nkiijjl1f2cx4kzykck";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/hcl";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/hcl";
+ rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
+ sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
+ };
+ }
+ {
+ goPackagePath = "github.com/hetznercloud/hcloud-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hetznercloud/hcloud-go";
+ rev = "400c6f026bf3c8d5fead3df7806e6981a16bb6b8";
+ sha256 = "0y6y7glnzbrzmly2j139vj8279w3c8bm1zc2mzljwyjpa6pvp7di";
+ };
+ }
+ {
+ goPackagePath = "github.com/inconshreveable/mousetrap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/inconshreveable/mousetrap";
+ rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/logfmt";
+ rev = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0";
+ sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+ };
+ }
+ {
+ goPackagePath = "github.com/magiconair/properties";
+ fetch = {
+ type = "git";
+ url = "https://github.com/magiconair/properties";
+ rev = "c2353362d570a7bfa228149c62842019201cfb71";
+ sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
+ sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/go-homedir";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-homedir";
+ rev = "58046073cbffe2f25d425fe1331102f55cf719de";
+ sha256 = "0kwflrwsjdsy8vbhyzicc4c2vdi7lhdvn4rarfr18x1qsrb7n1bx";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/mapstructure";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/mapstructure";
+ rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac";
+ sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al";
+ };
+ }
+ {
+ goPackagePath = "github.com/pelletier/go-toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pelletier/go-toml";
+ rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194";
+ sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
+ };
+ }
+ {
+ goPackagePath = "github.com/sergi/go-diff";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sergi/go-diff";
+ rev = "1744e2970ca51c86172c8190fadad617561ed6e7";
+ sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/afero";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/afero";
+ rev = "787d034dfe70e44075ccc060d346146ef53270ad";
+ sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cast";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cast";
+ rev = "8965335b8c7107321228e3e3702cab9832751bac";
+ sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cobra";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cobra";
+ rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
+ sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/jwalterweatherman";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/jwalterweatherman";
+ rev = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2";
+ sha256 = "1f9154lijbz0kkgqwmbphykwl4adv4fvkx6n1p7fdq3x5j9g8i17";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/pflag";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/pflag";
+ rev = "9a97c102cda95a86cec2345a6f09f55a939babf5";
+ sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/viper";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/viper";
+ rev = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9";
+ sha256 = "177ziws6mwxdlvicmgpv7w7zy5ri2wgnw2f2v3789b5skv9d6a6b";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "de0752318171da717af4ce24d0a2e8626afaeb11";
+ sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "1c9583448a9c3aa0f9a6a5241bf73c0bd8aafded";
+ sha256 = "0g0nc549pmdmvja4mdqh0kgvznnw6wliqmx5wrnj02l3a23vizmi";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-yaml/yaml";
+ rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ };
+ }
+]
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix
new file mode 100644
index 00000000000..c31389a78c2
--- /dev/null
+++ b/pkgs/applications/networking/cluster/jx/default.nix
@@ -0,0 +1,59 @@
+{ buildGoPackage, fetchFromGitHub, lib }:
+
+let
+ removeVendoredPackages = goDeps:
+ ''
+ echo "Removing any vendored duplicate of direct dependency... "
+ for dir in $(find $NIX_BUILD_TOP/go/src -type d -name vendor); do
+ ${builtins.concatStringsSep "\n" (map (goDep: ''
+ if test -d $dir/${goDep.goPackagePath}; then
+ echo "Removing duplicate directory at $dir/${goDep.goPackagePath}"
+ rm -rf $dir/${goDep.goPackagePath}
+ fi
+ '') goDeps)}
+ done
+ echo "Done"
+ '';
+in
+buildGoPackage rec {
+ name = "jx";
+ version = "1.3.955";
+
+ goPackagePath = "github.com/jenkins-x/jx";
+ subPackages = [ "cmd/jx" ];
+
+ src = fetchFromGitHub {
+ owner = "jenkins-x";
+ repo = "jx";
+ rev = "v${version}";
+ sha256 = "0h4ck1a8rlyg10gaxbnwvlabwjlhdrigrina84x4m2gsqr3lnp9a";
+ };
+
+ # Some of the dependencies have their own checked in vendor directory that
+ # vendor their dependencies. However, some of those dependencies are also
+ # directly pulled down through the vgo modules. Removing these dependencies
+ # as they confuse the go compiler and causes the build to fail.
+ # Removing all the vendor directories also breaks the build.
+ preBuild = removeVendoredPackages (import goDeps);
+
+ buildFlagsArray = ''
+ -ldflags=
+ -X ${goPackagePath}/pkg/version.Version=${version}
+ -X ${goPackagePath}/pkg/version.Revision=${version}
+ '';
+
+ goDeps = ./deps.nix;
+
+ meta = with lib; {
+ description = "JX is a command line tool for installing and using Jenkins X.";
+ longDescription = ''
+ Jenkins X provides automated CI+CD for Kubernetes with Preview
+ Environments on Pull Requests using Jenkins, Knative Build, Prow,
+ Skaffold and Helm.
+ '';
+ homepage = https://github.com/jenkins-x/jx;
+ license = licenses.asl20 ;
+ maintainers = with maintainers; [ kalbasit ];
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/jx/deps.nix b/pkgs/applications/networking/cluster/jx/deps.nix
new file mode 100644
index 00000000000..1e8beb18738
--- /dev/null
+++ b/pkgs/applications/networking/cluster/jx/deps.nix
@@ -0,0 +1,3380 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+# file was patched manually to account for the `replace` statements in the
+# upstream go.mod that's not yet supported by vgo2nix.
+[
+ {
+ goPackagePath = "cloud.google.com/go";
+ fetch = {
+ type = "git";
+ url = "https://code.googlesource.com/gocloud";
+ rev = "v0.34.0";
+ sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai";
+ };
+ }
+ {
+ goPackagePath = "code.gitea.io/sdk";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-gitea/go-sdk";
+ rev = "79a281c4e34a";
+ sha256 = "1bkcsmjagsyaynyi562rsi3xvypnb2z38inq6ni5k9mxk9q5r8h0";
+ };
+ }
+ {
+ goPackagePath = "contrib.go.opencensus.io/exporter/aws";
+ fetch = {
+ type = "git";
+ url = "https://github.com/census-ecosystem/opencensus-go-exporter-aws";
+ rev = "dd54a7ef511e";
+ sha256 = "05xs00w0miw7ci329dmfhxdav3wfjcn3z63px7s8cqd78k18a4sn";
+ };
+ }
+ {
+ goPackagePath = "contrib.go.opencensus.io/exporter/stackdriver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver";
+ rev = "v0.6.0";
+ sha256 = "0qhxpfmzn5jsh1qrq7w2zkg87xvalqam2ciq65qfq38mfkssda3v";
+ };
+ }
+ {
+ goPackagePath = "contrib.go.opencensus.io/integrations/ocsql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/opencensus-integrations/ocsql";
+ rev = "v0.1.2";
+ sha256 = "0rs8dyr8jp4907h8f6ih3bgqbqjhq9q7m8b3pfvargmr7kq5si70";
+ };
+ }
+ {
+ goPackagePath = "git.apache.org/thrift.git";
+ fetch = {
+ type = "git";
+ url = "https://github.com/apache/thrift.git";
+ rev = "2566ecd5d999";
+ sha256 = "14gl0j85x3hj3gncf417f8zf92phrpvkj4clxmvbcq1dcgjdn6mc";
+ };
+ }
+ {
+ goPackagePath = "github.com/Azure/azure-pipeline-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Azure/azure-pipeline-go";
+ rev = "v0.1.8";
+ sha256 = "0p2m31l893377na7dmsjfpjd5swqnb7p0vhsng3vyn237i8f1336";
+ };
+ }
+ {
+ goPackagePath = "github.com/Azure/azure-sdk-for-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Azure/azure-sdk-for-go";
+ rev = "v21.1.0";
+ sha256 = "1rway7ksn6c98pxs036hl8nvljs3vxspgsjj9y1ncc0vzavg29d1";
+ };
+ }
+ {
+ goPackagePath = "github.com/Azure/azure-storage-blob-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Azure/azure-storage-blob-go";
+ rev = "cf01652132cc";
+ sha256 = "0pcb59nsn094flpqwl7yz7cqvvwki0wam9r8gjbzqbsjn7ib3gac";
+ };
+ }
+ {
+ goPackagePath = "github.com/Azure/draft";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Azure/draft";
+ rev = "v0.15.0";
+ sha256 = "03396zlalfsdxaiqpb97m8x9r060yyydvh0dkg7506pz5zrfm4pn";
+ };
+ }
+ {
+ goPackagePath = "github.com/Azure/go-ansiterm";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Azure/go-ansiterm";
+ rev = "d6e3b3328b78";
+ sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q";
+ };
+ }
+ {
+ goPackagePath = "github.com/Azure/go-autorest";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Azure/go-autorest";
+ rev = "v10.15.5";
+ sha256 = "158xbd8wn1bna1k1ichlirz6a1zvlh3rg7klr9cnp72l2q8jwvcl";
+ };
+ }
+ {
+ goPackagePath = "github.com/BurntSushi/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/toml";
+ rev = "v0.3.0";
+ sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry";
+ };
+ }
+ {
+ goPackagePath = "github.com/DataDog/datadog-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/DataDog/datadog-go";
+ rev = "281ae9f2d895";
+ sha256 = "1n82vl636zcpfrhh7yhmszvdxdba5hn2fjl39dvnk0a8pm2afmkx";
+ };
+ }
+ {
+ goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/GoogleCloudPlatform/cloudsql-proxy";
+ rev = "ac834ce67862";
+ sha256 = "07n2hfhqa9hinabmx79aqqwxzzkky76x3jvpd89kch14fijbh532";
+ };
+ }
+ {
+ goPackagePath = "github.com/IBM-Cloud/bluemix-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/IBM-Cloud/bluemix-go";
+ rev = "d718d474c7c2";
+ sha256 = "1div1yrr7lbamh469hkd41acbjsln7jyaf0kzjxbjgb4rwmnh2jk";
+ };
+ }
+ {
+ goPackagePath = "github.com/Jeffail/gabs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Jeffail/gabs";
+ rev = "v1.1.1";
+ sha256 = "1lk6cn7fnnfyq8xb0xlv8zv3gvdd0vb2g8ikc9rfcppl7hwy51n8";
+ };
+ }
+ {
+ goPackagePath = "github.com/MakeNowJust/heredoc";
+ fetch = {
+ type = "git";
+ url = "https://github.com/MakeNowJust/heredoc";
+ rev = "e9091a26100e";
+ sha256 = "04lh2vm6d6s1vikzh9xb4ya744snr5c4v5797y2b8ri4pyfgd9h2";
+ };
+ }
+ {
+ goPackagePath = "github.com/Masterminds/semver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Masterminds/semver";
+ rev = "v1.4.2";
+ sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj";
+ };
+ }
+ {
+ goPackagePath = "github.com/Masterminds/sprig";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Masterminds/sprig";
+ rev = "6b2a58267f6a";
+ sha256 = "10vzhx710vaxqzh45vrkw4vc3fgcbycpn04shcylzcmlxmfnpjv1";
+ };
+ }
+ {
+ goPackagePath = "github.com/Microsoft/go-winio";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Microsoft/go-winio";
+ rev = "v0.4.6";
+ sha256 = "0i3z8yrxlldq0n70ic30517437jzzxmvbglhbxrz75qnlzrglhlp";
+ };
+ }
+ {
+ goPackagePath = "github.com/NYTimes/gziphandler";
+ fetch = {
+ type = "git";
+ url = "https://github.com/NYTimes/gziphandler";
+ rev = "63027b26b87e";
+ sha256 = "1px0rlhxpap7rk37w0qlq66zzxwfvbpdc2sps2i2rqxgd3w5n31g";
+ };
+ }
+ {
+ goPackagePath = "github.com/Netflix/go-expect";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Netflix/go-expect";
+ rev = "124a37274874";
+ sha256 = "1cq3d7d4cpwgyzb0syka4a4dspcymq5582qzvbdkbkc4s81kjr4c";
+ };
+ }
+ {
+ goPackagePath = "github.com/Nvveen/Gotty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Nvveen/Gotty";
+ rev = "cd527374f1e5";
+ sha256 = "1ylvr1p6p036ns3g3wdz8f92f69symshkc8j54fa6gpg4hyk0k6q";
+ };
+ }
+ {
+ goPackagePath = "github.com/Pallinder/go-randomdata";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Pallinder/go-randomdata";
+ rev = "15df0648130a";
+ sha256 = "1kdrchnhp71spz6amcbxr5m0pdksbqx8jjydvxb82pw43rrbx6s7";
+ };
+ }
+ {
+ goPackagePath = "github.com/PuerkitoBio/purell";
+ fetch = {
+ type = "git";
+ url = "https://github.com/PuerkitoBio/purell";
+ rev = "v1.1.0";
+ sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91";
+ };
+ }
+ {
+ goPackagePath = "github.com/PuerkitoBio/urlesc";
+ fetch = {
+ type = "git";
+ url = "https://github.com/PuerkitoBio/urlesc";
+ rev = "de5bf2ad4578";
+ sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw";
+ };
+ }
+ {
+ goPackagePath = "github.com/SAP/go-hdb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/SAP/go-hdb";
+ rev = "v0.13.2";
+ sha256 = "0gzw594y039chx22a3zn9y3j2y6bqsgi9zq7lzpf7schzl52ii7h";
+ };
+ }
+ {
+ goPackagePath = "github.com/SermoDigital/jose";
+ fetch = {
+ type = "git";
+ url = "https://github.com/SermoDigital/jose";
+ rev = "v0.9.1";
+ sha256 = "0fc6w0hl9n39ixpayg1j3b4nvnr06bgvhqx5mxgxcydjci5pqi8m";
+ };
+ }
+ {
+ goPackagePath = "github.com/StackExchange/wmi";
+ fetch = {
+ type = "git";
+ url = "https://github.com/StackExchange/wmi";
+ rev = "5d049714c4a6";
+ sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk";
+ };
+ }
+ {
+ goPackagePath = "github.com/acarl005/stripansi";
+ fetch = {
+ type = "git";
+ url = "https://github.com/acarl005/stripansi";
+ rev = "5a71ef0e047d";
+ sha256 = "02sxiishdixm791jqbkmhdcvc712l0fb8rqmibxzgc61h0qs6rs3";
+ };
+ }
+ {
+ goPackagePath = "github.com/alcortesm/tgz";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alcortesm/tgz";
+ rev = "9c5fe88206d7";
+ sha256 = "04dcwnz2c2i4wbq2vx3g2wrdgqpncr2r1h6p1k08rdwk4bq1h8c5";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/template";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/template";
+ rev = "a0175ee3bccc";
+ sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/units";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/units";
+ rev = "2efee857e7cf";
+ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+ };
+ }
+ {
+ goPackagePath = "github.com/alexflint/go-filemutex";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alexflint/go-filemutex";
+ rev = "d358565f3c3f";
+ sha256 = "19fzbm0x8821awsmqj9ig49dxxkd72p1yfqbijmdwwszvw2r0ggz";
+ };
+ }
+ {
+ goPackagePath = "github.com/andygrunwald/go-gerrit";
+ fetch = {
+ type = "git";
+ url = "https://github.com/andygrunwald/go-gerrit";
+ rev = "43cfd7a94eb4";
+ sha256 = "1350r7pvvgl26kiiz4x96ac5gym2xc9968ddx18z8wlv776azidr";
+ };
+ }
+ {
+ goPackagePath = "github.com/andygrunwald/go-jira";
+ fetch = {
+ type = "git";
+ url = "https://github.com/andygrunwald/go-jira";
+ rev = "v1.5.0";
+ sha256 = "13fp8qim22znvlqclsg2sdlpvbnmgh549rrsa9cxk04klgaapdqy";
+ };
+ }
+ {
+ goPackagePath = "github.com/anmitsu/go-shlex";
+ fetch = {
+ type = "git";
+ url = "https://github.com/anmitsu/go-shlex";
+ rev = "648efa622239";
+ sha256 = "10rgdp5d106iisgz25ic8k6f44s9adh4sjh6fyxq9ccm21gw49b7";
+ };
+ }
+ {
+ goPackagePath = "github.com/antham/chyle";
+ fetch = {
+ type = "git";
+ url = "https://github.com/antham/chyle";
+ rev = "v1.4.0";
+ sha256 = "144ja4g7b238dm3hwgqbl71skxp5mx7438w78hjpbfn5zq2cbrs2";
+ };
+ }
+ {
+ goPackagePath = "github.com/antham/envh";
+ fetch = {
+ type = "git";
+ url = "https://github.com/antham/envh";
+ rev = "v1.2.0";
+ sha256 = "0l0mn4vwns9b6faxvx464a38mjgk5rhn58sxai1g7l8c3qqr3g0h";
+ };
+ }
+ {
+ goPackagePath = "github.com/antham/strumt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/antham/strumt";
+ rev = "6776189777d3";
+ sha256 = "0m7xhjnfpxvhx3a59k46k33i0zmy427vxmx67smndjxgxgmpqzd0";
+ };
+ }
+ {
+ goPackagePath = "github.com/aokoli/goutils";
+ fetch = {
+ type = "git";
+ url = "https://github.com/aokoli/goutils";
+ rev = "v1.0.1";
+ sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n";
+ };
+ }
+ {
+ goPackagePath = "github.com/armon/circbuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/armon/circbuf";
+ rev = "bbbad097214e";
+ sha256 = "1idpr0lzb2px2p3wgfq2276yl7jpaz43df6n91kf790404s4zmk3";
+ };
+ }
+ {
+ goPackagePath = "github.com/armon/go-metrics";
+ fetch = {
+ type = "git";
+ url = "https://github.com/armon/go-metrics";
+ rev = "f0300d1749da";
+ sha256 = "13l7c35ps0r27vxfil2w0xhhc7w5rh00awvlmn4cz0a937b9ffpv";
+ };
+ }
+ {
+ goPackagePath = "github.com/armon/go-radix";
+ fetch = {
+ type = "git";
+ url = "https://github.com/armon/go-radix";
+ rev = "v1.0.0";
+ sha256 = "1m1k0jz9gjfrk4m7hjm7p03qmviamfgxwm2ghakqxw3hdds8v503";
+ };
+ }
+ {
+ goPackagePath = "github.com/asaskevich/govalidator";
+ fetch = {
+ type = "git";
+ url = "https://github.com/asaskevich/govalidator";
+ rev = "f9ffefc3facf";
+ sha256 = "02rsz7v49in9bmgsjciqcyik9xmy3yfz0znw739ssgy6px00cg04";
+ };
+ }
+ {
+ goPackagePath = "github.com/aws/aws-k8s-tester";
+ fetch = {
+ type = "git";
+ url = "https://github.com/aws/aws-k8s-tester";
+ rev = "b411acf57dfe";
+ sha256 = "1yhgmkdd003v99w9kdl96phfmg3f3a5ahmn49srdbakc3p1wwxh8";
+ };
+ }
+ {
+ goPackagePath = "github.com/aws/aws-sdk-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/aws/aws-sdk-go";
+ rev = "v1.16.20";
+ sha256 = "0a5wwmjmlbdgmsv1myxr9vmr9k9cic5d31kc30qbasm7p15ljxr1";
+ };
+ }
+ {
+ goPackagePath = "github.com/banzaicloud/bank-vaults";
+ fetch = {
+ type = "git";
+ url = "https://github.com/banzaicloud/bank-vaults";
+ rev = "e31657d7c4fe";
+ sha256 = "0f642k5prrvq7wcm96hk7vw8ma86x7k1bvkr8mrcvabnvvp5jcfk";
+ };
+ }
+ {
+ goPackagePath = "github.com/bazelbuild/buildtools";
+ fetch = {
+ type = "git";
+ url = "https://github.com/bazelbuild/buildtools";
+ rev = "80c7f0d45d7e";
+ sha256 = "1r2590m283k2449ikjmvrifz1ik8gn4wyq563r4v03ssylf3rv40";
+ };
+ }
+ {
+ goPackagePath = "github.com/beevik/etree";
+ fetch = {
+ type = "git";
+ url = "https://github.com/beevik/etree";
+ rev = "v1.0.1";
+ sha256 = "0f3lj7azxd5qq29hqd32211ds7n56i3rgmfll6c1f4css1f3srxg";
+ };
+ }
+ {
+ goPackagePath = "github.com/beorn7/perks";
+ fetch = {
+ type = "git";
+ url = "https://github.com/beorn7/perks";
+ rev = "3a771d992973";
+ sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
+ };
+ }
+ {
+ goPackagePath = "github.com/bgentry/speakeasy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/bgentry/speakeasy";
+ rev = "v0.1.0";
+ sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s";
+ };
+ }
+ {
+ goPackagePath = "github.com/bitly/go-hostpool";
+ fetch = {
+ type = "git";
+ url = "https://github.com/bitly/go-hostpool";
+ rev = "a3a6125de932";
+ sha256 = "1m82mvnfw6k2ylpn598bcsg8mdgbq4fnsk7yc23hpvps9glsrbb6";
+ };
+ }
+ {
+ goPackagePath = "github.com/blang/semver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/blang/semver";
+ rev = "v3.5.1";
+ sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
+ };
+ }
+ {
+ goPackagePath = "github.com/bmizerany/assert";
+ fetch = {
+ type = "git";
+ url = "https://github.com/bmizerany/assert";
+ rev = "b7ed37b82869";
+ sha256 = "18hy1wyl9zdi7sgxafrn3m7fadh6in0rhhb8l0cvkxqzdl0jcw2s";
+ };
+ }
+ {
+ goPackagePath = "github.com/bouk/monkey";
+ fetch = {
+ type = "git";
+ url = "https://github.com/bouk/monkey";
+ rev = "v1.0.0";
+ sha256 = "1ngcjmn6bys10zd22x8fh5lf0iyqkjqmbx47b0inw9ddh56sdzph";
+ };
+ }
+ {
+ goPackagePath = "github.com/bwmarrin/snowflake";
+ fetch = {
+ type = "git";
+ url = "https://github.com/bwmarrin/snowflake";
+ rev = "68117e6bbede";
+ sha256 = "1zpjxm82d55map8bvvpa1l9xjxg03005dza3rd7a6bapm31f3107";
+ };
+ }
+ {
+ goPackagePath = "github.com/c2h5oh/datasize";
+ fetch = {
+ type = "git";
+ url = "https://github.com/c2h5oh/datasize";
+ rev = "4eba002a5eae";
+ sha256 = "02sxd659q7m7axfywiqfxk5rh6djh2m5240bin1makldj1nj16j3";
+ };
+ }
+ {
+ goPackagePath = "github.com/cenkalti/backoff";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cenkalti/backoff";
+ rev = "v2.0.0";
+ sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr";
+ };
+ }
+ {
+ goPackagePath = "github.com/chai2010/gettext-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/chai2010/gettext-go";
+ rev = "bf70f2a70fb1";
+ sha256 = "0bwjwvjl7zqm7kxram1rzz0ri3h897kiin13ljy9hx3fzz1i9lml";
+ };
+ }
+ {
+ goPackagePath = "github.com/chromedp/cdproto";
+ fetch = {
+ type = "git";
+ url = "https://github.com/chromedp/cdproto";
+ rev = "57cf4773008d";
+ sha256 = "1m9qq4nvdj5rbpq123s88agiv3604lvg0q2af7fhr1m16rs4xg1k";
+ };
+ }
+ {
+ goPackagePath = "github.com/chromedp/chromedp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/chromedp/chromedp";
+ rev = "v0.1.1";
+ sha256 = "1wcj54ff3qa6sypl8bdaabwlhf3v9b7br3nr9rq0ls64jfdw1sla";
+ };
+ }
+ {
+ goPackagePath = "github.com/circonus-labs/circonus-gometrics";
+ fetch = {
+ type = "git";
+ url = "https://github.com/circonus-labs/circonus-gometrics";
+ rev = "v2.2.6";
+ sha256 = "11j6bm05baskaavjzjkf48jkxis5sk621wkvi3j2315abkyhsf6f";
+ };
+ }
+ {
+ goPackagePath = "github.com/client9/misspell";
+ fetch = {
+ type = "git";
+ url = "https://github.com/client9/misspell";
+ rev = "v0.3.4";
+ sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
+ };
+ }
+ {
+ goPackagePath = "github.com/codeship/codeship-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/codeship/codeship-go";
+ rev = "7793ca823354";
+ sha256 = "1jr93ddbb1v27vd4w8wx2dcha8g32gc6rl0chyz75rmypi6888h7";
+ };
+ }
+ {
+ goPackagePath = "github.com/containerd/continuity";
+ fetch = {
+ type = "git";
+ url = "https://github.com/containerd/continuity";
+ rev = "004b46473808";
+ sha256 = "0js7wjap44db6vvdpz4dvblqx6j36r1kb09ggvlwx4inkwg2ds2d";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/bbolt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/bbolt";
+ rev = "v1.3.1-coreos.6";
+ sha256 = "0r39wj5fv6d7nkkirjnnrnhikcp6sqa5dgmr6cimz5s0smvfm8vw";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/etcd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/etcd";
+ rev = "v3.3.10";
+ sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-semver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-semver";
+ rev = "v0.2.0";
+ sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-systemd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-systemd";
+ rev = "c6f51f82210d";
+ sha256 = "1vnccmnkjl6n539l4cliz6sznpqn6igf5v7mbmsgahb838742clb";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/pkg";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/pkg";
+ rev = "399ea9e2e55f";
+ sha256 = "0nxbn0m7lr4dg0yrwnvlkfiyg3ndv8vdpssjx7b714nivpc6ar0y";
+ };
+ }
+ {
+ goPackagePath = "github.com/cpuguy83/go-md2man";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cpuguy83/go-md2man";
+ rev = "v1.0.8";
+ sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2";
+ };
+ }
+ {
+ goPackagePath = "github.com/danwakefield/fnmatch";
+ fetch = {
+ type = "git";
+ url = "https://github.com/danwakefield/fnmatch";
+ rev = "cbb64ac3d964";
+ sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "v1.1.1";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+ };
+ }
+ {
+ goPackagePath = "github.com/deckarep/golang-set";
+ fetch = {
+ type = "git";
+ url = "https://github.com/deckarep/golang-set";
+ rev = "1d4478f51bed";
+ sha256 = "01kaqrc5ywbwa46b6lz3db7kkg8q6v383h4lnxds4z3kjglkqaff";
+ };
+ }
+ {
+ goPackagePath = "github.com/denisenkom/go-mssqldb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/denisenkom/go-mssqldb";
+ rev = "2fea367d496d";
+ sha256 = "0qq3b68ziqhfy8j9xrzpq2czsbacakbraicm7gp7l6mdbifi06zr";
+ };
+ }
+ {
+ goPackagePath = "github.com/denormal/go-gitignore";
+ fetch = {
+ type = "git";
+ url = "https://github.com/denormal/go-gitignore";
+ rev = "75ce8f3e513c";
+ sha256 = "0yqicwkrw7plrc6zybv025ssaqzhy01s0c7x8ifp0x3vmxrzy57k";
+ };
+ }
+ {
+ goPackagePath = "github.com/dgrijalva/jwt-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dgrijalva/jwt-go";
+ rev = "v3.2.0";
+ sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+ };
+ }
+ {
+ goPackagePath = "github.com/disintegration/imaging";
+ fetch = {
+ type = "git";
+ url = "https://github.com/disintegration/imaging";
+ rev = "v1.4.2";
+ sha256 = "0dzwqy1xcm0d481z1fa2r60frdlf5fzjligpiqh5g8lhqskk2lx8";
+ };
+ }
+ {
+ goPackagePath = "github.com/djherbis/atime";
+ fetch = {
+ type = "git";
+ url = "https://github.com/djherbis/atime";
+ rev = "v1.0.0";
+ sha256 = "1zwxsk2r2p53qpgsxkky4x1gvxca4fx6qy9y10jvgpn4wf57m4ja";
+ };
+ }
+ {
+ goPackagePath = "github.com/dnaeon/go-vcr";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dnaeon/go-vcr";
+ rev = "v1.0.1";
+ sha256 = "1d0kpqr12qrqlamz5a47bp05mx49za2v6l1k7c6z71xahfmb7v2d";
+ };
+ }
+ {
+ goPackagePath = "github.com/docker/distribution";
+ fetch = {
+ type = "git";
+ url = "https://github.com/docker/distribution";
+ rev = "edc3ab29cdff";
+ sha256 = "1nqjaq1q6fs3c0avpb02sib0a906xfbk3m74hk2mqjdbyx9y8b4m";
+ };
+ }
+ {
+ goPackagePath = "github.com/docker/docker";
+ fetch = {
+ type = "git";
+ url = "https://github.com/docker/docker";
+ rev = "5e5fadb3c020";
+ sha256 = "14rbpynz304xh0aqphjspld3955wcis1d1gcg4dicw0q1klhhw8v";
+ };
+ }
+ {
+ goPackagePath = "github.com/docker/go-connections";
+ fetch = {
+ type = "git";
+ url = "https://github.com/docker/go-connections";
+ rev = "v0.3.0";
+ sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0";
+ };
+ }
+ {
+ goPackagePath = "github.com/docker/go-units";
+ fetch = {
+ type = "git";
+ url = "https://github.com/docker/go-units";
+ rev = "v0.3.2";
+ sha256 = "1sqwvcszxqpv77xf2d8fxvryxphdwj9v8f93231wpnk9kpilhyii";
+ };
+ }
+ {
+ goPackagePath = "github.com/docker/spdystream";
+ fetch = {
+ type = "git";
+ url = "https://github.com/docker/spdystream";
+ rev = "bc6354cbbc29";
+ sha256 = "08746a15snvmax6cnzn2qy7cvsspxbsx97vdbjpdadir3pypjxya";
+ };
+ }
+ {
+ goPackagePath = "github.com/dsnet/compress";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dsnet/compress";
+ rev = "cc9eb1d7ad76";
+ sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx";
+ };
+ }
+ {
+ goPackagePath = "github.com/duosecurity/duo_api_golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/duosecurity/duo_api_golang";
+ rev = "539434bf0d45";
+ sha256 = "1dzf280gin51gww2hkcc5r5dmrjfjirsmkmksjw2ipkgy8kp40nz";
+ };
+ }
+ {
+ goPackagePath = "github.com/dustin/go-humanize";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dustin/go-humanize";
+ rev = "v1.0.0";
+ sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
+ };
+ }
+ {
+ goPackagePath = "github.com/elazarl/go-bindata-assetfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/elazarl/go-bindata-assetfs";
+ rev = "v1.0.0";
+ sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp";
+ };
+ }
+ {
+ goPackagePath = "github.com/elazarl/goproxy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/elazarl/goproxy";
+ rev = "2ce16c963a8a";
+ sha256 = "1jdgwbma4zs77w66y6hf7677hwpww1wzw27qdk1dr0pms0y7zlzp";
+ };
+ }
+ {
+ goPackagePath = "github.com/emicklei/go-restful";
+ fetch = {
+ type = "git";
+ url = "https://github.com/emicklei/go-restful";
+ rev = "v2.8.0";
+ sha256 = "1zqcjhg4q7788hyrkhwg4b6r1vc4qnzbw8c5j994mr18x42brxzg";
+ };
+ }
+ {
+ goPackagePath = "github.com/emirpasic/gods";
+ fetch = {
+ type = "git";
+ url = "https://github.com/emirpasic/gods";
+ rev = "v1.9.0";
+ sha256 = "1zhkppqzy149fp561pif8d5d92jd9chl3l9z4yi5f8n60ibdmmjf";
+ };
+ }
+ {
+ goPackagePath = "github.com/erikstmartin/go-testdb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/erikstmartin/go-testdb";
+ rev = "8d10e4a1bae5";
+ sha256 = "1fhrqcpv8x74qwxx9gpnhgqbz5wkp2bnsq92w418l1fnrgh4ppmq";
+ };
+ }
+ {
+ goPackagePath = "github.com/evanphx/json-patch";
+ fetch = {
+ type = "git";
+ url = "https://github.com/evanphx/json-patch";
+ rev = "v4.1.0";
+ sha256 = "1yqakqyqspdwpq2dzvrd9rb79z24zmrafscj284dnrl421ns3zvh";
+ };
+ }
+ {
+ goPackagePath = "github.com/fatih/color";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fatih/color";
+ rev = "v1.7.0";
+ sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
+ };
+ }
+ {
+ goPackagePath = "github.com/fatih/structs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fatih/structs";
+ rev = "v1.0.0";
+ sha256 = "040grl40gcqd1y852lnf0l1l5wi73g0crnaihzl0nfsas9ydk3h4";
+ };
+ }
+ {
+ goPackagePath = "github.com/flynn/go-shlex";
+ fetch = {
+ type = "git";
+ url = "https://github.com/flynn/go-shlex";
+ rev = "3f9db97f8568";
+ sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia";
+ };
+ }
+ {
+ goPackagePath = "github.com/fsnotify/fsnotify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "github.com/fsouza/fake-gcs-server";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fsouza/fake-gcs-server";
+ rev = "e85be23bdaa8";
+ sha256 = "185kw9cap458s9ldlb2nm0vlwx82rd6jnx13600p8hnb5y36fjw7";
+ };
+ }
+ {
+ goPackagePath = "github.com/gfleury/go-bitbucket-v1";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gfleury/go-bitbucket-v1";
+ rev = "3a732135aa4d";
+ sha256 = "0bnzxd1p6kbv3cym38l0kry1jbxhyz905lkbkhmiswmjg7mmlq1k";
+ };
+ }
+ {
+ goPackagePath = "github.com/ghodss/yaml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ghodss/yaml";
+ rev = "v1.0.0";
+ sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
+ };
+ }
+ {
+ goPackagePath = "github.com/gliderlabs/ssh";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gliderlabs/ssh";
+ rev = "v0.1.1";
+ sha256 = "0bylkc7yg8bxxffhchikcnzwli5n95cfmbji6v2a4mn1h5n36mdm";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-ini/ini";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-ini/ini";
+ rev = "v1.39.0";
+ sha256 = "0j7pyl5v7xfzkhsyz193iq56ilan69pp11g2n5jw1k4h4g8s4k9b";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-kit/kit";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kit/kit";
+ rev = "v0.8.0";
+ sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-ldap/ldap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-ldap/ldap";
+ rev = "v3.0.1";
+ sha256 = "0dn4v340wdrfhah5kp2pyi69a1kwwllrz84whsiiwbial8fac483";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-logfmt/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-logfmt/logfmt";
+ rev = "v0.3.0";
+ sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-ole/go-ole";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-ole/go-ole";
+ rev = "v1.2.1";
+ sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-openapi/jsonpointer";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-openapi/jsonpointer";
+ rev = "v0.17.0";
+ sha256 = "0sv2k1fwj6rsigc9489c19ap0jib1d0widm040h0sjdw2nadh3i2";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-openapi/jsonreference";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-openapi/jsonreference";
+ rev = "v0.17.0";
+ sha256 = "1d0rk17wn755xsfi9pxifdpgs2p23bc0rkf95kjwxczyy6jbqdaj";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-openapi/spec";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-openapi/spec";
+ rev = "v0.17.1";
+ sha256 = "14n5x2nxlj2x62v3km96yw7rncxk2b9v94k3j0c22r43c60m38mx";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-openapi/swag";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-openapi/swag";
+ rev = "v0.17.0";
+ sha256 = "1hhgbx59f7lcsqiza2is8q9walhf8mxfkwj7xql1scrn6ms2jmlv";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-sql-driver/mysql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-sql-driver/mysql";
+ rev = "v1.4.0";
+ sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-stack/stack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-stack/stack";
+ rev = "v1.8.0";
+ sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-test/deep";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-test/deep";
+ rev = "v1.0.1";
+ sha256 = "0f4rbdl6qmlq4bzh0443i634bm675bbrkyzwp8wkc1yhdl9qsij7";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-yaml/yaml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-yaml/yaml";
+ rev = "v2.1.0";
+ sha256 = "0k7afgp9gkx6pmilijx1wf1sgl3vfbnlfjj05qhnw3whhy4yyyqs";
+ };
+ }
+ {
+ goPackagePath = "github.com/gobuffalo/envy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gobuffalo/envy";
+ rev = "v1.6.5";
+ sha256 = "14ak10gap2xmy0vxwl0kplck8dhg6xyqcvra5wfana9w1520a622";
+ };
+ }
+ {
+ goPackagePath = "github.com/gobwas/glob";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gobwas/glob";
+ rev = "v0.2.3";
+ sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z";
+ };
+ }
+ {
+ goPackagePath = "github.com/gocql/gocql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gocql/gocql";
+ rev = "8516aabb0f99";
+ sha256 = "0b68630xizfzndl368l7inda8q8py69wxh967y9knvx33yfs7bzp";
+ };
+ }
+ {
+ goPackagePath = "github.com/gogo/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gogo/protobuf";
+ rev = "v1.1.1";
+ sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/glog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/glog";
+ rev = "23def4e6c14b";
+ sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/groupcache";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/groupcache";
+ rev = "6f2cf27854a4";
+ sha256 = "01wzacrqyqz10g29s88yjcm6w2wisffbadfppas51pfqmijhc11k";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/lint";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/lint";
+ rev = "06c8688daad7";
+ sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/mock";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/mock";
+ rev = "v1.1.1";
+ sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "v1.2.0";
+ sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/snappy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/snappy";
+ rev = "2e65f85255db";
+ sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/btree";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/btree";
+ rev = "4030bb1f1f0c";
+ sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-cmp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-cmp";
+ rev = "v0.2.0";
+ sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-github";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-github";
+ rev = "v17.0.0";
+ sha256 = "1kvw95l77a5n5rgal9n1xjh58zxb3a40ij1j722b1h4z8yg9jhg4";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-querystring";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-querystring";
+ rev = "53e6ce116135";
+ sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/gofuzz";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/gofuzz";
+ rev = "24818f796faf";
+ sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/martian";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/martian";
+ rev = "v2.1.0";
+ sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/subcommands";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/subcommands";
+ rev = "46f0354f6315";
+ sha256 = "043j9y17kp73972vblkzmr222143hja3gg6cnry4wsiri9lslc2l";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/uuid";
+ rev = "v1.1.0";
+ sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/wire";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/wire";
+ rev = "v0.2.0";
+ sha256 = "07arvzwyari18dz1lq4kzysm2dnph93wsbbdzq58hzcmar9snm8g";
+ };
+ }
+ {
+ goPackagePath = "github.com/googleapis/gax-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/googleapis/gax-go";
+ rev = "v2.0.0";
+ sha256 = "0h92x579vbrv2fka8q2ddy1kq6a63qbqa8zc09ygl6skzn9gw1dh";
+ };
+ }
+ {
+ goPackagePath = "github.com/googleapis/gnostic";
+ fetch = {
+ type = "git";
+ url = "https://github.com/googleapis/gnostic";
+ rev = "v0.2.0";
+ sha256 = "0yh3ckd7m0r9h50wmxxvba837d0wb1k5yd439zq4p1kpp4390z12";
+ };
+ }
+ {
+ goPackagePath = "github.com/gophercloud/gophercloud";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gophercloud/gophercloud";
+ rev = "bdd8b1ecd793";
+ sha256 = "0q9rss8yl11v9l10nb2203crsqzqpfxwnwfckaaszjx37rnd98cg";
+ };
+ }
+ {
+ goPackagePath = "github.com/gopherjs/gopherjs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gopherjs/gopherjs";
+ rev = "0766667cb4d1";
+ sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/context";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/context";
+ rev = "v1.1.1";
+ sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/mux";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/mux";
+ rev = "v1.6.2";
+ sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/securecookie";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/securecookie";
+ rev = "v1.1.1";
+ sha256 = "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/sessions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/sessions";
+ rev = "v1.1.3";
+ sha256 = "0a99mlw5gvqbghnc1nx76gaanpxzjqfd74klp3s3sgbss69clayi";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/websocket";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/websocket";
+ rev = "v1.4.0";
+ sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
+ };
+ }
+ {
+ goPackagePath = "github.com/gotestyourself/gotestyourself";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gotestyourself/gotestyourself";
+ rev = "v2.2.0";
+ sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl";
+ };
+ }
+ {
+ goPackagePath = "github.com/gregjones/httpcache";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gregjones/httpcache";
+ rev = "9cad4c3443a7";
+ sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/go-grpc-middleware";
+ rev = "v1.0.0";
+ sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/go-grpc-prometheus";
+ rev = "v1.2.0";
+ sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/grpc-gateway";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/grpc-gateway";
+ rev = "v1.5.1";
+ sha256 = "1q3l6ydf37lm6hdm9df8y385bacycj4pin1b06w7dpm6m045l3sp";
+ };
+ }
+ {
+ goPackagePath = "github.com/hailocab/go-hostpool";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hailocab/go-hostpool";
+ rev = "e80d13ce29ed";
+ sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/consul";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/consul";
+ rev = "v1.4.2";
+ sha256 = "1nprl9kcb98ikcmk7safji3hl4kfacx0gnh05k8m4ysfz6mr7zri";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/errwrap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/errwrap";
+ rev = "v1.0.0";
+ sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-cleanhttp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-cleanhttp";
+ rev = "v0.5.0";
+ sha256 = "1mwl96a815x1843pnqn7lk38s05bgn5rdjw57xd46jzr62izcnsq";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-hclog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-hclog";
+ rev = "4783caec6f2e";
+ sha256 = "1sjhmsysr5vp5y6y9s0l49hjgqb14s0m9p7wwc2m4cga4qps299s";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-immutable-radix";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-immutable-radix";
+ rev = "v1.0.0";
+ sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-memdb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-memdb";
+ rev = "032f93b25bec";
+ sha256 = "1bkbvx93a7li9myy2vs27wh6yyxn67gyvlmb6ywidr4lf50azi5v";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-msgpack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-msgpack";
+ rev = "v0.5.3";
+ sha256 = "00jv0ajqd58pkb2yyhlrjp0rv1mvb1ijx3yqjyikcmzvk9jb4h5m";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-multierror";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-multierror";
+ rev = "v1.0.0";
+ sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-plugin";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-plugin";
+ rev = "362c99b11937";
+ sha256 = "0q23ri3s5r2w7z20bpk76vlb79mdwz0xbk7ppdlcbrkbylrpw9ai";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-retryablehttp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-retryablehttp";
+ rev = "e651d75abec6";
+ sha256 = "1bw09c1q3hlgmp954w9y0xqzb1m82im28z2yfc85hanm3v71f76y";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-rootcerts";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-rootcerts";
+ rev = "6bb64b370b90";
+ sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-sockaddr";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-sockaddr";
+ rev = "v1.0.0";
+ sha256 = "1yn1xq8ysn0lszmkygz3a9lgpswbz1p91jv7q8l20s4749a22xgi";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-syslog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-syslog";
+ rev = "v1.0.0";
+ sha256 = "09vccqggz212cg0jir6vv708d6mx0f9w5bxrcdah3h6chgmal6v1";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-uuid";
+ rev = "v1.0.1";
+ sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-version";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-version";
+ rev = "270f2f71b1ee";
+ sha256 = "1d43wlp932nqbwkca4bhw8l4x6cg25jyh8l1s3814vddscfpfz2v";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go.net";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go.net";
+ rev = "v0.0.1";
+ sha256 = "06arwi95xp5rxyz7rndvhc3wlwg0jn9a5z6djf3yyg5h9zfab9i4";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/golang-lru";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/golang-lru";
+ rev = "v0.5.0";
+ sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/hcl";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/hcl";
+ rev = "ef8a98b0bbce";
+ sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/logutils";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/logutils";
+ rev = "v1.0.0";
+ sha256 = "076wf4sh5p3f953ndqk1cc0x7jhmlqrxak9953rz79rcdw77rjvv";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/mdns";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/mdns";
+ rev = "v1.0.0";
+ sha256 = "0qr4l91hhi97s8a1isnrw3s4q8pjzacqiks870vnwh15v7ig3axd";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/memberlist";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/memberlist";
+ rev = "v0.1.3";
+ sha256 = "0k1spq7dagvqj3baqw2dhxx1zxrb02y6m3apzr3a7gyirii890g3";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/serf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/serf";
+ rev = "v0.8.2";
+ sha256 = "0nrslghvdjhaczr2xp9mn8xgcx1dxl4jgpbk0l61ssmxahpx4iyc";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/vault";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/vault";
+ rev = "v0.11.4";
+ sha256 = "0snqa3kar40mygcacdv55k60k9blq2zqx9hfcv42v7p0x3zqh0z0";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/vault-plugin-secrets-kv";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/vault-plugin-secrets-kv";
+ rev = "edbfe287c5d9";
+ sha256 = "0rg7k3azsmk2kiwjvylfryhadxly7x2yj0gb4wkaacvka728kxrz";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/yamux";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/yamux";
+ rev = "3520598351bb";
+ sha256 = "15r8yzj7a7bki9d0k3da5pab6byhyc63kvmi0by92x61mz7svqa5";
+ };
+ }
+ {
+ goPackagePath = "github.com/heptio/sonobuoy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jenkins-x/sonobuoy";
+ rev = "dad27c12bf17";
+ sha256 = "1xs8h3rx4s9yvv0klxwjb2qw05qh65hllxhz688wrw7ynyrwcmr1";
+ };
+ }
+ {
+ goPackagePath = "github.com/hinshun/vt10x";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hinshun/vt10x";
+ rev = "d55458df857c";
+ sha256 = "0vwsp5iii7pf4na8pkd7cn3bawkwnsimkv1sysy7bslclg5jm370";
+ };
+ }
+ {
+ goPackagePath = "github.com/hpcloud/tail";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hpcloud/tail";
+ rev = "v1.0.0";
+ sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
+ };
+ }
+ {
+ goPackagePath = "github.com/huandu/xstrings";
+ fetch = {
+ type = "git";
+ url = "https://github.com/huandu/xstrings";
+ rev = "v1.0.0";
+ sha256 = "0bnyh4awmr9aagqhhi19xdadzksrkl01d987ycqx86dwlvqqxnxf";
+ };
+ }
+ {
+ goPackagePath = "github.com/iancoleman/orderedmap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/iancoleman/orderedmap";
+ rev = "22c6ecc9fe13";
+ sha256 = "0k8axkkg84ik5v5b4m398c7lbaygb815y1wsj7fn5y2d1mqndd4q";
+ };
+ }
+ {
+ goPackagePath = "github.com/imdario/mergo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/imdario/mergo";
+ rev = "v0.3.6";
+ sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7";
+ };
+ }
+ {
+ goPackagePath = "github.com/inconshreveable/mousetrap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/inconshreveable/mousetrap";
+ rev = "v1.0.0";
+ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+ };
+ }
+ {
+ goPackagePath = "github.com/influxdata/influxdb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/influxdata/influxdb";
+ rev = "049f9b42e9a5";
+ sha256 = "1m9p7zwwwk3fb9z3xxzv86avpnknvc1nya8l6q8maylyb89rk6ir";
+ };
+ }
+ {
+ goPackagePath = "github.com/jbenet/go-context";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jbenet/go-context";
+ rev = "d14ea06fba99";
+ sha256 = "0q91f5549n81w3z5927n4a1mdh220bdmgl42zi3h992dcc4ls0sl";
+ };
+ }
+ {
+ goPackagePath = "github.com/jbrukh/bayesian";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jbrukh/bayesian";
+ rev = "bf3f261f9a9c";
+ sha256 = "12xylsachg2br784909nf0n2c4bk1k7qwabfy4nccbvadyqscg82";
+ };
+ }
+ {
+ goPackagePath = "github.com/jefferai/jsonx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jefferai/jsonx";
+ rev = "v1.0.0";
+ sha256 = "15j4lch1k2bdrkcc2wnqbdcsf8avair0b7fn9ymhjqkz1zcqvpby";
+ };
+ }
+ {
+ goPackagePath = "github.com/jenkins-x/draft-repo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jenkins-x/draft-repo";
+ rev = "2f66cc518135";
+ sha256 = "1rwyyzakij8c13wvphksdf903dq9kw1k32lwsjwg3pxcr3rw9nr6";
+ };
+ }
+ {
+ goPackagePath = "github.com/jenkins-x/golang-jenkins";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jenkins-x/golang-jenkins";
+ rev = "65b83ad42314";
+ sha256 = "1mvvwklcp0cwg4vrsycamly7k9zck185bma3j9rr7pga12cwdsid";
+ };
+ }
+ {
+ goPackagePath = "github.com/jetstack/cert-manager";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jetstack/cert-manager";
+ rev = "v0.5.2";
+ sha256 = "0xic07v4fzvhn14sri6dlwklilq1966pc0l6vv664p4msgqldc9a";
+ };
+ }
+ {
+ goPackagePath = "github.com/jinzhu/gorm";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jinzhu/gorm";
+ rev = "572d0a0ab1eb";
+ sha256 = "1fzxbq89gdi57ql1pd9hf5q6jqzinz54v84lwp1bkv0mpipxqydr";
+ };
+ }
+ {
+ goPackagePath = "github.com/jinzhu/inflection";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jinzhu/inflection";
+ rev = "3272df6c21d0";
+ sha256 = "129xn1lm768ikbvwy5cap20d3p38hw4d631za34zapfxyy2p96c0";
+ };
+ }
+ {
+ goPackagePath = "github.com/jinzhu/now";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jinzhu/now";
+ rev = "8ec929ed50c3";
+ sha256 = "0ydl9cx17zkx21b5cqhrl8x4j7yhmyl3ki4kn1c0ql38jw4pww7y";
+ };
+ }
+ {
+ goPackagePath = "github.com/jmespath/go-jmespath";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jmespath/go-jmespath";
+ rev = "c2b33e8439af";
+ sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
+ };
+ }
+ {
+ goPackagePath = "github.com/joho/godotenv";
+ fetch = {
+ type = "git";
+ url = "https://github.com/joho/godotenv";
+ rev = "v1.3.0";
+ sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm";
+ };
+ }
+ {
+ goPackagePath = "github.com/jonboulle/clockwork";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jonboulle/clockwork";
+ rev = "v0.1.0";
+ sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl";
+ };
+ }
+ {
+ goPackagePath = "github.com/json-iterator/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/json-iterator/go";
+ rev = "v1.1.5";
+ sha256 = "11wn4hpmrs8bmpvd93wqk49jfbbgylakhi35f9k5qd7jd479ci4s";
+ };
+ }
+ {
+ goPackagePath = "github.com/jtolds/gls";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jtolds/gls";
+ rev = "v4.2.1";
+ sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h";
+ };
+ }
+ {
+ goPackagePath = "github.com/julienschmidt/httprouter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/julienschmidt/httprouter";
+ rev = "v1.2.0";
+ sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
+ };
+ }
+ {
+ goPackagePath = "github.com/kballard/go-shellquote";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kballard/go-shellquote";
+ rev = "95032a82bc51";
+ sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80";
+ };
+ }
+ {
+ goPackagePath = "github.com/kevinburke/ssh_config";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kevinburke/ssh_config";
+ rev = "9fc7bb800b55";
+ sha256 = "102icrla92zmr5zngipc8c9yfbqhf73zs2w2jq6s7p0gdjifigc8";
+ };
+ }
+ {
+ goPackagePath = "github.com/keybase/go-crypto";
+ fetch = {
+ type = "git";
+ url = "https://github.com/keybase/go-crypto";
+ rev = "255a5089e85a";
+ sha256 = "0c2n05lpkpq7ii8c2x3p228x3sm6msn33532zyfk2k9dk7zigzy9";
+ };
+ }
+ {
+ goPackagePath = "github.com/kisielk/gotool";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kisielk/gotool";
+ rev = "v1.0.0";
+ sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+ };
+ }
+ {
+ goPackagePath = "github.com/knative/build";
+ fetch = {
+ type = "git";
+ url = "https://github.com/knative/build";
+ rev = "v0.3.0";
+ sha256 = "1zn9ngl3wr8mgg31m8dw1w5jfjdiq0gkrdv0936vabazxjgsyb5q";
+ };
+ }
+ {
+ goPackagePath = "github.com/knative/build-pipeline";
+ fetch = {
+ type = "git";
+ url = "https://github.com/knative/build-pipeline";
+ rev = "7c289d8aedf7";
+ sha256 = "132flxjg6aj12xmz5px6dyljj630q0icdmxr9dz7l6j01ll4yagk";
+ };
+ }
+ {
+ goPackagePath = "github.com/knative/pkg";
+ fetch = {
+ type = "git";
+ url = "https://github.com/knative/pkg";
+ rev = "994b801b03ef";
+ sha256 = "15xpdk9zmsljdd3rwcxmk1nml9nync9yj71pqih69bgxfqpbyrx1";
+ };
+ }
+ {
+ goPackagePath = "github.com/knq/snaker";
+ fetch = {
+ type = "git";
+ url = "https://github.com/knq/snaker";
+ rev = "d9ad1e7f342a";
+ sha256 = "1020q2faxm12lshmyd6qh1dnhls145nyrmisw4gy3zlk3ccy5jif";
+ };
+ }
+ {
+ goPackagePath = "github.com/knq/sysutil";
+ fetch = {
+ type = "git";
+ url = "https://github.com/knq/sysutil";
+ rev = "0218e141a794";
+ sha256 = "11nsjv7bm370gbiwv7l4kp573gv5zj1xajxjf4x57wynzxhij5lq";
+ };
+ }
+ {
+ goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+ fetch = {
+ type = "git";
+ url = "https://github.com/konsorten/go-windows-terminal-sequences";
+ rev = "v1.0.1";
+ sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/logfmt";
+ rev = "b84e30acd515";
+ sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pretty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pretty";
+ rev = "v0.1.0";
+ sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pty";
+ rev = "v1.1.2";
+ sha256 = "1jhi5g23xsrqkfjg9a7l7rqzgx2mlf2w11892nng9p9f7xp55k6h";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/text";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/text";
+ rev = "v0.1.0";
+ sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+ };
+ }
+ {
+ goPackagePath = "github.com/lib/pq";
+ fetch = {
+ type = "git";
+ url = "https://github.com/lib/pq";
+ rev = "v1.0.0";
+ sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i";
+ };
+ }
+ {
+ goPackagePath = "github.com/lusis/go-slackbot";
+ fetch = {
+ type = "git";
+ url = "https://github.com/lusis/go-slackbot";
+ rev = "401027ccfef5";
+ sha256 = "125rraz8nwid7vw7x8xj4cz7i74xycx3jddvzn0r3sqajnq94s0l";
+ };
+ }
+ {
+ goPackagePath = "github.com/lusis/slack-test";
+ fetch = {
+ type = "git";
+ url = "https://github.com/lusis/slack-test";
+ rev = "3c758769bfa6";
+ sha256 = "110gs02k9bqrch248jycb7a3yzx2i3yh02k9s16fhdw612ag2sak";
+ };
+ }
+ {
+ goPackagePath = "github.com/magiconair/properties";
+ fetch = {
+ type = "git";
+ url = "https://github.com/magiconair/properties";
+ rev = "v1.8.0";
+ sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+ };
+ }
+ {
+ goPackagePath = "github.com/mailru/easyjson";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mailru/easyjson";
+ rev = "60711f1a8329";
+ sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1";
+ };
+ }
+ {
+ goPackagePath = "github.com/markbates/inflect";
+ fetch = {
+ type = "git";
+ url = "https://github.com/markbates/inflect";
+ rev = "v1.0.4";
+ sha256 = "0pd50b8q6bib84yab14csd6nc08hfdapzbh1nnw6qrmc1zxi7r7m";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattbaird/jsonpatch";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattbaird/jsonpatch";
+ rev = "81af80346b1a";
+ sha256 = "0ll22kpf75m72r7i5ddg3r87gdlagbj2x24bppgbi8jp018pdq95";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "v0.0.9";
+ sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "v0.0.4";
+ sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-runewidth";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-runewidth";
+ rev = "v0.0.2";
+ sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-sqlite3";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-sqlite3";
+ rev = "38ee283dabf1";
+ sha256 = "18xyi0n1dhspvy6z982k7v545w7k0idpmvlqmrn6nkd6dkw7pfdw";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-zglob";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-zglob";
+ rev = "49693fbb3fe3";
+ sha256 = "1j7li9jbqfakm3glj1hf0bl062y25jmaqw3d6v973c1vcgmdxvgw";
+ };
+ }
+ {
+ goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/matttproud/golang_protobuf_extensions";
+ rev = "v1.0.1";
+ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+ };
+ }
+ {
+ goPackagePath = "github.com/mgutz/ansi";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mgutz/ansi";
+ rev = "9520e82c474b";
+ sha256 = "00bz22314j26736w1f0q4jy9d9dfaml17vn890n5zqy3cmvmww1j";
+ };
+ }
+ {
+ goPackagePath = "github.com/mholt/archiver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mholt/archiver";
+ rev = "v3.1.1";
+ sha256 = "1v18xzzwi836rdxnr5dssllc083rdiry9baqaqnz6x3f1xvfnqp9";
+ };
+ }
+ {
+ goPackagePath = "github.com/miekg/dns";
+ fetch = {
+ type = "git";
+ url = "https://github.com/miekg/dns";
+ rev = "v1.0.14";
+ sha256 = "1qgli6yp59bv6vc6zag84cwxmcxgnyxm1q2f301yyijk3wy5b2ak";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/cli";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/cli";
+ rev = "v1.0.0";
+ sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/copystructure";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/copystructure";
+ rev = "v1.0.0";
+ sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/go-homedir";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-homedir";
+ rev = "3864e76763d9";
+ sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/go-testing-interface";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-testing-interface";
+ rev = "v1.0.0";
+ sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/gox";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/gox";
+ rev = "v0.4.0";
+ sha256 = "1q4fdkw904mrmh1q5z8pfd3r0gcn5dm776kldqawddy93iiwnp8r";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/iochan";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/iochan";
+ rev = "v1.0.0";
+ sha256 = "058n9bbf536f2nw3pbs7pysrg9cqvgkb28z2zf5wjyrzrknyk53g";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/ioprogress";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/ioprogress";
+ rev = "6a23b12fa88e";
+ sha256 = "1fcfwi5fzv17iahif42y7dhjfnjwkslk03zb9cniw42wyiwhj3jk";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/mapstructure";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/mapstructure";
+ rev = "f15292f7a699";
+ sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/reflectwalk";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/reflectwalk";
+ rev = "v1.0.0";
+ sha256 = "0wzkp0fdx22n8f7y9y37dgmnlrlfsv9zjdb48cbx7rsqsbnny7l0";
+ };
+ }
+ {
+ goPackagePath = "github.com/modern-go/concurrent";
+ fetch = {
+ type = "git";
+ url = "https://github.com/modern-go/concurrent";
+ rev = "bacd9c7ef1dd";
+ sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+ };
+ }
+ {
+ goPackagePath = "github.com/modern-go/reflect2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/modern-go/reflect2";
+ rev = "v1.0.1";
+ sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
+ };
+ }
+ {
+ goPackagePath = "github.com/mwitkow/go-conntrack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mwitkow/go-conntrack";
+ rev = "cc309e4a2223";
+ sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
+ };
+ }
+ {
+ goPackagePath = "github.com/nbio/st";
+ fetch = {
+ type = "git";
+ url = "https://github.com/nbio/st";
+ rev = "e9e8d9816f32";
+ sha256 = "14r4acm82gp9ikqnp41a06bm4mrdlbskakhibbxsc5ljav7bni27";
+ };
+ }
+ {
+ goPackagePath = "github.com/nlopes/slack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/nlopes/slack";
+ rev = "347a74b1ea30";
+ sha256 = "0wkj2kvvg2jl01bajkjavcpn1c98yhxd96cadpm522ag3gqdlw81";
+ };
+ }
+ {
+ goPackagePath = "github.com/nwaples/rardecode";
+ fetch = {
+ type = "git";
+ url = "https://github.com/nwaples/rardecode";
+ rev = "v1.0.0";
+ sha256 = "1dsq1wcddl7r1y0d94px368biiy1dgzl3nab47f0rb0fp1b24l1x";
+ };
+ }
+ {
+ goPackagePath = "github.com/oklog/run";
+ fetch = {
+ type = "git";
+ url = "https://github.com/oklog/run";
+ rev = "v1.0.0";
+ sha256 = "1pbjza4claaj95fpqvvfrysvs10y7dm0pl6qr5lzh6qy1vnhmcgw";
+ };
+ }
+ {
+ goPackagePath = "github.com/olekukonko/tablewriter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/olekukonko/tablewriter";
+ rev = "a0225b3f23b5";
+ sha256 = "0bp9r6xzy6d3p7l2hjmvr25y3rp3p8c9xv1agkllkksm45ng6681";
+ };
+ }
+ {
+ goPackagePath = "github.com/onsi/ginkgo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/onsi/ginkgo";
+ rev = "v1.6.0";
+ sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25";
+ };
+ }
+ {
+ goPackagePath = "github.com/onsi/gomega";
+ fetch = {
+ type = "git";
+ url = "https://github.com/onsi/gomega";
+ rev = "v1.4.2";
+ sha256 = "0f1lpgdcfan3bj545xjrlkdkmi7g0l8gn82gsxay1x6rsqv6nl0b";
+ };
+ }
+ {
+ goPackagePath = "github.com/opencontainers/go-digest";
+ fetch = {
+ type = "git";
+ url = "https://github.com/opencontainers/go-digest";
+ rev = "v1.0.0-rc1";
+ sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
+ };
+ }
+ {
+ goPackagePath = "github.com/opencontainers/image-spec";
+ fetch = {
+ type = "git";
+ url = "https://github.com/opencontainers/image-spec";
+ rev = "v1.0.1";
+ sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q";
+ };
+ }
+ {
+ goPackagePath = "github.com/opencontainers/runc";
+ fetch = {
+ type = "git";
+ url = "https://github.com/opencontainers/runc";
+ rev = "v0.1.1";
+ sha256 = "09fm7f1k4lvx8v3crqb0cli1x2brlz8ka7f7qa8d2sb6ln58h7w7";
+ };
+ }
+ {
+ goPackagePath = "github.com/openzipkin/zipkin-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/openzipkin/zipkin-go";
+ rev = "v0.1.1";
+ sha256 = "0kd5yc4117dlqc80v0f29kb2l8nrx2da9c03ljns5n8hynnjgb27";
+ };
+ }
+ {
+ goPackagePath = "github.com/operator-framework/operator-sdk";
+ fetch = {
+ type = "git";
+ url = "https://github.com/operator-framework/operator-sdk";
+ rev = "913cbf711929";
+ sha256 = "1fq6g8q11qx842zsj8k16ng6p2xpmp52v91m24vz35rh9pl4kdg0";
+ };
+ }
+ {
+ goPackagePath = "github.com/ory/dockertest";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ory/dockertest";
+ rev = "v3.3.4";
+ sha256 = "0gwdbxszjzv3cr42kmwjvqab1y8y8g9j0p3yl1n0rzmsfxcz1mmb";
+ };
+ }
+ {
+ goPackagePath = "github.com/pascaldekloe/goe";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pascaldekloe/goe";
+ rev = "57f6aae5913c";
+ sha256 = "1dqd3mfb4z2vmv6pg6fhgvfc53vhndk24wcl9lj1rz02n6m279fq";
+ };
+ }
+ {
+ goPackagePath = "github.com/patrickmn/go-cache";
+ fetch = {
+ type = "git";
+ url = "https://github.com/patrickmn/go-cache";
+ rev = "v2.1.0";
+ sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs";
+ };
+ }
+ {
+ goPackagePath = "github.com/pborman/uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pborman/uuid";
+ rev = "e790cca94e6c";
+ sha256 = "0y1crv4wkly2naki2f68ln9sc8l9skswkc696vr8vc43p4p67wam";
+ };
+ }
+ {
+ goPackagePath = "github.com/pelletier/go-buffruneio";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pelletier/go-buffruneio";
+ rev = "v0.2.0";
+ sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2";
+ };
+ }
+ {
+ goPackagePath = "github.com/pelletier/go-toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pelletier/go-toml";
+ rev = "v1.2.0";
+ sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
+ };
+ }
+ {
+ goPackagePath = "github.com/petar/GoLLRB";
+ fetch = {
+ type = "git";
+ url = "https://github.com/petar/GoLLRB";
+ rev = "53be0d36a84c";
+ sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0";
+ };
+ }
+ {
+ goPackagePath = "github.com/peterbourgon/diskv";
+ fetch = {
+ type = "git";
+ url = "https://github.com/peterbourgon/diskv";
+ rev = "v2.0.1";
+ sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b";
+ };
+ }
+ {
+ goPackagePath = "github.com/petergtz/pegomock";
+ fetch = {
+ type = "git";
+ url = "https://github.com/petergtz/pegomock";
+ rev = "b113d17a7e81";
+ sha256 = "1si2dxz6wvx7px8g1455gz1vvlfwsm014wdbvyr69c3m2ad86wm0";
+ };
+ }
+ {
+ goPackagePath = "github.com/pierrec/lz4";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pierrec/lz4";
+ rev = "v2.0.5";
+ sha256 = "0y5rh7z01zycd59nnjpkqq0ydyjmcg9j1xw15q1i600l9j9g617p";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/browser";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/browser";
+ rev = "c90ca0c84f15";
+ sha256 = "05xpqsns08blmwdh8aw5kpq2d9x4fl91535j6np1ylw1q2b67b8i";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "v0.8.0";
+ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "v1.0.0";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+ {
+ goPackagePath = "github.com/posener/complete";
+ fetch = {
+ type = "git";
+ url = "https://github.com/posener/complete";
+ rev = "v1.1.1";
+ sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_golang";
+ rev = "v0.9.1";
+ sha256 = "01gnylazia30pcp069xcng482gwmm3xcx5zgrlwdkhic1lyb6i9l";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_model";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_model";
+ rev = "5c3871d89910";
+ sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/common";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/common";
+ rev = "v0.2.0";
+ sha256 = "02kym6lcfnlq23qbv277jr0q1n7jj0r14gqg93c7wn7gc44jv3vp";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/procfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/procfs";
+ rev = "185b4288413d";
+ sha256 = "0d85429kdw5dgj5zhyiz1sq3i5691vj2gjnda93nnxxzx9acg8cv";
+ };
+ }
+ {
+ goPackagePath = "github.com/qor/inflection";
+ fetch = {
+ type = "git";
+ url = "https://github.com/qor/inflection";
+ rev = "04140366298a";
+ sha256 = "1s4qcnwaajp3c5ykwx4dfy32hykwsm0ki7kx8lcw8b0z0grkz6qh";
+ };
+ }
+ {
+ goPackagePath = "github.com/rifflock/lfshook";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rifflock/lfshook";
+ rev = "bf539943797a";
+ sha256 = "0hns4zidw8g3s5l9dyl894fnyjr0a5xgdvx26rnal9jrn4n6z835";
+ };
+ }
+ {
+ goPackagePath = "github.com/rodaine/hclencoder";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rodaine/hclencoder";
+ rev = "0680c4321930";
+ sha256 = "0xyzmbhg0qnaybbd4sxly8932kswx2gplcw788gh811ylhjj2liy";
+ };
+ }
+ {
+ goPackagePath = "github.com/russross/blackfriday";
+ fetch = {
+ type = "git";
+ url = "https://github.com/russross/blackfriday";
+ rev = "v1.5.1";
+ sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0";
+ };
+ }
+ {
+ goPackagePath = "github.com/ryanuber/columnize";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ryanuber/columnize";
+ rev = "9b3edd62028f";
+ sha256 = "1ya1idkbb0a9fjlhkcnh5a9yvpwzwfmbyg7d56lpplwr9rqi1da4";
+ };
+ }
+ {
+ goPackagePath = "github.com/ryanuber/go-glob";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ryanuber/go-glob";
+ rev = "256dc444b735";
+ sha256 = "07rsd7hranghwc68ib0r2zxd9d5djanzjvd84j9dgj3wqsyg5mi2";
+ };
+ }
+ {
+ goPackagePath = "github.com/satori/go.uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/satori/go.uuid";
+ rev = "v1.2.0";
+ sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";
+ };
+ }
+ {
+ goPackagePath = "github.com/sean-/seed";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sean-/seed";
+ rev = "e2103e2c3529";
+ sha256 = "0glir8jxi1w7aga2jwdb63pp1h8q4whknili7xixsqzwyy716125";
+ };
+ }
+ {
+ goPackagePath = "github.com/sergi/go-diff";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sergi/go-diff";
+ rev = "v1.0.0";
+ sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
+ };
+ }
+ {
+ goPackagePath = "github.com/sethgrid/pester";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sethgrid/pester";
+ rev = "03e26c9abbbf";
+ sha256 = "0xhzs8xjaxr00n0sc0hjhlp78l01jwqqv9r6yfcxqy86cfyrdfgw";
+ };
+ }
+ {
+ goPackagePath = "github.com/sethvargo/go-password";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sethvargo/go-password";
+ rev = "v0.1.2";
+ sha256 = "0z6jz4b7cfdwiqrzhcyvraq2s1rw4fpw4fbna9r7xi1vvj26gyrf";
+ };
+ }
+ {
+ goPackagePath = "github.com/shirou/gopsutil";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shirou/gopsutil";
+ rev = "eb1f1ab16f2e";
+ sha256 = "0qn5nn4kcqcw5wkcg82s9jbjh6wvrfq88zinm35xlpwhpdklznjw";
+ };
+ }
+ {
+ goPackagePath = "github.com/shirou/w32";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shirou/w32";
+ rev = "bb4de0191aa4";
+ sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4";
+ };
+ }
+ {
+ goPackagePath = "github.com/shurcooL/githubv4";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/githubv4";
+ rev = "51d7b505e2e9";
+ sha256 = "0zy2aci0gr9x08fl8bicknc2v9nqnxhqr3y05dzvmr0b5av9q24f";
+ };
+ }
+ {
+ goPackagePath = "github.com/shurcooL/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/go";
+ rev = "9e1955d9fb6e";
+ sha256 = "1lad9bvs75jsn61cfza19739c2c057k0bqxg2b4xz3z3l4w1mkqj";
+ };
+ }
+ {
+ goPackagePath = "github.com/shurcooL/graphql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/graphql";
+ rev = "e4a3a37e6d42";
+ sha256 = "0d4a6njigzis6hgac5dpxaw6nzrm4cqmfyj53icr3isa38c2isrf";
+ };
+ }
+ {
+ goPackagePath = "github.com/sirupsen/logrus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sirupsen/logrus";
+ rev = "v1.2.0";
+ sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
+ };
+ }
+ {
+ goPackagePath = "github.com/smartystreets/assertions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/smartystreets/assertions";
+ rev = "b2de0cb4f26d";
+ sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y";
+ };
+ }
+ {
+ goPackagePath = "github.com/smartystreets/goconvey";
+ fetch = {
+ type = "git";
+ url = "https://github.com/smartystreets/goconvey";
+ rev = "ef6db91d284a";
+ sha256 = "16znlpsms8z2qc3airawyhzvrzcp70p9bx375i19bg489hgchxb7";
+ };
+ }
+ {
+ goPackagePath = "github.com/soheilhy/cmux";
+ fetch = {
+ type = "git";
+ url = "https://github.com/soheilhy/cmux";
+ rev = "v0.1.4";
+ sha256 = "1f736g68d9vwlyfb6g0fxkr0r875369xafk30cz8kaq5niaqwv0h";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/afero";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/afero";
+ rev = "v1.1.1";
+ sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cast";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cast";
+ rev = "v1.2.0";
+ sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cobra";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cobra";
+ rev = "v0.0.3";
+ sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/jwalterweatherman";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/jwalterweatherman";
+ rev = "7c0cea34c8ec";
+ sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/pflag";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/pflag";
+ rev = "v1.0.3";
+ sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/viper";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/viper";
+ rev = "v1.0.2";
+ sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis";
+ };
+ }
+ {
+ goPackagePath = "github.com/src-d/gcfg";
+ fetch = {
+ type = "git";
+ url = "https://github.com/src-d/gcfg";
+ rev = "v1.3.0";
+ sha256 = "1hrdxlha4kkcpyydmjqd929rmwn5a9xq7arvwhryxppxq7502axk";
+ };
+ }
+ {
+ goPackagePath = "github.com/stoewer/go-strcase";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stoewer/go-strcase";
+ rev = "v1.0.1";
+ sha256 = "0axc5sq5n9gkhy7npn9w12ycxddngmbphdywhfrsskm44kvd8rpx";
+ };
+ }
+ {
+ goPackagePath = "github.com/streadway/amqp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/streadway/amqp";
+ rev = "27835f1a64e9";
+ sha256 = "1py7lsrk0a4r0fx91jq6nn0vdv8phzw5wlnjbl38gmlq32hsff7k";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/objx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/objx";
+ rev = "v0.1.1";
+ sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "v1.3.0";
+ sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+ };
+ }
+ {
+ goPackagePath = "github.com/tidwall/gjson";
+ fetch = {
+ type = "git";
+ url = "https://github.com/tidwall/gjson";
+ rev = "v1.1.0";
+ sha256 = "0m19fh7djlwl188ddw4myspck92hq0pck4xwmvx6msq7pz2mhds9";
+ };
+ }
+ {
+ goPackagePath = "github.com/tidwall/match";
+ fetch = {
+ type = "git";
+ url = "https://github.com/tidwall/match";
+ rev = "1731857f09b1";
+ sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578";
+ };
+ }
+ {
+ goPackagePath = "github.com/tmc/grpc-websocket-proxy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/tmc/grpc-websocket-proxy";
+ rev = "830351dc03c6";
+ sha256 = "0d1b7jydlwfx9m78fbmfdva2yf1cd8x4j0bq5wxj5n7ihwyf07jg";
+ };
+ }
+ {
+ goPackagePath = "github.com/trivago/tgo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/trivago/tgo";
+ rev = "v1.0.1";
+ sha256 = "10243ai91r57fkh8jpyxg9dz503cb5nkmlsj10p3g8a38v808mrl";
+ };
+ }
+ {
+ goPackagePath = "github.com/ugorji/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ugorji/go";
+ rev = "8333dd449516";
+ sha256 = "16bix8957bgszzm176jn12q1dzi6flha4bif5h8j8lqbxc6pab3q";
+ };
+ }
+ {
+ goPackagePath = "github.com/ulikunitz/xz";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ulikunitz/xz";
+ rev = "v0.5.6";
+ sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831";
+ };
+ }
+ {
+ goPackagePath = "github.com/urfave/cli";
+ fetch = {
+ type = "git";
+ url = "https://github.com/urfave/cli";
+ rev = "v1.18.0";
+ sha256 = "0al7w7yjyijx9dldndnj1bws5w1li0a7wjbwbkxa5kd0z7l39x81";
+ };
+ }
+ {
+ goPackagePath = "github.com/viniciuschiele/tarx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/viniciuschiele/tarx";
+ rev = "6e3da540444d";
+ sha256 = "0r7d6s5znbr69xm9334c8b404yk1jqg0h8n6bjs8zwgwk20cwxjf";
+ };
+ }
+ {
+ goPackagePath = "github.com/wbrefvem/go-bitbucket";
+ fetch = {
+ type = "git";
+ url = "https://github.com/wbrefvem/go-bitbucket";
+ rev = "fc08fd046abb";
+ sha256 = "1h7wpl442cl4qfhm2115rwnch8bs2314qi09kwgy2zjrv5gq969n";
+ };
+ }
+ {
+ goPackagePath = "github.com/xanzy/go-gitlab";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xanzy/go-gitlab";
+ rev = "f3bc634ab936";
+ sha256 = "1lznkdlhm1jvka745qkynlyci4svw38s9chrz0lvwpl680kazv1q";
+ };
+ }
+ {
+ goPackagePath = "github.com/xanzy/ssh-agent";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xanzy/ssh-agent";
+ rev = "v0.2.0";
+ sha256 = "069nlriymqswg52ggiwi60qhwrin9nzhd2g65a7h59z2qbcvk2hy";
+ };
+ }
+ {
+ goPackagePath = "github.com/xi2/xz";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xi2/xz";
+ rev = "48954b6210f8";
+ sha256 = "178r0fa2dpzxf0sabs7dn0c8fa7vs87zlxk6spkn374ls9pir7nq";
+ };
+ }
+ {
+ goPackagePath = "github.com/xiang90/probing";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xiang90/probing";
+ rev = "07dd2e8dfe18";
+ sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2";
+ };
+ }
+ {
+ goPackagePath = "github.com/xlab/handysort";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xlab/handysort";
+ rev = "fb3537ed64a1";
+ sha256 = "0g1q7qx259xhywkiqmcf0siwvyqbwdyc4ng0hz5z8r9zc68ic647";
+ };
+ }
+ {
+ goPackagePath = "go.etcd.io/bbolt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/etcd-io/bbolt";
+ rev = "v1.3.1-etcd.7";
+ sha256 = "0f2brc4zyc1z3s1bw9krgj7gijdrdz9sw2w8i7s0xvidd54qr32l";
+ };
+ }
+ {
+ goPackagePath = "go.etcd.io/etcd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/etcd-io/etcd";
+ rev = "83304cfc808c";
+ sha256 = "1jfiv4a6n6ik5l1sscgmvll9yyic5ax0a03vis8n3b5g5qycws34";
+ };
+ }
+ {
+ goPackagePath = "go.opencensus.io";
+ fetch = {
+ type = "git";
+ url = "https://github.com/census-instrumentation/opencensus-go";
+ rev = "v0.18.0";
+ sha256 = "0flvv47h3988k1sg56qyh3hfskn563kblp4bs7mi6kzjc9jqz817";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/atomic";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/atomic";
+ rev = "v1.3.2";
+ sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/multierr";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/multierr";
+ rev = "v1.1.0";
+ sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/zap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/zap";
+ rev = "v1.9.1";
+ sha256 = "19a1i6fipqj8w7h6qjmg1sfbg18yzzqsgfn0vmr55hkgc0y6nmny";
+ };
+ }
+ {
+ goPackagePath = "gocloud.dev";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-cloud";
+ rev = "v0.9.0";
+ sha256 = "0rk0k2iy4rk0vqjyq98l89zkhq194bgdr95542ks5jbwinc82h36";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "505ab145d0a9";
+ sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/exp";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/exp";
+ rev = "509febef88a4";
+ sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/image";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/image";
+ rev = "c73c2afc3b81";
+ sha256 = "1kkafy29vz5xf6r29ghbvvbwrgjxwxvzk6dsa2qhyp1ddk6l2vkz";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/lint";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/lint";
+ rev = "c67002cb31c3";
+ sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "351d144fa1fc";
+ sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/oauth2";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/oauth2";
+ rev = "d668ce993890";
+ sha256 = "17m8d02fazil0dwvk33vpwvsb91asgbmmpqy05751csrfqhhdqna";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "37e7f081c4d4";
+ sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "aca44879d564";
+ sha256 = "106vs2md02h16rwnk9mq2h4ix7iyv2n6bfm7v9zp0kknswlag1x0";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "v0.3.0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/time";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/time";
+ rev = "fbb02b2291d2";
+ sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/tools";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/tools";
+ rev = "06f26fdaaa28";
+ sha256 = "07qj9wfjygy64krr8rgbxf43v007y7hmbimh8j95qfrq5fh7bp21";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/api";
+ fetch = {
+ type = "git";
+ url = "https://code.googlesource.com/google-api-go-client";
+ rev = "v0.1.0";
+ sha256 = "1az6n10i35ls13wry20nnm5afzr3j3s391nia8ghgx5vfskgzn56";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/appengine";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/appengine";
+ rev = "v1.3.0";
+ sha256 = "13cyhqwmvc2nia4ssdwwdzscq52aj3z9zjikx17wk4kb0j8vr370";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/genproto";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-genproto";
+ rev = "082222b4a5c5";
+ sha256 = "1q57b7c01wwcgd488fdkipizaxnwm4pkl0bzs2p7wbdagsbvv1g9";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/grpc";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc/grpc-go";
+ rev = "v1.17.0";
+ sha256 = "0ibwav7p5cqng8yslarix521i1s11r7w9y2rjliahm75cj5crrb8";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/AlecAivazis/survey.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/AlecAivazis/survey.v1";
+ rev = "v1.6.2";
+ sha256 = "1w8pfgnnr0wz13fcnfhjkc20yh42in3ia7v6nczzyn38r2fdr43g";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/airbrake/gobrake.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/airbrake/gobrake.v2";
+ rev = "v2.0.9";
+ sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "v2.2.6";
+ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/asn1-ber.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/asn1-ber.v1";
+ rev = "f715ec2f112d";
+ sha256 = "00ixms8x3lrhywbvq5v2sagcqsxa1pcnlk17dp5lnwckv3xg4psb";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/check.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/check.v1";
+ rev = "788fd7840127";
+ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/cheggaaa/pb.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/cheggaaa/pb.v1";
+ rev = "v1.0.25";
+ sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/fsnotify.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/fsnotify.v1";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2";
+ rev = "v2.1.2";
+ sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/h2non/gock.v0";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/h2non/gock.v0";
+ rev = "1baf36abac00";
+ sha256 = "1gddy7cl8d84r3s2kkzm25bm19n8ml8iznch94q6wnsrz3g6bsqq";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/inf.v0";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/inf.v0";
+ rev = "v0.9.1";
+ sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/ini.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/ini.v1";
+ rev = "v1.39.0";
+ sha256 = "0j7pyl5v7xfzkhsyz193iq56ilan69pp11g2n5jw1k4h4g8s4k9b";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/mgo.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/mgo.v2";
+ rev = "9856a29383ce";
+ sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/pipe.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/pipe.v2";
+ rev = "3c2ca4d52544";
+ sha256 = "090wrj4n6a6pzdlakcxy9qnkngc8hp6m49ipbnlszs0hyj2hnngv";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/robfig/cron.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/robfig/cron.v2";
+ rev = "be2e0b0deed5";
+ sha256 = "1cmm6dc4cl8269wlknxmicyn1s63irg66lj76b9ncjjfrvijpf0y";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/src-d/go-billy.v4";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/src-d/go-billy.v4";
+ rev = "v4.2.0";
+ sha256 = "18fghcyk69g460px8rvmhmqldkbhw17dpnhg45qwdvaq90b0bkx9";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/src-d/go-git-fixtures.v3";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/src-d/go-git-fixtures.v3";
+ rev = "v3.3.0";
+ sha256 = "1xbnd2ln95xgr6385ahl1y7108ifr3fh0zhy7fmb7cjasq8zlvw9";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/src-d/go-git.v4";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/src-d/go-git.v4";
+ rev = "v4.5.0";
+ sha256 = "1krg24ncckwalmhzs2vlp8rwyk4rfnhfydwg8iw7gaywww2c1wfc";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/tomb.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/tomb.v1";
+ rev = "dd632973f1e7";
+ sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/warnings.v0";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/warnings.v0";
+ rev = "v0.1.2";
+ sha256 = "1kzj50jn708cingn7a13c2wdlzs6qv89dr2h4zj8d09647vlnd81";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "v2.2.1";
+ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ };
+ }
+ {
+ goPackagePath = "gotest.tools";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gotestyourself/gotest.tools";
+ rev = "v2.2.0";
+ sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl";
+ };
+ }
+ {
+ goPackagePath = "honnef.co/go/tools";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dominikh/go-tools";
+ rev = "88497007e858";
+ sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/api";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/api";
+ rev = "6db15a15d2d3";
+ sha256 = "0jqb0c57yzaajrl17hbziw19x5n14q46dg73y0gmv0blpa6laxcy";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/apiextensions-apiserver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/apiextensions-apiserver";
+ rev = "1f84094d7e8e";
+ sha256 = "1b73cwjgsxjr00jbygmgs13bgyz6593kqqx2xksn9rir42qb3zil";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/apimachinery";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/apimachinery";
+ rev = "bebe27e40fb7";
+ sha256 = "1g1q2f77b320z0v9b1gmal056dz189wf069400a44c0v5y61ak8l";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/cli-runtime";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/cli-runtime";
+ rev = "1ee5ba10d7e3";
+ sha256 = "1nr5s217sy9s23xkhn2fpa6ck473wxq3a8m3vrmxq6xd0c60fkyy";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/client-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/client-go";
+ rev = "701b91367003";
+ sha256 = "1qmz3s7yfa1l07lpyn3g7x9wnc9bxc0lk0p893vana96xj177zih";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/code-generator";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/code-generator";
+ rev = "8c97d6ab64da";
+ sha256 = "137ih44qiaaidjw5xk7giqngi0x01awvknb0vrnf60ajq2dy9sdh";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/gengo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/gengo";
+ rev = "906d99f89cd6";
+ sha256 = "08hcvmn6n02a5yjl9yby1n6ybqf7b4jwzppj0v6rr73hh6w3kfi4";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/helm";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/helm";
+ rev = "v2.7.2";
+ sha256 = "087f8wnf0kcbkh6flxlv07knrb964zyszi2k4i1ihaajg3bkbpq6";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/kube-openapi";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/kube-openapi";
+ rev = "d8ea2fe547a4";
+ sha256 = "1m64xrp2vz7il2b3nikdjxf8l4yw2b2yp8997mwkj4rldznfxlxb";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/kubernetes";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/kubernetes";
+ rev = "v1.11.3";
+ sha256 = "123qk5y9cwsj1cyswbpbdha84ynraam1xmqd5cpr4w29kw7nsjr8";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/metrics";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/metrics";
+ rev = "3954d62a524d";
+ sha256 = "0y3ywkbhc9kdzp1dl4crphijx0ajd7apqpq3gvrmq4v224078hic";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/test-infra";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/test-infra";
+ rev = "a22cef183a8f";
+ sha256 = "17cjbbadx2qsr1si5v6pb1ma59j9162mzk62zdimr8jr8q2pc402";
+ };
+ }
+ {
+ goPackagePath = "k8s.io/utils";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes/utils";
+ rev = "5e321f9a457c";
+ sha256 = "0bgmjzjhxjldbd2n046fywk8351xnp8acf3nh8si0f0s5saniy7i";
+ };
+ }
+ {
+ goPackagePath = "sigs.k8s.io/yaml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kubernetes-sigs/yaml";
+ rev = "v1.1.0";
+ sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb";
+ };
+ }
+ {
+ goPackagePath = "vbom.ml/util";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fvbommel/util";
+ rev = "256737ac55c4";
+ sha256 = "0pvsbh23fpa8w1gx2hv2rcw6nlb7r4nalfhfy3385sj0pc0b62lc";
+ };
+ }
+]
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 597c2c18309..ffae170a199 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -15,13 +15,13 @@ with lib;
stdenv.mkDerivation rec {
name = "kubernetes-${version}";
- version = "1.13.3";
+ version = "1.13.4";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "1fcp27c501ql4v7fl7rl5qyjlw1awk139rwwm0jqdpgh3sd22l2z";
+ sha256 = "1q3dc416fr9nzy64pl7rydahygnird0vpk9yflssw7v9gx84m6x9";
};
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix
index 6ac232ee5bf..9e991b25fc2 100644
--- a/pkgs/applications/networking/cluster/kubetail/default.nix
+++ b/pkgs/applications/networking/cluster/kubetail/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "kubetail-${version}";
- version = "1.6.6";
+ version = "1.6.7";
src = fetchFromGitHub {
owner = "johanhaleby";
repo = "kubetail";
rev = "${version}";
- sha256 = "0fd3xmhn20wmbwxdqs49nvwhl6vc3ipns83j558zir8x4fgq0yrr";
+ sha256 = "159162dazcr0gsq9mkwb7sf4psqq5iqqgavy2mc8qnpswdlq3pfc";
};
installPhase = ''
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index c44b7ac1dc7..13c7f59f794 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -14,9 +14,9 @@ let
in buildGoPackage rec {
pname = "minikube";
name = "${pname}-${version}";
- version = "0.30.0";
+ version = "0.35.0";
- kubernetesVersion = "1.11.2";
+ kubernetesVersion = "1.13.4";
goPackagePath = "k8s.io/minikube";
@@ -24,7 +24,7 @@ in buildGoPackage rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "02jxwh8qrvjn31rzjwx23908nd1i592drfdykxbc5b6a62fwp02z";
+ sha256 = "1qb342zs50sdfvfb8vbn7vrx11qqjy1hw518c053s7p34ljb24qd";
};
buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet;
@@ -35,7 +35,9 @@ in buildGoPackage rec {
go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/...
- ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//")
+ VERSION_MAJOR=$(grep "^VERSION_MAJOR" Makefile | sed "s/^.*\s//")
+ VERSION_MINOR=$(grep "^VERSION_MINOR" Makefile | sed "s/^.*\s//")
+ ISO_VERSION=v$VERSION_MAJOR.$VERSION_MINOR.0
ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//")
KUBERNETES_VERSION=${kubernetesVersion}
@@ -66,7 +68,7 @@ in buildGoPackage rec {
homepage = https://github.com/kubernetes/minikube;
description = "A tool that makes it easy to run Kubernetes locally";
license = licenses.asl20;
- maintainers = with maintainers; [ ebzzry copumpkin ];
+ maintainers = with maintainers; [ ebzzry copumpkin vdemeester ];
platforms = with platforms; unix;
};
}
diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix
index bb10349470f..9515b6ce3d0 100644
--- a/pkgs/applications/networking/cluster/minishift/default.nix
+++ b/pkgs/applications/networking/cluster/minishift/default.nix
@@ -4,10 +4,10 @@
}:
let
- version = "1.31.0";
+ version = "1.32.0";
# Update these on version bumps according to Makefile
- centOsIsoVersion = "v1.14.0";
+ centOsIsoVersion = "v1.15.0";
openshiftVersion = "v3.11.0";
in buildGoPackage rec {
@@ -18,7 +18,7 @@ in buildGoPackage rec {
owner = "minishift";
repo = "minishift";
rev = "v${version}";
- sha256 = "0v5hngfz393yi3x4c328g5bjazw02jr59ljqh6ws0j6wzxzm8jxf";
+ sha256 = "06qhcycnr06fw5dmmzwizmknm0j34j43894nl3kxa5mxh8x542pa";
};
nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index 765d1684499..9e55c2f8a0f 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
homepage = https://www.nomadproject.io/;
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
- platforms = platforms.linux;
+ platforms = platforms.unix;
license = licenses.mpl20;
maintainers = with maintainers; [ rushmorem pradeepchhetri ];
};
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index f730329d072..652d4e58f67 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -83,6 +83,6 @@ in buildGoPackage rec {
license = licenses.asl20;
homepage = http://www.openshift.org;
maintainers = with maintainers; [offline bachp moretea];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix
index c276c2e752f..618bea36de8 100644
--- a/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "pachyderm-${version}";
- version = "1.4.6";
+ version = "1.8.5";
rev = "v${version}";
goPackagePath = "github.com/pachyderm/pachyderm";
@@ -12,7 +12,7 @@ buildGoPackage rec {
inherit rev;
owner = "pachyderm";
repo = "pachyderm";
- sha256 = "1fivihn9s04lmzdiwg0f05qm708fb14xy81pbc31wxdyjw28m8ns";
+ sha256 = "1b9x2xn0sxsjid15lnwr79lps8xzf24i7jfl0i48nabdigmi04wp";
};
meta = with lib; {
diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix
index bb179606b36..052797db2f3 100644
--- a/pkgs/applications/networking/cluster/ssm-agent/default.nix
+++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix
@@ -24,7 +24,7 @@ buildGoPackage rec {
description = "Agent to enable remote management of your Amazon EC2 instance configuration";
homepage = "https://github.com/aws/amazon-ssm-agent";
license = licenses.asl20;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ copumpkin ];
};
}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index 86787a12c6a..34945ea87a4 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -4,15 +4,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-acme";
- version = "1.0.1";
- sha256 = "1yh0dqmrwa1gqpnzj4mdv9p9081azpcskqjrbmy2lzmn3di2ag3r";
+ version = "1.1.0";
+ sha256 = "1ha56pr5hixpz2nmqy5558ljkvcs4c23i0jnw4vqdv1a00hi035z";
};
alicloud =
{
owner = "terraform-providers";
repo = "terraform-provider-alicloud";
- version = "1.28.0";
- sha256 = "1clivywiv41dbdiix5cqghncf782jvpixlh02hlj4hn2cwq2j6mn";
+ version = "1.32.1";
+ sha256 = "0gdx54iw6q3w5pkci7433rd5yrplv1f08svsl7r3a75pww16j103";
};
archive =
{
@@ -39,8 +39,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-aws";
- version = "1.56.0";
- sha256 = "1jsvkqr3l88z2lq89rjw0nrnm8dsm57nydi45mbzjl3k0j7g028m";
+ version = "2.0.0";
+ sha256 = "17hf59wavv44a8a2vy2smcs3sxnws30h81jxiimg91vh1rrhisrw";
};
azuread =
{
@@ -53,8 +53,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-azurerm";
- version = "1.21.0";
- sha256 = "1xvw884nmr3h5ai2ijm2vms12cghas0jbkb52mqbqbaqci7273lc";
+ version = "1.22.1";
+ sha256 = "0jg2vsfkk3z1gppcfwla5aqbn9vaxbl8px1hps7nhmylp06l9avv";
};
azurestack =
{
@@ -81,8 +81,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-brightbox";
- version = "1.0.5";
- sha256 = "0sn7k5bqgms5sxjhjikmby0jf2n6y14z6s4wsifxaw7b0082fy28";
+ version = "1.0.6";
+ sha256 = "02wbx36kdbxxjwsbbwry3drdx5injllglpsb56dw1fvqymmal7wl";
};
chef =
{
@@ -200,15 +200,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-fastly";
- version = "0.5.0";
- sha256 = "08mnpf5j0pwhd38yl0phy5ipdvk9hwh8q9kcbv997y8mzpn5703g";
+ version = "0.6.0";
+ sha256 = "1z9qrqcib2rxy8s4glb4ggdkqcq7rwphiclsr1zncyly2n6887yj";
};
flexibleengine =
{
owner = "terraform-providers";
repo = "terraform-provider-flexibleengine";
- version = "1.3.1";
- sha256 = "19jncf24hl448srk4r2vqn8sca1mx8pcql9p5nxn015q6gig510v";
+ version = "1.4.0";
+ sha256 = "1gj3y9xw9zzh2fs2i6q0afw591lhy1lvcn80xac4da08r5l3si6g";
};
github =
{
@@ -221,22 +221,22 @@
{
owner = "terraform-providers";
repo = "terraform-provider-gitlab";
- version = "1.1.0";
- sha256 = "07mj69w0bvvkbzgfj17z7j34dg19db1d2m4gxwzjj81qmgmvzs3x";
+ version = "1.2.0";
+ sha256 = "11j84kyw2lsqsn6ya070hx0k6igb3hhjl8zlnr4q3gpmv51y23qc";
};
google =
{
owner = "terraform-providers";
repo = "terraform-provider-google";
- version = "1.20.0";
- sha256 = "1brkq4iz140miai6gzvzxfl28qi4j8gcc22igd7cb4qzafnlbxaj";
+ version = "2.1.0";
+ sha256 = "1dcdk60xwqr9sazllzxai8g6ghk0pnrz4zwm5qf6m9d3l39y2gkr";
};
google-beta =
{
owner = "terraform-providers";
repo = "terraform-provider-google-beta";
- version = "1.20.0";
- sha256 = "0qbzacfm1ai0lflwrq49sjy5y84n8zvaxsp6yz7ifvylqmirj1j0";
+ version = "2.1.0";
+ sha256 = "04lx43bb1kwd36a78l49knk8n6g5bh6p970yhniyypr28zrss1by";
};
grafana =
{
@@ -249,29 +249,29 @@
{
owner = "terraform-providers";
repo = "terraform-provider-hcloud";
- version = "1.7.0";
- sha256 = "10i043mlcp4vvlsd22zcdj2ma3372cxfklrx30kav7w3lfsqgcl6";
+ version = "1.8.0";
+ sha256 = "1gahka6012rq1p2wwvsbb1w353vm4aaifgb08a6s9la47ca7944s";
};
hedvig =
{
owner = "terraform-providers";
repo = "terraform-provider-hedvig";
- version = "1.0.1";
- sha256 = "1cbvr43qb2kxvsg17cnf91lnfv6cmj0dmc1manxrq1nicsnz6v5f";
+ version = "1.0.2";
+ sha256 = "1zk93iv57f9b8qcr1byhpxjpf1mxpbsd94iyv5k5r2xzw53ccv7q";
};
helm =
{
owner = "terraform-providers";
repo = "terraform-provider-helm";
- version = "0.7.0";
- sha256 = "172l5cpl6vfdz75s3s60iqcavi5m66gwbrm7aw47hby8lv5ivflc";
+ version = "0.8.0";
+ sha256 = "1v30sr5dql2365bf63gcr0hqn85gk6lk9lzz1i3w0j232jw700bh";
};
heroku =
{
owner = "terraform-providers";
repo = "terraform-provider-heroku";
- version = "1.7.2";
- sha256 = "0wliiks1cvxai3rca2nzy6dhc763fkrzagsl92c5xsz1zs59vy98";
+ version = "1.8.0";
+ sha256 = "0gansylgmc8fx9lskpc4dkjjc3v3jxbmcgscbgc4qfiiybxf5j8n";
};
http =
{
@@ -305,15 +305,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-influxdb";
- version = "1.0.2";
- sha256 = "05l2i0z35x6462mm1inn6jhp1pfi7df6hv52lhcyypk0lv2rgqf9";
+ version = "1.0.3";
+ sha256 = "1mdarb65v977680q55bis9ds84vx8vv84p7sgf0f0svfwq8z9r0k";
};
kubernetes =
{
owner = "terraform-providers";
repo = "terraform-provider-kubernetes";
- version = "1.5.0";
- sha256 = "1rzydw8bg2rmwvcvjp1h2qd4izkfs96rnmff42h0av22sfxkd7ng";
+ version = "1.5.2";
+ sha256 = "0g1f5cbmzrd46abwd0rdyrf8wj8w9bx1251gf4s9z41adrxjy2lp";
};
librato =
{
@@ -326,8 +326,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-linode";
- version = "1.4.0";
- sha256 = "0ak102bmi6yh7x9d3ryyvpck49vgdgwhbk958bbyhfpdr6jrvsrr";
+ version = "1.5.0";
+ sha256 = "1vp20jxxrzm57z6ldni2rbw9plwws17gpzv3z0ffqa9rijqxh3fr";
};
local =
{
@@ -361,8 +361,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-mysql";
- version = "1.5.0";
- sha256 = "1fsqfqz1db1pv8agr5zgqqyhizd7647n6rznf24iwapy1q0wkvmi";
+ version = "1.5.1";
+ sha256 = "0i5s62z3cdg3mhahf09nyw8l2hcx6d7jp3hr3n8rcjwj3ajj8qis";
};
netlify =
{
@@ -375,8 +375,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-newrelic";
- version = "1.2.0";
- sha256 = "1dh2i7qps7nr876y54jrjb414vdjhd8c7m1zwdiny93ggvl8f5j2";
+ version = "1.4.0";
+ sha256 = "09asrq9y0l49vq3cg96zmshdpgv7dgkvi2yda45cqz04bi6jvszz";
};
nomad =
{
@@ -389,22 +389,22 @@
{
owner = "terraform-providers";
repo = "terraform-provider-ns1";
- version = "1.1.0";
- sha256 = "1qfzm35p6kgamm1ffdvll96br025sj496nqzhsnfh3n3hsxzf0b8";
+ version = "1.1.2";
+ sha256 = "0ayxw40yg0k64i3y4hsghzyv3q3bqr1y142y7mc2xwnvgvgzzg98";
};
nsxt =
{
owner = "terraform-providers";
repo = "terraform-provider-nsxt";
- version = "1.0.0";
- sha256 = "09yliw59wp9flfgmkznbf4syl510wpxsplzr8sa9m2vw0yc78jnq";
+ version = "1.1.0";
+ sha256 = "0y9n4acbrjf5n2v8j10qfnz8677gil60by5miz3wd2qpxwgmhhm8";
};
null =
{
owner = "terraform-providers";
repo = "terraform-provider-null";
- version = "2.0.0";
- sha256 = "1qbb4pyzqys2010g6b4yzdzgalrf6az1s24y4sa577q2bix8x45v";
+ version = "2.1.0";
+ sha256 = "0hgdg5hl33kx9hzj2y0aqfq32q92b3hbdvx1a391c0miz6rn2k8k";
};
nutanix =
{
@@ -417,8 +417,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-oci";
- version = "3.12.0";
- sha256 = "00mwyangy7n665wlvvr6jmrlfbhnw5spy47q64rmm4pp66gg9brw";
+ version = "3.17.0-rc1";
+ sha256 = "0c49i4fic0bqgpwg05q60a99w7a236kxyhdww5k4sk04cdg3aa1f";
};
oneandone =
{
@@ -438,15 +438,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-openstack";
- version = "1.14.0";
- sha256 = "05vlcfnbfs4xwzfx8lihq63zya19gdgq2xh5ddwprzddm42v1i1z";
+ version = "1.16.0";
+ sha256 = "1s0fclqclq1rrwz6217jw4qh6bz3zlk6zxsaabxvzbsg4b7vwnrh";
};
opentelekomcloud =
{
owner = "terraform-providers";
repo = "terraform-provider-opentelekomcloud";
- version = "1.5.2";
- sha256 = "1zprj2k86wad9c35jgv22imld8l8f1jjgv54dj54ry56964nhkh8";
+ version = "1.6.1";
+ sha256 = "143sbfhc44bw21wa86lyd2m7vdihhnqs7grrdxpmw4w7bcx9sql2";
};
opsgenie =
{
@@ -459,8 +459,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-oraclepaas";
- version = "1.4.1";
- sha256 = "12jsqsyrkmrxpz8zashjwnvn6nkrd6ya06d58m116a0qija1a4s3";
+ version = "1.4.3";
+ sha256 = "0lyz2fjs4hr28ymx1qlzp93r3w4qn74bglipgv5mf55k543dmwdz";
};
ovh =
{
@@ -473,8 +473,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-packet";
- version = "1.2.5";
- sha256 = "1c40w1q18piip4fn572mnf67g07h6g03hnin23c7jw265m4yr222";
+ version = "1.4.1";
+ sha256 = "0wky3kw3vhb1bn7n7h03nbd6n7bz1xbmygs0ipnkgq4qyzydjrhh";
};
pagerduty =
{
@@ -487,15 +487,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-panos";
- version = "1.4.1";
- sha256 = "1mlz01v01675cf9ja8i42c6ssklf65kd8wpjzf0j472lfwki4xpp";
+ version = "1.5.1";
+ sha256 = "17w4zkc445bpfq6pqx575y5njsak18yca1y2by4chg9d05inphqd";
};
postgresql =
{
owner = "terraform-providers";
repo = "terraform-provider-postgresql";
- version = "0.1.3";
- sha256 = "1jx907wrq3b9cvx0z4731d1vkp40g358czgpgmky6k8wg70mhp17";
+ version = "0.2.1";
+ sha256 = "025s3wgj1v6iwaliyics33cb5sx4614658z1vxxrxx7xb9pf328w";
};
powerdns =
{
@@ -508,8 +508,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-profitbricks";
- version = "1.4.0";
- sha256 = "1yrmlpqc1bzgs3c8pxhfbscf4anjri6gv6sd8i8rn764z8xhwaff";
+ version = "1.4.2";
+ sha256 = "0raz070sj5csyqn3gav1a5p5dsbrym9ba8nfw43hbnk5ixxr0izk";
};
rabbitmq =
{
@@ -560,12 +560,12 @@
version = "1.8.0";
sha256 = "1vr3im5jas7m3yn5529m6ghhx4lxf2lksqbznpwyi351sbsn4ji2";
};
- selvpc =
+ selectel =
{
owner = "terraform-providers";
- repo = "terraform-provider-selvpc";
- version = "1.1.0";
- sha256 = "045mp6j5hll0lym9z035swxmdjq43mdpf881qgmk8sz8j2wgvm5f";
+ repo = "terraform-provider-selectel";
+ version = "2.0.0";
+ sha256 = "1yw1526llvqc3ibrmjffan2lvqas99x93h6rlz9lrgzylgxnqaxy";
};
skytap =
{
@@ -585,8 +585,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-spotinst";
- version = "1.5.0";
- sha256 = "15ggn37qsgzb78g0f6bj1l89zy65yqj66abs7xq5kjxsh62h9dij";
+ version = "1.8.0";
+ sha256 = "1j6gab5vva21m01p5gh0x1p64jnx9ch2q3zd4f1s8ch9mba6zgsl";
};
statuscake =
{
@@ -606,8 +606,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-template";
- version = "2.0.0";
- sha256 = "0rn2qavvx1y0hv25iw8yd6acvrclmz17hzg2jpb161mnlh8q94r4";
+ version = "2.1.0";
+ sha256 = "1db9gr4f5awryqxq5iahv2xj5p0msd44j3lgklkqw2q3kswlvckr";
};
tencentcloud =
{
@@ -627,8 +627,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-tfe";
- version = "0.6.0";
- sha256 = "1p8l034cjpj81vcvnz8mr2yyw3bz4zffmdg9pz9mp62s8rrrvwkw";
+ version = "0.7.1";
+ sha256 = "0iqr1r4fd14c9fyj4f21kmnlypxsdi1w787gdj2jr27acqkq3pqh";
};
tls =
{
@@ -648,8 +648,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-ucloud";
- version = "1.1.0";
- sha256 = "0v4f7rvyiwmm64v6gwqdz3mn9sjq5y8mlhd7v9saq7rh56pfx3n2";
+ version = "1.2.0";
+ sha256 = "1pq0288lgj288xjs647n740fbpxgbly0hxy5kz9xr3lf7ld1cclq";
};
ultradns =
{
@@ -662,15 +662,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vault";
- version = "1.4.1";
- sha256 = "1nkhcgd2y7wyi179l2znjpakmjjcxarwc9j5mb7r191p2m27k27s";
+ version = "1.5.0";
+ sha256 = "1lny94555ws0nd2lp9zkbq6c1324h50izfk88941irl7apjmwzw5";
};
vcd =
{
owner = "terraform-providers";
repo = "terraform-provider-vcd";
- version = "1.0.0";
- sha256 = "0sjqdb37lalvizf4imxwn7nmry1c76dw2fpnrfmal34gghddm91p";
+ version = "2.0.0";
+ sha256 = "1h4zcxbrg6j4xy3hw84f9mmnz535a91jgxvymnrjadgm91bn6g8s";
};
vsphere =
{
@@ -679,12 +679,19 @@
version = "1.9.1";
sha256 = "07pxzy8fw0n0kq9mf43bz4cycbwxp8vy0jbl44sknszmzbn4pam7";
};
+ yandex =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-yandex";
+ version = "0.1.15";
+ sha256 = "03ynfzdlpl5z7lpq5yisqkzsk53lfz71ss30bfvx0q3qhv7514dy";
+ };
matchbox =
{
owner = "coreos";
repo = "terraform-provider-matchbox";
- version = "0.2.2";
- sha256 = "07lzslbl41i3h84bpsmxhvchm5kqk87yzin2yvpbq0m3m7r2f547";
+ version = "0.2.3";
+ sha256 = "12vf8krzx79yrsk3lk2k6vwwk1f18617ky7g2yf60bf2x836lg09";
};
nixos =
{
@@ -697,7 +704,14 @@
{
owner = "tweag";
repo = "terraform-provider-secret";
- version = "0.0.1";
- sha256 = "1mqs1il8y97hf9havcmxdfwjcpkrxa1hpkifzzy4rjc88m2m4q9r";
+ version = "1.0.0";
+ sha256 = "03q78d0g3b4j4213qjlacj1adh7hjwcqcqrwm8c2r2k5w9kb25k0";
+ };
+ segment =
+ {
+ owner = "ajbosco";
+ repo = "terraform-provider-segment";
+ version = "0.2.0";
+ sha256 = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz";
};
}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
index c32d6d7b7d6..3352fb79f1e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
@@ -17,3 +17,6 @@ tweag/terraform-provider-nixos
# include terraform-provider-secret
tweag/terraform-provider-secret
+
+# include terraform-provider-segment
+ajbosco/terraform-provider-segment
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index a9d8faf62b5..45c8dcf9800 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -97,8 +97,8 @@ in rec {
terraform_0_11-full = terraform_0_11.full;
terraform_0_12 = pluggable (generic {
- version = "0.12.0-alpha4";
- sha256 = "16cwqxxb19m91d7rx7awri1awz7d8cfnrv0rbql9rbg5qjyqxcp9";
+ version = "0.12.0-beta1";
+ sha256 = "0djakf2agbhpfqis4x0lf2i8s1ahvrdyfkcgr6lzp0nsks652rcm";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix
index f66692d1056..589cd04057e 100644
--- a/pkgs/applications/networking/davmail/default.nix
+++ b/pkgs/applications/networking/davmail/default.nix
@@ -1,10 +1,11 @@
{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper, unzip }:
stdenv.mkDerivation rec {
- name = "davmail-4.8.6";
+ pname = "davmail";
+ version = "5.2.0";
src = fetchurl {
- url = "mirror://sourceforge/davmail/4.8.6/davmail-4.8.6-2600.zip";
- sha256 = "1wk4jxb46qlyipxj57flqadgm4mih243rhqq9sp9m5pifjqrw9dp";
+ url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-2961.zip";
+ sha256 = "0jw6sjg7k7zg8ab0srz6cjjj5hnw5ppxx1w35sw055dlg54fh2m5";
};
sourceRoot = ".";
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/share/davmail
cp -vR ./* $out/share/davmail
- makeWrapper $out/share/davmail/davmail.sh $out/bin/davmail \
+ makeWrapper $out/share/davmail/davmail $out/bin/davmail \
--prefix PATH : ${jre}/bin \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]}
'';
diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
index 113d6a2e5f4..34ebc84cea2 100644
--- a/pkgs/applications/networking/drive/default.nix
+++ b/pkgs/applications/networking/drive/default.nix
@@ -20,6 +20,6 @@ buildGoPackage rec {
homepage = https://github.com/odeke-em/drive;
description = "Google Drive client for the commandline";
license = licenses.asl20;
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix
index a7cfc605824..22b2e2f43c4 100644
--- a/pkgs/applications/networking/feedreaders/feedreader/default.nix
+++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix
@@ -1,44 +1,34 @@
-{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala_0_40, gettext, python3
+{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala, gettext, python3
, appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook
-, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo
+, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, hicolor-icon-theme
+, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
}:
stdenv.mkDerivation rec {
pname = "feedreader";
- version = "2.6.2";
+ version = "2.8.2";
src = fetchFromGitHub {
owner = "jangernert";
repo = pname;
rev = "v${version}";
- sha256 = "1x5milynfa27zyv2jkzyi7ikkszrvzki1hlzv8c2wvcmw60jqb8n";
+ sha256 = "1qm7scrz8xm68zizcfn13ll4ksdd004fahki7gbwqagsr1fg62y8";
};
- patches = [
- # See: https://github.com/jangernert/FeedReader/pull/842
- (fetchpatch {
- url = "https://github.com/jangernert/FeedReader/commit/f4ce70932c4ddc91783309708402c7c42d627455.patch";
- sha256 = "076fpjn973xg2m35lc6z4h7g5x8nb08sghg94glsqa8wh1ig2311";
- })
- ];
-
nativeBuildInputs = [
- meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils
- python3 glibcLocales wrapGAppsHook
+ meson ninja pkgconfig vala gettext appstream-glib desktop-file-utils
+ libxml2 python3 wrapGAppsHook
];
buildInputs = [
- curl glib json-glib libnotify libsecret sqlite gumbo
- ] ++ (with gnome3; [
- gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts
- gsettings-desktop-schemas
- ]) ++ (with gst_all_1; [
+ curl glib json-glib libnotify libsecret sqlite gumbo gtk3
+ libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas
+ gnome3.gnome-online-accounts
+ hicolor-icon-theme # for setup hook
+ ] ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good
]);
- # vcs_tag function fails with UnicodeDecodeError
- LC_ALL = "en_US.UTF-8";
-
postPatch = ''
patchShebangs meson_post_install.py
'';
@@ -47,7 +37,7 @@ stdenv.mkDerivation rec {
description = "A modern desktop application designed to complement existing web-based RSS accounts";
homepage = https://jangernert.github.io/FeedReader/;
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ edwtjo ];
+ maintainers = with maintainers; [ edwtjo worldofpeace ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix
index 9252b95a00c..25ec5d29613 100644
--- a/pkgs/applications/networking/ftp/taxi/default.nix
+++ b/pkgs/applications/networking/ftp/taxi/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3
-, gtk3, gnome3, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:
+, gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "taxi";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pantheon.granite
- gnome3.libgee
+ libgee
gtk3
libsecret
libsoup
diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix
index f39fac2605a..d5ef1d7beaa 100644
--- a/pkgs/applications/networking/gdrive/default.nix
+++ b/pkgs/applications/networking/gdrive/default.nix
@@ -17,7 +17,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
homepage = https://github.com/prasmussen/gdrive;
description = "A command line utility for interacting with Google Drive";
- platforms = platforms.linux;
+ platforms = platforms.unix;
license = licenses.mit;
maintainers = [ maintainers.rzetterberg ];
};
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index fcaa1b2c1e8..80f98e23231 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,7 +1,7 @@
{ callPackage, stdenv }:
let
- stableVersion = "2.1.12";
+ stableVersion = "2.1.14";
previewVersion = "2.2.0a1";
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
@@ -9,8 +9,8 @@ let
in args // { inherit version branch; };
mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
- guiSrcHash = "19kk1nc8h6ljczhizkgszw6xma31p0fmh6vkygpmrfwb8975d1s6";
- serverSrcHash = "1rs3l33jf33y02xri0b7chy02cjzd8v7l20ccjw2in8mw08mpc99";
+ guiSrcHash = "1k4g1sd9s6nc3rsc918chnkr515qik4hfd4z5lw065bp3lshf48b";
+ serverSrcHash = "0npm9p52jk04g9cmflsfph4dkj6373mfyvd3hff1caqmjalnfxg4";
in {
guiStable = mkGui {
stable = true;
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index 8daa5d166c5..8207c2cecfa 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -1,9 +1,9 @@
{ stable, branch, version, sha256Hash }:
-{ stdenv, python36, fetchFromGitHub }:
+{ stdenv, python3, fetchFromGitHub, fetchpatch }:
let
- python = if stable then python36.override {
+ python = if stable then python3.override {
packageOverrides = self: super: {
async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec {
version = "2.0.1";
@@ -31,7 +31,7 @@ let
++ stdenv.lib.optional (pythonOlder "3.5") typing;
});
};
- } else python36;
+ } else python3;
in python.pkgs.buildPythonPackage {
pname = "gns3-server";
@@ -44,9 +44,14 @@ in python.pkgs.buildPythonPackage {
sha256 = sha256Hash;
};
+ postPatch = ''
+ # "typing" is only required for Python 3.4 and breaks Python 3.7:
+ sed -iE "s/.*typing.*//" requirements.txt
+ '';
+
propagatedBuildInputs = with python.pkgs; [
aiohttp-cors yarl aiohttp multidict
- jinja2 psutil zipstream raven jsonschema typing
+ jinja2 psutil zipstream raven jsonschema
(python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {})
] ++ stdenv.lib.optional (!stable) python.pkgs.distro;
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index fd3bda35fd4..8eea9a84cb4 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -3,11 +3,11 @@
, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
}:
stdenv.mkDerivation rec {
- version = "0.6.0";
+ version = "0.6.1";
name = "baresip-${version}";
src=fetchurl {
url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
- sha256 = "0r073nv2hmkc00s0paa538by160mh511nidmxqzghkcyb4lx6gdb";
+ sha256 = "1nfqdhnnnh5g552d8klv61j98arr84b3fbhvynv6y1mxfp5candm";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [zlib openssl libre librem cairo mpg123
diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix
index 1e88456e6b2..86fb3d7de2c 100644
--- a/pkgs/applications/networking/instant-messengers/coyim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
- cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook }:
+ cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
buildGoPackage rec {
name = "coyim-${version}";
@@ -14,7 +14,7 @@ buildGoPackage rec {
sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl";
};
- nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ];
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gtk3 gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; {
description = "a safe and secure chat client";
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 0ee051a87fb..6e57ae85ef5 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -2,7 +2,7 @@
, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext
, gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking
, xorg, libXdmcp, libxkbcommon
-, libnotify, libsoup
+, libnotify, libsoup, libgee
, libgcrypt
, epoxy
, at-spi2-core
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
gobject-introspection
glib-networking
glib
- gnome3.libgee
- gnome3.defaultIconTheme
+ libgee
+ gnome3.adwaita-icon-theme
sqlite
gdk_pixbuf
gtk3
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 18d593bbdec..7129e0a1e83 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -1,6 +1,6 @@
{ stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
, perlPackages, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook
-, libsigcxx, gtk, dbus-glib, libnotify, libXext, xorgproto, gnome3, boost, libsecret
+, libsigcxx, gtk2, dbus-glib, libnotify, libXext, xorgproto, gnome3, boost, libsecret
, pkgconfig, libxml2, unixODBC, db, nspr, nss, zlib
, libXrandr, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
evolution-data-server gnome-doc-utils avahi
- libsigcxx gtk dbus-glib libnotify libXext xorgproto sqlite
- gnome3.libsoup glib gnome3.defaultIconTheme boost
+ libsigcxx gtk2 dbus-glib libnotify libXext xorgproto sqlite
+ gnome3.libsoup glib gnome3.adwaita-icon-theme boost
autoreconfHook pkgconfig libxml2 unixODBC db nspr
nss zlib libsecret libXrandr which libxslt libtasn1
gmp nettle makeWrapper ]
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index cf4e6358dff..8c1af783602 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchurl, gettext, wrapGAppsHook
# Native dependencies
-, python3, gtk3, gobject-introspection, defaultIconTheme
+, python3, gtk3, gobject-introspection, gnome3
# Test dependencies
, xvfb_run, dbus
@@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
'';
buildInputs = [
- gobject-introspection gtk3 defaultIconTheme
+ gobject-introspection gtk3 gnome3.adwaita-icon-theme
] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
++ lib.optional enableSecrets libsecret
++ lib.optional enableSpelling gspell
diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
index 109893850de..e8c28dc3e53 100644
--- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, fetchurl, gnome2, gtk2, pango, atk, cairo, gdk_pixbuf, glib,
+{ stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk_pixbuf, glib,
freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage,
libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst,
libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }:
let
- rpath = lib.makeLibraryPath [
+ rpath = stdenv.lib.makeLibraryPath [
alsaLib
atk
cairo
@@ -15,7 +15,7 @@ let
gdk_pixbuf
glib
gnome2.GConf
- gtk2
+ gtk3
pango
libX11
libXScrnSaver
@@ -38,44 +38,51 @@ let
in
stdenv.mkDerivation rec {
name = "mattermost-desktop-${version}";
- version = "4.1.2";
+ version = "4.2.0";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz";
- sha256 = "16dn6870bs1nfl2082ym9gwvmqb3i5sli48qprap80p7riph6k9s";
+ sha256 = "0hka94gwpscjn61032c0grpjv5gjb0j8rkx6pgwci617n29xkyf6";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz";
- sha256 = "145zb1l37fa2slfrrlprlwzcc5km3plxs374yhgix25mlg2afkqr";
+ sha256 = "1nx2sgbnr60h6kn56wv54m7cvyx27d64bfprpb94hqd5c2z21x80";
}
else
throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}";
- phases = [ "unpackPhase" "installPhase" ];
+ dontBuild = true;
+ dontConfigure = true;
+ dontPatchELF = true;
+
installPhase = ''
- mkdir -p $out
- cp -R . $out
+ mkdir -p $out/share/mattermost-desktop
+ cp -R . $out/share/mattermost-desktop
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath ${rpath}:$out $out/mattermost-desktop
+ mkdir -p "$out/bin"
+ ln -s $out/share/mattermost-desktop/mattermost-desktop \
+ $out/bin/mattermost-desktop
- patchShebangs $out/create_desktop_file.sh
- $out/create_desktop_file.sh
+ patchShebangs $out/share/mattermost-desktop/create_desktop_file.sh
+ $out/share/mattermost-desktop/create_desktop_file.sh
+ rm $out/share/mattermost-desktop/create_desktop_file.sh
+ mkdir -p $out/share/applications
+ mv Mattermost.desktop $out/share/applications/Mattermost.desktop
- mkdir -p $out/{bin,share/applications}
- cp Mattermost.desktop $out/share/applications/Mattermost.desktop
- ln -s $out/mattermost-desktop $out/bin/mattermost-desktop
+ patchelf \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${rpath}:$out/share/mattermost-desktop" \
+ $out/share/mattermost-desktop/mattermost-desktop
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Mattermost Desktop client";
homepage = https://about.mattermost.com/;
- license = lib.licenses.asl20;
- platforms = [
- "x86_64-linux" "i686-linux"
- ];
+ license = licenses.asl20;
+ platforms = [ "x86_64-linux" "i686-linux" ];
+ maintainers = [ maintainers.joko ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index ae2f6f10304..e131e4c7a3c 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl
, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid
, cmocka, libmicrohttpd, stabber, expat, libmesode
+, autoconf-archive
, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
, notifySupport ? true, libnotify ? null, gdk_pixbuf ? null
@@ -32,7 +33,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- nativeBuildInputs = [ autoreconfHook glibcLocales pkgconfig ];
+ nativeBuildInputs = [
+ autoreconfHook autoconf-archive glibcLocales pkgconfig
+ ];
buildInputs = [
expect readline libuuid glib openssl expat ncurses libotr
@@ -58,12 +61,6 @@ stdenv.mkDerivation rec {
LC_ALL = "en_US.utf8";
- NIX_CFLAGS_COMPILE = [ ]
- ++ optionals pythonPluginSupport [ "-I${python}/include/${python.libPrefix}" ];
-
- LDFLAGS = [ ]
- ++ optionals pythonPluginSupport [ "-L${python}/lib" "-l${python.libPrefix}" ];
-
meta = {
description = "A console based XMPP client";
longDescription = ''
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 668f466cf97..51561fa2233 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -56,11 +56,11 @@ let
in stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
- version = "1.21.2";
+ version = "1.22.0";
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "0nr9d4z9c451nbzhjz3a1szx490rw1r01qf84xw72z7d7awn25ci";
+ sha256 = "1j5kh0fvbl3nnxdpnwvamrnxfwbp6nzbij39b2lc5wp1m1yaaky5";
};
phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 49e5a12d447..f510e0e783e 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -6,7 +6,7 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
- version = "8.32.0.44";
+ version = "8.34.0.78";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -56,7 +56,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
- sha256 = "0yzh4bmv8mrfp0ml9nhcpcy0lhi8jp1fnmnxy0krvnphkp8750c7";
+ sha256 = "1986nvdw1cpj06rq76hjsif0j4z5g2k01v73r4c4n43q7dgzl5z0";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix
index 5dd8bf5f69a..aff3cf82dc9 100644
--- a/pkgs/applications/networking/instant-messengers/spectral/default.nix
+++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix
@@ -1,26 +1,42 @@
{ stdenv, fetchgit
-, pkgconfig
+, pkgconfig, makeWrapper
, qmake, qtbase, qtquickcontrols2, qtmultimedia
, libpulseaudio
# Not mentioned but seems needed
, qtgraphicaleffects
-# Unsure but needed by similar
-, qtdeclarative, qtsvg
+, qtdeclarative
}:
-stdenv.mkDerivation rec {
- name = "spectral-${version}";
- version = "2018-09-24";
+let
+ # Following "borrowed" from yubikey-manager-qt
+ qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}";
+
+ inherit (stdenv) lib;
+
+ qml2ImportPath = lib.concatMapStringsSep ":" qmlPath [
+ qtbase.bin qtdeclarative.bin qtquickcontrols2.bin qtgraphicaleffects qtmultimedia
+ ];
+
+in stdenv.mkDerivation rec {
+ pname = "spectral";
+ version = "2019-03-03";
src = fetchgit {
url = "https://gitlab.com/b0/spectral.git";
- rev = "c9d1d6887722860a52b597a0f74d0ce39c8622e1";
- sha256 = "1ym8jlqls4lcq5rd81vxw1dni79fc6ph00ip8nsydl6i16fngl4c";
+ rev = "0473f25d38a064ee4e18203ec16eeae84fea4866";
+ sha256 = "1n09ginw6g0p42xj3zgxm52dvyyvj5psllv70vx21i50lvkbh9rw";
fetchSubmodules = true;
};
- nativeBuildInputs = [ pkgconfig qmake ];
- buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative qtsvg ]
+ qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ];
+
+ postInstall = ''
+ wrapProgram $out/bin/spectral \
+ --set QML2_IMPORT_PATH "${qml2ImportPath}"
+ '';
+
+ nativeBuildInputs = [ pkgconfig qmake makeWrapper ];
+ buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ]
++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
index fdb3326803c..f79622b39cf 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper }:
let
- version = "3.5.1";
+ version = "3.6.1";
arch = if stdenv.is64bit then "amd64" else "x86";
libDir = if stdenv.is64bit then "lib64" else "lib";
in
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
"http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"
];
sha256 = if stdenv.is64bit
- then "0ygb867ff2fvi9n9hgs4hldpg4y012w4i1d9cx4f5mpli1xim6da"
- else "0g1cixsldpdbfzg2vain7h3hr5j3xjdngjw66r0aqnzbx743gjzj";
+ then "0wgnb7fdy393anridymm1frlgr86j0awxnzvd498ar5fch06ij87"
+ else "0x6p1z4qvgy464n6gnkaqrm7dns1ysyadm68sr260d39a7028q1c";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
index 3c9157081d3..2b744c61ccb 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchgit, bash, libconfig, libevent, openssl,
- readline, zlib, lua5_2, python, pkgconfig, jansson
+{ stdenv, fetchgit, bash, libconfig, libevent, openssl
+, readline, zlib, lua5_2, python, pkgconfig, jansson
+, runtimeShell
}:
stdenv.mkDerivation rec {
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
cp ./bin/telegram-cli $out/bin/telegram-wo-key
cp ./tg-server.pub $out/
cat > $out/bin/telegram-cli < ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
- version = "2.3";
+ version = "2.4";
name = "weechat-${version}";
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
- sha256 = "0mi4pfnyny0vqc35r0scn6yy21y790a5iwq8ms7kch7b7z11jn9w";
+ sha256 = "1z80y5fbrb56wdcx9njrf203r8282wnn3piw3yffk5lvhklsz9k1";
};
+ patches = [
+ (fetchpatch {
+ url = https://github.com/weechat/weechat/commit/6a9937f08ad2c14aeb0a847ffb99e652d47d8251.patch;
+ sha256 = "1blhgxwqs65dvpw3ppxszxrsg02rx7qck1w71h61ljinyjzri3bp";
+ excludes = [ "ChangeLog.adoc" ];
+ })
+ ];
+
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix
index faf069cebf1..81073222c2b 100644
--- a/pkgs/applications/networking/irc/weechat/wrapper.nix
+++ b/pkgs/applications/networking/irc/weechat/wrapper.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, runCommand, writeScriptBin, buildEnv
-, pythonPackages, perlPackages
+, pythonPackages, perlPackages, runtimeShell
}:
weechat:
@@ -60,7 +60,7 @@ let
in "${scripts};${init}";
mkWeechat = bin: (writeScriptBin bin ''
- #!${stdenv.shell}
+ #!${runtimeShell}
export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init}
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 006684ecc10..41f3a271a69 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk
, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
+, gtkmm3, libpeas, gsettings-desktop-schemas
, makeWrapper, python3, python3Packages
, vim ? vim_configurable.override {
features = "normal";
@@ -21,10 +22,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ];
- buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas
- python3 python3Packages.pygobject3
- notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
- glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]);
+ buildInputs = [
+ gtkmm3 gmime3 webkitgtk libsass libpeas
+ python3 python3Packages.pygobject3
+ notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme
+ glib-networking protobuf
+ ] ++ (if vim == null then [] else [ vim ]);
postPatch = ''
sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 34361e1dab9..42f29574eef 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -2,7 +2,7 @@
, curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor-icon-theme
, libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager
, openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2
-, glib-networking, gsettings-desktop-schemas, libSM, libytnef
+, glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical
# Build options
# TODO: A flag to build the manual.
# TODO: Plugins that complain about their missing dependencies, even when
@@ -69,7 +69,8 @@ stdenv.mkDerivation rec {
++ optional enableNetworkManager networkmanager
++ optional enableLdap openldap
++ optional enablePluginPdf poppler
- ++ optional enablePluginFancy webkitgtk24x-gtk2;
+ ++ optional enablePluginFancy webkitgtk24x-gtk2
+ ++ optional enablePluginVcalendar libical;
configureFlags =
optional (!enableLdap) "--disable-ldap"
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index 2b62db069bc..6c39dc78e57 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -18,13 +18,14 @@ in pythonPackages.buildPythonApplication rec {
};
buildInputs = [
- gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
+ gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3;
nativeBuildInputs = [
+ gettext
wrapGAppsHook
];
diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix
index 86f945f369a..6356fcfc209 100644
--- a/pkgs/applications/networking/mailreaders/mblaze/default.nix
+++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "mblaze-${version}";
- version = "0.4";
+ version = "0.5";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
@@ -10,11 +10,15 @@ stdenv.mkDerivation rec {
owner = "chneukirchen";
repo = "mblaze";
rev = "v${version}";
- sha256 = "15ac213a17mxni3bqvzxhiln65s4almrlmv72bbcgi7cymb303rp";
+ sha256 = "0fyvydafpz7vmwgn7hc4drm9sb7367smrd07wfyizpas0gmxw2j8";
};
makeFlags = "PREFIX=$(out)";
+ postInstall = ''
+ install -Dm644 -t $out/share/zsh/site-functions contrib/_mblaze
+ '';
+
meta = with stdenv.lib; {
homepage = https://github.com/chneukirchen/mblaze;
description = "Unix utilities to deal with Maildir";
diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
index 6e2e8d58c67..88e573f6cf4 100644
--- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix
+++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, unzip, jre }:
+{ stdenv, fetchurl, makeWrapper, unzip, jre, runtimeShell }:
let
version = "1.9";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
mv $dir/${uname}/* $dir
rmdir $dir/${uname}
cat <<_EOF > $out/bin/msgviewer
- #!${stdenv.shell} -eu
+ #!${runtimeShell} -eu
exec ${stdenv.lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@"
_EOF
chmod 755 $out/bin/msgviewer
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 3afabb8bafb..dde0d480391 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mutt-${version}";
- version = "1.11.2";
+ version = "1.11.3";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
- sha256 = "08w7lbhj5ba2zkjcd0cxkgfiy9y82yhg731xjg9i9292kz1x8p6s";
+ sha256 = "0h8rmcc62n1pagm7mjjccd5fxyhhi4vbvp8m88digkdf5z0g8hm5";
};
patches = optional smimeSupport (fetchpatch {
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index a8c322b42b8..0da451ed51e 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl
-, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap
+, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell
}:
let
muttWrapper = writeScript "mutt" ''
- #!${stdenv.shell} -eu
+ #!${runtimeShell} -eu
echo 'The neomutt project has renamed the main binary from `mutt` to `neomutt`.'
echo ""
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 2fff46a1737..305535029c2 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -12,7 +12,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "0.28.2";
+ version = "0.28.3";
name = "notmuch-${version}";
passthru = {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://notmuchmail.org/releases/${name}.tar.gz";
- sha256 = "0cg9ff7h7mklgbqqknxigxxx1j3p3s2a9cxvrs5ih7j56f04k9l5";
+ sha256 = "1v0ff6qqwj42p3n6qw30czzqi52nvgf3dn05vd7a03g39a5js8af";
};
nativeBuildInputs = [ pkgconfig ];
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
description = "Mail indexer";
homepage = https://notmuchmail.org/;
license = licenses.gpl3;
- maintainers = with maintainers; [ chaoflow flokli garbas the-kenny ];
+ maintainers = with maintainers; [ flokli garbas the-kenny ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index ed798ee9233..7f32e45f5d3 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -30,7 +30,7 @@
, libcanberra-gtk2
, libgnome
, libgnomeui
-, defaultIconTheme
+, gnome3
, libGLU_combined
, nspr
, nss
@@ -41,6 +41,7 @@
, gnused
, gnugrep
, gnupg
+, runtimeShell
}:
# imports `version` and `sources`
@@ -117,7 +118,7 @@ stdenv.mkDerivation {
stdenv.cc.cc
];
- buildInputs = [ gtk3 defaultIconTheme ];
+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ makeWrapper ];
@@ -159,7 +160,7 @@ stdenv.mkDerivation {
'';
passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
- inherit name stdenv writeScript xidel coreutils gnused gnugrep curl gnupg;
+ inherit name stdenv writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell;
baseName = "thunderbird";
channel = "release";
basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 1baa173010a..9769a5e8ca6 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,585 +1,585 @@
{
- version = "60.5.1";
+ version = "60.5.2";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ar/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ar/thunderbird-60.5.2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "42bba29f92dd86f1dbbb0ffd2e13c464b62b418c387f83167e82f9a2d6f4953329bb3cc772dc1d2dac10471c1ca1004f17f0923160485802fb8676677ac73912";
+ sha512 = "ebb79e23a3f67c6d365c95d4570d5d278731231839cf4ba8ae2231aa68eb28ef08165bf025798d5311f5fd28a66dc90a1fe52ec52e4e1eb21084c1d613c3c3e5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ast/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ast/thunderbird-60.5.2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "3e15886ac06c83d33d33dd49afd4256ae52ccaf17a9b5cab69fde9ea4598803a4e8b8048f1132d7f07d6fc15ae65e272ce1ded92adfbffca0c9ca28d56904483";
+ sha512 = "d3eb72f40f5fedc2e3c6f3b3472a8d90d74e1c6599e6dded49f20c1b3e99efcdd724c09645354d0ee531b2bb9f5750742c6c97f5323b23803b59a0f93f2fe98c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/be/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/be/thunderbird-60.5.2.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "f1ce8a443ee22e6ef9aeddd609408c75f66fd162cdc68dc8bdc70c301e5937d1ab6c3bdc021646e36e7d6c39b284d74742049a1eb0f9349c3d3c11b2b49a90fc";
+ sha512 = "b895b42343a9abc291b0cbaca4d1a190d7472f9206b3161cfa93d97489846682be44c923e92b27fb7e84e3dcda9d727ff8130eea731bdfd28273a691a38b3f00";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/bg/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/bg/thunderbird-60.5.2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "be7c25bcb9688c4f90e6496b1c8a1ec3e58753aa4d9eb63e84863013a4ff7dae92e3d9e299c509191bd8336deb94d30ebcb44ea39b881e5bd974427d8cc2de72";
+ sha512 = "ba2b1c0666466d89ff01dba6fae809b7515d026b3d34de4f27c0bc6230f722739822da1d65f4a9c1ada66ecdff8b50f8aa6164c4ff0bb3d8a1c11c355e441cbe";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/br/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/br/thunderbird-60.5.2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "ed4ac8a3ad7b1b6b4b553b52b1b00c8590872bac407ecb539f3f8f3f94579af85ace6196525a93e1f726ec8ac9a72c873d438737a09401673970e923ddd0dc02";
+ sha512 = "79937d514822bcf5f2882c4f71e277d6450adce04cd490001bf2535850689ff8691a715030132c805b85406d3aac0d4bbdc78c7f77398db43e1fedeaea2ebd81";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ca/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ca/thunderbird-60.5.2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "74303a6784bf8cd6a40c3dc548476f67bc1bfbee163999c873635af7df712139a216e5047c61ff3613391f10b1ede6b7d1520e9e30b9d100f731607a5314e56f";
+ sha512 = "f1948d481fff6cad4ab0ba48c40c3e317c3cd9a68972d7c94fd4d92fabcc0becc8bebaf4e5517016af26125334695fc6b7be17ccf26fd291cd5a679e95b632b7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/cs/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/cs/thunderbird-60.5.2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "cd3a2f34c084c6e8bb628a73979940d5c0a37608173faee08cbba289af283eb2f9b6db494beceb72ccbc235f2ddf71b2bd966f9935d90efebe6042d463a50dbf";
+ sha512 = "9210fda93564133c67db5f6a10783a65e34fe0a2e8dbdb7f30fda60b4b839525530081376dc88482bbe5aff37580f0d837010e21d076994520e36a7c6ea27721";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/cy/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/cy/thunderbird-60.5.2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "d0fc024e76e496fc159e70efc7e50416375c8666ee07ec858c15de9013b8e4ccf4fdac33ba5b2969c76e7a0e8ed4474377528ca46ed5701b17deef3940b971fa";
+ sha512 = "29c35ffd5e33627ee4f3c9574b1dbe4e8addac509afbd4186f5e47284071711dc0bf74e550aa0896f39fb4fbefc72a8475b665685121fddbbbd870d020e5913d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/da/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/da/thunderbird-60.5.2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "700e73df23ac5e3d193d147f317c55a6a356b8a87b2bd35816946a8c9a4ffeab857f0c9461a8a0e2568827bab92cad388010a540e0959d14fb1fb36d5d7b683c";
+ sha512 = "e64c03f083325750020f5502ae4bdbd3b6e20a0fb9cd1163c87c2b7baabbd576dffb06b24d79c76a81d40744e6dc4064dff6d316d8e2a216a4a4e9e546f11aed";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/de/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/de/thunderbird-60.5.2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "bf3bd905e89680a2ed6f123d45f9fb554ef1b1d93d9048aa0680f2d9a0d2c882f8100ab45f0b9d16fd0411b3c93e884561bc37680019c4a1cc90d5014144d199";
+ sha512 = "d2727f56906e742c77365655422f0e53ca822702c13b496181889dc778502f922900c76178259797300dd3a440128103e7e6f48be1316a85f41edccb7a9c291f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/dsb/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/dsb/thunderbird-60.5.2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "58d016161ff90489ec090cb5f62593f22a29bf87bfee689f9a5489f9ca711d1a08199e48fa7624af324e051b96bf4cb1fea8c25f0cac5a13e2120067966a8133";
+ sha512 = "19eb975d0c97168e0106baec96ca8a645bf42f7f5993e11f0e4e2c6bd797808a98b70cc643872e3f03c8f8fa644cfb46210bbcd96d91a5f5f8bb4443f49befdf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/el/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/el/thunderbird-60.5.2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "8edb85baac50532067832341fc15fb01d6ad5338c1298293926aca2f3bb604623de495f95dde78a1d31b669cefec7c62b870f3d324e1d18787bf9a4b17483436";
+ sha512 = "10cdb6888830d88bde779d402140dcfcc68c5d6d1fe77a8a0014bd230314af28b5a04a93f36a15e32d6cedbc6c06f9cedd447d1ef120bf0e332b71e8bd67930b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/en-GB/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/en-GB/thunderbird-60.5.2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "39d7b7996d46cbba174780ccd31e86b8f168d5c7af9f3753ffd6c6b6050aa72d6863c5287db3f7f9c30fe80a4f20ce8a9918b9f37471d8520682ea4c34bbcc16";
+ sha512 = "09c8fb67e8d8c914be78d7af15e9cfc292fba45d87a8e95c83c38ee271c9004155a8d2826aaa880716e997ef4e6edeeab32b447b673c1ec6684d796d53e872f4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/en-US/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/en-US/thunderbird-60.5.2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "99588bd58ef55ff7f9b8b248bc0cbe04707e0f94ccd248f0dd7caa4c1f21945e694deee3b41258c818c33cf845d9a38854a6ded5e225332752942da7dd0bfdc9";
+ sha512 = "89efb313ef9246590e38bec044682c0a472741be3dcb7addb982ae09072d0f63652e4bda632d76f0340417b7a4bbed4631e009300d896c0e06af7626ef2fe526";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/es-AR/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/es-AR/thunderbird-60.5.2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "e0e28a36de8eb088c4f56044198175fe87968fb977cfe515aad3abf28b9846f76c575a03670a9a618cf46f9906c0086f5a671fd4440b3aa4614bfae0799743ba";
+ sha512 = "df915675422bd60d59f1e427c8a7fd68c20b3feb70e7a15a3d280ef3c98a40edae7663a266e5df3fb1045f63c480584a862dbe9c20bb4a208bc2baec2ab9255d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/es-ES/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/es-ES/thunderbird-60.5.2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "846ca3ff9847106cfa23a74ca3add2d7a12e5b192734ce0f2a027fff037e8ef8344b60fbf36ac678f20dc2292f7d4cc44b80fdd644af6ba839f2648fa996cafd";
+ sha512 = "449e0e5d02bbad21569a45b61d16f5a8ccee853b1e6716b24e66744f1e6688bdd9adf240e06b2e40b71306759795bda150d8fff201c2b91466df06a66f55e484";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/et/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/et/thunderbird-60.5.2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "9a5c4616a40df5c35629cfecb1086f43b7a159ba4c966b52022e2f7a6b9d3437a0b933cbf3b857b708b349e2dada43dc82cdbeb2824a9b3c49fd466bd1dde89d";
+ sha512 = "09f0e6dcbc99e9d39f253225db3d6f370414c3120b5ef0fcb3258ea3779117f4f41c6481aedda00ec7006993c3b05e14b0aaaf7b9a805046717ba29054803a70";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/eu/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/eu/thunderbird-60.5.2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "72950cf78c2016f6c7679c6d4a45c39a3b325c491de0def38758556f945867d8299678abdf1de052e5a18079753a820b7329935ea373b0c5cf32063efe953471";
+ sha512 = "fd2097d6fbee4ccaa85744af1676b7ab8097315d9f52dbe0b60d2e620d1bcd052f9eabb9eff5791654a5b87a8d4e6b170318ef8dd68d666d4861c5bede1fc879";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/fi/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/fi/thunderbird-60.5.2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "ba815c3de1a894cf616c2172528c045aeb4768c237abc6c11234c8e6d10aa80b7578e2c9e562957bf6e5f757c0fb5fedf65a905a2c49836e08fe18029bef5065";
+ sha512 = "2c7ac9136d7d44f8870f5b5555f21405ddf6f243cbd346c985f71ca12bebc05c81a25ccc7050919704d9101643accc50c3fa8a5c6f93a6f97c96e91adcc07833";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/fr/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/fr/thunderbird-60.5.2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "3da8f0eed4096f64ac297feb87e902a943ac025d8db66ba48a56456d450fc6bf4f00c729b4b72bdde4688991a1a6eafe8f71f91859bf3d3b0db80b9953035d42";
+ sha512 = "303dc437b230d5991c4ca33afdec531c2c5b2b67d02b4f9ee923c2b4ec434d0765a8fd670cc2978226eb7a25982ddb4a14f91c0829aa97d822f7927421313170";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/fy-NL/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/fy-NL/thunderbird-60.5.2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "b49c4b191651d8f22e23c7ba1a7a4bf28613162bcbe9926dab9ac42a9c4a96e26bfa74bcd6ca5e0fe8c43070559990f885300c71cb3638eb96efdcb307f9b513";
+ sha512 = "040d1112d135ff81aaf86964eafd235f6d9cb793049e5cbb68d9d183555eb2b08af257046de373a1bdc76e0113e372369cc1c0ba26381204cc089f2a7c752977";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ga-IE/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ga-IE/thunderbird-60.5.2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "fe360cbd6e9b4cec554f0f9e72501707aeb7b52c9dd783c028b447d79a0172c6b42ca52593e5a6251c4090fddbf15ed21d2ae97f055c2a1d77efc60e5c63eb80";
+ sha512 = "aa9eaaabbae45d554a31a5ec9940f7dad5c1ad46d34438f6cbdce5573a12d019c014bb4e9013e3efd73b68ffc699b5bda8721901b78af83dc370c71d588ca1db";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/gd/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/gd/thunderbird-60.5.2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "29b6589c431ea3f5e229a2868220ddf2ec4a9146cca6cfe02cb471eeddf193d8795c1944582047cb58036be97a83a1dc87797623bf46fe856f7bf6f52d2a73c0";
+ sha512 = "479601e5d4b346d9c69daf2673b12a8e74e5f4ee924b0deaea7a6ff56c92ff5aa3ada825ebd75bbcf6e115455e032e50d1e7cfefe51f9bd059d499a023b514eb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/gl/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/gl/thunderbird-60.5.2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "60cc4f02e9e67fb774eaa21ed6c4525b0bcf3ea59c52934b043921b690405d53185336acd3c47a34f03efc2585b29384764614c6bd24359a32f5294872208fb4";
+ sha512 = "fc6b5c061bf402f46c255befe2ce6a752d2ede4af5ba303e1e88ce935553ff4bc3defa5a4b54a10a8b6a3888044300f9472e0390ce71e43b256be0e549a61f60";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/he/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/he/thunderbird-60.5.2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "5f0252d6e36de08da28520b72b2d43539652c8e38b12db525e69c8cc459244e7304904d334730728e1887fcaeeefc45ffa8998a59d07e32cc219d9b437dbedb4";
+ sha512 = "f942b69831af29e4024c3b5250e6eee3cd5cc19863f960bc477f90e75e55bce7098fba1155452d67dc2f5a957c1fdcef049a0b4e0cd8867b540d34b6c17ac6c0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/hr/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/hr/thunderbird-60.5.2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "fb986a942ea25800f2eba0f98fa14f1fca71d7fbe55040d4ecf70013be413cd3afb6c323e35a76b085daa6ff2defb062e2d27c8590231ab5b0d87125a8f3d1f9";
+ sha512 = "dd0cd07f20e8b28581ce34c3481a8aebad31099392151b5cfb5503b3cfbb6b69a595a4c58702a4f359d860f325cf1feb73ac13456f743410e63b2471587e45c0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/hsb/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/hsb/thunderbird-60.5.2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "f7ce5acaaeb88a1322d78e9d66378dbde4a628fecf1e196efaf42ccc6ca02d99192dd3b8271399d288cdf74233f7c42df5e4a2a6e44d22d5c177c876d857e4be";
+ sha512 = "7a18f221a0d41fc52a4efa63ad85bc41e3d7789f8e5d82ff60f2163ec4e9a0da420f795a2be4e4d05c35589cf26460b01f660d03b83039cd46684fde3f980668";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/hu/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/hu/thunderbird-60.5.2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "9319cf8f6e297bcd8d263bd6528adf6eb63560469509482d0c9bb24488c91865d97084ce6fdf2aefcca4585d64c83991438021bfcacf26861eb5db42cd6bdd9e";
+ sha512 = "9a8206e613c8989f1288936853070b0e719294aabbd2454ceff0ea8f2fca36ead7aa51a0b7b1134b4d75854d77f64cc809d4a12e6e2216e30f7d67ff41c8db6e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/hy-AM/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/hy-AM/thunderbird-60.5.2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "ca4efc6abea252c4637966718fe7ce7015325edefd4209216de3fcd501b86744349be48fb19ae21a8bccb98848cad8604afcd48518a7a42016a999adac5b0c0d";
+ sha512 = "1166b2380d09ae62dbe73713e9ae978f613997326cfac04b7c30abe94e51637a5ac4ac23be75d2cbdcdc60e1997b58bd8c07c35e13987be89b439cae4edc04ef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/id/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/id/thunderbird-60.5.2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "deec3df7b9a25e450000976fb03389d06befa0429ed4970327f9265d6576b3a914646c192bf857c47cc1881a0e71ad3b52f98c6e66cbbdc43103715cd983f118";
+ sha512 = "34006d900389d1cb5f29ef379e5aee0177df74f22e43a42f99520821c04fe5c33cda7ab8b77665091403b889ea54537561eea14532290fd096efb4f7f8ca3615";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/is/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/is/thunderbird-60.5.2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "1d88b0917f636a48af360003d57f30b9e4eca4d6ed026184a475f980abe7f1ad011306dc542ac124fbc1787f386421ef1fcc1937e06432daed92b835fe4a7865";
+ sha512 = "e8b96762eae43a50b73b7faec2647d13612dfacc4c58687461ce2ac08e14c54bcce138c82378ec7a71660dde3bb9d96a29f78f304f51ede8751d97f32b9a4151";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/it/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/it/thunderbird-60.5.2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "2a4028b462dd764e20f14cb97667466d548482ca28d621e4e830b8aa29ccace76389f0bd9892b5ad4fb54908bc83a7975a0dde1129ee54d7331fbf0682fc445e";
+ sha512 = "42182a88f948f57a9c8efb347b6178bc14c6d5bc13b3814cd9f187c84c47aa897d904495443d1d8800837d66e8c3bc4a266df4a08ff1a31ac136f0860a563423";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ja/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ja/thunderbird-60.5.2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "89568859a275424d00581bc596172fd8c5fe562c01087d9d63b734874e91f5933d80123d66fabb34a09f11638a5552200ce32ce13a4eb5464af380332687381e";
+ sha512 = "dbc4ccf655ded43805192ae65c67467002645fc527c935c4e15871173c7bf975681df66ba1e21ff823cefddc551e3680d50dcda9fd2a072234977c83dcbe31c9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/kab/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/kab/thunderbird-60.5.2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "d20004efd3285670ee253d519cf1cc0d6f0fb6f3b95b0c4b96e56a9bd1d8c6183accaa1989b1038fd69683fd2aa3f5ea68a545a965c6c4d9a194eae2941d7d55";
+ sha512 = "cf4fc5243334b8ad84e007606cf836c12d0c51aaffb02d97eff8a248fcbd5644a82767b8e129d1643e0efc03525db65b6ed7cefe8a53e0680c9984fe2a13f472";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/kk/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/kk/thunderbird-60.5.2.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "9d3963346b80e8877a5edc49a76dd0b2d26737ff887a3f2847df8e9ca359966575beea15b9390c1086c1a31690f0d70a60726eeecace1bd0f9490f2fe5d99c96";
+ sha512 = "a2be7803b84d9bc9ad5be834226e314a980c60d5079339beba9de6e296c9b26c02ab0fb6e06398061588df005b9dec4e19a6eb55a1f7f51ad7ecc61fe17a9b50";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ko/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ko/thunderbird-60.5.2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "3d7b645f5fa84bb6d22bbcd5d4d963f56613836e3da1396188645c82c5b3519723bfd041f9f3b74b7da966c6700a0ce8071662683791583ef09ba252a053c5e2";
+ sha512 = "a0b0a2a4818c61b838c22f55c8950a826be819c22e17e38548e18b189e5bf9743eb3832eba176087c291ff12349415d12c3c83416b24d38d148973e2219f6daf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/lt/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/lt/thunderbird-60.5.2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "c8efa6c786c9075c8abcc9c544ece1dd25b299bac3444ff510858c32c9ab7e162104bad236edebb7b56b4a1fcedc9c1794acb2c2b907398d3244439750cc0d04";
+ sha512 = "0b2635edecfa8517a967fb298f91e77861e8af2a6dead50a451ce23e36c26ba8b0aa4c9339828008178d5b3c3f36fb2a13d91f48446a507eeed8824fb162c578";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ms/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ms/thunderbird-60.5.2.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "42bfcc826317bb07bc54fc2c14b27f784faa05fe17c5ca1a5e7724a47490488856172a595aaa4f56b01ff6f702c3eeb6715da5e48df2af67832d2b4bdb979e1b";
+ sha512 = "3671774abf19d63fb5141c28f4d3a35608db59eb75530e6f78337122a42a78a467fbd0a0cd33402286cb3ebd43ce777b202ca704ddbf0ea7a4ed52981ea1c01b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/nb-NO/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/nb-NO/thunderbird-60.5.2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "a4b21d7fb17a73f9e75a7d4d9e21ab87d276200e346f3078a70ebbd2e270a73120ca34d1c15c8e06416a57aa4a3cdc4c72dcdda0892abc657a9aa089dc25f04d";
+ sha512 = "cf1052a4c0a48d2f2c2b2a63a36266b7f33c572f5bc8d5fa0c6be94c5f4e5a71dfb19fb8971282bbccdc2c5366255bc46e0c549acfdb98b5b769af0b392496c7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/nl/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/nl/thunderbird-60.5.2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "9847949b60ad60848dcd200acd4b4b4de32f9f605740c9fe24dbaa79f6e17de2ca5f2d50a70cbe2b823cd25ab9e1221a475be6ac87ba0124b0ad2c6ecf87a30a";
+ sha512 = "8448a26d8e80d042f59d4bf617a60915b656d2477ca0e214b954104ff7a2d1a7751881c09f262d32046f9e9f3bece7e591dba689bf6b09b21b318e76de9cbffd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/nn-NO/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/nn-NO/thunderbird-60.5.2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "38b0c5f3d48e5ac17e76b6ab018913a3af2470b59cb82e21dd044104ae84fe0354fd212210bf36cea0c13b9d500ba6ce41c6d55da6f22a71d0b9e9ae4ee45448";
+ sha512 = "c6a2c15d4e2470c9c0cbd984f8928b4eef88f356bdd16a24e4698bca7005a381001667e6ed357c22047c748a7fe0a6647402763c9c90c026306c23bd8b2dc3f2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/pl/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/pl/thunderbird-60.5.2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "2d7952a4cc934da58697dc2ae8067a6ecc3dc1112ab32e9592c8837919c55487a9e4c84ead5520bdcd551d5dc656cb9b1a913913f8e0f2b2b79c07e4889f46cd";
+ sha512 = "d8a5e014e95074e68678c2fa2f4ecf0151495891d496dbb9c89fbfb9a2fd9e168af8751c214d612789dbf179817ffed4e0fbe27b8d8b15a1fe5a5bfa1710ca50";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/pt-BR/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/pt-BR/thunderbird-60.5.2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "e26d527c462e4682375ca21827a8d4decfea599af0e8e0dd399de0e511f9ca0d41584847067f787f5df0e9956b65c0f9da5edd68e9edfbe4283e5fa3ec6d019d";
+ sha512 = "913c164af6d714b9a99c8c28b52eac4fae702fd0626bb3c232d556c6047c809834c390946b4c9cfc52894bc8da7d0fbe794055642f3570f8bf7bab5b1de00977";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/pt-PT/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/pt-PT/thunderbird-60.5.2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "815769609ee977104f0819099233c4d8ef0a7ad87219e09dab564d1a6b98534e26fd0f6f07458d762cbd03e1a74f152fb4bb4707430c06e3b6322c4f23b17673";
+ sha512 = "ed84b2dc5bc16bc79d9ad14ddf22d03c0b23c78a42e3cf447c4e456bb643ce23ef890399114bf47229f0a496d56617ba65ee71282bce5bb5f085eebda0e3b5ee";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/rm/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/rm/thunderbird-60.5.2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "8e0bd0cf42206ccfe5de8e4a5a3632b67603e88acbf72f7b4154d1a4d220458e1d6aa57877da728d9677b6fbcb88ce8c71ec1fe7a153a3db82267533a2f15634";
+ sha512 = "b41c15cc2758f3a90c8e96ee20abfbd20f747bce5e40eb0301faec23e512e2a39c4d69b18356fbe72c6b8de3a83e79dc18be20a20c77f33d03bfaf7584cb86d6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ro/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ro/thunderbird-60.5.2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "046706f9701bed310895bb39704e6852a4323efe25425355cfb816033814682b5150880fb77e72361bb4893f52be08598ba29323fbf25242dece1ffdf4fba570";
+ sha512 = "b100178b0ddf33e5568180f7d3f64755a2722ed8693bfb92391bfa9a8c0a2f3b88534bd0bdecd3eb823cf25c5b17ea0d80a9a3f007b805d512a6f4b29321ae17";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ru/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ru/thunderbird-60.5.2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "3e348bfe2fa4fd8a27f5aa5e7d32b320577cbf5b64975392dc8a9fadbd5ce1ca2927b4a9563b7a3b578df80d6b0636c032380a1da6d750d165a20df5bc898d7d";
+ sha512 = "486b51a55c5dcac73ffc92a763dabdb4a428f7b23c7f4d3fd3e44ef814f26d4987f4cb794431d372d07453a9e3beaf3b985e22fce0d2d45cad7f75f0b32c5875";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/si/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/si/thunderbird-60.5.2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "378a9ccdb98cbc0df37663880a141080ab1f312d17b9ddcfc3ab7102c55bc130f46b79a84ebcad0fc0844b1f511bf910db644b9aa2ceaeaf0191d079cbf9ac43";
+ sha512 = "edc25ee0903b52f6f5bde6bd81519e0cd76597fa5b93880312a1e251dae03ceff5166dfa137478805619b4776d4c00f9be6144c72dda2b4301794d38c1fe7c10";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sk/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sk/thunderbird-60.5.2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "c0c3e097f4b23cd3c2d184bf03a4e8027003a0c143b09e89dec457df372b239f7d045aeea0b3e106c1ea60b9100103c17d82e611011488275c735e25b632c0b6";
+ sha512 = "fe383eda44cac66ffee31ac2dcd0afd1e5d864ca32f14114bd3be4ed9d59ce45b4cffda40aa15f5276b682110205c71f28ccc5a29222194782f0ec9ce4262f65";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sl/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sl/thunderbird-60.5.2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "af5cdbbe141e5e913d5dbee9afd02d1aa452683655224091ea4956f4caa28a92ba1a3bf4d7325011181e11f377aeb0990be30c0409e3839b693040b9f0154ca8";
+ sha512 = "be543501922ef4b0e6205f25846a5ff07009566f018a880b38ca5525d601d107a1b0589fba4502711e4bf187f2e47445ece5c2f2b3b4523f887e865edef8816a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sq/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sq/thunderbird-60.5.2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "3cc134a77f4235c09ba95ea60e40db7a0be5b3663dd655ecf8cd8e490804e9c22d467783348bec53c4e73f9521e063e6b6e55ea5508ecd7687536bf1bf173ec7";
+ sha512 = "1a26c71d2466ff93aa8814f0138e597f9b05e6c80ef712c6d91d17dd793529274b30dca8c9a864cfe5d5e959594cc5905e6aa6ec9503264b3e25e6dc240cda50";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sr/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sr/thunderbird-60.5.2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "f0ecea0810eb21b78c099d5cfac3c9825114fabc608a52244d3394b8af1e296bb76f5b8656d164faf80d770c2be84ad74f0cbb8a71029fe6fbd0a1da4c193444";
+ sha512 = "6e61edd11aee58cde3e50f94d0053140289927239627e53b79a68d81d8ae4eb3adddf6fbaa92c71584a8cdb9b352f32ea64b1d118abee64be9ec5bd5ade6ab03";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sv-SE/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sv-SE/thunderbird-60.5.2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "a0676f15038b5aa4323dd0a5c4769b55da3450b72982bd0a08b24a1c07ec27c5c267042508109111e6aab181904680072aceda154af0363ccac1f572215100d7";
+ sha512 = "c85b14d0d69675290734896c2fa188fa2ebd291aefbc006c88f6a8b0929c3a0fdc88728af8f7a584155988e44ac18cc18468d05b38c0a3be45d0d9225a3ae8f8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/tr/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/tr/thunderbird-60.5.2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "02be00e15e625119621eda8c8204cedc13bc6a71ed020bca4d2fa4f0c2267150638ea01b88adab61b6ce76e91ea6e197e3ab981f85a253b253f652ceb74f6dba";
+ sha512 = "03440acea9928ebab312dd9411aa01f4928bb379acd377b2999c9c11b0a39aa5045cbb396b4a76bbfe0c0161b1e1bb75bbbacca1b370dcc84a12a22925189642";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/uk/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/uk/thunderbird-60.5.2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "3a785b5569bf9d5c95cd3b8bbf7d8c07b0e994a2bc239a755106cb21e51032a29039f0fa5a1395a803fda106b2bd2b8a7d802acc48c406fee698f2d7c2c3cf37";
+ sha512 = "7f55c44695a62c9b889b2867dcf8c8b42e057afb9b94bd44912ad3da617c18f4064f41a05e2582b24acd982cb3c667d081dee4f012cfbe096f06d795dabe456e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/vi/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/vi/thunderbird-60.5.2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "fc684e3f3d9614a386e1f2dfe6fe7b3880be13335b567c27ef7c593dae97b6d4d2d272a14747de77d09b5ef9ffb2d860e2cd1b2f4a833a9f570c1d56a2548fd0";
+ sha512 = "316cc05da31325eab8299496660d0c3785ee4bee9939ef4c4ee4cb19688fea79131d1b47ffde3fe1154a9b90048bdd584ef584a0044c66d104eae6aae98f5913";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/zh-CN/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/zh-CN/thunderbird-60.5.2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "748c1fedb6b1caa3f6037c1554af8870ebd8ade3b242f5a7561c8085b70f13aa4452e0ad61ba5d9430455246468f21edb92d2651f36dfb466529feebba662c66";
+ sha512 = "99d7524b51e9d43b129903e9c4339d9db7e18541973e5813b491b4866e94ae51373a8b3e23aca41681bf097905e93dc888590cc208d40bacc907546b0f6f5106";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/zh-TW/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/zh-TW/thunderbird-60.5.2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "bb25cbdd2ff483c20d3fed558567c82aaba2eefff5919bf7f513d25e44f1918377e17c65028642436f7c5f178249a5fa389235268e3b2b1ff00a85275ea8ab2f";
+ sha512 = "235cd4de682d65ceae05aa2ed9f7971cc85aa01cb60e6bcd85de7da24d878d5d98a4e2f5386a9ee30263eb51da7cd50e9bfdd44136bddbcb7b001af0a79da34a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ar/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ar/thunderbird-60.5.2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "1976c20e7c5686ccc96da87ef5afe3dfb8d5fd5a9a0a24322fad8c09fcca7cf2613c2a029792799d417b6d1ef88d79e15697cfc41d7c7656f17685cfc4593c12";
+ sha512 = "a9356c983c9ecacc5f381c51709c41a529cb792eb2cfbe62bd55fa190ba6f53a417c5e7f1ee13ca57b71cb781cc7d1485d794cb1486a2f74d06e17dd3a59ccb5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ast/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ast/thunderbird-60.5.2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "7327b5cfc0331811e932e1748c01e3365c02bc0e2a1a59620f066b5e02aa55b97b7d0d62f7c45d920f0d9fcfbb30684d8ea504ae404494e19173cfe5dd3ada52";
+ sha512 = "627cbc249e56351c527b33571a43f5b28c7c2267ce83466d74a66c231349a6677f423eb817a86fed84b3e214a274c87af5284164d39fdc74f04610bc289771c3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/be/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/be/thunderbird-60.5.2.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "7188c82333bae58b88ff4dbaff493161dcaa0f515d26d7bc15984556265d11efb526a0597d84e6db95d2a65384745a4229945f3f82d26e62d853bb8faba7ee11";
+ sha512 = "a3d96e1ac59aa7144cdc50d7064ece222e401f8d6e6a2d7b60b2731510f934b8eb3c686ac53f6ff96915e14ff3b3cec38d7b01b4c549490d314aaa6a40bba365";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/bg/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/bg/thunderbird-60.5.2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "979c588c3a6bee2c712310879ef2f971731f2bae504d5631d30ce53fe201bd22ba0d5dce0a4b2758c994f6ddecf3a3d4c04b3c173f575d39579fa8961d60b28e";
+ sha512 = "c39fd5d4dab48ce85bb4d524f210b17e1bf16d7b576639055d4f949e7ee549db3c681fb3579cc3722882753c401ce0a0dc97182767dbce57785a474105521345";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/br/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/br/thunderbird-60.5.2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "fe36fb26ab14c7da712a077199ac24c22e7d8a892f35246e76579a70062476dce362fdc13911332b8a017d57a51e580227a5ab774ee1b8156711ce432e1c958b";
+ sha512 = "b5e1a4c7fb6c12ea41d5e5c1cc7a6214e822012fe318e2777ebcd89b2502018c5af0758b704dc3cb1b0487a759222393a4cc4f57a491f5d9ee1f71522a8d242b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ca/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ca/thunderbird-60.5.2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "2a3ae6a3e3297abed7d1202c55019dcfcc71658345cf0e35ebdab765ab9d35408450e5d7121fb5767409f6923e07ada832221785546a417ae390bc1c8b376cc0";
+ sha512 = "0004d9792dcd2d0ae211083d6dc87019e362a6e10390a29dd8d9ef567a0282b0fcedfd95c4e91c857c25361673e2f3c429b3afd19f35714925a7252e15fc4231";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/cs/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/cs/thunderbird-60.5.2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "5195590d7687e942c6a46e11c3493d00c0e4362cc9dc1e4fef5427ff18161f48caff02f700c862da00753d8b9b7929505d1626a1f33b40c56b0ebd965cf00d04";
+ sha512 = "c7428593007a117f44e9891e2cab7d352a64f9f53487478671bb062d7dfc623b65f15749b994c298afebd4776afae4619f36da513866607cdc1160896748918d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/cy/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/cy/thunderbird-60.5.2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "311b612736dcb1b70934f0df4f8fa6b58f01530abb41944eb7cd135b353839af39ee40ee8a8e3f337d1e5d0e2bde706d9c3454019e37ec09e1780b07f040adbe";
+ sha512 = "6c768a2e5ff27988f7e52c9f38f543b40f3111c6e944e573e8dda4791253cb9f4f25d2dafd8d0c63d2120e7bd331315cc3ebcdf6381cbae0d4700564d7a54d11";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/da/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/da/thunderbird-60.5.2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "6bc22359bac0a2d16a25eaf4d0d43fd08922870a36c437f5476d945f2c2988b749e46210b61c1b78952a907d10d1c5604a55585d08a4b1808bf59ee32cd6f816";
+ sha512 = "e4bdab9dbdd1c4d2db731dad1e42c3e9839e6d2c8b9f92ae88ae76d6b838ff5d328f43c73c03a2a2e3998bf7f667d59f02016f676d3d23f1ca2d2fec105ed0db";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/de/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/de/thunderbird-60.5.2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "9e88dd66eeea5f77720698d163108e1205dd05c15b6170a7dc8a66c39d85aa58ab07f5f8a55e5db3660056bcdc697500cd64ca720893a54d9737bd34ce099ac8";
+ sha512 = "df0dc702eee0a658e2756fee0f3d26a43a8c2e5defca1e1a7a4cb34909af0e6a88f73f880fd06d0fb336b740b2d25174386d615434b1e4dd85c91416d08c2e2b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/dsb/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/dsb/thunderbird-60.5.2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "d94f8ed0d637cdc444459d5e79d9f753d290ed0fea0557a0e53603ff1f1d861b9c436219b000783be67acc0bc1ea5d226e024faa8ddd73b259a10807705996bc";
+ sha512 = "0ba2bb386d9408b86041a87414e1c84ebae07f9ca357ad9aeb76aab195b16b90ba8313bcfa3b386b232a10ab295e183d4c1eda37ec4448b02abc1566ffc29b74";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/el/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/el/thunderbird-60.5.2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "e632ded7de7e269af5e8dc2dc14c17dce3b15fdd33c00423ecc51e5067a98fc694d600022ae9d0126630c9c9d6768f805dd6bb6492d658524f37ecf5a27dcba7";
+ sha512 = "66b8ccf62e7e8bc3964ad18a21437acce9980b1378b05bc943fc579f8c3f201972ac7dfb3ce25dcfdfeda88008b6c273fa4a748e3b73d8500ace905ebc3cc816";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/en-GB/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/en-GB/thunderbird-60.5.2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "00b958aa333c0ecf1048051be9c9767949a2c21e52005134ced1e2f25ff1dc4a15b73225fe0fcf7297dbbedbd0a02a75262c100e2f59ee8fac6403e8bcabf6b8";
+ sha512 = "ce8cccda4e620f712a78b477a37815404acd55580a977a7bb71cd349e64e28747935231cd5dec048e9d31fc1cf198a4579308f9a320220c282427913f323ecfd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/en-US/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/en-US/thunderbird-60.5.2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "150f6674dd95932c713c275eb24194197ae52cb4ac08aac49c1c6302e3734cd3de5580878b8d73c2dfdcc18df311654920914d9562ca85f580d560c372f5807e";
+ sha512 = "50b50e2df00fc2a71c555105806b2134ba9f7e09601e9194334ac2e89e53fb940065e604b56c22a8aeb97ec6f30fa8cda6881347a53acd22270b38767c3b00ae";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/es-AR/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/es-AR/thunderbird-60.5.2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "eafefac3a5626c713d39f032ffd11cf65b733dad78f6157a0c83e55b0103301066d825d1cc47017101f8b09e757ef92f30654adea538a00f9e0f0d60b1248c72";
+ sha512 = "e3d0708a89548a36712fddaeec6e7e2a15a255b29fb63e05efeb279e1748dd41034f9d568013ddae50484300b536ddcc08cb37d013b1d4beb52e7ca0fa47a924";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/es-ES/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/es-ES/thunderbird-60.5.2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "3dbc541e002c2954e427327eb20bafaf126e157449c4f68f2cab2781097faa5a15c73a07bf27c9a841c02842f028bef3f43618781e9b29a1cb86bdb533c2c91e";
+ sha512 = "b34202bff1054718cc068f21c2d4cad9cf1cfdaedd5802a1c1a9f897e75e7cba1b2b63d4bfc9e3849468f69728308c2c1ebb716b19468de054149c8c5e614c7b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/et/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/et/thunderbird-60.5.2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "3ab361983dd178f1fbeb97a79dcb4fd13841d1556821a732e29543071b5d8de054da7488cdbb4fd12b80e2b9c7409c0fe177d9677b0d2333ad49d1dfc6fb03e1";
+ sha512 = "023343885b09835dc7a924407724aafbc6e833d668d4066aee0971abe93ecc53deab16b0d3a0e0527d159f62c1fcb1243615736cd68404537587b57173c52573";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/eu/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/eu/thunderbird-60.5.2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "e17f1e2248eb6a48e74780b1a908427656af1cf7f9b3cc3a1c3539c80dcb870126e90908b419b56c1cba7e445431b3802ba8e19a5516fc704c383a31c1ffbd5d";
+ sha512 = "b5db0e61be652f851cb4e729abaec04cd2295f5b769cbae82da9a13521b145e3af7bcdec0d595e82200840eb0e9e8d3b321c9e2bca7e504ecc45b4a438494e7d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/fi/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/fi/thunderbird-60.5.2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "3e054a95162fb3469ae4cbcccd8c285058fedc661b63cbc43d94359341d971a86f69cfcad307ead734ce22d62c8235a817f943ad111a13e5d7af445bfd905431";
+ sha512 = "cfcd1cfc0b49b94acf2c4b65064badf4f48d85f6833b4ba6bb3b9da21a41815ca9c544899ca5282a96b3e498ff948037fd6e97755b9bd4f994e67341ddb46aa0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/fr/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/fr/thunderbird-60.5.2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "61a3766fdedfd5dc45c203616c7c99c2d72d172d3e9577234d9539e841fce33c495518460262a2ba4c636ed9495a734d13e7ecbf193edbf5ddd81a767e03f8dd";
+ sha512 = "853d0b8d8cee1d036adc8784ffb750acebf4499adc41c770436e1499622e3a6dd4c79c64a088c2e80e7ae33b158f696c5d7b055e920379f0c39e574ef04b208e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/fy-NL/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/fy-NL/thunderbird-60.5.2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "3068d8570dada0655f5429064903cb9218fe82e472978f269a91600dfff7a322a3cb3dae9dd24183c7a7ea0184fe520ec32bded34ec640ad3fff7d721b96c69a";
+ sha512 = "5556f9faa896595e1e3bf6b57fbd9e15cf66240b1483ffe0d4af2b58481892dbd2ba542e143b322a00cb8c3a25a54c5c6d35ab2a3eee0e20acfcb805706b9ed5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ga-IE/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ga-IE/thunderbird-60.5.2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "ed51255886ccef985c9f684fc7a5f1ba902f8ad256673e4348ac3b5e67445f470e8f62fb5281ff63c4976c92b8f6461f4ed1f5da920e7911b2bfc36d7c86b716";
+ sha512 = "db7df726276180585e203b375f19adeec45bc7241f2f9804626cb4ded86714234c16ee39ca96e29b23caa9400100adbcc34d7610323b5c5c96b301fe80746f20";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/gd/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/gd/thunderbird-60.5.2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "4a0daf723de4828687c9dd0b037a8aa9d0acecfbcd72e21b50b737fab5dc8c4689cb8574f8093c1f468f6c52b3f4f05ec0106fb48e005a533fe4f81d94345542";
+ sha512 = "5a5a2b058ce97d7860601a5e41edae6d4c61f4b533c3822aaf20a31a996fadb4da73c505cc83d42f53f4544c5dd95f03ca175950a8354ffafdbf8910c436a43d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/gl/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/gl/thunderbird-60.5.2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "046e04f0d9a1c8d1666d81d4fb26a479ad84a243365dc8df50034df3a7e504244eeac7cc0710d81edb122faf022ed94665d77af70fb01ff43be0c7d1dd056e2f";
+ sha512 = "6d757d6634bed978f71031fee24299015b1d9b1cba5166a29cb6a57dbddd93a2ce1ac002766cd4f705ebd3448b9f1e1360e88658d1e90225e04dd9533cc7fc41";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/he/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/he/thunderbird-60.5.2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "aa6be15596e35530ea8bcef9739d462b1836d5d7d11e540e307e08034458efd0bd890d61dd72aafa4ee93c8295e2f08181f498579fd01e686205a28152488290";
+ sha512 = "790b99eab94e6bf70fe935c4794413ff6fe1020a1baa73a66cb9b27dd630dd712266104b94eef23b17161fde4484037264b114cb367bd7db2c3fd213b6b0655a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/hr/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/hr/thunderbird-60.5.2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "28ce82024616656b4a81a2ff82be23a243306c4209f2522bef63b2b4e1315c3dd007a73c20065972d3ef05938411489b4cd2a63d1e79c7fdeac4e7d752ad4675";
+ sha512 = "b6e7649321d2f8976f71bb685cd6f29ad47a890139ea4d9ab509677e462a43cb27410c8516d7d1fa65e7273a2c006ae44ccc4e9cb93275970926661502bbba90";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/hsb/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/hsb/thunderbird-60.5.2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "70c9095d1e8d63df6aa1544d4fdbf2642679cdbc20ca610de2e66bc15c6013287d079c65b93d4a04566d116b160f0e82136e2d9706083a96aea6045eff74e240";
+ sha512 = "6c957a26ee1b17ed8a9087187fabb228028c2b6d472cb7d5e28c66724a8b34a7e6c74bbdb625041db9f4ddcf754c574b9d6b803cdb6b0445bb82077b93de35ce";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/hu/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/hu/thunderbird-60.5.2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "fe965925e424ba1023443c5a77e362f1c8880c04a2801c8956ee9873a3027eb1bdc61cbdb2d016781df6388a853a754827c70a2aa200917c854fb04865da7495";
+ sha512 = "a8f920c0b3691b36586d9a756d68a2e61d54e0195cf602dff5803cf79a0c13aef90db60a608b9d0defefde4e2e8778b316dc2fe38647fdb9406f74b6c316fb9c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/hy-AM/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/hy-AM/thunderbird-60.5.2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "b2f47f578df59beb27200421229b147d83a1cb6caebf6796ea8edf52a0ea6890386d48ad53ada738fa9e6b7a5232851d52c4c656f740d4735dd550c47d3a781f";
+ sha512 = "bd24605ba4a7eaa399e56cf244aab6a6f3c1158a7733bb99a4f57c3028acb648562adba1b7b4885b89a4142d023bd5be5d483fa4ba47378b8de300893e1e9ef6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/id/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/id/thunderbird-60.5.2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "ac1719151c4f729bb66f4e2654b5159de27c6d22a6776f24615938e769a01036273ba551fe38fd0ed4560fb853427be0c65c387f76ad3c01aca144e90b7e9c48";
+ sha512 = "0c66a067811907292ec54f1673c912b5bb4564e5493108121c628b277f91410b0fd6b579e073d8937588606be34ca2c9c317d4f46bdf5aaf0f839ce9704a9d20";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/is/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/is/thunderbird-60.5.2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "e28e6a3691cbdfd1b03e88afe747cc51aceffb7a0014fc9c86c7403ee96d3d12f9bd6f49ed4916d8ff281d1913ee39ad9b41851f8cc285f8834db9c50545c4c4";
+ sha512 = "9b9e85ac15437a3b7871f0842996e5c85386e9594fb4399ecfd3f599318155abd24929ec8be1ed0034ad24539415aa26d74cb1a1edc06368b71464cab28ed8b0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/it/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/it/thunderbird-60.5.2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "b1ae4c0952871bfbaf673793e02a9c3c283be87523e421ed97502a36377f1388b15ab77370b757daf411714803fcedbad1c8a4aa21241cedca394429ecad5990";
+ sha512 = "07c6fa4027816e1e6d58799d746543890f5eda26fc92179daa2d7b5c7762f5a5b3bb4e6aad784097ec4e013c5012e975289651a77fd78af711dc7c0516344297";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ja/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ja/thunderbird-60.5.2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "b6b1d702f446aaf50b83fdc5019d7130613cca4f9c9be363701c897f33cdfd4c794c147e7e3ff85b61da54125458a2da4f84aeef76b4f8abf4fd3faeff4301bc";
+ sha512 = "c64e1719914fc50b110a800395e404b0aa356cf8b7deaede6315da122b8cec01a69c530ffce232e3ef130068b6df94a1210b9655403e167ffe6e42d59b2456f5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/kab/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/kab/thunderbird-60.5.2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "9b0c45f7478bd2ec0668d0c4238b2f8229da7d12f4d6e56d65c22323bb54a6ac55d18acee22b13caf63bda73bf097a039b2aa85bd96befa2169845706083fd55";
+ sha512 = "b0067c1d698a5a032122609fc9df96966c33c78b71611fba43762b9f14944c9b1be52e7d16d71cdf323330e3a473f0822a75b8d5ccb4756ce86e3c6cf5d47c3f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/kk/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/kk/thunderbird-60.5.2.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "12fa4f57e1b0579ead0c7f7f223fe9328898ae999b8949e0dc1f20142eabbfaad03c16a53966d2c0966d9db44133c001f56c97c10a6f4a5acb51e6e30b922f78";
+ sha512 = "7e0e9a5f7bdb609687c4e8a87c581a9c33b242c80f71fecfce0a0737a8cf70b4d864e6e8bc8ddf0d6bfe5212b4a5f44a7c11cc586348bf2c1325a177f04bc62d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ko/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ko/thunderbird-60.5.2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "a6979bf472fdca68df1067ca8341353561741e27afbad18a96ad6e810313f54a8ac5f96c58955ab4d5fa6f4b4ec468d6e711139073f35e9bac45de81555b345e";
+ sha512 = "45ecc21470e10df9d6b6eb9eb91729384c4aab20f4bdb3ab9659d30e0447441c26b9daa86b670d458ff90c8a7120333a5398caccafd4000a88fb219244bd5bca";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/lt/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/lt/thunderbird-60.5.2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "47ea6c107bfbd196ec6ca5fafa0c856ac86bf16872ccf259afeec384f5f2157c9a7263bb2177ef79c876ba9f3a33209cb6ef7ceee0bae8877f0272e1a8fd4a9e";
+ sha512 = "6b47400b6260b172d9e40ac0c3f8cf94b02f31273acc18b9befa1c602188f6d8e0c46fefcb9b4faaa2513bd5c586559bf9fd6f5c03c1d4ff895c78e14c5a593a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ms/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ms/thunderbird-60.5.2.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "fda7fd25d3d72dee67e0e51c1d2c50ea66e1c574cb0b22c4c8476a7252a61209d5dd7ff5c5e918c9dc959064d048c75339fed5215a5bff53e4954f6ef56aeb14";
+ sha512 = "037c6d52bca81ddc54389546dcbf9422e3dc5872477f49e4a681a2dd75b6b7456ff2477b0b6e2e88d8b9e899ca9569751809a4ab5cfae8f8d8e7a5c13cd10bbb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/nb-NO/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/nb-NO/thunderbird-60.5.2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "0940d7d24612f7e526a2c4d21c7d23a2a6577c5599abd98e73be338cc7b9c1efa33af69d644e62e1e903443b8458786899052bd176bb7e99ce44f4ed846cc532";
+ sha512 = "ebdb9cd19d874cee39a27f2f44e23d877c304cc44b3cbb9849237d08077a5e8890d444671efddb4ba0633f89ff6348a7195e96f8041025f39fd4773ad8a04a56";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/nl/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/nl/thunderbird-60.5.2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "9af66d8294797aa2586b7520e20f88110c7fd807ba4e27ff62fe70308f8f5ea94dcf2d17b9a2fb8e19f10961e470736932b785ba936656582fd4a48071afb43f";
+ sha512 = "251ccf641a7e6f724cbdee55eec09f6ef0a2b77b3c12c483e1b159840f039df0820c583ecc0ff5831d48582df7716f9c29678f1be81b6cdc39480dc2fc870d65";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/nn-NO/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/nn-NO/thunderbird-60.5.2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "94240443b68053b4ffb7a256362a6183f43b6241ebfe479ce41b14b5bb9e1973a1c027f73baff35be9b448490cb0bedcf2b458049d84cac2082eb196ae5fbbd9";
+ sha512 = "e4b12c33bb86fef90f699a2c8aa3bf66d140f77e3bcae5012fa005f47cecf978ca5b5051c7826b56f65cd8501413e649bbd73c01cddfadf97e3635a19a0f3406";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/pl/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/pl/thunderbird-60.5.2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "3af095626b358f4e9074554539b8e204a47108bccb02a90e9f07c78285a05ca2c64d8a2e06935090d8de4ba50765546d7cf9e55cbab8cc3d3eca674569df3d8c";
+ sha512 = "c9d8fcf4a468fae3849fdd4c02e054bde1407f3007743744defc09a0d56de5796b46e8ea27247bad3e9ec8f3d588f8871390ef3568c2b27a4fc12d795474b739";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/pt-BR/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/pt-BR/thunderbird-60.5.2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "cc5357923dcee1979760a889dd53512e3bb63db085349ecae02f4909353a2518799cb24bc36de6ed35853e8317d71672539a52998a62f968ff4c4e484cdd0489";
+ sha512 = "0cdaf41470e28eb15d66da46ba2d3841f62fa11235b91b3b054e3ee7906e1952feb8f447ffef4195a6b49f7224af316731607945646d1157f6674b50d8c7e7fe";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/pt-PT/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/pt-PT/thunderbird-60.5.2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "a9fd7ffcb7633f17b183a12b4d290822e480f59e01c8e3fcc2e6fea0cf051c73396c2a5e41dd5d897e98a8199aeb4dbff737f06b748c57690541abefa42bd283";
+ sha512 = "bdf0af0eca14e74518d43246f515aa3e5ead284502a27d4b6dbf9e69a2657e55484793859682b807f0b9f2e7ae6d2c084a239f276524829b923ed6eaa4d63457";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/rm/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/rm/thunderbird-60.5.2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "5cc3f2fc6f84ebdaa298e96b0a56d0d6b0ea87a1df68eca17c558cf603296e83e7644d90e29183107eef1cd045084730f4311c603f546a29a495c7a443ddcc30";
+ sha512 = "4db1bcf38a6525e5507f02c07ee1bb877f81b4643df25eddf0c6b85a6fca5a4e892affb397caa0b5fbebdc5a044bc1eecf5d8755420e8e032906e81a1fcb68c0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ro/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ro/thunderbird-60.5.2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "ed57227fac6e43ddf68837de7252fa8f57df399122653a533e2e5826a8fc48abe0bd1ec4f1c213473b9764d69b65ec905963554aa3b05676ae0cd87e64ff9f8e";
+ sha512 = "21a2dcf1a70657afaa49e3825fc6c544bd123c50c753ab2af52474daf80f7c01dafdff95a6c84a48f3f4b09d019acf6cf84958ef81fd12b5616fe4f7c44517c5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ru/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ru/thunderbird-60.5.2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "9f520da05a7968e632fd262cef964ac65e3e1afc0e70b279af667cff144784adde796862b5d4a66d64826bea70e2d4a76fab69c1fb5181d9038f9d2a4f81cd31";
+ sha512 = "427b84004ea0a93c1eb55fdf3c46d4fc1560cd5b9284294b91ffc1f48581acfca4931fb90b2ec67f8f41763e47505be9e677e30ff009f1607b910272bd2aa481";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/si/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/si/thunderbird-60.5.2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "1a9d8a911bea3ff6e13e02ce3b26271dd9b0755b5ff78982b82ea00fed6e760b067a3a8733c3397fa1bde300f44c7078c37638e79ac18bdef08c820a6dded86b";
+ sha512 = "adb6bb5a5ea5aa26cd8edce2eccfce86c1f05bfedd784dd8b6438d5f9bc9b21b6fd1e9d544f0d72ca4c09b502843426b1db3a9faa51c795d1da7342263a68acf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sk/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sk/thunderbird-60.5.2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "0220c4ff8a2dbdbfba5dbb381983a4394f0ec4d246407d7d70d035bf13b8b9d220a73d1f10782c9612ae5521865761ac169cc96d19e4a903b785dfebf762760b";
+ sha512 = "8e5774e339f29d4db96541227f0cbac8aa43940f8db803b1c3d0037e870ebabe0e35e931866206c45ceca60df940342e837f5a341fe297d1d77094a68ff087c0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sl/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sl/thunderbird-60.5.2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "3eaca0ba175d97478171269c6027fc7e67780e97dc9a15dc966c8d22c7ac26984f041ba2f94470d4cfc2988f13af29d9afc7940339f3bbd3ea3ed0712855a916";
+ sha512 = "5bc6c3afe167b81e67236e2ce405c784ea6b3eccefbe64169df9c5846ac352b786e7cbb5a130134bc00bf711577425dcc228e44028b907517c870110392de9c9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sq/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sq/thunderbird-60.5.2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "006b17fdc8201c493e77465ece97373fb23fdcc6d79ee9b9d88c544f338b88dbe51c1bc9f27fc41052c1838eacb604abe04c7b43ead49a0ee02b6591a74dd410";
+ sha512 = "056cb05dbd7a8eaf482fe70cd48182d821724d531f482fa39f220b74da4ac3ffdd01ca25b3a31589081254b8be2868bb0bbe24d28fd02f817d64521136e9b652";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sr/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sr/thunderbird-60.5.2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "4908bb89bf199ef0e8767ddba6defe78c42ecbdfeac5c040811d1cd2b445407a0365cfeaff39cee5610a15194878d1700da194efdb6de570188ba7e5f77197da";
+ sha512 = "76a3b4c6d620a3d2309d1075d9a85e3603ab60bb9bfdfe6b538662b5281a4e2458d6e6ecbc977dadd7f7a2c9c78691277d5ca336c54beb2cb3f653ff4fe4e6c2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sv-SE/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sv-SE/thunderbird-60.5.2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "c149b2a11dac65d98c64fa4b548573587ddf540c7de925d983cc9da63a9f55cc9138988adb32fd189a25f6f5baec85542fe8663eada1f7e16dd80e50069795fa";
+ sha512 = "3519106ffd79c84ed2609675104889010ea3dad76ca2b3db5cb2729c99927ffa9d457e714e73862b01d0c88c52ccdd986ab15844e9bb3b8de2de0eb6f0e29b96";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/tr/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/tr/thunderbird-60.5.2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "dc45e7cf29f2b3798c83ccabc9d110bf622e0920ca7bee8bb6cd9a4d793fe7df5e7f78677b11c00e43714111bfc2ea2a74a8446026612afb0d54e58fd4e97797";
+ sha512 = "782825d4bb3f0073a2e417ec86e7ad27f7d84e482e6fd0435941cd2ecad4f930329362a1b1be32a99379e98d2dd4f43bc7bc4a80b0c38692c9f1e5436c6e3131";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/uk/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/uk/thunderbird-60.5.2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "c1d04517a50c0882cb442221e71e171993015a36e597361708f858989ca1b538c8a48c6f40637a382879e394c471157e05543494095560d1c5d60a4d31d56398";
+ sha512 = "9246e616b9c87383064697f8f9b17304768a85ef6e1f8bcf83d07cbf0990dac3c20b5add194f85f3a58021fc2f707004e8b348ca41a3052cad27f7ba117539d7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/vi/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/vi/thunderbird-60.5.2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "186869df9def5f892851496c5a8f3784d5f0ed5a845d8330906c1242c5c856dc284ada045a802f83d1841007eb6aa9ea7098e3ca5d8d17ca85530890e2b3f13e";
+ sha512 = "2601517a8a04bfc8068f03295c357f3980228fcb53e54d90a3aca190f94546ba8a4712e763c93faeffab036ad623e1e3cda4bf16d22774a3f95ed2869a4f00b8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/zh-CN/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/zh-CN/thunderbird-60.5.2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "8cd3250b0eef5018dc5129bcf4d1dae9acb2226fab784e66f63f6224cc197d7863338ba134f0523f1e17dce53f0db5cb23206ad98c8e754766f6f51ef15ac33e";
+ sha512 = "8ca48799b44edaec1d35bc690433c5a6790daa907cc64f67c1e350ce24bb4422ac04657f68898c6e3f40737b32a74b139e715c2e4dc33d4b179eac2d7e04c7de";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/zh-TW/thunderbird-60.5.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/zh-TW/thunderbird-60.5.2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "bde2b2bed5a1498fef39ea1da0c260a9876fd672282ccac6cc983973fd2a1d8cdc889e4439c4b9acc4b9016bf13d892e2dc387c3a9fa8166cabcdcee8fe9cf8b";
+ sha512 = "716c6392918f8fc6e6c1046b7454acc84484bc39a723dc659cc1e3919f04fcce628783685f63110370b38f64d60771e40425eeef1ecbb4b83ad999e29d8bede4";
}
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 99a76d434b8..ae0db67920d 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -5,7 +5,7 @@
, hunspell, libevent, libstartup_notification
, icu, libpng, jemalloc
, autoconf213, which, m4
-, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
+, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl, runtimeShell
, cargo, rustc, llvmPackages
, enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper
, enableCalendar ? true
@@ -24,11 +24,11 @@ let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation rec {
name = "thunderbird-${version}";
- version = "60.5.1";
+ version = "60.5.2";
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
- sha512 = "1y8r96rzp1rv6ycn98l2c1bpa26gszhbijhrwk6llw8aq33xhx9dpqpbgfsnrsbn4a5ff14h8m9g82snqysrzb7ldd2i5lbas0pryys";
+ sha512 = "3q7h9jbxz7p7dh2dskmcqikpgd8czbmxknij063w02bh9lyffv6rasszl8pwz21mcylb9zzqjn29xl99g51sjx81555bdr38l8mjg55";
};
# from firefox, but without sound libraries
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
hunspell libevent libstartup_notification /* cairo */
icu libpng jemalloc
]
- ++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ];
+ ++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ];
# from firefox + m4 + wrapperTool
nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ];
@@ -193,6 +193,6 @@ in stdenv.mkDerivation rec {
passthru.updateScript = import ./../../browsers/firefox/update.nix {
attrPath = "thunderbird";
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
- inherit stdenv writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;
+ inherit stdenv writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl runtimeShell;
};
}
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 2d008492050..d4e624e6ad5 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig
+{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper, pkgconfig
, qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
, alsaLib, python
, jackSupport ? false, libjack2 ? null
@@ -154,5 +154,12 @@ in {
murmur = server stableSource;
murmur_git = (server gitSource).overrideAttrs (old: {
meta = old.meta // { broken = iceSupport; };
+
+ nativeBuildInputs = old.nativeBuildInputs or [] ++ [ makeWrapper ];
+
+ installPhase = old.installPhase or "" + ''
+ wrapProgram $out/bin/murmurd --suffix QT_PLUGIN_PATH : \
+ ${getBin qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}
+ '';
});
}
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index c142661fd03..6b85dbfa3cc 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -2,15 +2,13 @@
stdenv.mkDerivation rec {
name = "owncloud-client-${version}";
- version = "2.4.3";
+ version = "2.5.3.11470";
src = fetchurl {
url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
- sha256 = "1gz6xg1vm054ksrsakzfkzxgpskm0xkhsqwq0fj3i2kas09zzczk";
+ sha256 = "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n";
};
- patches = [ ./find-sql.patch ];
-
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qtbase qtwebkit qtkeychain sqlite ];
diff --git a/pkgs/applications/networking/owncloud-client/find-sql.patch b/pkgs/applications/networking/owncloud-client/find-sql.patch
deleted file mode 100644
index 44dea6414e9..00000000000
--- a/pkgs/applications/networking/owncloud-client/find-sql.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-*** a/cmake/modules/QtVersionAbstraction.cmake
---- b/cmake/modules/QtVersionAbstraction.cmake
-***************
-*** 8,13 ****
---- 8,14 ----
- find_package(Qt5Core REQUIRED)
- find_package(Qt5Network REQUIRED)
- find_package(Qt5Xml REQUIRED)
-+ find_package(Qt5Sql REQUIRED)
- find_package(Qt5Concurrent REQUIRED)
- if(UNIT_TESTING)
- find_package(Qt5Test REQUIRED)
diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix
new file mode 100644
index 00000000000..999f80a7bbd
--- /dev/null
+++ b/pkgs/applications/networking/p2p/torrential/default.nix
@@ -0,0 +1,60 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, pantheon
+, curl
+, glib
+, gtk3
+, hicolor-icon-theme
+, libb64
+, libevent
+, libgee
+, libnatpmp
+, libunity
+, miniupnpc
+, openssl
+, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ pname = "torrential";
+ version = "1.1.0";
+
+ src = fetchFromGitHub {
+ owner = "davidmhewitt";
+ repo = "torrential";
+ rev = version;
+ fetchSubmodules = true;
+ sha256 = "17aby0c17ybyzyzyc1cg1j6q1a186801fy84avlaxahqp7vdammx";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pantheon.vala
+ pkgconfig
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ curl
+ glib
+ gtk3
+ hicolor-icon-theme
+ libb64
+ libevent
+ libgee
+ libnatpmp
+ libunity
+ miniupnpc
+ openssl
+ pantheon.granite
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Download torrents in style with this speedy, minimalist torrent client for elementary OS";
+ homepage = https://github.com/davidmhewitt/torrential;
+ maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
+ platforms = platforms.linux;
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix
index 1dc4e3e4351..88f07f0a8a5 100644
--- a/pkgs/applications/networking/p2p/zeronet/default.nix
+++ b/pkgs/applications/networking/p2p/zeronet/default.nix
@@ -2,14 +2,14 @@
python2Packages.buildPythonApplication rec {
pname = "zeronet";
- version = "0.6.4";
+ version = "0.6.5";
format = "other";
src = fetchFromGitHub {
owner = "HelloZeroNet";
repo = "ZeroNet";
rev = "v${version}";
- sha256 = "04mpnkx0pbvcfjs337f0ajabdbh6h0gypnaz6n395avkf8r1g4c3";
+ sha256 = "1b9jg525jq40czyw9xh9ck90fl9rzrdmzl2mzhqqhz23idb60j4a";
};
propagatedBuildInputs = with python2Packages; [ msgpack gevent ];
diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix
new file mode 100644
index 00000000000..d20b07a8d3b
--- /dev/null
+++ b/pkgs/applications/networking/ping/default.nix
@@ -0,0 +1,60 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkgconfig
+, pantheon
+, python3
+, glib
+, gtk3
+, gtksourceview
+, hicolor-icon-theme
+, json-glib
+, libsoup
+, libgee
+, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ pname = "ping";
+ version = "0.6.0";
+
+ src = fetchFromGitHub {
+ owner = "jeremyvaartjes";
+ repo = "ping";
+ rev = version;
+ sha256 = "1h9cdy2jxa2ffykjg89j21hazls32z9yyv3g0x07x3vizzl5xcij";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pantheon.vala
+ pkgconfig
+ python3
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ gtk3
+ gtksourceview
+ hicolor-icon-theme
+ json-glib
+ libgee
+ libsoup
+ pantheon.granite
+ ];
+
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A helpful tool that lets you debug what part of your API is causing you issues";
+ homepage = https://github.com/jeremyvaartjes/ping;
+ maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
+ platforms = platforms.linux;
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index 3e74fbfb66a..eac1acb1e6a 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -2,7 +2,7 @@
libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }:
let
- version = "1.1.0-1";
+ version = "1.1.3-1";
description = ''
An application that runs on your computer in the background and seamlessly encrypts
@@ -12,9 +12,9 @@ let
'';
desktopItem = makeDesktopItem {
- name = "Desktop-Bridge";
- exec = "Desktop-Bridge";
- icon = "desktop-bridge";
+ name = "protonmail-bridge";
+ exec = "protonmail-bridge";
+ icon = "protonmail-bridge";
comment = stdenv.lib.replaceStrings ["\n"] [" "] description;
desktopName = "ProtonMail Bridge";
genericName = "ProtonMail Bridge for Linux";
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
- sha256 = "0l29z208krnd3dginc203m4p5dlmnxf08vpmbm9xzlckwmswizkb";
+ sha256 = "15kyhyx1v4bb2sqzwq7bqrxxw7g733p5jnsgjqka2ygzg6dl2c5n";
};
nativeBuildInputs = [ makeWrapper ];
@@ -40,11 +40,11 @@ in stdenv.mkDerivation rec {
mkdir -p $out/{bin,lib,share/applications}
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
- cp -r usr/lib/protonmail/bridge/Desktop-Bridge{,.sh} $out/lib
- cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg
+ cp -r usr/lib/protonmail/bridge/protonmail-bridge $out/lib
+ cp usr/share/icons/protonmail/ProtonMail_Bridge.svg $out/share/icons/hicolor/scalable/apps/protonmail-bridge.svg
cp ${desktopItem}/share/applications/* $out/share/applications
- ln -s $out/lib/Desktop-Bridge $out/bin/Desktop-Bridge
+ ln -s $out/lib/protonmail-bridge $out/bin/protonmail-bridge
'';
postFixup = let
@@ -66,9 +66,9 @@ in stdenv.mkDerivation rec {
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${rpath}" \
- $out/lib/Desktop-Bridge
+ $out/lib/protonmail-bridge
- wrapProgram $out/lib/Desktop-Bridge \
+ wrapProgram $out/lib/protonmail-bridge \
--set QT_PLUGIN_PATH "${qtPath qtbase.qtPluginPrefix}" \
--set QML_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \
--set QML2_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index c2ae02e0149..bd4ea2d9238 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -6,20 +6,20 @@
, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core
, openssl, gsettings-desktop-schemas, json-glib
# The themes here are soft dependencies; only icons are missing without them.
-, hicolor-icon-theme, adwaita-icon-theme
+, hicolor-icon-theme, gnome3
}:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "remmina";
- version = "1.3.2";
+ version = "1.3.3";
src = fetchFromGitLab {
owner = "Remmina";
repo = "Remmina";
rev = "v${version}";
- sha256 = "1ld5ik2g4b95z9pynmwx8mqhblbfzr7a0v35pms89ig4ck1kvr5r";
+ sha256 = "09mizr9igf22kk26rdx5masai8ghd2nbqryvswkybvia2s6lccrs";
};
nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
pcre libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon
libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core
- openssl hicolor-icon-theme adwaita-icon-theme json-glib
+ openssl hicolor-icon-theme gnome3.adwaita-icon-theme json-glib
];
cmakeFlags = [
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index af01b89dc76..c4b434dcaa4 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
buildGoPackage rec {
- name = "rclone-${version}";
- version = "1.45";
+ pname = "rclone";
+ version = "1.46";
goPackagePath = "github.com/ncw/rclone";
subPackages = [ "." ];
@@ -11,11 +11,19 @@ buildGoPackage rec {
owner = "ncw";
repo = "rclone";
rev = "v${version}";
- sha256 = "06xg0ibv9pnrnmabh1kblvxx1pk8h5rmkr9mjbymv497sx3zgz26";
+ sha256 = "1fl52dl41n76r678nzkxa2kgk9khn1fxraxgk8jd3ayc787qs9ia";
};
outputs = [ "bin" "out" "man" ];
+ # https://github.com/ncw/rclone/issues/2964
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/ncw/rclone/commit/1c1a8ef24bea9332c6c450379ed3c5d953e07508.patch";
+ sha256 = "0mq74z78lc3dhama303k712xkzz9q6p7zqlbwbl04bndqlkny03k";
+ })
+ ];
+
postInstall = ''
install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1
'';
diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix
index 149e126d6e8..b5b8445df45 100644
--- a/pkgs/applications/networking/weather/meteo/default.nix
+++ b/pkgs/applications/networking/weather/meteo/default.nix
@@ -1,24 +1,21 @@
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3
-, gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk
-, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }:
+, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk, geocode-glib
+, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "meteo";
- version = "0.8.5";
-
- name = "${pname}-${version}";
+ version = "0.9.6";
src = fetchFromGitLab {
owner = "bitseater";
repo = pname;
rev = version;
- sha256 = "1mc2djhkg0nzcjmy87l1wqwni48vgpqh8s1flr90pipk12a1mh7n";
+ sha256 = "1786s5637hc3dnnkf5vr2ngfiq73dyvx8187gx7qkh7cr8xrl50w";
};
nativeBuildInputs = [
appstream
desktop-file-utils
- gobject-introspection
meson
ninja
pkgconfig
@@ -30,11 +27,11 @@ stdenv.mkDerivation rec {
buildInputs = [
clutter
clutter-gtk
- gnome3.geocode-glib
+ geocode-glib
gtk3
+ hicolor-icon-theme
json-glib
libappindicator
- libchamplain
libsoup
webkitgtk
];
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 2f736dd5856..472f6c13c56 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "znc-${version}";
- version = "1.7.1";
+ version = "1.7.2";
src = fetchurl {
url = "https://znc.in/releases/archive/${name}.tar.gz";
- sha256 = "1i1r1lh9q2mr1bg520zrvrlwhrhy6wibrin78wjxq1gab1qymks4";
+ sha256 = "1ac2csl5jr56vahnxdynlvrhwlvcc1gqxvyifckc6cn5aj7ygd30";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index 8dd127715ae..6808a81bec1 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk3, fribidi
, libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
-, boost, libxslt, goffice, wrapGAppsHook, iconTheme
+, boost, libxslt, goffice, wrapGAppsHook, gnome3
}:
stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 librsvg bzip2 fribidi libpng popt
- libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme
+ libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix
index cfd7a4eda20..9eec315217c 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
# The (only) source file states:
# License: "Do what you feel is right, but don't be a jerk" public license.
- maintainers = with stdenv.lib.maintainers; [ ];
+ maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
};
}
diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 6f0fcca480a..e33a0b202da 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -5,11 +5,11 @@ let
in
buildPythonApplication rec {
pname = "fava";
- version = "1.9";
+ version = "1.10";
src = fetchPypi {
inherit pname version;
- sha256 = "115r99l6xfliafgkpcf0mndqrvijix5mflg2i56s7xwqr3ch8z9k";
+ sha256 = "145995nzgr06qsn619zap0xqa8ckfrp5azga41smyszq97pd01sj";
};
doCheck = false;
@@ -32,6 +32,6 @@ buildPythonApplication rec {
homepage = https://beancount.github.io/fava;
description = "Web interface for beancount";
license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ ];
+ maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
};
}
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index bd3425e282a..e7aacb9de0f 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, makeWrapper, cmake, gtest
, boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales
-, webkit, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi
+, webkitgtk, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi
, libdbiDrivers, guile, perl, perlPackages
}:
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
buildInputs = [
boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales
- webkit dconf hicolor-icon-theme libofx aqbanking gwenhywfar libdbi
+ webkitgtk dconf hicolor-icon-theme libofx aqbanking gwenhywfar libdbi
libdbiDrivers guile
perlWrapper perl
] ++ (with perlPackages; [ FinanceQuote DateManip ]);
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index e42777bdd00..87aaf85d950 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
# ToDo: optional libgda, introspection?
buildInputs = [
- goffice gtk3 gnome3.defaultIconTheme
+ goffice gtk3 gnome3.adwaita-icon-theme
python pygobject3
] ++ (with perlPackages; [ perl XMLParser ]);
diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix
index 7c07082b304..f901123065f 100644
--- a/pkgs/applications/office/grisbi/default.nix
+++ b/pkgs/applications/office/grisbi/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup
- gnome3.defaultIconTheme ];
+ gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; {
description = "A personnal accounting application.";
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 12b5aef898d..f93b7f42c68 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup
- gnome3.defaultIconTheme ];
+ gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; {
description = "Free, easy, personal accounting for everyone";
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index b60874e7c3c..5853face10c 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -12,7 +12,7 @@
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
-, defaultIconTheme, glib, ncurses, epoxy, gpgme
+, gnome3, glib, ncurses, epoxy, gpgme
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ]
, withHelp ? true
, kdeIntegration ? false
@@ -277,7 +277,7 @@ in stdenv.mkDerivation rec {
mdds bluez5 libcmis libwps libabw libzmf libtool
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses epoxy
- libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
+ libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
]
++ lib.optional kdeIntegration kdelibs4;
nativeBuildInputs = [ wrapGAppsHook gdb ];
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index ff8823e3d9c..64b12263e9a 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -12,7 +12,7 @@
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
-, defaultIconTheme, glib, ncurses, epoxy, gpgme
+, gnome3, glib, ncurses, epoxy, gpgme
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ]
, withHelp ? true
, kdeIntegration ? false
@@ -272,7 +272,7 @@ in stdenv.mkDerivation rec {
mdds bluez5 libcmis libwps libabw libzmf libtool
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses epoxy
- libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
+ libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
]
++ lib.optional kdeIntegration kdelibs4;
nativeBuildInputs = [ wrapGAppsHook gdb ];
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 9c4c22dabe9..892ebcee99f 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -32,6 +32,7 @@
, autorunLinkHandler ? true
# Update script
, writeScript
+, runtimeShell
}:
let
@@ -130,7 +131,7 @@ stdenv.mkDerivation {
dontStrip = true;
dontPatchElf = true;
- updateScript = import ./update.nix { inherit stdenv writeScript; };
+ updateScript = import ./update.nix { inherit stdenv writeScript runtimeShell; };
meta = with stdenv.lib; {
homepage = http://www.mendeley.com;
diff --git a/pkgs/applications/office/mendeley/update.nix b/pkgs/applications/office/mendeley/update.nix
index 147c95b8e7b..c174e7dc668 100644
--- a/pkgs/applications/office/mendeley/update.nix
+++ b/pkgs/applications/office/mendeley/update.nix
@@ -1,7 +1,7 @@
-{ stdenv, writeScript }:
+{ stdenv, writeScript, runtimeShell }:
writeScript "update-mendeley" ''
- #!${stdenv.shell}
+ #!${runtimeShell}
function follow() {
local URL=$1
while true; do
diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix
index 9f4ed80e6d8..ad621303d7d 100644
--- a/pkgs/applications/office/moneyplex/default.nix
+++ b/pkgs/applications/office/moneyplex/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, patchelf, coreutils, pcsclite
-, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl }:
+, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl
+, runtimeShell }:
let
libPath = stdenv.lib.makeLibraryPath [
@@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
mkdir "$out/bin"
cat > $out/bin/moneyplex < /etc/alliance-install.log
'';
allianceUnInstaller = ''
- #!${stdenv.shell}
+ #!${runtimeShell}
awk '{print \$3}' /etc/alliance-install.log | xargs rm
awk '{print \$3}' /etc/alliance-install.log | xargs rmdir
rm /etc/alliance-install.log
diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix
index d5720440f7c..69b111562ab 100644
--- a/pkgs/applications/science/electronics/eagle/eagle7.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle7.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig
, openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi
-, libxcb, cups, xkeyboardconfig
+, libxcb, cups, xkeyboardconfig, runtimeShell
}:
let
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)"
mkdir -p "$out"/bin
cat > "$out"/bin/eagle << EOF
- #!${stdenv.shell}
+ #!${runtimeShell}
export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:${libPath}"
export LD_PRELOAD="$out/lib/eagle_fixer.so"
export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index e2ac4c4b44c..7d9d7a662f2 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gtkwave-${version}";
- version = "3.3.98";
+ version = "3.3.99";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
- sha256 = "1xi2b9yck8fagnjhnhhwrhz5rfvrs2h2m6m64m210m5xnfzbp9pg";
+ sha256 = "0lc4y2vizrbxldjk5yw2i4y7pyprjdjqx3iafzjfnin694zp2630";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix
new file mode 100644
index 00000000000..b6ebce68193
--- /dev/null
+++ b/pkgs/applications/science/logic/clprover/clprover.nix
@@ -0,0 +1,27 @@
+{ stdenv, pkgs, fetchzip }:
+
+stdenv.mkDerivation rec {
+ name = "clprover-${version}";
+ version = "1.0.3";
+
+ src = fetchzip {
+ url = "http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/CLProver++-v1.0.3-18-04-2015.zip";
+ sha256 = "10kmlg4m572qwfzi6hkyb0ypb643xw8sfb55xx7866lyh37w1q3s";
+ stripRoot = false;
+ };
+
+ installPhase = ''
+ mkdir $out
+ cp -r bin $out/bin
+ mkdir -p $out/share/clprover
+ cp -r examples $out/share/clprover/examples
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Resolution-based theorem prover for Coalition Logic implemented in C++";
+ homepage = http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/;
+ license = licenses.gpl3; # Note that while the website states that it is GPLv2 but the file in the zip as well as the comments in the source state it is GPLv3
+ maintainers = with maintainers; [ mgttlinger ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix
index 18af6f0a618..c6b7b918eac 100644
--- a/pkgs/applications/science/logic/cryptominisat/default.nix
+++ b/pkgs/applications/science/logic/cryptominisat/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "cryptominisat-${version}";
- version = "5.6.6";
+ version = "5.6.8";
src = fetchFromGitHub {
owner = "msoos";
repo = "cryptominisat";
rev = version;
- sha256 = "1a1494gj4j73yij0hjbzsn2hglk9zy5c5wfwgig3j67cis28saf5";
+ sha256 = "0csimmy1nvkfcsxjra9bm4mlcyxa3ac8zarm88zfb7640ca0d0wv";
};
buildInputs = [ python3 boost ];
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index ffd25b6238b..099e2102c51 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, num, camlp5 }:
+{ stdenv, runtimeShell, fetchFromGitHub, ocaml, num, camlp5 }:
let
load_num =
@@ -11,7 +11,7 @@ let
start_script =
''
- #!${stdenv.shell}
+ #!${runtimeShell}
cd $out/lib/hol_light
exec ${ocaml}/bin/ocaml \
-I \`${camlp5}/bin/camlp5 -where\` \
diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix
index a3834dc70b6..dcea9c27acb 100644
--- a/pkgs/applications/science/logic/leo3/binary.nix
+++ b/pkgs/applications/science/logic/leo3/binary.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openjdk}:
+{stdenv, fetchurl, openjdk, runtimeShell}:
stdenv.mkDerivation rec {
pname = "leo3";
version = "1.2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p "$out"/{bin,lib/java/leo3}
cp "${jar}" "$out/lib/java/leo3/leo3.jar"
- echo "#!${stdenv.shell}" > "$out/bin/leo3"
+ echo "#!${runtimeShell}" > "$out/bin/leo3"
echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" > "$out/bin/leo3"
chmod a+x "$out/bin/leo3"
'';
diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix
index 426f1928938..8e94356f376 100644
--- a/pkgs/applications/science/logic/sad/default.nix
+++ b/pkgs/applications/science/logic/sad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ghc, spass }:
+{ stdenv, fetchurl, haskell, spass }:
stdenv.mkDerivation {
name = "system-for-automated-deduction-2.3.25";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
url = "http://nevidal.org/download/sad-2.3-25.tar.gz";
sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b";
};
- buildInputs = [ ghc spass ];
+ buildInputs = [ haskell.compiler.ghc844 spass ];
patches = [
./patch
# Since the LTS 12.0 update, <> is an operator in Prelude, colliding with
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index c22c15b3a4b..a3b369ad54a 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "why3-${version}";
- version = "1.1.1";
+ version = "1.2.0";
src = fetchurl {
- url = https://gforge.inria.fr/frs/download.php/file/37842/why3-1.1.1.tar.gz;
- sha256 = "065ix1ill009bxg7w27s8wq47vn03vbr63hsaa79arv31d96izny";
+ url = https://gforge.inria.fr/frs/download.php/file/37903/why3-1.2.0.tar.gz;
+ sha256 = "0xz001jhi71ja8vqrjz27v63bidrzj4qvg1yqarq6p4dmpxhk348";
};
buildInputs = (with ocamlPackages; [
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
index ced075ff432..c0536b36cfe 100644
--- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix
+++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
@@ -33,8 +33,9 @@ in stdenv.mkDerivation rec {
cp -r . "$out"
rm -r $out/Libs
- cp -r "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \
- "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* "$out"/Maps/
+ cp -ur "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \
+ "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* \
+ "${maps.ladder2018season3}"/* "${maps.ladder2018season4}"/* "${maps.ladder2019season1}"/* "$out"/Maps/
'';
preFixup = ''
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
index 228bafe3f7c..b4ff9fc1821 100644
--- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
+++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix
@@ -1,7 +1,7 @@
-{ fetchzip
+{ fetchzip, unzip
}:
let
- fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-P iagreetotheeula"; });
+ fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-j -P iagreetotheeula"; });
in
{
minigames = fetchzip {
@@ -12,37 +12,52 @@ in
melee = fetchzip' {
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Melee.zip";
- sha256 = "0w050yah5rybx3m5zvpr09jv01r0xsazpyrc76338b2sd8pdxv3y";
+ sha256 = "0z44pgy10jklsvgpr0kcn4c2mz3hw7nlcmvsy6a6lzpi3dvzf33i";
stripRoot = false;
};
ladder2017season1 = fetchzip' {
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season1.zip";
- sha256 = "194p0mb0bh63sjy84q21x4v5pb6d7hidivfi28aalr2gkwhwqfvh";
+ sha256 = "0ngg4g74s2ryhylny93fm8yq9rlrhphwnjg2s6f3qr85a2b3zdpd";
stripRoot = false;
};
ladder2017season2 = fetchzip' {
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season2.zip";
- sha256 = "1pvp7zi16326x3l45mk7s959ggnkg2j1w9rfmaxxa8mawr9c6i39";
+ sha256 = "01kycnvqagql9pkjkcgngfcnry2pc4kcygdkk511m0qr34909za5";
stripRoot = false;
};
ladder2017season3 = fetchzip' {
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season3_Updated.zip";
- sha256 = "1sjskfp6spmh7l2za1z55v7binx005qxw3w11xdvjpn20cyhkh8a";
+ sha256 = "0wix3lwmbyxfgh8ldg0n66i21p0dbavk2dxjngz79rx708m8qvld";
stripRoot = false;
};
ladder2017season4 = fetchzip' {
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season4.zip";
- sha256 = "1zf4mfq6r1ylf8bmd0qpv134dcrfgrsi4afxfqwnf39ijdq4z26g";
+ sha256 = "1sidnmk2rc9j5fd3a4623pvaika1mm1rwhznb2qklsqsq1x2qckp";
stripRoot = false;
};
ladder2018season1 = fetchzip' {
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season1.zip";
- sha256 = "0p51xj98qg816qm9ywv9zar5llqvqs6bcyns6d5fp2j39fg08v6f";
+ sha256 = "0mp0ilcq0gmd7ahahc5i8c7bdr3ivk6skx0b2cgb1z89l5d76irq";
stripRoot = false;
};
ladder2018season2 = fetchzip' {
url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season2_Updated.zip";
- sha256 = "1wjn6vpbymjvjxqf10h7az34fnmhb5dpi878nsydlax25v9lgzqx";
+ sha256 = "176rs848cx5src7qbr6dnn81bv1i86i381fidk3v81q9bxlmc2rv";
+ stripRoot = false;
+ };
+ ladder2018season3 = fetchzip' {
+ url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season3.zip";
+ sha256 = "1r3wv4w53g9zq6073ajgv74prbdsd1x3zfpyhv1kpxbffyr0x0zp";
+ stripRoot = false;
+ };
+ ladder2018season4 = fetchzip' {
+ url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season4.zip";
+ sha256 = "0k47rr6pzxbanlqnhliwywkvf0w04c8hxmbanksbz6aj5wpkcn1s";
+ stripRoot = false;
+ };
+ ladder2019season1 = fetchzip' {
+ url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2019Season1.zip";
+ sha256 = "1dlk9zza8h70lbjvg2ykc5wr9vsvvdk02szwrkgdw26mkssl2rg9";
stripRoot = false;
};
}
diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/applications/science/math/form/default.nix
index 88f2367e334..23ab2184266 100644
--- a/pkgs/applications/science/math/form/default.nix
+++ b/pkgs/applications/science/math/form/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, gmp, zlib }:
stdenv.mkDerivation rec {
- version = "4.2.0";
+ version = "4.2.1";
name = "form-${version}";
# This tarball is released by author, it is not downloaded from tag, so can't use fetchFromGitHub
src = fetchurl {
- url = "https://github.com/vermaseren/form/releases/download/v4.2.0/form-4.2.0.tar.gz";
- sha256 = "19528aphn4hvm151lyyhd7wz0bp2s3rla8jv6s7d8jwfp5ljzysm";
+ url = "https://github.com/vermaseren/form/releases/download/v4.2.1/form-4.2.1.tar.gz";
+ sha256 = "0a0smc10gm85vxd85942n5azy88w5qs5avbqrw0lw0yb9injswpj";
};
buildInputs = [ gmp zlib ];
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 694c621db00..e3760533eda 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
, zlib, libGLU_combined, libGLU, xorg }:
-let version = "4.1.3"; in
+let version = "4.2.1"; in
stdenv.mkDerivation {
name = "gmsh-${version}";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
- sha256 = "0padylvicyhcm4vqkizpknjfw8qxh39scw3mj5xbs9bs8c442kmx";
+ sha256 = "1f11481e68900dc256f88aaed18d03e93b416ba01e9e8c3dc3f6d59a211f0561";
};
buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined
diff --git a/pkgs/applications/science/math/maxima/5.41.nix b/pkgs/applications/science/math/maxima/5.41.nix
new file mode 100644
index 00000000000..583391d08dd
--- /dev/null
+++ b/pkgs/applications/science/math/maxima/5.41.nix
@@ -0,0 +1,102 @@
+{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null
+, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false
+}:
+
+let
+ name = "maxima";
+ # old version temporarily kept for sage, see discussion at
+ # https://github.com/NixOS/nixpkgs/commit/82254747af35f3e0e0d6f78023ded3a81e25331b
+ version = "5.41.0";
+
+ searchPath =
+ stdenv.lib.makeBinPath
+ (stdenv.lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]);
+in
+stdenv.mkDerivation ({
+ inherit version;
+ name = "${name}-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
+ sha256 = "0x0n81z0s4pl8nwpf7ivlsbvsdphm9w42250g7qdkizl0132by6s";
+ };
+
+ buildInputs = stdenv.lib.filter (x: x != null) [
+ sbcl ecl texinfo perl python makeWrapper
+ ];
+
+ postInstall = ''
+ # Make sure that maxima can find its runtime dependencies.
+ for prog in "$out/bin/"*; do
+ wrapProgram "$prog" --prefix PATH ":" "$out/bin:${searchPath}"
+ done
+ # Move emacs modules and documentation into the right place.
+ mkdir -p $out/share/emacs $out/share/doc
+ ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp
+ ln -s ../maxima/${version}/doc $out/share/doc/maxima
+ ''
+ + (stdenv.lib.optionalString ecl-fasl ''
+ cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/"
+ '')
+ ;
+
+ patches = [
+ # fix path to info dir (see https://trac.sagemath.org/ticket/11348)
+ (fetchpatch {
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+ sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x";
+ })
+
+ # fix https://sourceforge.net/p/maxima/bugs/2596/
+ (fetchpatch {
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+ sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg";
+ })
+
+ # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca, see see https://trac.sagemath.org/ticket/13364#comment:93
+ (fetchpatch {
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+ sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx";
+ })
+
+ # upstream bug https://sourceforge.net/p/maxima/bugs/2520/ (not fixed)
+ # introduced in https://trac.sagemath.org/ticket/13364
+ (fetchpatch {
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/0001-taylor2-Avoid-blowing-the-stack-when-diff-expand-isn.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+ sha256 = "0xa0b6cr458zp7lc7qi0flv5ar0r3ivsqhjl0c3clv86di2y522d";
+ })
+ ] ++ stdenv.lib.optionals ecl-fasl [
+ # build fasl, needed for ECL support
+ (fetchpatch {
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+ sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar";
+ })
+ # There are some transient test failures. I hope this disables all those tests.
+ # If those test failures ever happen in the non-ecl version, that should be
+ # reportetd upstream.
+ ./known-ecl-failures.patch
+ ];
+
+ # Failures in the regression test suite won't abort the build process. We run
+ # the suite only so that potential errors show up in the build log. See also:
+ # https://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933.
+ doCheck = true;
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "Computer algebra system";
+ homepage = http://maxima.sourceforge.net;
+ license = stdenv.lib.licenses.gpl2;
+
+ longDescription = ''
+ Maxima is a fairly complete computer algebra system written in
+ lisp with an emphasis on symbolic computation. It is based on
+ DOE-MACSYMA and licensed under the GPL. Its abilities include
+ symbolic integration, 3D plotting, and an ODE solver.
+ '';
+
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.peti ];
+ };
+})
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 9f6e281849d..5843f38a74a 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -4,7 +4,7 @@
let
name = "maxima";
- version = "5.41.0";
+ version = "5.42.2";
searchPath =
stdenv.lib.makeBinPath
@@ -16,11 +16,12 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
- sha256 = "0x0n81z0s4pl8nwpf7ivlsbvsdphm9w42250g7qdkizl0132by6s";
+ sha256 = "0kdncy6137sg3rradirxzj10mkcvafxd892zlclwhr9sa7b12zhn";
};
buildInputs = stdenv.lib.filter (x: x != null) [
sbcl ecl texinfo perl python makeWrapper
+ gnuplot # required in the test suite
];
postInstall = ''
@@ -69,16 +70,19 @@ stdenv.mkDerivation ({
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar";
})
- # There are some transient test failures. I hope this disables all those tests.
- # If those test failures ever happen in the non-ecl version, that should be
- # reportetd upstream.
- ./known-ecl-failures.patch
];
- # Failures in the regression test suite won't abort the build process. We run
- # the suite only so that potential errors show up in the build log. See also:
- # https://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933.
- doCheck = true;
+ # The test suite is disabled since 5.42.2 because of the following issues:
+ #
+ # Errors found in /build/maxima-5.42.2/share/linearalgebra/rtest_matrixexp.mac, problems:
+ # (20 21 22)
+ # Error found in rtest_arag, problem:
+ # (error break)
+ # 3 tests failed out of 3,881 total tests.
+ #
+ # These failures don't look serious. It would be nice to fix them, but I
+ # don't know how and probably won't have the time to find out.
+ doCheck = false; # try to re-enable after next version update
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
index fb0ea206735..aef18abaedf 100644
--- a/pkgs/applications/science/math/nasc/default.nix
+++ b/pkgs/applications/science/math/nasc/default.nix
@@ -4,6 +4,8 @@
, gtk3
, pantheon
, gnome3
+, gtksourceview
+, libgee
, cmake
, libqalculate
, gobject-introspection
@@ -35,8 +37,8 @@ stdenv.mkDerivation rec {
buildInputs = [
pantheon.elementary-icon-theme
- gnome3.gtksourceview
- gnome3.libgee
+ gtksourceview
+ libgee
gnome3.libsoup
pantheon.granite
gtk3
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 32e4d81acec..72827112c50 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,20 +1,37 @@
-{ stdenv, fetchurl
-, gmp, readline, libX11, tex, perl
+{ stdenv
+, fetchurl
+, fetchpatch
+, gmp
+, readline
+, libX11
+, tex
+, perl
, withThread ? true, libpthreadstubs
}:
assert withThread -> libpthreadstubs != null;
stdenv.mkDerivation rec {
-
- name = "pari-${version}";
+ pname = "pari";
version = "2.11.1";
src = fetchurl {
- url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
+ url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz";
sha256 = "1jfax92jpydjd02fwl30r6b8kfzqqd6sm4yx94gidyz9lqjb7a94";
};
+ patches = [
+ # Fix a off-by-one bug that can potentially lead to segfaults (accepted upstream)
+ # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2117
+ # https://trac.sagemath.org/ticket/27335
+ (fetchpatch {
+ name = "fix-off-by-one-error.patch";
+ # only relevant parts of https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=patch;h=aa1ee6e0898d177e6bcf49237d82c804bc410985
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pari/patches/red_montgomery.patch?id=bbea55c96e1f05302b3c7f593cf64492497047c5";
+ sha256 = "0vqkmhgv9splsdswp6zjnkj50z76rc1m6k9iy3cf9dxwqw3h3nr6";
+ })
+ ];
+
buildInputs = [
gmp
readline
@@ -70,7 +87,7 @@ stdenv.mkDerivation rec {
homepage = http://pari.math.u-bordeaux.fr;
downloadPage = http://pari.math.u-bordeaux.fr/download.html;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ ertes raskin AndersonTorres ];
+ maintainers = with maintainers; [ ertes raskin AndersonTorres timokau ];
platforms = platforms.linux ++ platforms.darwin;
updateWalker = true;
};
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index ddb22bcb1ef..92ec32d5cc5 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -60,7 +60,7 @@ let
# the files its looking fore are located. Also see `sage-env`.
env-locations = callPackage ./env-locations.nix {
inherit pari_data ecl;
- inherit singular;
+ inherit singular maxima-ecl;
cysignals = python.pkgs.cysignals;
three = nodePackages.three;
mathjax = nodePackages.mathjax;
@@ -71,21 +71,21 @@ let
sage-env = callPackage ./sage-env.nix {
sagelib = python.pkgs.sagelib;
inherit env-locations;
- inherit python ecl singular palp flint pynac pythonEnv;
+ inherit python ecl singular palp flint pynac pythonEnv maxima-ecl;
pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
};
# The documentation for sage, building it takes a lot of ram.
sagedoc = callPackage ./sagedoc.nix {
inherit sage-with-env;
- inherit python;
+ inherit python maxima-ecl;
};
# sagelib with added wrappers and a dependency on sage-tests to make sure thet tests were run.
sage-with-env = callPackage ./sage-with-env.nix {
inherit pythonEnv;
inherit sage-env;
- inherit pynac singular;
+ inherit pynac singular maxima-ecl;
pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
three = nodePackages.three;
};
@@ -129,6 +129,9 @@ let
singular = pkgs.singular.override { inherit flint; };
+ # https://trac.sagemath.org/ticket/26625
+ maxima-ecl = pkgs.maxima-ecl-5_41;
+
# *not* to confuse with the python package "pynac"
pynac = pkgs.pynac.override { inherit singular flint; };
diff --git a/pkgs/applications/science/math/sage/patches/ignore-pip-deprecation.patch b/pkgs/applications/science/math/sage/patches/ignore-pip-deprecation.patch
new file mode 100644
index 00000000000..95b377dc955
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/ignore-pip-deprecation.patch
@@ -0,0 +1,22 @@
+diff --git a/src/sage/misc/package.py b/src/sage/misc/package.py
+index 689e5a23b9..4e16fe3a8d 100644
+--- a/src/sage/misc/package.py
++++ b/src/sage/misc/package.py
+@@ -142,9 +142,14 @@ def pip_installed_packages():
+ sage: d['beautifulsoup'] # optional - beautifulsoup
+ u'...'
+ """
+- proc = subprocess.Popen(["pip", "list", "--no-index", "--format", "json"], stdout=subprocess.PIPE)
+- stdout = proc.communicate()[0].decode()
+- return {package['name'].lower():package['version'] for package in json.loads(stdout)}
++ with open(os.devnull, 'w') as devnull:
++ proc = subprocess.Popen(
++ ["pip", "list", "--no-index", "--format", "json"],
++ stdout=subprocess.PIPE,
++ stderr=devnull,
++ )
++ stdout = proc.communicate()[0].decode()
++ return {package['name'].lower():package['version'] for package in json.loads(stdout)}
+
+ def list_packages(*pkg_types, **opts):
+ r"""
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index b9d0a9ef448..83459021687 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -1,6 +1,7 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
+, runtimeShell
}:
# This file is responsible for fetching the sage source and adding necessary patches.
@@ -111,6 +112,9 @@ stdenv.mkDerivation rec {
url = "https://git.sagemath.org/sage.git/patch?id=a05b6b038e1571ab15464e98f76d1927c0c3fd12";
sha256 = "05yq97pq84xi60wb1p9skrad5h5x770gq98ll4frr7hvvmlwsf58";
})
+
+ # https://trac.sagemath.org/ticket/27405
+ ./patches/ignore-pip-deprecation.patch
];
patches = nixPatches ++ packageUpgradePatches;
@@ -121,7 +125,7 @@ stdenv.mkDerivation rec {
-e 's/sage-python23/python/g' \
-i {} \;
- echo '#!${stdenv.shell}
+ echo '#!${runtimeShell}
python "$@"' > build/bin/sage-python23
# Do not use sage-env-config (generated by ./configure).
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index 814eef9560e..d7f9cb9ee32 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -65,11 +65,13 @@ buildPythonPackage rec {
perl
jupyter_core
pkg-config
+ pip # needed to query installed packages
];
buildInputs = [
gd
readline
+ iml
];
propagatedBuildInputs = [
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 67cdaa4055a..13ccd70c83f 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
name = "wxmaxima-${version}";
- version = "18.02.0";
+ version = "19.03.0";
src = fetchFromGitHub {
owner = "andrejv";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa";
};
- buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ];
+ buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ wrapGAppsHook cmake gettext ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Cross platform GUI for the computer algebra system Maxima";
license = licenses.gpl2;
- homepage = http://wxmaxima.sourceforge.net;
+ homepage = https://wxmaxima-developers.github.io/wxmaxima/;
platforms = platforms.linux;
maintainers = [ maintainers.peti ];
};
diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix
index 9e9a10a011e..1a1ae3df942 100644
--- a/pkgs/applications/science/misc/openmodelica/default.nix
+++ b/pkgs/applications/science/misc/openmodelica/default.nix
@@ -1,5 +1,5 @@
{stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake,
-hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which,
+hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which,
lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison,
doxygen, boost, openscenegraph, gnome2, pangox_compat, xorg, git, bash, gtk2, makeWrapper }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
src = fetchgit (import ./src-main.nix);
buildInputs = [autoconf cmake automake libtool gfortran clang gnumake
- hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which
+ hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkitgtk which
lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison
doxygen boost openscenegraph gnome2.gtkglext pangox_compat xorg.libXmu
git gtk2 makeWrapper];
diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index 258073e4080..0b663b2fb63 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
scheduling on distributed computing platforms ranging from simple
network of workstations to Computational Grids.
'';
- homepage = http://simgrid.gforge.inria.fr/;
+ homepage = https://simgrid.org/;
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ mickours ];
platforms = ["x86_64-linux"];
diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 71def712db6..417d5544d6c 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -1,22 +1,44 @@
{ stdenv, python3, makeDesktopItem }:
-python3.pkgs.buildPythonApplication rec {
+let
+
+ spyder-kernels = with python3.pkgs; buildPythonPackage rec {
+ pname = "spyder-kernels";
+ version = "0.4.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b";
+ };
+
+ propagatedBuildInputs = [
+ cloudpickle
+ ipykernel
+ wurlitzer
+ ];
+
+ # No tests
+ doCheck = false;
+
+ meta = {
+ description = "Jupyter kernels for Spyder's console";
+ homepage = https://github.com/spyder-ide/spyder-kernels;
+ license = stdenv.lib.licenses.mit;
+ };
+ };
+
+in python3.pkgs.buildPythonApplication rec {
pname = "spyder";
- version = "3.2.8";
+ version = "3.3.3";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5";
+ sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba";
};
- # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?
- postPatch = ''
- sed -i -e '/pyqt5/d' setup.py
- '';
-
propagatedBuildInputs = with python3.pkgs; [
- jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint
- numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle
+ jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
+ numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
];
# There is no test for spyder
diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix
index 7c41a60a725..6301acdf134 100644
--- a/pkgs/applications/version-management/bugseverywhere/default.nix
+++ b/pkgs/applications/version-management/bugseverywhere/default.nix
@@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec {
homepage = http://www.bugseverywhere.org/;
license = licenses.gpl2Plus;
platforms = platforms.all;
- maintainers = [ ];
+ maintainers = [ maintainers.matthiasbeyer ];
};
}
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index cf58731b46c..d0f79600e8c 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
name = "fossil-${version}";
- version = "2.7";
+ version = "2.8";
src = fetchurl {
urls =
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
"https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
];
name = "${name}.tar.gz";
- sha256 = "0g032502lx4l1lvkczh8v7g0i90vbyriw0lmvi3mwjfp668ka91c";
+ sha256 = "0pbinf8d2kj1j7niblhzjd2l2khg6r2pn2xvig6gavz27p3vwcka";
};
buildInputs = [ zlib openssl readline sqlite which ed ]
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index e7199543ad7..0797d75a837 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -82,6 +82,8 @@ let
git-hub = callPackage ./git-hub { };
+ git-ignore = callPackage ./git-ignore { };
+
git-imerge = callPackage ./git-imerge { };
git-octopus = callPackage ./git-octopus { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
index 7a47ed9a992..2d171df8bf2 100644
--- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
@@ -15,6 +15,8 @@ python2Packages.buildPythonApplication rec {
buildInputs = [ git graphviz ];
+ checkInputs = [ git ];
+
postFixup = ''
wrapProgram $out/bin/git-big-picture \
--prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs }
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 9c362276383..473f0b1c450 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -49,6 +49,6 @@ buildRustPackage rec {
inherit (src.meta) homepage;
description = "Decentralized Issue Tracking for git";
license = licenses.gpl2;
- maintainers = with maintainers; [ Profpatsch ];
+ maintainers = with maintainers; [ Profpatsch matthiasbeyer ];
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index ba126bb476c..ded9bcc2ffd 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "git-hub-${version}";
- version = "1.0.1";
+ version = "1.0.3";
src = fetchFromGitHub {
- sha256 = "1lizjyi8vac1p1anbnh6qrr176rwxp5yjc1787asw437sackkwza";
+ sha256 = "03mz64lzicbxxz9b202kqs5ysf82sgb7lw967wkjdy2wbpqk8j0z";
rev = "v${version}";
repo = "git-hub";
owner = "sociomantic-tsunami";
diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
new file mode 100644
index 00000000000..9edcf4c3ac4
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+ name = "git-ignore-${version}";
+ version = "0.2.0";
+
+ cargoSha256 = "1fqfy8lnvpn5sd3l73x2p359zq4303vsrdgw3aphvy6580yjb84d";
+
+ src = fetchFromGitHub {
+ owner = "sondr3";
+ repo = "git-ignore";
+ rev = "v${version}";
+ sha256 = "1nihh5inh46r8jg9z7d6g9gqfyhrznmkn15nmzpbnzf0653dl629";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openssl ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [
+ darwin.apple_sdk.frameworks.Security
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Quickly and easily fetch .gitignore templates from gitignore.io";
+ homepage = https://github.com/sondr3/git-ignore;
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
+ maintainers = [ maintainers.sondr3 ];
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
index fb85bb7da46..211685c8edb 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "git-secrets-${version}";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "git-secrets";
rev = "${version}";
- sha256 = "14jsm4ks3k5d9iq3jr23829izw040pqpmv7dz8fhmvx6qz8fybzg";
+ sha256 = "10lnxg0q855zi3d6804ivlrn6dc817kilzdh05mmz8a0ccvm2qc7";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix
index 6979a47cdfc..899f33218a1 100644
--- a/pkgs/applications/version-management/git-and-tools/gita/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix
@@ -1,12 +1,12 @@
{ lib, python3Packages }:
python3Packages.buildPythonApplication rec {
- version = "0.7.3";
+ version = "0.8.2";
pname = "gita";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "0ccqjf288513im7cvafiw4ypbp9s3z0avyzd4jzr13m38jrsss3r";
+ sha256 = "16jpnl323x86dkrnh4acyvi9jknhgi3r0ccv63rkjcmd0srkaxkk";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 8ae600ed360..9f18beda7f9 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, ronn, ruby, groff, Security, utillinux, git, glibcLocales }:
+{ stdenv, buildGoPackage, fetchFromGitHub, groff, Security, utillinux }:
buildGoPackage rec {
pname = "hub";
- version = "2.9.0";
+ version = "2.10.0";
goPackagePath = "github.com/github/hub";
@@ -13,12 +13,11 @@ buildGoPackage rec {
owner = "github";
repo = pname;
rev = "v${version}";
- sha256 = "0yxpr606xx23l8823hjqj16cvjjrwb28c7z08ml1pkfvaf7w4n81";
+ sha256 = "1vvrc3k81jm9c664g0j9666i7ypn7n7jfyj4gxcybq3sg2d4di27";
};
- nativeBuildInputs = [ groff ronn utillinux glibcLocales ];
- buildInputs = [ ruby ] ++
- stdenv.lib.optional stdenv.isDarwin Security;
+ nativeBuildInputs = [ groff utillinux ];
+ buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
postPatch = ''
patchShebangs .
@@ -30,7 +29,8 @@ buildGoPackage rec {
install -D etc/hub.bash_completion.sh "$bin/share/bash-completion/completions/hub"
install -D etc/hub.fish_completion "$bin/share/fish/vendor_completions.d/hub.fish"
- PATH=$PATH:${git}/bin LC_ALL=en_US.utf-8 make man-pages
+ LC_ALL=C.UTF8 \
+ make man-pages
cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/
'';
diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
index 331b020d8ca..b5edd256256 100644
--- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
@@ -1,11 +1,12 @@
{ stdenv, python3Packages }:
with python3Packages; buildPythonApplication rec {
- pname = "pre_commit";
- version = "1.11.1";
+ pname = "pre-commit";
+ version = "1.14.2";
src = fetchPypi {
- inherit pname version;
- sha256 = "1kjrq8z78b6aqhyyw07dlwf6cqls88kik6f5l07hs71fj5ddvs9w";
+ inherit version;
+ pname = "pre_commit";
+ sha256 = "010fwih91gbc20hm2hmkyicm2a2xwrjjg4r4wv24x3n7zn4abdrc";
};
propagatedBuildInputs = [
@@ -17,7 +18,9 @@ with python3Packages; buildPythonApplication rec {
six
toml
virtualenv
- ];
+ importlib-metadata
+ ] ++ stdenv.lib.optional (pythonOlder "3.7") importlib-resources
+ ++ stdenv.lib.optional (pythonOlder "3.2") futures;
# Tests fail due to a missing windll dependency
doCheck = false;
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 36631449096..6f72b2e1775 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -1,19 +1,20 @@
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper
-, git, bash, gzip, openssh
+, git, bash, gzip, openssh, pam
, sqliteSupport ? true
+, pamSupport ? true
}:
with stdenv.lib;
buildGoPackage rec {
name = "gitea-${version}";
- version = "1.7.1";
+ version = "1.7.3";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
- sha256 = "1r13l7h4146729lwif45bkzn36sgg6an0qbhgvj8w3zp035c00k3";
+ sha256 = "0q33xn2l2ii8vd3hxr0f6ipk8mv2ahb3p8fzdzylhgg9w15snvsr";
# Required to generate the same checksum on MacOS due to unicode encoding differences
# More information: https://github.com/NixOS/nixpkgs/pull/48128
extraPostFetch = ''
@@ -31,9 +32,11 @@ buildGoPackage rec {
substituteInPlace modules/setting/setting.go --subst-var data
'';
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ]
+ ++ optional pamSupport pam;
- buildFlags = optional sqliteSupport "-tags sqlite";
+ buildFlags = optional sqliteSupport "-tags sqlite"
+ ++ optional pamSupport "-tags pam";
buildFlagsArray = ''
-ldflags=
-X=main.Version=${version}
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 664ef62be54..b27ade204ed 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -1,8 +1,8 @@
{ stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib
-, libXfixes, atk, gtk3, libXrender, pango, gnome2, cairo, freetype, fontconfig
+, libXfixes, atk, gtk3, libXrender, pango, gnome2, gnome3, cairo, freetype, fontconfig
, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
, nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
-, dpkg, makeDesktopItem, openssl
+, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme
}:
with stdenv.lib;
@@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
name = "gitkraken-${version}";
- version = "4.2.1";
+ version = "4.2.2";
src = fetchurl {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb";
- sha256 = "07f9h3276bs7m22vwpxrxmlwnq7l5inr2l67nmpiaz1569yabwsg";
+ sha256 = "0zbnw2x15688hjdj10kpp2ipka3j7b2p945a4mzwlsc8a245ljgb";
};
libPath = makeLibraryPath [
@@ -65,8 +65,8 @@ stdenv.mkDerivation rec {
comment = "Graphical Git client from Axosoft";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ dpkg ];
+ nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+ buildInputs = [ dpkg gtk3 gnome3.adwaita-icon-theme hicolor-icon-theme ];
unpackCmd = ''
mkdir out
@@ -85,6 +85,7 @@ stdenv.mkDerivation rec {
rm -rf bin/gitkraken share/lintian
cp -av share bin $out/
popd
+
ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken
'';
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index 895e1e13bec..b9423ccb328 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = [ ruby bundler go ];
+ GOCACHE="$TMPDIR/go-cache";
+
patches = [ ./remove-hardcoded-locations.patch ];
installPhase = ''
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index ad3b11f3b2c..c49bbe9ccef 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ git go ];
- makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" ];
+ makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" "GOCACHE=$(TMPDIR)/go-cache" ];
meta = with stdenv.lib; {
homepage = http://www.gitlab.com/;
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 56e41136896..238540a1c98 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -1,19 +1,20 @@
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper
-, git, bash, gzip, openssh
+, git, bash, gzip, openssh, pam
, sqliteSupport ? true
+, pamSupport ? true
}:
with stdenv.lib;
buildGoPackage rec {
name = "gogs-${version}";
- version = "0.11.66";
+ version = "0.11.86";
src = fetchFromGitHub {
owner = "gogs";
repo = "gogs";
rev = "v${version}";
- sha256 = "1b9ilk4xlsllsj5pzmxwsz4a1zvgd06a8mi9ni9hbvmfl3w8xf28";
+ sha256 = "0l8mwy0cyy3cdxqinf8ydb35kf7c8pj09xrhpr7rr7lldnvczabw";
};
patches = [ ./static-root-path.patch ];
@@ -23,9 +24,11 @@ buildGoPackage rec {
substituteInPlace pkg/setting/setting.go --subst-var data
'';
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ]
+ ++ optional pamSupport pam;
- buildFlags = optionalString sqliteSupport "-tags sqlite";
+ buildFlags = optional sqliteSupport "-tags sqlite"
+ ++ optional pamSupport "-tags pam";
outputs = [ "bin" "out" "data" ];
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 6456dd75b52..83f26fa08fc 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
intltool itstool libxml2 gobject-introspection wrapGAppsHook
];
buildInputs = [
- gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
+ gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme
];
propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ];
checkInputs = [ xvfb_run python3.pkgs.pytest dbus ];
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 67baa98d21e..fc4c18f5eb7 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -4,7 +4,7 @@
let
# if you bump version, update pkgs.tortoisehg too or ping maintainer
- version = "4.8.2";
+ version = "4.9";
name = "mercurial-${version}";
inherit (python2Packages) docutils hg-git dulwich python;
in python2Packages.buildPythonApplication {
@@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication {
src = fetchurl {
url = "https://mercurial-scm.org/release/${name}.tar.gz";
- sha256 = "1cpx8nf6vcqz92kx6b5c4900pcay8zb89gvy8y33prh5rywjq83c";
+ sha256 = "01ig0464cvy9d87rn274g39frxr0p5q4lxf1xn5k3m24grf0qq0g";
};
inherit python; # pass it so that the same version can be used in hg2git
diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile b/pkgs/applications/version-management/redmine/4.x/Gemfile
index 3fd176007ab..babcfe75ed7 100644
--- a/pkgs/applications/version-management/redmine/4.x/Gemfile
+++ b/pkgs/applications/version-management/redmine/4.x/Gemfile
@@ -14,6 +14,7 @@ gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6"
gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1")
gem "i18n", "~> 0.7.0"
+gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3"
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
@@ -33,7 +34,7 @@ end
platforms :mri, :mingw, :x64_mingw do
# Optional gem for exporting the gantt to a PNG file, not supported with jruby
group :rmagick do
- gem "rmagick", ">= 2.14.0"
+ gem "rmagick", "~> 2.16.0"
end
# Optional Markdown support, not for JRuby
diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
index 8c569ddb322..26df0e1506a 100644
--- a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
+++ b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
@@ -60,7 +60,7 @@ GEM
ffi (~> 1.0, >= 1.0.11)
concurrent-ruby (1.1.4)
crass (1.0.4)
- css_parser (1.6.0)
+ css_parser (1.7.0)
addressable
csv (3.0.4)
docile (1.1.5)
@@ -70,7 +70,7 @@ GEM
activesupport (>= 4.2.0)
htmlentities (4.3.4)
i18n (0.7.0)
- json (2.1.0)
+ json (2.2.0)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
@@ -191,7 +191,7 @@ DEPENDENCIES
rbpdf (~> 1.19.6)
redcarpet (~> 3.4.0)
request_store (= 1.0.5)
- rmagick (>= 2.14.0)
+ rmagick (~> 2.16.0)
roadie-rails (~> 1.3.0)
rouge (~> 3.3.0)
ruby-openid (~> 2.3.0)
diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix
index ba9f96f5a30..04adc31a886 100644
--- a/pkgs/applications/version-management/redmine/4.x/default.nix
+++ b/pkgs/applications/version-management/redmine/4.x/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bundlerEnv, ruby }:
let
- version = "4.0.1";
+ version = "4.0.2";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@@ -15,7 +15,7 @@ in
src = fetchurl {
url = "https://www.redmine.org/releases/${name}.tar.gz";
- sha256 = "1zzn9rkh7x1h9f2shcc8qhb693hp0hpah0z53i6gfgg5p8k5hns1";
+ sha256 = "0v00f6m7si0ca0bmh6h7mx8yz1pl4zql2c8abavya57j97mi8182";
};
buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
diff --git a/pkgs/applications/version-management/redmine/4.x/gemset.nix b/pkgs/applications/version-management/redmine/4.x/gemset.nix
index ce21a58b556..afda745241e 100644
--- a/pkgs/applications/version-management/redmine/4.x/gemset.nix
+++ b/pkgs/applications/version-management/redmine/4.x/gemset.nix
@@ -152,10 +152,10 @@
dependencies = ["addressable"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61";
+ sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd";
type = "gem";
};
- version = "1.6.0";
+ version = "1.7.0";
};
csv = {
source = {
@@ -217,10 +217,10 @@
json = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+ sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.0";
};
loofah = {
dependencies = ["crass" "nokogiri"];
diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile
index 8f457449e7e..15662f56015 100644
--- a/pkgs/applications/version-management/redmine/Gemfile
+++ b/pkgs/applications/version-management/redmine/Gemfile
@@ -21,6 +21,7 @@ gem "mail", "~> 2.6.4"
gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.1" : "~> 1.6.8")
gem "i18n", "~> 0.7.0"
gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
+gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3"
# Request at least rails-html-sanitizer 1.0.3 because of security advisories
gem "rails-html-sanitizer", ">= 1.0.3"
@@ -43,7 +44,7 @@ end
platforms :mri, :mingw, :x64_mingw do
# Optional gem for exporting the gantt to a PNG file, not supported with jruby
group :rmagick do
- gem "rmagick", ">= 2.14.0"
+ gem "rmagick", "~> 2.16.0"
end
# Optional Markdown support, not for JRuby
diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock
index 8bc8a03e790..eb3e0ee73bb 100644
--- a/pkgs/applications/version-management/redmine/Gemfile.lock
+++ b/pkgs/applications/version-management/redmine/Gemfile.lock
@@ -53,7 +53,7 @@ GEM
coderay (1.1.2)
concurrent-ruby (1.1.4)
crass (1.0.4)
- css_parser (1.6.0)
+ css_parser (1.7.0)
addressable
docile (1.1.5)
erubis (2.7.0)
@@ -120,7 +120,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.2)
- rbpdf (1.19.7)
+ rbpdf (1.19.8)
htmlentities
rbpdf-font (~> 1.19.0)
rbpdf-font (1.19.1)
@@ -191,7 +191,7 @@ DEPENDENCIES
rdoc (~> 4.3)
redcarpet (~> 3.4.0)
request_store (= 1.0.5)
- rmagick (>= 2.14.0)
+ rmagick (~> 2.16.0)
roadie (~> 3.2.1)
roadie-rails (~> 1.1.1)
ruby-openid (~> 2.3.0)
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index 02ae5da0f3f..ab0b113bf87 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bundlerEnv, ruby }:
let
- version = "3.4.8";
+ version = "3.4.9";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@@ -15,7 +15,7 @@ in
src = fetchurl {
url = "https://www.redmine.org/releases/${name}.tar.gz";
- sha256 = "1d8bj3hx2nlyvsqbx7zbslb4dgwgyxidj4jzh4n2ki0i7vgw0x5m";
+ sha256 = "1f7sgyka21cjkvmdqkkwrx1hn0b38yq4b7283vw858fccp0l2vy2";
};
buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix
index 0a231c99579..bdf1b55a732 100644
--- a/pkgs/applications/version-management/redmine/gemset.nix
+++ b/pkgs/applications/version-management/redmine/gemset.nix
@@ -142,10 +142,10 @@
dependencies = ["addressable"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61";
+ sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd";
type = "gem";
};
- version = "1.6.0";
+ version = "1.7.0";
};
docile = {
source = {
@@ -430,10 +430,10 @@
dependencies = ["htmlentities" "rbpdf-font"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0i00mmc028p7hnpwlx9r6zdwwz589kd9ns6qpxmgl6f620n1fvs2";
+ sha256 = "0fnhcn4z2zz6ic1yvl5hmhwmkdnybh8f8fnk1ni7bvl2s4ig5195";
type = "gem";
};
- version = "1.19.7";
+ version = "1.19.8";
};
rbpdf-font = {
source = {
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 1054a2c06cf..20d3922138b 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "src-${version}";
- version = "1.22";
+ version = "1.24";
src = fetchurl {
url = "http://www.catb.org/~esr/src/${name}.tar.gz";
- sha256 = "0xvfg3aikr2jh09vjvxsha7day5br88chvirncr59ad40da1fils";
+ sha256 = "0n9j2mywbm8c7mc5b3m7dvn6gff88wwwaygk4y1jivpg1f6s3k3l";
};
buildInputs = [ python rcs git makeWrapper ];
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 3937244f25b..a94bb7ade33 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchurl, makeDesktopItem, ffmpeg, qt4, qmake4Hook }:
+{ stdenv, fetchurl, makeDesktopItem, ffmpeg
+, qmake, qttools
+, qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine
+}:
stdenv.mkDerivation rec {
name = "clipgrab-${version}";
- version = "3.7.2";
+ version = "3.8.2";
src = fetchurl {
- sha256 = "1xkap4zgx8k0h0qfcqfwi3lj7s3mqsj0dp1cddiqmxbibbmg3rcc";
+ sha256 = "0dhiv1mldp5f555im6mkjxdh6iivn1hnx2xdaqa6wxzsrwrvv5dd";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
url = "https://download.clipgrab.org/${name}.tar.gz";
};
- buildInputs = [ ffmpeg qt4 ];
- nativeBuildInputs = [ qmake4Hook ];
+ buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ];
+ nativeBuildInputs = [ qmake qttools ];
postPatch = stdenv.lib.optionalString (ffmpeg != null) ''
substituteInPlace converter_ffmpeg.cpp \
diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix
index a329321b70c..344c47eb934 100644
--- a/pkgs/applications/video/dvd-slideshow/default.nix
+++ b/pkgs/applications/video/dvd-slideshow/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }:
+{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }:
let
binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ];
wrapper = writeScript "dvd-slideshow.sh" ''
- #!${stdenv.shell}
+ #!${runtimeShell}
# wrapper script for dvd-slideshow programs
export PATH=${binPath}:$PATH
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 07474c5e52c..77ee2bc10f8 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -3,7 +3,7 @@
# Derivation patches HandBrake to use Nix closure dependencies.
#
-{ stdenv, lib, fetchurl, callPackage,
+{ stdenv, lib, fetchurl,
# Main build tools
python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4,
# Processing, video codecs, containers
@@ -29,12 +29,12 @@
}:
stdenv.mkDerivation rec {
- version = "1.2.0";
- name = "handbrake-${version}";
+ pname = "handbrake";
+ version = "1.2.2";
src = fetchurl {
url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2'';
- sha256 = "03clkknaq3mz84p85cvr21gsy9b8vv2g4vvyfz44hz8la253jfqi";
+ sha256 = "0k2yaqy7zi06k8mkp9az2mn9dlgj3a1339vacakfh2nn2zsics6z";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 05105b64af7..24a1f07fb0d 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -18,7 +18,7 @@
, libcec, libcec_platform, dcadec, libuuid
, libcrossguid, libmicrohttpd
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp
-, libplist, p11-kit, zlib
+, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson
, dbusSupport ? true, dbus ? null
, joystickSupport ? true, cwiid ? null
, nfsSupport ? true, libnfs ? null
@@ -40,21 +40,18 @@ assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used i
assert vdpauSupport -> libvdpau != null;
# TODO for Kodi 18.0
-# - cmake is no longer in project/cmake
-# - maybe we can remove auto{conf,make} and libtool from inputs
# - check if dbus support PR has been merged and add dbus as a buildInput
-# - try to use system ffmpeg (kodi 17 works best with bundled 3.1 with patches)
let
- kodiReleaseDate = "20171115";
- kodiVersion = "17.6";
- rel = "Krypton";
+ kodiReleaseDate = "20190129";
+ kodiVersion = "18.0";
+ rel = "Leia";
kodi_src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "${kodiVersion}-${rel}";
- sha256 = "1pwmmbry7dajwdpmc1mdygjvxna4kl38h32d71g10yf3mdm5wmz3";
+ sha256 = "1ci5jjvqly01lysdp6j6jrnn49z4is9z5kan5zl3cpqm9w7rqarg";
};
kodiDependency = { name, version, rev, sha256, ... } @attrs:
@@ -72,9 +69,9 @@ let
ffmpeg = kodiDependency rec {
name = "FFmpeg";
- version = "3.1.11";
- rev = "${version}-${rel}-17.5"; # TODO: change 17.5 back to ${kodiVersion}
- sha256 = "0nc4sb6v1g3l11v9h5l9n44a8r40186rcbp2xg5c7vg6wcpjid13";
+ version = "4.0.3";
+ rev = "${version}-${rel}-RC5";
+ sha256 = "0l20bysv2y711khwpnpw4dz6mzd37qllki3fnv4dx1lj8ivydrlx";
preConfigure = ''
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
'';
@@ -86,29 +83,29 @@ let
# we should be able to build these externally and have kodi reference them as buildInputs.
# Doesn't work ATM though so we just use them for the src
- libdvdcss = kodiDependency {
+ libdvdcss = kodiDependency rec {
name = "libdvdcss";
- version = "20160215";
- rev = "2f12236bc1c92f73c21e973363f79eb300de603f";
- sha256 = "198r0q73i55ga1dvyqq9nfcri0zq08b94hy8671lg14i3izx44dd";
+ version = "1.4.2";
+ rev = "${version}-${rel}-Beta-5";
+ sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl";
buildInputs = [ libdvdread ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
};
- libdvdnav = kodiDependency {
+ libdvdnav = kodiDependency rec {
name = "libdvdnav";
- version = "20170217";
- rev = "981488f7f27554b103cca10c1fbeba027396c94a";
- sha256 = "089pswc51l3avh95zl4cpsh7gh1innh7b2y4xgx840mcmy46ycr8";
+ version = "6.0.0";
+ rev = "${version}-${rel}-Alpha-3";
+ sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb";
buildInputs = [ libdvdread ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
};
- libdvdread = kodiDependency {
+ libdvdread = kodiDependency rec {
name = "libdvdread";
- version = "20160221";
- rev = "17d99db97e7b8f23077b342369d3c22a6250affd";
- sha256 = "1gr5aq1cjr3as9mnwrw29cxn4m6f6pfrxdahkdcjy70q3ldg90sl";
+ version = "6.0.0";
+ rev = "${version}-${rel}-Alpha-3";
+ sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
};
@@ -136,7 +133,7 @@ in stdenv.mkDerivation rec {
libgcrypt libgpgerror libunistring
libcrossguid cwiid libplist
bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp
- ffmpeg
+ ffmpeg flatbuffers fmt fstrcmp rapidjson
# libdvdcss libdvdnav libdvdread
]
++ lib.optional dbusSupport dbus
@@ -176,14 +173,10 @@ in stdenv.mkDerivation rec {
doCheck = false;
postPatch = ''
- substituteInPlace xbmc/linux/LinuxTimezone.cpp \
+ substituteInPlace xbmc/platform/linux/LinuxTimezone.cpp \
--replace 'usr/share/zoneinfo' 'etc/zoneinfo'
'';
- preConfigure = ''
- cd project/cmake
- '';
-
postInstall = ''
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
@@ -209,6 +202,6 @@ in stdenv.mkDerivation rec {
homepage = https://kodi.tv/;
license = licenses.gpl2;
platforms = platforms.linux;
- maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg ];
+ maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg sephalon ];
};
}
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 196852933a9..91fd7eab126 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,13 +1,15 @@
{ stdenv, callPackage, fetchurl, fetchFromGitHub, unzip
-, cmake, kodiPlain, libcec_platform, tinyxml
+, cmake, kodiPlain, libcec_platform, tinyxml, rapidxml
, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib
-, python2Packages }:
+, python2Packages, expat, glib, nspr, nss, openssl
+, libssh, libarchive, lzma, bzip2, lz4, lzo }:
with stdenv.lib;
let self = rec {
pluginDir = "/share/kodi/addons";
+ rel = "Leia";
kodi = kodiPlain;
@@ -54,6 +56,8 @@ let self = rec {
dontStrip = true;
+ extraRuntimeDependencies = [ ];
+
installPhase = ''
${if isNull sourceDir then "" else "cd $src/$sourceDir"}
d=$out${pluginDir}/${namespace}
@@ -64,7 +68,8 @@ let self = rec {
'';
} // args));
- mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], ... }@args:
+ mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [],
+ extraRuntimeDependencies ? [], extraInstallPhase ? "", ... }@args:
toKodiPlugin (stdenv.mkDerivation (rec {
name = "kodi-plugin-${plugin}-${version}";
@@ -73,6 +78,8 @@ let self = rec {
buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ]
++ extraBuildInputs;
+ inherit extraRuntimeDependencies;
+
# disables check ensuring install prefix is that of kodi
cmakeFlags = [
"-DOVERRIDE_PATHS=1"
@@ -84,6 +91,7 @@ let self = rec {
installPhase = let n = namespace; in ''
make install
ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version}
+ ${extraInstallPhase}
'';
} // args));
@@ -212,14 +220,14 @@ let self = rec {
joystick = mkKodiABIPlugin rec {
namespace = "peripheral.joystick";
- version = "1.3.2";
+ version = "1.4.7";
plugin = namespace;
src = fetchFromGitHub {
- owner = "kodi-game";
+ owner = "xbmc";
repo = namespace;
- rev = "96171dd32899553ffe8fc775fca66e8df5ff5cf1";
- sha256 = "18m61v8z9fbh4imvzhh4g9629r9df49g2yk9ycaczirg131dhfbh";
+ rev = "v${version}";
+ sha256 = "03gsp4kg41s3n4ib4wsv7m3krfipgwc2z07i4mnd5zvg0c4xrmap";
};
meta = {
@@ -282,14 +290,14 @@ let self = rec {
steam-controller = mkKodiABIPlugin rec {
namespace = "peripheral.steamcontroller";
- version = "0.9.0";
+ version = "0.10.0";
plugin = namespace;
src = fetchFromGitHub {
owner = "kodi-game";
repo = namespace;
- rev = "76f640fad4f68118f4fab6c4c3338d13daca7074";
- sha256 = "0yqlfdiiymb8z6flyhpval8w3kdc9qv3mli3jg1xn5ac485nxsxh";
+ rev = "ea345392ab5aa4485f3a48d2037fa8a8e8ab82de";
+ sha256 = "1hbd8fdvn7xkr9csz1g9wah78nhnq1rkazl4zwa31y70830k3279";
};
extraBuildInputs = [ libusb ];
@@ -355,13 +363,13 @@ let self = rec {
plugin = "pvr-hts";
namespace = "pvr.hts";
- version = "3.4.16";
+ version = "4.4.14";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hts";
- rev = "b39e4e9870d68841279cbc7d7214f3ad9b27f330";
- sha256 = "0pmlgqr4kd0gvckz77mj6v42kcx6lb23anm8jnf2fbn877snnijx";
+ rev = "${version}-${rel}";
+ sha256 = "1bcwcwd2yjhw85yk6lyhf0iqiclrsz7r7vpbxgc650fwqbb146gr";
};
meta = {
@@ -377,13 +385,13 @@ let self = rec {
plugin = "pvr-hdhomerun";
namespace = "pvr.hdhomerun";
- version = "2.4.7";
+ version = "3.5.0";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hdhomerun";
- rev = "60d89d16dd953d38947e8a6da2f8bb84a0f764ef";
- sha256 = "0dvdv0vk2q12nj0i5h51iaypy3i7jfsxjyxwwpxfy82y8260ragy";
+ rev = "${version}-${rel}";
+ sha256 = "1zrkvfn0im2qmvqm93pa3cg8xkxv61sxlj8nsz4r5z9v9nhqadf6";
};
meta = {
@@ -401,13 +409,13 @@ let self = rec {
plugin = "pvr-iptvsimple";
namespace = "pvr.iptvsimple";
- version = "2.4.14";
+ version = "3.5.7";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.iptvsimple";
- rev = "2a649d7e21b64c4fa4a8b14c2cc139261eebc7e8";
- sha256 = "1f1im2gachrxnr3z96h5cg2c13vapgkvkdwvrbl4hxlnyp1a6jyz";
+ rev = "${version}-${rel}";
+ sha256 = "17znib7c491h2ii4gagxradh0jyvgga0d548gbk4yjj2nc9qqc6d";
};
meta = {
@@ -418,20 +426,20 @@ let self = rec {
license = licenses.gpl2Plus;
};
- extraBuildInputs = [ zlib ];
+ extraBuildInputs = [ zlib rapidxml ];
};
osmc-skin = mkKodiPlugin rec {
plugin = "osmc-skin";
namespace = "skin.osmc";
- version = "17.0.4";
+ version = "18.0.0";
src = fetchFromGitHub {
owner = "osmc";
repo = namespace;
- rev = "a9268937f49286bab9fb49de430b8aafd7a60a9e";
- sha256 = "1b3fm02annsq58pcfc985glrmh21rmqksdj3q8wn6gyza06jdf3v";
+ rev = "40a6c318641e2cbeac58fb0e7dde9c2beac737a0";
+ sha256 = "1l7hyfj5zvjxjdm94y325bmy1naak455b9l8952sb0gllzrcwj6s";
};
meta = {
@@ -470,4 +478,76 @@ let self = rec {
};
});
+ inputstream-adaptive = mkKodiABIPlugin rec {
+
+ plugin = "inputstream-adaptive";
+ namespace = "inputstream.adaptive";
+ version = "2.3.12";
+
+ src = fetchFromGitHub {
+ owner = "peak3d";
+ repo = "inputstream.adaptive";
+ rev = "${version}";
+ sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z";
+ };
+
+ extraBuildInputs = [ expat ];
+
+ extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ];
+
+ extraInstallPhase = let n = namespace; in ''
+ ln -s $out/lib/addons/${n}/libssd_wv.so $out/${pluginDir}/${n}/libssd_wv.so
+ '';
+
+ meta = {
+ homepage = https://github.com/peak3d/inputstream.adaptive;
+ description = "Kodi inputstream addon for several manifest types";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ sephalon ];
+ };
+ };
+
+ vfs-sftp = mkKodiABIPlugin rec {
+ namespace = "vfs.sftp";
+ version = "1.0.1";
+ plugin = namespace;
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = namespace;
+ rev = "${version}-${rel}";
+ sha256 = "1l9igrl168s91c15v9klyaaz226ik3xlbzjk2f1346fvzmp87g9v";
+ };
+
+ meta = with stdenv.lib; {
+ description = "SFTP Virtual Filesystem add-on for Kodi";
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ minijackson ];
+ };
+
+ extraBuildInputs = [ openssl libssh zlib ];
+ };
+
+ vfs-libarchive = mkKodiABIPlugin rec {
+ namespace = "vfs.libarchive";
+ version = "1.0.5";
+ plugin = namespace;
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = namespace;
+ rev = "${version}-${rel}";
+ sha256 = "0l1f1fijflr1ia30r0dcz1x2zn35c4lxy30az1cqxdf8nipza0b8";
+ };
+
+ meta = with stdenv.lib; {
+ description = "LibArchive Virtual Filesystem add-on for Kodi";
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ minijackson ];
+ };
+
+ extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ];
+ };
}; in self
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index d0dc9274a10..b4365eed949 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -14,7 +14,10 @@ buildEnv {
do
makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
--prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \
- --prefix KODI_HOME : $out/share/kodi
+ --prefix KODI_HOME : $out/share/kodi \
+ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
+ (stdenv.lib.concatMap
+ (plugin: plugin.extraRuntimeDependencies) plugins)}"
done
'';
diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix
index 34efffc21d7..cceed556f97 100644
--- a/pkgs/applications/video/mediathekview/default.nix
+++ b/pkgs/applications/video/mediathekview/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)";
homepage = https://mediathekview.de/;
license = licenses.gpl3;
- maintainers = with maintainers; [ chaoflow moredread ];
+ maintainers = with maintainers; [ moredread ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 2cd4f19ca93..6e0b7412558 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -48,7 +48,7 @@ in python3Packages.buildPythonApplication rec {
buildInputs = [
gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libnotify
gst-transcoder
] ++ (with gst_all_1; [
diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
index 2dd76b36d05..812004bd119 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
pname = "qstopmotion";
- version = "2.4.0";
+ version = "2.4.1";
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/project/${pname}/Version_2_4_0/${name}-Source.tar.gz";
- sha256 = "0pbyq6nrr9g3crlsng660768167s0fybvcpzbfc0w9kkhs2jwrr2";
+ url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${name}-Source.tar.gz";
+ sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh";
};
buildInputs = with qt5; [ v4l_utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview
diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix
index 6042f490dfa..1671c3f14d0 100644
--- a/pkgs/applications/video/screenkey/default.nix
+++ b/pkgs/applications/video/screenkey/default.nix
@@ -9,7 +9,7 @@
, libX11
, libXtst
, wrapGAppsHook
-, defaultIconTheme
+, gnome3
, hicolor-icon-theme
}:
buildPythonApplication rec {
@@ -39,7 +39,7 @@ buildPythonApplication rec {
];
buildInputs = [
- defaultIconTheme
+ gnome3.adwaita-icon-theme
hicolor-icon-theme
];
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index bbb11c49766..27a0fa3388e 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
stdenv.mkDerivation rec {
name = "shotcut-${version}";
- version = "18.12.23";
+ version = "19.02.28";
src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
rev = "v${version}";
- sha256 = "1i6gkqvg31q7g5s3zgqzg4i5kyas7k4svclgbk459i5h1ar3v5vn";
+ sha256 = "14l0cm81jy7syi08d8dg4nzp7s9zji9cycnf2mvh7zc7x069d1jr";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index dbf22aa9f8e..4cc0890a847 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -1,14 +1,14 @@
{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
pythonPackages.buildPythonApplication rec {
- version = "0.14.2";
+ version = "1.0.0";
name = "streamlink-${version}";
src = fetchFromGitHub {
owner = "streamlink";
repo = "streamlink";
rev = "${version}";
- sha256 = "1njwfy1h8a9n5z6crrfnknlw4ys0bap2jam6ga6njgkd10aly9qr";
+ sha256 = "12x8gnp6lv3vi1z2wfb0vjim2wm6abpr938yy48kqj7qff385ihd";
};
checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ];
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 94b21a77a70..b0f60fd8b87 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -4,13 +4,13 @@ with lib;
buildGoPackage rec {
name = "containerd-${version}";
- version = "1.2.2";
+ version = "1.2.4";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
- sha256 = "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya";
+ sha256 = "1rw7f0y3iv0mapxid1rgpns80dcy8nhgmxmw27x8qzrzic5viivy";
};
goPackagePath = "github.com/containerd/containerd";
diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix
index 4af9c32fed6..8e1934487cb 100644
--- a/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/pkgs/applications/virtualization/docker-compose/default.nix
@@ -6,12 +6,12 @@
, enum34, functools32,
}:
buildPythonApplication rec {
- version = "1.23.1";
+ version = "1.23.2";
pname = "docker-compose";
src = fetchPypi {
inherit pname version;
- sha256 = "15jijx3md70b9xw8818xjm70nr9pc27p7v7is0yi6agf8scvvqkq";
+ sha256 = "1x2jlh7z2znvyz2pqcpn0gigfiqnx8s59pc7xlvy9ryd76g9w1zz";
};
# lots of networking and other fails
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index e7c8a302c27..d4ba9568fed 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -100,6 +100,7 @@ rec {
export AUTO_GOPATH=1
export DOCKER_GITCOMMIT="${rev}"
export VERSION="${version}"
+ export GOCACHE="$TMPDIR/go-cache"
./hack/make.sh dynbinary
cd -
'') + ''
diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix
index 4499fff4dc8..9419939d1c7 100644
--- a/pkgs/applications/virtualization/dynamips/default.nix
+++ b/pkgs/applications/virtualization/dynamips/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dynamips";
- version = "0.2.19";
+ version = "0.2.20";
src = fetchFromGitHub {
owner = "GNS3";
repo = pname;
rev = "v${version}";
- sha256 = "0x63m37vjyp57900x09gfvw02cwg85b33918x7fjj9x37wgmi5qf";
+ sha256 = "1841h0m0k0p3c3ify4imafjk7jigcj2zlr8rn3iyp7jnafkxqik7";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix
index 711838b2944..ab971fe64c9 100644
--- a/pkgs/applications/virtualization/ecs-agent/default.nix
+++ b/pkgs/applications/virtualization/ecs-agent/default.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS";
homepage = "https://github.com/aws/amazon-ecs-agent";
license = licenses.asl20;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ copumpkin ];
};
}
diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix
index e1696fc15a5..778006a40f0 100644
--- a/pkgs/applications/virtualization/firecracker/default.nix
+++ b/pkgs/applications/virtualization/firecracker/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv }:
let
- version = "0.13.0";
+ version = "0.15.0";
baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download";
fetchbin = name: sha256: fetchurl {
@@ -9,8 +9,8 @@ let
inherit sha256;
};
- firecracker-bin = fetchbin "firecracker" "1wdcy4vmnx216jnza7bz6czlqpsjrnpqfsb5d322ld4gzbylm718";
- jailer-bin = fetchbin "jailer" "0k0sc5138bh35ciim2l78ma9g5x18dw098f2ar5y31ybr8i4q60y";
+ firecracker-bin = fetchbin "firecracker" "06b9pj9s4i0wqbh24frsza2j28n7qflp623vwvar5k18jq6jixd0";
+ jailer-bin = fetchbin "jailer" "17nbsg3yi9rif9qxgp483b2qx0jn2sn1hlvk63gl8m54mnxzmcr3";
in
stdenv.mkDerivation {
name = "firecracker-${version}";
diff --git a/pkgs/applications/virtualization/nvidia-docker/config.toml b/pkgs/applications/virtualization/nvidia-docker/config.toml
new file mode 100644
index 00000000000..bbd166995f3
--- /dev/null
+++ b/pkgs/applications/virtualization/nvidia-docker/config.toml
@@ -0,0 +1,13 @@
+disable-require = false
+#swarm-resource = "DOCKER_RESOURCE_GPU"
+
+[nvidia-container-cli]
+#root = "/run/nvidia/driver"
+#path = "/usr/bin/nvidia-container-cli"
+environment = []
+#debug = "/var/log/nvidia-container-runtime-hook.log"
+ldcache = "/tmp/ld.so.cache"
+load-kmods = true
+#no-cgroups = false
+#user = "root:video"
+ldconfig = "@@glibcbin@/bin/ldconfig"
diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix
new file mode 100644
index 00000000000..3e79ff84882
--- /dev/null
+++ b/pkgs/applications/virtualization/nvidia-docker/default.nix
@@ -0,0 +1,84 @@
+{ stdenv, lib, fetchFromGitHub, fetchpatch, callPackage, makeWrapper
+, buildGoPackage, runc, libelf, libcap, libseccomp, glibc }:
+
+with lib; let
+
+ glibc-ldconf = glibc.overrideAttrs (oldAttrs: {
+ # ldconfig needs help reading libraries that have been patchelf-ed, as the
+ # .dynstr section is no longer in the first LOAD segment. See also
+ # https://sourceware.org/bugzilla/show_bug.cgi?id=23964 and
+ # https://github.com/NixOS/patchelf/issues/44
+ patches = oldAttrs.patches ++ [ (fetchpatch {
+ name = "ldconfig-patchelf.patch";
+ url = "https://sourceware.org/bugzilla/attachment.cgi?id=11444";
+ sha256 = "0nzzmq7pli37iyjrgcmvcy92piiwjybpw245ds7q43pbgdm7lc3s";
+ })];
+ });
+
+ libnvidia-container = callPackage ./libnvc.nix { };
+
+ nvidia-container-runtime = fetchFromGitHub {
+ owner = "NVIDIA";
+ repo = "nvidia-container-runtime";
+ rev = "runtime-v2.0.0";
+ sha256 = "0jcj5xxbg7x7gyhbb67h3ds6vly62gx7j02zm6lg102h34jajj7a";
+ };
+
+ nvidia-container-runtime-hook = buildGoPackage rec {
+ name = "nvidia-container-runtime-hook-${version}";
+ version = "1.4.0";
+
+ goPackagePath = "nvidia-container-runtime-hook";
+
+ src = "${nvidia-container-runtime}/hook/nvidia-container-runtime-hook";
+ };
+
+ nvidia-runc = runc.overrideAttrs (oldAttrs: rec {
+ name = "nvidia-runc";
+ version = "1.0.0-rc6";
+ src = fetchFromGitHub {
+ owner = "opencontainers";
+ repo = "runc";
+ rev = "v${version}";
+ sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j";
+ };
+ patches = [ "${nvidia-container-runtime}/runtime/runc/3f2f8b84a77f73d38244dd690525642a72156c64/0001-Add-prestart-hook-nvidia-container-runtime-hook-to-t.patch" ];
+ });
+
+in stdenv.mkDerivation rec {
+ name = "nvidia-docker-${version}";
+ version = "2.0.3";
+
+ src = fetchFromGitHub {
+ owner = "NVIDIA";
+ repo = "nvidia-docker";
+ rev = "v${version}";
+ sha256 = "1vx5m591mnvcb9vy0196x5lh3r8swjsk0fnlv5h62m7m4m07v6wx";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ buildPhase = ''
+ mkdir bin
+ cp nvidia-docker bin
+ cp ${libnvidia-container}/bin/nvidia-container-cli bin
+ cp ${nvidia-container-runtime-hook}/bin/nvidia-container-runtime-hook bin
+ cp ${nvidia-runc}/bin/runc bin/nvidia-container-runtime
+ '';
+
+ installPhase = ''
+ mkdir -p $out/{bin,etc}
+ cp -r bin $out
+ wrapProgram $out/bin/nvidia-container-cli \
+ --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib
+ cp ${./config.toml} $out/etc/config.toml
+ substituteInPlace $out/etc/config.toml --subst-var-by glibcbin ${lib.getBin glibc-ldconf}
+ '';
+
+ meta = {
+ homepage = https://github.com/NVIDIA/nvidia-docker;
+ description = "NVIDIA container runtime for Docker";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch
new file mode 100644
index 00000000000..043c1efade8
--- /dev/null
+++ b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch
@@ -0,0 +1,130 @@
+diff --git a/src/ldcache.c b/src/ldcache.c
+index 38bab05..e1abc89 100644
+--- a/src/ldcache.c
++++ b/src/ldcache.c
+@@ -108,40 +108,27 @@ ldcache_close(struct ldcache *ctx)
+
+ int
+ ldcache_resolve(struct ldcache *ctx, uint32_t arch, const char *root, const char * const libs[],
+- char *paths[], size_t size, ldcache_select_fn select, void *select_ctx)
++ char *paths[], size_t size, const char* version)
+ {
+ char path[PATH_MAX];
+- struct header_libc6 *h;
+- int override;
++ char dir[PATH_MAX];
++ char lib[PATH_MAX];
+
+- h = (struct header_libc6 *)ctx->ptr;
+ memset(paths, 0, size * sizeof(*paths));
+
+- for (uint32_t i = 0; i < h->nlibs; ++i) {
+- int32_t flags = h->libs[i].flags;
+- char *key = (char *)ctx->ptr + h->libs[i].key;
+- char *value = (char *)ctx->ptr + h->libs[i].value;
+-
+- if (!(flags & LD_ELF) || (flags & LD_ARCH_MASK) != arch)
++ for (size_t j = 0; j < size; ++j) {
++ snprintf(dir, 100, "/run/opengl-driver%s/lib",
++ arch == LD_I386_LIB32 ? "-32" : "");
++ if (!strncmp(libs[j], "libvdpau_nvidia.so", 100))
++ strcat(dir, "/vdpau");
++ snprintf(lib, 100, "%s/%s.%s", dir, libs[j], version);
++ if (path_resolve_full(ctx->err, path, "/", lib) < 0)
++ return (-1);
++ if (!file_exists(ctx->err, path))
+ continue;
+-
+- for (size_t j = 0; j < size; ++j) {
+- if (!str_has_prefix(key, libs[j]))
+- continue;
+- if (path_resolve(ctx->err, path, root, value) < 0)
+- return (-1);
+- if (paths[j] != NULL && str_equal(paths[j], path))
+- continue;
+- if ((override = select(ctx->err, select_ctx, root, paths[j], path)) < 0)
+- return (-1);
+- if (override) {
+- free(paths[j]);
+- paths[j] = xstrdup(ctx->err, path);
+- if (paths[j] == NULL)
+- return (-1);
+- }
+- break;
+- }
++ paths[j] = xstrdup(ctx->err, path);
++ if (paths[j] == NULL)
++ return (-1);
+ }
+ return (0);
+ }
+diff --git a/src/ldcache.h b/src/ldcache.h
+index 33d78dd..2b087db 100644
+--- a/src/ldcache.h
++++ b/src/ldcache.h
+@@ -50,6 +50,6 @@ void ldcache_init(struct ldcache *, struct error *, const char *);
+ int ldcache_open(struct ldcache *);
+ int ldcache_close(struct ldcache *);
+ int ldcache_resolve(struct ldcache *, uint32_t, const char *, const char * const [],
+- char *[], size_t, ldcache_select_fn, void *);
++ char *[], size_t, const char*);
+
+ #endif /* HEADER_LDCACHE_H */
+diff --git a/src/nvc_info.c b/src/nvc_info.c
+index cc96542..3fe7612 100644
+--- a/src/nvc_info.c
++++ b/src/nvc_info.c
+@@ -163,15 +163,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char *
+ if (path_resolve_full(err, path, root, ldcache) < 0)
+ return (-1);
+ ldcache_init(&ld, err, path);
+- if (ldcache_open(&ld) < 0)
+- return (-1);
+
+ info->nlibs = size;
+ info->libs = array_new(err, size);
+ if (info->libs == NULL)
+ goto fail;
+ if (ldcache_resolve(&ld, LIB_ARCH, root, libs,
+- info->libs, info->nlibs, select_libraries, info) < 0)
++ info->libs, info->nlibs, info->nvrm_version) < 0)
+ goto fail;
+
+ info->nlibs32 = size;
+@@ -179,13 +177,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char *
+ if (info->libs32 == NULL)
+ goto fail;
+ if (ldcache_resolve(&ld, LIB32_ARCH, root, libs,
+- info->libs32, info->nlibs32, select_libraries, info) < 0)
++ info->libs32, info->nlibs32, info->nvrm_version) < 0)
+ goto fail;
+ rv = 0;
+
+ fail:
+- if (ldcache_close(&ld) < 0)
+- return (-1);
+ return (rv);
+ }
+
+@@ -199,7 +195,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r
+ char path[PATH_MAX];
+ int rv = -1;
+
+- if ((env = secure_getenv("PATH")) == NULL) {
++ if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin") == NULL) {
+ error_setx(err, "environment variable PATH not found");
+ return (-1);
+ }
+diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c
+index d41a24d..65b7878 100644
+--- a/src/nvc_ldcache.c
++++ b/src/nvc_ldcache.c
+@@ -331,7 +331,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt)
+ if (validate_args(ctx, cnt != NULL) < 0)
+ return (-1);
+
+- argv = (char * []){cnt->cfg.ldconfig, cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};
++ argv = (char * []){cnt->cfg.ldconfig, "-f", "/tmp/ld.so.conf.nvidia-host", "-C", "/tmp/ld.so.cache.nvidia-host", cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};
+ if (*argv[0] == '@') {
+ /*
+ * We treat this path specially to be relative to the host filesystem.
diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
new file mode 100644
index 00000000000..46b8e3ba43c
--- /dev/null
+++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
@@ -0,0 +1,53 @@
+{ stdenv, lib, fetchFromGitHub, libelf, libcap, libseccomp }:
+
+with lib; let
+
+ modp-ver = "396.51";
+
+ nvidia-modprobe = fetchFromGitHub {
+ owner = "NVIDIA";
+ repo = "nvidia-modprobe";
+ rev = modp-ver;
+ sha256 = "1fw2qwc84k64agw6fx2v0mjf88aggph9c6qhs4cv7l3gmflv8qbk";
+ };
+
+in stdenv.mkDerivation rec {
+ name = "libnvidia-container-${version}";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "NVIDIA";
+ repo = "libnvidia-container";
+ rev = "v${version}";
+ sha256 = "1ws6mfsbgxhzlb5w1r8qqg2arvxkr21n59i4cqsyz3h5jsqsflbw";
+ };
+
+ # locations of nvidia-driver libraries are not resolved via ldconfig which
+ # doesn't get used on NixOS. Additional support binaries like nvidia-smi are
+ # not resolved via the environment PATH but via the derivation output path.
+ patches = [ ./libnvc-ldconfig-and-path-fixes.patch ];
+
+ makeFlags = [
+ "WITH_LIBELF=yes"
+ "prefix=$(out)"
+ ];
+
+ postPatch = ''
+ sed -i 's/^REVISION :=.*/REVISION = ${src.rev}/' mk/common.mk
+ sed -i 's/^COMPILER :=.*/COMPILER = $(CC)/' mk/common.mk
+
+ mkdir -p deps/src/nvidia-modprobe-${modp-ver}
+ cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver}
+ chmod -R u+w deps/src
+ touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp
+ '';
+
+ buildInputs = [ libelf libcap libseccomp ];
+
+ meta = {
+ homepage = https://github.com/NVIDIA/libnvidia-container;
+ description = "NVIDIA container runtime library";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index a43e1733f06..0668400d28c 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook,
fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps,
libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst,
- pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd, which,
+ pkgconfig, glib, gtk3, gtkmm3, iproute, dbus, systemd, which,
withX ? true }:
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ]
- ++ lib.optionals withX [ gtk gtkmm libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
+ ++ lib.optionals withX [ gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
patches = [ ./recognize_nixos.patch ];
postPatch = ''
diff --git a/pkgs/applications/virtualization/podman/conmon.nix b/pkgs/applications/virtualization/podman/conmon.nix
index 42907bc84ba..6089aa7f69c 100644
--- a/pkgs/applications/virtualization/podman/conmon.nix
+++ b/pkgs/applications/virtualization/podman/conmon.nix
@@ -4,13 +4,13 @@ with lib;
stdenv.mkDerivation rec {
name = "conmon-${version}";
- version = "unstable-2018-11-28";
- rev = "8fba206232c249a8fc4e2fac1469fb2fddbf5cf7";
+ version = "unstable-2019-02-15";
+ rev = "cc2b49590a485da9bd358440f92f219dfd6b230f";
src = fetchFromGitHub {
owner = "containers";
repo = "conmon";
- sha256 = "07ar0dk9i072b14f6il51yqahxp5c4fkf5jzar8rxcpvymkdy8zq";
+ sha256 = "13f5as4a9y6nkmr7cg0n27c2hfx9pkr75fxq2m0hlpcwhaardbm7";
inherit rev;
};
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 7fc74de1d2e..e50803db4e3 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -5,13 +5,13 @@
buildGoPackage rec {
name = "podman-${version}";
- version = "1.0.0";
+ version = "1.1.2";
src = fetchFromGitHub {
owner = "containers";
repo = "libpod";
rev = "v${version}";
- sha256 = "1py6vbmpm25j1gb51dn973pckvgjl9q63y9qyzszvc3q3wsxsqhw";
+ sha256 = "180sv1a7k3866ilb0mxbhiysms9xy4v6xbpy4in6ch8m8qym9amh";
};
goPackagePath = "github.com/containers/libpod";
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 777dc6fe930..42aad06d0c0 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -48,6 +48,7 @@ in stdenv.mkDerivation rec {
preBuild = ''
export BUILDDIR
+ export GOCACHE="$TMPDIR/go-cache"
'';
installPhase = ''
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 91934a3610b..26307f3f38d 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
];
buildInputs =
- [ libvirt-glib vte dconf gtk-vnc gnome3.defaultIconTheme avahi
+ [ libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi
gsettings-desktop-schemas libosinfo gtk3
] ++ optional spiceSupport spice-gtk;
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 8304dd15597..bd148733bc5 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -19,9 +19,10 @@ with stdenv.lib;
let
python = python2;
buildType = "release";
- # Remember to change the extpackRev and version in extpack.nix as well.
- main = "1m48ywa913g6zgqslvrihxs2fbr4gmljypbdpjma2hck6isyi02m";
- version = "5.2.22";
+ # Remember to change the extpackRev and version in extpack.nix and
+ # guest-additions/default.nix as well.
+ main = "0rylf1g0vmv0q19iyvyq4dj5h9yvyqqnmmqaqrx93qrv8s1ybssd";
+ version = "5.2.26";
in stdenv.mkDerivation {
name = "virtualbox-${version}";
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index d2c513e899a..96b4c7a8fbb 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -2,7 +2,7 @@
with lib;
-let version = "5.2.22";
+let version = "5.2.26";
in
fetchurl rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
@@ -10,7 +10,7 @@ fetchurl rec {
sha256 =
# Manually sha256sum the extensionPack file, must be hex!
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
- let value = "779250666551b2f5426e86c2d21ceb0209b46174536971611025f753535131ef";
+ let value = "4b7caa9b722840d49f154c3e5efb6463b1b7129f09973a25813dfdbccd9debb7";
in assert (builtins.stringLength value) == 64; value;
meta = {
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 259f2b268fe..ccfedd1b2e1 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "e51e33500a265b5c2d7bb2d03d32208df880523dfcb1e2dde2c78a0e0daa0603";
+ sha256 = "0f3w9wjd5aj2khzqh37vdg86wqbbx4gx9aidaai9syn9sk8ca9xr";
};
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix
index 8e248061cd5..94682893d51 100644
--- a/pkgs/applications/virtualization/x11docker/default.nix
+++ b/pkgs/applications/virtualization/x11docker/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }:
stdenv.mkDerivation rec {
name = "x11docker-${version}";
- version = "5.4.1";
+ version = "5.4.4";
src = fetchFromGitHub {
owner = "mviereck";
repo = "x11docker";
rev = "v${version}";
- sha256 = "0fcdr8i3crf4cina41h030q2jf5zvafll97iff129dl3sb27jnvi";
+ sha256 = "1p45dyd1zfjxlawsy190q71hwl083f90ryaslslhxsadsi9m64dq";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ nx-libs xorg.xhost xorg.xinit ];
diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index 03652c749de..7cb423123dc 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "bspwm-${version}";
- version = "0.9.6";
+ version = "0.9.7";
src = fetchFromGitHub {
owner = "baskerville";
repo = "bspwm";
rev = version;
- sha256 = "1ywjhqxvggfdfd3cfki0vvlsli8lhqlziwfrj5vd57c6yisc2fyy";
+ sha256 = "17cfvbrvzwwr9r72xgpn144k45xavzi0hnl2qqp9lhxflvirac0c";
};
buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix
index 1fed92764c1..b44aa73bc5a 100644
--- a/pkgs/applications/window-managers/i3/pystatus.nix
+++ b/pkgs/applications/window-managers/i3/pystatus.nix
@@ -3,7 +3,7 @@
python3Packages.buildPythonApplication rec {
# i3pystatus moved to rolling release:
# https://github.com/enkore/i3pystatus/issues/584
- version = "unstable-2018-04-11";
+ version = "unstable-2019-02-10";
pname = "i3pystatus";
disabled = !python3Packages.isPy3k;
@@ -11,8 +11,8 @@ python3Packages.buildPythonApplication rec {
{
owner = "enkore";
repo = "i3pystatus";
- rev = "3efbd56bb7a851f16173ec6f0eef472b6e96c7cc";
- sha256 = "0r4mc23chxlaym7jcjnflw7mn5nbw3q8q4ix0nim7lh98yfndd3b";
+ rev = "bcd8f12b18d491029fdd5bd0f433b4500fcdc68e";
+ sha256 = "0gw6sla73cid6gwxn2n4zmsg2svq5flf9zxly6x2rfljizgf0720";
};
propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++
@@ -44,4 +44,3 @@ python3Packages.buildPythonApplication rec {
maintainers = [ maintainers.igsha ];
};
}
-
diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix
index 155b26e0987..83c8e9328ca 100644
--- a/pkgs/applications/window-managers/sway/beta.nix
+++ b/pkgs/applications/window-managers/sway/beta.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "sway";
- version = "1.0-rc3";
+ version = "1.0-rc5";
src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = version;
- sha256 = "1ixwc1bg725x68qr84s8a5i4rlzc4svc52jgdw1yl5bgr6l1k5zc";
+ sha256 = "1jkacibmxy9rpq5mxnq7bkwcy0c592zk4vf20j5qbbljp9h7c87i";
};
postPatch = ''
@@ -36,8 +36,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
mesonFlags = [
- "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled"
- "-Dtray=enabled"
+ "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" "-Dtray=enabled"
] ++ stdenv.lib.optional buildDocs "-Dman-pages=enabled";
meta = with stdenv.lib; {
@@ -45,6 +44,6 @@ stdenv.mkDerivation rec {
homepage = https://swaywm.org;
license = licenses.mit;
platforms = platforms.linux;
- maintainers = with maintainers; [ primeos synthetica ]; # Trying to keep it up-to-date.
+ maintainers = with maintainers; [ primeos synthetica ];
};
}
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
new file mode 100644
index 00000000000..ef7da72fda9
--- /dev/null
+++ b/pkgs/build-support/appimage/default.nix
@@ -0,0 +1,176 @@
+{ pkgs, stdenv, libarchive, patchelf, zlib, buildFHSUserEnv, writeScript }:
+
+rec {
+ # Both extraction functions could be unified, but then
+ # it would depend on libmagic to correctly identify ISO 9660s
+
+ extractType1 = { name, src }: stdenv.mkDerivation {
+ name = "${name}-extracted";
+ inherit src;
+
+ nativeBuildInputs = [ libarchive ];
+ buildCommand = ''
+ mkdir $out
+ bsdtar -x -C $out -f $src
+ '';
+ };
+
+ extractType2 = { name, src }: stdenv.mkDerivation {
+ name = "${name}-extracted";
+ inherit src;
+
+ nativeBuildInputs = [ patchelf ];
+ buildCommand = ''
+ install $src ./appimage
+ patchelf \
+ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \
+ ./appimage
+
+ ./appimage --appimage-extract
+
+ cp -rv squashfs-root $out
+ '';
+ };
+
+ wrapAppImage = { name, src, extraPkgs }: buildFHSUserEnv (defaultFhsEnvArgs // {
+ inherit name;
+
+ targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
+
+ runScript = writeScript "run" ''
+ #!${stdenv.shell}
+
+ export APPDIR=${src}
+ export APPIMAGE_SILENT_INSTALL=1
+ cd $APPDIR
+ exec ./AppRun "$@"
+ '';
+ });
+
+ wrapType1 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage {
+ inherit name extraPkgs;
+ src = extractType1 { inherit name src; };
+ };
+
+ wrapType2 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage {
+ inherit name extraPkgs;
+ src = extractType2 { inherit name src; };
+ };
+
+ defaultFhsEnvArgs = {
+ name = "appimage-env";
+
+ # Most of the packages were taken from the Steam chroot
+ targetPkgs = pkgs: with pkgs; [
+ gtk3
+ bashInteractive
+ gnome3.zenity
+ python2
+ xorg.xrandr
+ which
+ perl
+ xdg_utils
+ iana-etc
+ krb5
+ ];
+
+ multiPkgs = pkgs: with pkgs; [
+ desktop-file-utils
+ xorg.libXcomposite
+ xorg.libXtst
+ xorg.libXrandr
+ xorg.libXext
+ xorg.libX11
+ xorg.libXfixes
+ libGL
+
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-ugly
+ libdrm
+ xorg.xkeyboardconfig
+ xorg.libpciaccess
+
+ glib
+ gtk2
+ bzip2
+ zlib
+ gdk_pixbuf
+
+ xorg.libXinerama
+ xorg.libXdamage
+ xorg.libXcursor
+ xorg.libXrender
+ xorg.libXScrnSaver
+ xorg.libXxf86vm
+ xorg.libXi
+ xorg.libSM
+ xorg.libICE
+ gnome2.GConf
+ freetype
+ (curl.override { gnutlsSupport = true; sslSupport = false; })
+ nspr
+ nss
+ fontconfig
+ cairo
+ pango
+ expat
+ dbus
+ cups
+ libcap
+ SDL2
+ libusb1
+ udev
+ dbus-glib
+ libav
+ atk
+ at-spi2-atk
+ libudev0-shim
+ networkmanager098
+
+ xorg.libXt
+ xorg.libXmu
+ xorg.libxcb
+ libGLU
+ libuuid
+ libogg
+ libvorbis
+ SDL
+ SDL2_image
+ glew110
+ openssl
+ libidn
+ tbb
+ wayland
+ mesa_noglu
+ libxkbcommon
+
+ flac
+ freeglut
+ libjpeg
+ libpng12
+ libsamplerate
+ libmikmod
+ libtheora
+ libtiff
+ pixman
+ speex
+ SDL_image
+ SDL_ttf
+ SDL_mixer
+ SDL2_ttf
+ SDL2_mixer
+ gstreamer
+ gst-plugins-base
+ libappindicator-gtk2
+ libcaca
+ libcanberra
+ libgcrypt
+ libvpx
+ librsvg
+ xorg.libXft
+ libvdpau
+ alsaLib
+ ];
+ };
+}
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index 23568f51b23..c0f741b6288 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -196,4 +196,5 @@ in stdenv.mkDerivation {
${if isMultiBuild then extraBuildCommandsMulti else ""}
'';
preferLocalBuild = true;
+ allowSubstitutes = false;
}
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 678f5a3fe9e..b699d762d29 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -26,6 +26,13 @@ sub isInPathsToLink {
return 0;
}
+# Similar to `lib.isStorePath`
+sub isStorePath {
+ my $path = shift;
+ my $storePath = "@storeDir@";
+
+ return substr($path, 0, 1) eq "/" && dirname($path) eq $storePath;
+}
# For each activated package, determine what symlinks to create.
@@ -84,6 +91,11 @@ sub checkCollision {
sub findFiles {
my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
+ # The store path must not be a file
+ if (-f $target && isStorePath $target) {
+ die "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv!";
+ }
+
# Urgh, hacky...
return if
$relName eq "/propagated-build-inputs" ||
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 41a1e67ef42..7f2427777f9 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -2,7 +2,7 @@
# a fork of the buildEnv in the Nix distribution. Most changes should
# eventually be merged back into the Nix distribution.
-{ buildPackages, runCommand, lib }:
+{ buildPackages, runCommand, lib, substituteAll }:
lib.makeOverridable
({ name
@@ -43,6 +43,13 @@ lib.makeOverridable
, meta ? {}
}:
+let
+ builder = substituteAll {
+ src = ./builder.pl;
+ inherit (builtins) storeDir;
+ };
+in
+
runCommand name
rec {
inherit manifest ignoreCollisions checkCollisionContents passthru
@@ -63,10 +70,11 @@ runCommand name
priority = drv.meta.priority or 5;
}) paths);
preferLocalBuild = true;
+ allowSubstitutes = false;
# XXX: The size is somewhat arbitrary
passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null;
}
''
- ${buildPackages.perl}/bin/perl -w ${./builder.pl}
+ ${buildPackages.perl}/bin/perl -w ${builder}
eval "$postBuild"
'')
diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix
index 28f2802a5bc..24795a724ec 100644
--- a/pkgs/build-support/closure-info.nix
+++ b/pkgs/build-support/closure-info.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation {
exportReferencesGraph.closure = rootPaths;
+ preferLocalBuild = true;
+
PATH = "${buildPackages.coreutils}/bin:${buildPackages.jq}/bin";
builder = builtins.toFile "builder"
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index ef17a3f4e58..8d47f157013 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -23,7 +23,8 @@
writeScript,
writeText,
closureInfo,
- substituteAll
+ substituteAll,
+ runtimeShell
}:
# WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future.
@@ -76,6 +77,7 @@ rec {
cp ${./tarsum.go} tarsum.go
export GOPATH=$(pwd)
+ export GOCACHE="$TMPDIR/go-cache"
mkdir -p src/github.com/docker/docker/pkg
ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
go build
@@ -119,7 +121,7 @@ rec {
export PATH=${shadow}/bin:$PATH
mkdir -p /etc/pam.d
if [[ ! -f /etc/passwd ]]; then
- echo "root:x:0:0::/root:${stdenv.shell}" > /etc/passwd
+ echo "root:x:0:0::/root:${runtimeShell}" > /etc/passwd
echo "root:!x:::::::" > /etc/shadow
fi
if [[ ! -f /etc/group ]]; then
@@ -261,7 +263,7 @@ rec {
# things like `ls` or `echo` will be missing.
shellScript = name: text:
writeScript name ''
- #!${stdenv.shell}
+ #!${runtimeShell}
set -e
export PATH=${coreutils}/bin:/bin
${text}
@@ -283,6 +285,7 @@ rec {
let
storePathToLayer = substituteAll
{ inherit (stdenv) shell;
+ isExecutable = true;
src = ./store-path-to-layer.sh;
};
in
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index d78e35c5662..8a1b35f02d9 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -87,9 +87,9 @@ rec {
# 4. example of pulling an image. could be used as a base for other images
nixFromDockerHub = pullImage {
imageName = "nixos/nix";
- imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b";
- sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8";
- finalImageTag = "1.11";
+ imageDigest = "sha256:85299d86263a3059cf19f419f9d286cc9f06d3c13146a8ebbb21b3437f598357";
+ sha256 = "0vnp3mhpk4ny3xa3cgngqsargnmvfgld54d5sn4b5av6yqzzp67z";
+ finalImageTag = "2.2.1";
};
# 5. example of multiple contents, emacs and vi happily coexisting
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index e161daffbd3..dfdd5b60851 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -121,21 +121,25 @@ stdenv.mkDerivation {
siteStart="$out/share/emacs/site-lisp/site-start.el"
siteStartByteCompiled="$siteStart"c
+ subdirs="$out/share/emacs/site-lisp/subdirs.el"
+ subdirsByteCompiled="$subdirs"c
- # A dependency may have brought the original siteStart, delete it and
- # create our own
+ # A dependency may have brought the original siteStart or subdirs, delete
+ # it and create our own
# Begin the new site-start.el by loading the original, which sets some
# NixOS-specific paths. Paths are searched in the reverse of the order
# they are specified in, so user and system profile paths are searched last.
- rm -f $siteStart $siteStartByteCompiled
+ rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled
cat >"$siteStart" <> $out/bin/${w.name} <" ];
+ sha256 = "0dn292d4mjlxif0kclrljzff8rm35cd9d92vycjbzklyhz5d62wi";
+ crateBin =
+ [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++
+ [{ name = "carnix"; path = "src/main.rs"; }];
+ dependencies = mapFeatures features ([
+ (crates."clap"."${deps."carnix"."0.9.1"."clap"}" deps)
+ (crates."dirs"."${deps."carnix"."0.9.1"."dirs"}" deps)
+ (crates."env_logger"."${deps."carnix"."0.9.1"."env_logger"}" deps)
+ (crates."error_chain"."${deps."carnix"."0.9.1"."error_chain"}" deps)
+ (crates."itertools"."${deps."carnix"."0.9.1"."itertools"}" deps)
+ (crates."log"."${deps."carnix"."0.9.1"."log"}" deps)
+ (crates."nom"."${deps."carnix"."0.9.1"."nom"}" deps)
+ (crates."regex"."${deps."carnix"."0.9.1"."regex"}" deps)
+ (crates."serde"."${deps."carnix"."0.9.1"."serde"}" deps)
+ (crates."serde_derive"."${deps."carnix"."0.9.1"."serde_derive"}" deps)
+ (crates."serde_json"."${deps."carnix"."0.9.1"."serde_json"}" deps)
+ (crates."tempdir"."${deps."carnix"."0.9.1"."tempdir"}" deps)
+ (crates."toml"."${deps."carnix"."0.9.1"."toml"}" deps)
+ ]);
+ };
+ features_.carnix."0.9.1" = deps: f: updateFeatures f (rec {
+ carnix."0.9.1".default = (f.carnix."0.9.1".default or true);
+ clap."${deps.carnix."0.9.1".clap}".default = true;
+ dirs."${deps.carnix."0.9.1".dirs}".default = true;
+ env_logger."${deps.carnix."0.9.1".env_logger}".default = true;
+ error_chain."${deps.carnix."0.9.1".error_chain}".default = true;
+ itertools."${deps.carnix."0.9.1".itertools}".default = true;
+ log."${deps.carnix."0.9.1".log}".default = true;
+ nom."${deps.carnix."0.9.1".nom}".default = true;
+ regex."${deps.carnix."0.9.1".regex}".default = true;
+ serde."${deps.carnix."0.9.1".serde}".default = true;
+ serde_derive."${deps.carnix."0.9.1".serde_derive}".default = true;
+ serde_json."${deps.carnix."0.9.1".serde_json}".default = true;
+ tempdir."${deps.carnix."0.9.1".tempdir}".default = true;
+ toml."${deps.carnix."0.9.1".toml}".default = true;
+ }) [
+ (features_.clap."${deps."carnix"."0.9.1"."clap"}" deps)
+ (features_.dirs."${deps."carnix"."0.9.1"."dirs"}" deps)
+ (features_.env_logger."${deps."carnix"."0.9.1"."env_logger"}" deps)
+ (features_.error_chain."${deps."carnix"."0.9.1"."error_chain"}" deps)
+ (features_.itertools."${deps."carnix"."0.9.1"."itertools"}" deps)
+ (features_.log."${deps."carnix"."0.9.1"."log"}" deps)
+ (features_.nom."${deps."carnix"."0.9.1"."nom"}" deps)
+ (features_.regex."${deps."carnix"."0.9.1"."regex"}" deps)
+ (features_.serde."${deps."carnix"."0.9.1"."serde"}" deps)
+ (features_.serde_derive."${deps."carnix"."0.9.1"."serde_derive"}" deps)
+ (features_.serde_json."${deps."carnix"."0.9.1"."serde_json"}" deps)
+ (features_.tempdir."${deps."carnix"."0.9.1"."tempdir"}" deps)
+ (features_.toml."${deps."carnix"."0.9.1"."toml"}" deps)
+ ];
+
+
# end
# carnix-0.9.2
@@ -396,6 +455,68 @@ rec {
];
+# end
+# carnix-0.9.8
+
+ crates.carnix."0.9.8" = deps: { features?(features_.carnix."0.9.8" deps {}) }: buildRustCrate {
+ crateName = "carnix";
+ version = "0.9.8";
+ authors = [ "pe@pijul.org " ];
+ sha256 = "0c2k98qjm1yyx5wl0wqs0rrjczp6h62ri1x8a99442clxsyvp4n9";
+ crateBin =
+ [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++
+ [{ name = "carnix"; path = "src/main.rs"; }];
+ dependencies = mapFeatures features ([
+ (crates."clap"."${deps."carnix"."0.9.8"."clap"}" deps)
+ (crates."dirs"."${deps."carnix"."0.9.8"."dirs"}" deps)
+ (crates."env_logger"."${deps."carnix"."0.9.8"."env_logger"}" deps)
+ (crates."error_chain"."${deps."carnix"."0.9.8"."error_chain"}" deps)
+ (crates."itertools"."${deps."carnix"."0.9.8"."itertools"}" deps)
+ (crates."log"."${deps."carnix"."0.9.8"."log"}" deps)
+ (crates."nom"."${deps."carnix"."0.9.8"."nom"}" deps)
+ (crates."regex"."${deps."carnix"."0.9.8"."regex"}" deps)
+ (crates."serde"."${deps."carnix"."0.9.8"."serde"}" deps)
+ (crates."serde_derive"."${deps."carnix"."0.9.8"."serde_derive"}" deps)
+ (crates."serde_json"."${deps."carnix"."0.9.8"."serde_json"}" deps)
+ (crates."tempdir"."${deps."carnix"."0.9.8"."tempdir"}" deps)
+ (crates."toml"."${deps."carnix"."0.9.8"."toml"}" deps)
+ (crates."url"."${deps."carnix"."0.9.8"."url"}" deps)
+ ]);
+ };
+ features_.carnix."0.9.8" = deps: f: updateFeatures f (rec {
+ carnix."0.9.8".default = (f.carnix."0.9.8".default or true);
+ clap."${deps.carnix."0.9.8".clap}".default = true;
+ dirs."${deps.carnix."0.9.8".dirs}".default = true;
+ env_logger."${deps.carnix."0.9.8".env_logger}".default = true;
+ error_chain."${deps.carnix."0.9.8".error_chain}".default = true;
+ itertools."${deps.carnix."0.9.8".itertools}".default = true;
+ log."${deps.carnix."0.9.8".log}".default = true;
+ nom."${deps.carnix."0.9.8".nom}".default = true;
+ regex."${deps.carnix."0.9.8".regex}".default = true;
+ serde."${deps.carnix."0.9.8".serde}".default = true;
+ serde_derive."${deps.carnix."0.9.8".serde_derive}".default = true;
+ serde_json."${deps.carnix."0.9.8".serde_json}".default = true;
+ tempdir."${deps.carnix."0.9.8".tempdir}".default = true;
+ toml."${deps.carnix."0.9.8".toml}".default = true;
+ url."${deps.carnix."0.9.8".url}".default = true;
+ }) [
+ (features_.clap."${deps."carnix"."0.9.8"."clap"}" deps)
+ (features_.dirs."${deps."carnix"."0.9.8"."dirs"}" deps)
+ (features_.env_logger."${deps."carnix"."0.9.8"."env_logger"}" deps)
+ (features_.error_chain."${deps."carnix"."0.9.8"."error_chain"}" deps)
+ (features_.itertools."${deps."carnix"."0.9.8"."itertools"}" deps)
+ (features_.log."${deps."carnix"."0.9.8"."log"}" deps)
+ (features_.nom."${deps."carnix"."0.9.8"."nom"}" deps)
+ (features_.regex."${deps."carnix"."0.9.8"."regex"}" deps)
+ (features_.serde."${deps."carnix"."0.9.8"."serde"}" deps)
+ (features_.serde_derive."${deps."carnix"."0.9.8"."serde_derive"}" deps)
+ (features_.serde_json."${deps."carnix"."0.9.8"."serde_json"}" deps)
+ (features_.tempdir."${deps."carnix"."0.9.8"."tempdir"}" deps)
+ (features_.toml."${deps."carnix"."0.9.8"."toml"}" deps)
+ (features_.url."${deps."carnix"."0.9.8"."url"}" deps)
+ ];
+
+
# end
# cc-1.0.25
@@ -801,6 +922,32 @@ rec {
];
+# end
+# idna-0.1.5
+
+ crates.idna."0.1.5" = deps: { features?(features_.idna."0.1.5" deps {}) }: buildRustCrate {
+ crateName = "idna";
+ version = "0.1.5";
+ authors = [ "The rust-url developers" ];
+ sha256 = "1gwgl19rz5vzi67rrhamczhxy050f5ynx4ybabfapyalv7z1qmjy";
+ dependencies = mapFeatures features ([
+ (crates."matches"."${deps."idna"."0.1.5"."matches"}" deps)
+ (crates."unicode_bidi"."${deps."idna"."0.1.5"."unicode_bidi"}" deps)
+ (crates."unicode_normalization"."${deps."idna"."0.1.5"."unicode_normalization"}" deps)
+ ]);
+ };
+ features_.idna."0.1.5" = deps: f: updateFeatures f (rec {
+ idna."0.1.5".default = (f.idna."0.1.5".default or true);
+ matches."${deps.idna."0.1.5".matches}".default = true;
+ unicode_bidi."${deps.idna."0.1.5".unicode_bidi}".default = true;
+ unicode_normalization."${deps.idna."0.1.5".unicode_normalization}".default = true;
+ }) [
+ (features_.matches."${deps."idna"."0.1.5"."matches"}" deps)
+ (features_.unicode_bidi."${deps."idna"."0.1.5"."unicode_bidi"}" deps)
+ (features_.unicode_normalization."${deps."idna"."0.1.5"."unicode_normalization"}" deps)
+ ];
+
+
# end
# itertools-0.7.8
@@ -926,6 +1073,21 @@ rec {
];
+# end
+# matches-0.1.8
+
+ crates.matches."0.1.8" = deps: { features?(features_.matches."0.1.8" deps {}) }: buildRustCrate {
+ crateName = "matches";
+ version = "0.1.8";
+ authors = [ "Simon Sapin " ];
+ sha256 = "03hl636fg6xggy0a26200xs74amk3k9n0908rga2szn68agyz3cv";
+ libPath = "lib.rs";
+ };
+ features_.matches."0.1.8" = deps: f: updateFeatures f (rec {
+ matches."0.1.8".default = (f.matches."0.1.8".default or true);
+ }) [];
+
+
# end
# memchr-1.0.2
@@ -1093,6 +1255,21 @@ rec {
];
+# end
+# percent-encoding-1.0.1
+
+ crates.percent_encoding."1.0.1" = deps: { features?(features_.percent_encoding."1.0.1" deps {}) }: buildRustCrate {
+ crateName = "percent-encoding";
+ version = "1.0.1";
+ authors = [ "The rust-url developers" ];
+ sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i";
+ libPath = "lib.rs";
+ };
+ features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec {
+ percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true);
+ }) [];
+
+
# end
# proc-macro2-0.4.20
@@ -1849,6 +2026,56 @@ rec {
}) [];
+# end
+# unicode-bidi-0.3.4
+
+ crates.unicode_bidi."0.3.4" = deps: { features?(features_.unicode_bidi."0.3.4" deps {}) }: buildRustCrate {
+ crateName = "unicode-bidi";
+ version = "0.3.4";
+ authors = [ "The Servo Project Developers" ];
+ sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q";
+ libName = "unicode_bidi";
+ dependencies = mapFeatures features ([
+ (crates."matches"."${deps."unicode_bidi"."0.3.4"."matches"}" deps)
+ ]);
+ features = mkFeatures (features."unicode_bidi"."0.3.4" or {});
+ };
+ features_.unicode_bidi."0.3.4" = deps: f: updateFeatures f (rec {
+ matches."${deps.unicode_bidi."0.3.4".matches}".default = true;
+ unicode_bidi = fold recursiveUpdate {} [
+ { "0.3.4".default = (f.unicode_bidi."0.3.4".default or true); }
+ { "0.3.4".flame =
+ (f.unicode_bidi."0.3.4".flame or false) ||
+ (f.unicode_bidi."0.3.4".flame_it or false) ||
+ (unicode_bidi."0.3.4"."flame_it" or false); }
+ { "0.3.4".flamer =
+ (f.unicode_bidi."0.3.4".flamer or false) ||
+ (f.unicode_bidi."0.3.4".flame_it or false) ||
+ (unicode_bidi."0.3.4"."flame_it" or false); }
+ { "0.3.4".serde =
+ (f.unicode_bidi."0.3.4".serde or false) ||
+ (f.unicode_bidi."0.3.4".with_serde or false) ||
+ (unicode_bidi."0.3.4"."with_serde" or false); }
+ ];
+ }) [
+ (features_.matches."${deps."unicode_bidi"."0.3.4"."matches"}" deps)
+ ];
+
+
+# end
+# unicode-normalization-0.1.7
+
+ crates.unicode_normalization."0.1.7" = deps: { features?(features_.unicode_normalization."0.1.7" deps {}) }: buildRustCrate {
+ crateName = "unicode-normalization";
+ version = "0.1.7";
+ authors = [ "kwantam " ];
+ sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs";
+ };
+ features_.unicode_normalization."0.1.7" = deps: f: updateFeatures f (rec {
+ unicode_normalization."0.1.7".default = (f.unicode_normalization."0.1.7".default or true);
+ }) [];
+
+
# end
# unicode-width-0.1.5
@@ -1879,6 +2106,43 @@ rec {
}) [];
+# end
+# url-1.7.2
+
+ crates.url."1.7.2" = deps: { features?(features_.url."1.7.2" deps {}) }: buildRustCrate {
+ crateName = "url";
+ version = "1.7.2";
+ authors = [ "The rust-url developers" ];
+ sha256 = "0qzrjzd9r1niv7037x4cgnv98fs1vj0k18lpxx890ipc47x5gc09";
+ dependencies = mapFeatures features ([
+ (crates."idna"."${deps."url"."1.7.2"."idna"}" deps)
+ (crates."matches"."${deps."url"."1.7.2"."matches"}" deps)
+ (crates."percent_encoding"."${deps."url"."1.7.2"."percent_encoding"}" deps)
+ ]);
+ features = mkFeatures (features."url"."1.7.2" or {});
+ };
+ features_.url."1.7.2" = deps: f: updateFeatures f (rec {
+ idna."${deps.url."1.7.2".idna}".default = true;
+ matches."${deps.url."1.7.2".matches}".default = true;
+ percent_encoding."${deps.url."1.7.2".percent_encoding}".default = true;
+ url = fold recursiveUpdate {} [
+ { "1.7.2".default = (f.url."1.7.2".default or true); }
+ { "1.7.2".encoding =
+ (f.url."1.7.2".encoding or false) ||
+ (f.url."1.7.2".query_encoding or false) ||
+ (url."1.7.2"."query_encoding" or false); }
+ { "1.7.2".heapsize =
+ (f.url."1.7.2".heapsize or false) ||
+ (f.url."1.7.2".heap_size or false) ||
+ (url."1.7.2"."heap_size" or false); }
+ ];
+ }) [
+ (features_.idna."${deps."url"."1.7.2"."idna"}" deps)
+ (features_.matches."${deps."url"."1.7.2"."matches"}" deps)
+ (features_.percent_encoding."${deps."url"."1.7.2"."percent_encoding"}" deps)
+ ];
+
+
# end
# utf8-ranges-1.0.1
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index 4206b0f33ff..3fc10c8b0b4 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -8,12 +8,13 @@
, vmTools
, gawk
, utillinux
+, runtimeShell
, e2fsprogs }:
rec {
shellScript = name: text:
writeScript name ''
- #!${stdenv.shell}
+ #!${runtimeShell}
set -e
${text}
'';
diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix
index 51921fdfbdc..e4712a5ef22 100644
--- a/pkgs/build-support/skaware/build-skaware-package.nix
+++ b/pkgs/build-support/skaware/build-skaware-package.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeScript, file }:
+{ stdenv, callPackage, cleanPackaging, fetchurl, writeScript, file }:
let lib = stdenv.lib;
in {
# : string
@@ -19,6 +19,10 @@ in {
# mostly for moving and deleting files from the build directory
# : lines
, postInstall
+ # packages with setup hooks that should be run
+ # (see definition of `makeSetupHook`)
+ # : list drv
+, setupHooks ? []
# : list Maintainer
, maintainers ? []
@@ -50,25 +54,6 @@ let
"README.*"
];
- globWith = stdenv.lib.concatMapStringsSep "\n";
- rmNoise = globWith (f:
- ''rm -rf ${f}'') commonNoiseFiles;
- mvMeta = globWith
- (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'')
- commonMetaFiles;
-
- # Move & remove actions, taking the package doc directory
- commonFileActions = writeScript "common-file-actions.sh" ''
- #!${stdenv.shell}
- set -e
- DOCDIR="$1"
- shopt -s globstar extglob nullglob
- ${rmNoise}
- mkdir -p "$DOCDIR"
- ${mvMeta}
- '';
-
-
in stdenv.mkDerivation {
name = "${pname}-${version}";
@@ -82,6 +67,8 @@ in stdenv.mkDerivation {
dontDisableStatic = true;
enableParallelBuilding = true;
+ nativeBuildInputs = setupHooks;
+
configureFlags = configureFlags ++ [
"--enable-absolute-paths"
(if stdenv.isDarwin
@@ -99,21 +86,16 @@ in stdenv.mkDerivation {
# TODO(Profpatsch): ensure that there is always a $doc output!
postInstall = ''
echo "Cleaning & moving common files"
- mkdir -p $doc/share/doc/${pname}
- ${commonFileActions} $doc/share/doc/${pname}
+ ${cleanPackaging.commonFileActions {
+ noiseFiles = commonNoiseFiles;
+ docFiles = commonMetaFiles;
+ }} $doc/share/doc/${pname}
${postInstall}
'';
postFixup = ''
- echo "Checking for remaining source files"
- rem=$(find -mindepth 1 -xtype f -print0 \
- | tee $TMP/remaining-files)
- if [[ "$rem" != "" ]]; then
- echo "ERROR: These files should be either moved or deleted:"
- cat $TMP/remaining-files | xargs -0 ${file}/bin/file
- exit 1
- fi
+ ${cleanPackaging.checkForRemainingFiles}
'';
meta = {
diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/build-support/skaware/clean-packaging.nix
new file mode 100644
index 00000000000..16bae04b21e
--- /dev/null
+++ b/pkgs/build-support/skaware/clean-packaging.nix
@@ -0,0 +1,53 @@
+# set of utilities that assure the cwd of a build
+# is completely clean after the build, meaning all
+# files were either discarded or moved to outputs.
+# This ensures nothing is forgotten and new files
+# are correctly handled on update.
+{ stdenv, file, writeScript }:
+
+let
+ globWith = stdenv.lib.concatMapStringsSep "\n";
+ rmNoise = noiseGlobs: globWith (f:
+ ''rm -rf ${f}'') noiseGlobs;
+ mvDoc = docGlobs: globWith
+ (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'')
+ docGlobs;
+
+ # Shell script that implements common move & remove actions
+ # $1 is the doc directory (will be created).
+ # Best used in conjunction with checkForRemainingFiles
+ commonFileActions =
+ { # list of fileglobs that are removed from the source dir
+ noiseFiles
+ # files that are moved to the doc directory ($1)
+ # TODO(Profpatsch): allow to set target dir with
+ # { glob = …; to = "html" } (relative to docdir)
+ , docFiles }:
+ writeScript "common-file-actions.sh" ''
+ #!${stdenv.shell}
+ set -e
+ DOCDIR="$1"
+ shopt -s globstar extglob nullglob
+ ${rmNoise noiseFiles}
+ mkdir -p "$DOCDIR"
+ ${mvDoc docFiles}
+ '';
+
+ # Shell script to check whether the build directory is empty.
+ # If there are still files remaining, exit 1 with a helpful
+ # listing of all remaining files and their types.
+ checkForRemainingFiles = writeScript "check-for-remaining-files.sh" ''
+ #!${stdenv.shell}
+ echo "Checking for remaining source files"
+ rem=$(find -mindepth 1 -xtype f -print0 \
+ | tee $TMP/remaining-files)
+ if [[ "$rem" != "" ]]; then
+ echo "ERROR: These files should be either moved or deleted:"
+ cat $TMP/remaining-files | xargs -0 ${file}/bin/file
+ exit 1
+ fi
+ '';
+
+in {
+ inherit commonFileActions checkForRemainingFiles;
+}
diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix
index aa600a76650..66feb695c41 100644
--- a/pkgs/build-support/substitute-files/substitute-all-files.nix
+++ b/pkgs/build-support/substitute-files/substitute-all-files.nix
@@ -22,4 +22,5 @@ stdenv.mkDerivation ({
eval "$postInstall"
'';
preferLocalBuild = true;
+ allowSubstitutes = false;
} // args)
diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix
index 7fd46f95f99..57b160bbe90 100644
--- a/pkgs/build-support/substitute/substitute-all.nix
+++ b/pkgs/build-support/substitute/substitute-all.nix
@@ -8,4 +8,5 @@ stdenvNoCC.mkDerivation ({
builder = ./substitute-all.sh;
inherit (args) src;
preferLocalBuild = true;
+ allowSubstitutes = false;
} // args)
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 454ef8912b3..58bc7147ede 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, stdenvNoCC, lndir }:
+{ lib, stdenv, stdenvNoCC, lndir, runtimeShell }:
let
@@ -15,12 +15,12 @@ rec {
/* Run the shell command `buildCommand' to produce a store path named
* `name'. The attributes in `env' are added to the environment
* prior to running the command. By default `runCommand' runs using
- * stdenv with no compiler environment. `runCommandCC`
+ * stdenv with no compiler environment. `runCommandCC`
*
* Examples:
* runCommand "name" {envVariable = true;} ''echo hello''
* runCommandNoCC "name" {envVariable = true;} ''echo hello'' # equivalent to prior
- * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out'';
+ * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out'';
*/
runCommand = runCommandNoCC;
runCommandNoCC = runCommand' stdenvNoCC;
@@ -145,11 +145,11 @@ rec {
executable = true;
destination = "/bin/${name}";
text = ''
- #!${stdenv.shell}
+ #!${runtimeShell}
${text}
'';
checkPhase = ''
- ${stdenv.shell} -n $out/bin/${name}
+ ${runtimeShell} -n $out/bin/${name}
'';
};
@@ -215,7 +215,7 @@ rec {
* myhellohook = makeSetupHook { deps = [ hello ]; } ./myscript.sh;
*
* # wrotes a setup hook where @bash@ myscript.sh is substituted for the
- * # bash interpreter.
+ * # bash interpreter.
* myhellohookSub = makeSetupHook {
* deps = [ hello ];
* substitutions = { bash = "${pkgs.bash}/bin/bash"; };
@@ -278,7 +278,7 @@ rec {
* packages that cannot be built automatically.
*
* Examples:
- *
+ *
* requireFile {
* name = "my-file";
* url = "http://example.com/download/";
diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index e000308bed8..08b93aaf117 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -1,5 +1,6 @@
{ stdenv, writeScript, vmTools, makeInitrd
, samba, vde2, openssh, socat, netcat-gnu, coreutils, gnugrep, gzip
+, runtimeShell
}:
{ sshKey
@@ -74,7 +75,7 @@ let
loopForever = "while :; do ${coreutils}/bin/sleep 1; done";
initScript = writeScript "init.sh" (''
- #!${stdenv.shell}
+ #!${runtimeShell}
${coreutils}/bin/cp -L "${sshKey}" /ssh.key
${coreutils}/bin/chmod 600 /ssh.key
'' + (if installMode then ''
diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix
index b260c67ca7c..8a122b74b23 100644
--- a/pkgs/common-updater/scripts.nix
+++ b/pkgs/common-updater/scripts.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, coreutils, gawk, gnused, diffutils, nix }:
+{ stdenv, makeWrapper, coreutils, gawk, gnused, gnugrep, diffutils, nix }:
stdenv.mkDerivation {
name = "common-updater-scripts";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
cp ${./scripts}/* $out/bin
for f in $out/bin/*; do
- wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk gnused nix diffutils ]}
+ wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk gnused gnugrep nix diffutils ]}
done
'';
}
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 117e8724cd8..a66ffb750f6 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -1,29 +1,79 @@
#!/usr/bin/env bash
set -e
+scriptName=update-source-versions # do not use the .wrapped name
+
die() {
- echo "$0: error: $1" >&2
+ echo "$scriptName: error: $1" >&2
exit 1
}
-# Usage: update-source-hash [] [] []
-attr=$1
-newVersion=$2
-newHash=$3
-newUrl=$4
-versionKey=$5
+usage() {
+ echo "Usage: $scriptName [] []"
+ echo " [--version-key=] [--system=] [--file=]"
+}
+
+args=()
+
+for arg in "$@"; do
+ case $arg in
+ --system=*)
+ systemArg="--system ${arg#*=}"
+ ;;
+ --version-key=*)
+ versionKey="${arg#*=}"
+ ;;
+ --file=*)
+ nixFile="${arg#*=}"
+ if [ ! -f "$nixFile" ]; then
+ die "Could not find provided file $nixFile"
+ fi
+ ;;
+ --help)
+ usage
+ exit 0
+ ;;
+ --*)
+ echo "$scriptName: Unknown argument: " $arg
+ usage
+ exit 1
+ ;;
+ *)
+ args["${#args[*]}"]=$arg
+ ;;
+ esac
+done
+
+attr=${args[0]}
+newVersion=${args[1]}
+newHash=${args[2]}
+newUrl=${args[3]}
+
+if [ "${#args[*]}" -lt 2 ]; then
+ echo "$scriptName: Too few arguments"
+ usage
+ exit 1
+fi
+
+if [ "${#args[*]}" -gt 4 ]; then
+ echo "$scriptName: Too many arguments"
+ usage
+ exit 1
+fi
if [ -z "$versionKey" ]; then
versionKey=version
fi
-nixFile=$(nix-instantiate --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
-if [ ! -f "$nixFile" ]; then
- die "Couldn't evaluate '$attr.meta.position' to locate the .nix file!"
+if [ -z "$nixFile" ]; then
+ nixFile=$(nix-instantiate $systemArg --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
+ if [ ! -f "$nixFile" ]; then
+ die "Couldn't evaluate '$attr.meta.position' to locate the .nix file!"
+ fi
fi
-oldHashAlgo=$(nix-instantiate --eval --strict -A "$attr.src.drvAttrs.outputHashAlgo" | tr -d '"')
-oldHash=$(nix-instantiate --eval --strict -A "$attr.src.drvAttrs.outputHash" | tr -d '"')
+oldHashAlgo=$(nix-instantiate $systemArg --eval --strict -A "$attr.src.drvAttrs.outputHashAlgo" | tr -d '"')
+oldHash=$(nix-instantiate $systemArg --eval --strict -A "$attr.src.drvAttrs.outputHash" | tr -d '"')
if [ -z "$oldHashAlgo" -o -z "$oldHash" ]; then
die "Couldn't evaluate old source hash from '$attr.src'!"
@@ -33,21 +83,21 @@ if [ $(grep -c "$oldHash" "$nixFile") != 1 ]; then
die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!"
fi
-oldUrl=$(nix-instantiate --eval -E "with import ./. {}; builtins.elemAt $attr.src.drvAttrs.urls 0" | tr -d '"')
+oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt $attr.src.drvAttrs.urls 0" | tr -d '"')
if [ -z "$oldUrl" ]; then
die "Couldn't evaluate source url from '$attr.name'!"
fi
-drvName=$(nix-instantiate --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"')
-oldVersion=$(nix-instantiate --eval -E "with import ./. {}; $attr.version or (builtins.parseDrvName $attr.name).version" | tr -d '"')
+drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"')
+oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.version or (builtins.parseDrvName $attr.name).version" | tr -d '"')
if [ -z "$drvName" -o -z "$oldVersion" ]; then
die "Couldn't evaluate name and version from '$attr.name'!"
fi
if [ "$oldVersion" = "$newVersion" ]; then
- echo "$0: New version same as old version, nothing to do." >&2
+ echo "$scriptName: New version same as old version, nothing to do." >&2
exit 0
fi
@@ -94,7 +144,7 @@ fi
# If new hash not given on the command line, recalculate it ourselves.
if [ -z "$newHash" ]; then
- nix-build --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true
+ nix-build $systemArg --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true
# FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed
newHash=$(egrep -v "killing process|dependencies couldn't be built|wanted: " "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'\| got: .*:\(.*\)~\1\2\3~" | head -n1)
fi
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 6d657472e66..280202c2200 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "man-pages-${version}";
- version = "4.16";
+ version = "5.00";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
- sha256 = "1d2d6llazg3inwjiz22cn46mbm5ydpbyh9qb55z4j3nm4w6wrzs7";
+ sha256 = "006rcqhs4ay9q8wip2kbgk3065gwvfbzrqgv2dsydwvcnwv50bss";
};
makeFlags = [ "MANDIR=$(out)/share/man" ];
diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix
new file mode 100644
index 00000000000..bad78e3433e
--- /dev/null
+++ b/pkgs/data/fonts/creep/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, fontforge }:
+
+stdenv.mkDerivation rec {
+ pname = "creep";
+ version = "0.31";
+
+ src = fetchFromGitHub {
+ owner = "romeovs";
+ repo = pname;
+ rev = version;
+ sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n";
+ };
+
+ nativeBuildInputs = [ fontforge ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ install -D -m644 creep.bdf "$out/usr/share/fonts/misc/creep.bdf"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A pretty sweet 4px wide pixel font";
+ homepage = https://github.com/romeovs/creep;
+ license = licenses.mit;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ buffet ];
+ };
+}
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix
index 9d4c1e22e14..f466a5b230d 100644
--- a/pkgs/data/fonts/emojione/default.nix
+++ b/pkgs/data/fonts/emojione/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "emojione-${version}";
- version = "1.3";
+ version = "1.4";
src = fetchFromGitHub {
owner = "eosrei";
repo = "emojione-color-font";
rev = "v${version}";
- sha256 = "0hgs661g1j91lkafhrfx5ix7ymarh5bzcx34r2id6jl7dc3j41l3";
+ sha256 = "1781kxfbhnvylypbkwxc3mx6hi0gcjisfjr9cf0jdz4d1zkf09b3";
};
preBuild = ''
diff --git a/pkgs/data/fonts/font-awesome-4/default.nix b/pkgs/data/fonts/font-awesome-4/default.nix
deleted file mode 100644
index 34548b97244..00000000000
--- a/pkgs/data/fonts/font-awesome-4/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchzip }:
-
-let
- version = "4.7.0";
-in fetchzip rec {
- name = "font-awesome-${version}";
-
- url = "https://github.com/FortAwesome/Font-Awesome/archive/v${version}.zip";
-
- postFetch = ''
- mkdir -p $out/share/fonts
- unzip -j $downloadedFile Font-Awesome-${version}/fonts/fontawesome-webfont.ttf -d $out/share/fonts/truetype
- '';
-
- sha256 = "0w8y7gxbqiy444phg4jl89kc5hq3jffbkhab8p110qy9jx8s106s";
-
- meta = with stdenv.lib; {
- description = "Font Awesome - TTF font";
- longDescription = ''
- Font Awesome gives you scalable vector icons that can instantly be customized.
- This package includes only the TTF font. For full CSS etc. see the project website.
- '';
- homepage = http://fortawesome.github.io/Font-Awesome/;
- license = licenses.ofl;
- platforms = platforms.all;
- maintainers = with maintainers; [ abaldeau ];
- };
-}
diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix
index c1eda7e6a56..595a1c0d37f 100644
--- a/pkgs/data/fonts/font-awesome-5/default.nix
+++ b/pkgs/data/fonts/font-awesome-5/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
- version = "5.6.3";
+ version = "5.7.2";
in fetchzip rec {
name = "font-awesome-${version}";
@@ -12,7 +12,7 @@ in fetchzip rec {
unzip -j $downloadedFile "Font-Awesome-${version}/otfs/*.otf" -d $out/share/fonts/opentype
'';
- sha256 = "0y3zar7hyx5pj8rpyk2kz3sx6zgrfif2ka2h4rg0b8h8qbja0al6";
+ sha256 = "0b3syzz8baxmwzjgz09dnamm4nzmyvb2yddlrm94ww5j9bjk25al";
meta = with stdenv.lib; {
description = "Font Awesome - OTF font";
diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix
new file mode 100644
index 00000000000..e61e582d742
--- /dev/null
+++ b/pkgs/data/fonts/undefined-medium/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchzip }:
+
+fetchzip rec {
+ name = "undefined-medium-1.0";
+
+ url = https://github.com/andirueckel/undefined-medium/archive/v1.0.zip;
+
+ postFetch = ''
+ mkdir -p $out/share/fonts
+ unzip -j $downloadedFile ${name}/fonts/otf/\*.otf -d $out/share/fonts/opentype
+ '';
+
+ sha256 = "0v3p1g9f1c0d6b9lhrvm1grzivm7ddk7dvn96zl5hdzr2y60y1rw";
+
+ meta = with stdenv.lib; {
+ homepage = https://undefined-medium.com/;
+ description = "A pixel grid-based monospace typeface";
+ longDescription = ''
+ undefined medium is a free and open-source pixel grid-based
+ monospace typeface suitable for programming, writing, and
+ whatever else you can think of … it’s pretty undefined.
+ '';
+ license = licenses.ofl;
+ maintainers = [ maintainers.rycee ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index 943eb9572b2..b167a7802d1 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "unifont-${version}";
- version = "11.0.03";
+ version = "12.0.01";
ttf = fetchurl {
url = "mirror://gnu/unifont/${name}/${name}.ttf";
- sha256 = "1fqlf3kczh1y7vhpcdcs1i9043idg5x9jisfqfd99sikvcbw7w75";
+ sha256 = "191vgddv5fksg7g01q692nfcb02ks2y28fi9fv8aghvs36q4iana";
};
pcf = fetchurl {
url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
- sha256 = "0wqcmvkqdww60hqh245whzh4mx3frrx2712lay826f9h5s4ywz6g";
+ sha256 = "14xbrsdrnllly8h2afan3b4v486vd4y8iff8zqmcfliw0cipm8v4";
};
nativeBuildInputs = [ mkfontscale mkfontdir ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "006jbla4zfwccyy84sm4ck869sq5az5s5cfkcmdgj7ah3rz4d7dn";
+ outputHash = "1jccbz7wyyk7rpyapgsppcgakgpm1l9fqqxs7fg9naav7i0nzzpg";
meta = with stdenv.lib; {
description = "Unicode font for Base Multilingual Plane";
diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix
index 29ba4bfb540..d94a2cc0242 100644
--- a/pkgs/data/fonts/unifont_upper/default.nix
+++ b/pkgs/data/fonts/unifont_upper/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchzip }:
let
- version = "10.0.06";
+ version = "12.0.01";
in fetchzip rec {
name = "unifont_upper-${version}";
- url = "http://unifoundry.com/pub/unifont-${version}/font-builds/${name}.ttf";
+ url = "mirror://gnu/unifont/unifont-${version}/${name}.ttf";
postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf";
- sha256 = "13x5z8iyh9xz5fllcy89yinnz1iy16a2pjf3vip66nz10sq8crlr";
+ sha256 = "1mmbndyi91fcdj7ykk5y7rypmm5jf2zf5pp5ab8hq3aa9y7invw3";
meta = with stdenv.lib; {
description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";
diff --git a/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/pkgs/data/fonts/yanone-kaffeesatz/default.nix
new file mode 100644
index 00000000000..026bb2d2244
--- /dev/null
+++ b/pkgs/data/fonts/yanone-kaffeesatz/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchzip}:
+
+fetchzip {
+ name = "yanone-kaffeesatz-2004";
+
+ url = https://yanone.de/2015/data/UIdownloads/Yanone%20Kaffeesatz.zip;
+
+ postFetch = ''
+ mkdir -p $out/share/fonts
+ unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+ '';
+
+ sha256 = "190c4wx7avy3kp98lsyml7kc0jw7csf5n79af2ypbkhsadfsy8di";
+
+ meta = {
+ description = "The free font classic";
+ maintainers = with stdenv.lib.maintainers; [ mt-caret ];
+ platforms = with stdenv.lib.platforms; all;
+ homepage = https://yanone.de/fonts/kaffeesatz/;
+ license = stdenv.lib.licenses.ofl;
+ };
+}
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index 4ad03627870..98a98cfa7c8 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "numix-icon-theme-circle";
- version = "19.01.24";
+ version = "19.02.22";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
- sha256 = "18asihcv41jlysb2ynbvbk6fn0lnj7ckaz1nyx1w25a7nk413dnm";
+ sha256 = "10jh633rllp9yjfkjjyf8455n84q7ppxw1kk9dp1rsg4dq327ks7";
};
nativeBuildInputs = [ gtk3 numix-icon-theme ];
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 967c629324c..ddec15e5f31 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "numix-icon-theme-square";
- version = "19.01.24";
+ version = "19.02.22";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
- sha256 = "0x3d21snfp4v9ippny1jmf2hw5dcscwrlasxvr5bgxhff1idf81c";
+ sha256 = "0qn0s7cd795pm0hbx85gxd1s272zxrzf3r9r6da54h149v3wkgzw";
};
nativeBuildInputs = [ gtk3 numix-icon-theme ];
diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix
index b37ed1931a2..455147d7aa7 100644
--- a/pkgs/data/icons/zafiro-icons/default.nix
+++ b/pkgs/data/icons/zafiro-icons/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zafiro-icons";
- version = "0.8.4";
+ version = "0.8.7";
src = fetchFromGitHub {
owner = "zayronxio";
repo = pname;
rev = "v${version}";
- sha256 = "1jdijiccazn2g42x1w1m4hl94ach9b2kl3rwb0mpy7ykdzmj6vj0";
+ sha256 = "09zdaly9g11k6p36xdd7skgl78s6j78hn3gy1jnpsxh0136md89h";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index c50c511e736..3ec29402b1a 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
- url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e95fefd56a6b8de585e92cd34de4870e31fb7bc7.tar.gz";
- sha256 = "08pzxwsc4incrl5mv8572xs9332206p2cw2mynxks33n7nh98vmx";
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/179aac2faddbba8921029ca9851ad97bcaa79991.tar.gz";
+ sha256 = "17cbapnvpasdpza2r1y7lf4y4b31k094jqsnx89dn8zwp8n862lv";
}
diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index d8f5ebf56b9..4e6a5bde55d 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
stdenv.mkDerivation rec {
- name = "osinfo-db-20181214";
+ pname = "osinfo-db";
+ version = "20190301";
src = fetchurl {
- url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
- sha256 = "18ym54wvhvjk66fqpsfvfd5b7d7743dvfqrcq91w1n71r20fkhcd";
+ url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
+ sha256 = "1rjqizsglgdcjxi7kpbwm26krdkrlxacinjp9684sfzhqwdqi4as";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index b5293c6d341..e44526cbe66 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "wireless-regdb-${version}";
- version = "2018.10.24";
+ pname = "wireless-regdb";
+ version = "2019.03.01";
src = fetchurl {
- url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz";
- sha256 = "05lixkdzy7f3wpan6svh1n9f70rs0kfw6hl6p34sl8bxqxd88ghd";
+ url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "0pwipig8bik1gca440hfv0xa23bi49jfiqc69xvcb6sr0rq6ykis";
};
dontBuild = true;
makeFlags = [
- "DESTDIR=$(out)"
+ "DESTDIR=${placeholder "out"}"
"PREFIX="
];
diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix
index d839d4a3dd8..de15034590d 100644
--- a/pkgs/data/themes/plata/default.nix
+++ b/pkgs/data/themes/plata/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
name = "plata-theme-${version}";
- version = "0.4.9";
+ version = "0.6.0";
src = fetchFromGitLab {
owner = "tista500";
repo = "plata-theme";
rev = version;
- sha256 = "0kj04nj265rgkbbhzhz9f7q6z5yr1dxmcrnq1b5ldha3xqrq2pv9";
+ sha256 = "182i2wbviwpdvmkmayyqggjx6fvlpf4vsmhsyi6nlg9m4n1djxp8";
};
preferLocalBuild = true;
diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix
index c1321acb853..6e61a30e258 100644
--- a/pkgs/desktops/deepin/dde-api/default.nix
+++ b/pkgs/desktops/deepin/dde-api/default.nix
@@ -44,6 +44,7 @@ buildGoPackage rec {
'';
buildPhase = ''
+ export GOCACHE="$TMPDIR/go-cache";
make -C go/src/${goPackagePath}
'';
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 4fe787bc5d4..4c0e44f6b72 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -1,13 +1,19 @@
-{ pkgs, makeScope, libsForQt5 }:
+{ pkgs, makeScope, libsForQt5, go_1_11 }:
let
packages = self: with self; {
updateScript = callPackage ./update.nix { };
dbus-factory = callPackage ./dbus-factory { };
- dde-api = callPackage ./dde-api { };
+ dde-api = callPackage ./dde-api {
+ # XXX: the build is finding references to Go when compiled with go v1.12
+ go = go_1_11;
+ };
dde-calendar = callPackage ./dde-calendar { };
- dde-daemon = callPackage ./dde-daemon { };
+ dde-daemon = callPackage ./dde-daemon {
+ # XXX: the build is finding references to Go when compiled with go v1.12
+ go = go_1_11;
+ };
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
dde-session-ui = callPackage ./dde-session-ui { };
deepin-desktop-base = callPackage ./deepin-desktop-base { };
diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix
index 28873d8459e..137ad3dafe0 100644
--- a/pkgs/desktops/deepin/go-dbus-generator/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"PREFIX=$(out)"
- "GOCACHE=off"
+ "GOCACHE=$TMPDIR/go-cache"
];
passthru.updateScript = deepin.updateScript { inherit name; };
diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix
index d33837b21c3..e6e70d2c167 100644
--- a/pkgs/desktops/deepin/go-gir-generator/default.nix
+++ b/pkgs/desktops/deepin/go-gir-generator/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"PREFIX=$(out)"
- "GOCACHE=off"
+ "GOCACHE=$TMPDIR/go-cache"
];
passthru.updateScript = deepin.updateScript { inherit name; };
diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
index e7f687d9606..31dd985af2a 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkgconfig, python2, gtk }:
+{ stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkgconfig, python2, gtk2 }:
let
inherit (python2.pkgs) python pygtk;
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk librsvg libwnck libgtop python ];
+ buildInputs = [ gtk2 librsvg libwnck libgtop python ];
propagatedBuildInputs = [ gnome_python pygtk ];
# gnome-python-desktop expects that .pth file is already installed by PyGTK
diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
index f571cf8738f..37bd631adbc 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk, gnome_vfs }:
+{ stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk2, gnome_vfs }:
with stdenv.lib;
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ python glib gtk GConf libgnome gnome_vfs ];
+ buildInputs = [ python glib gtk2 GConf libgnome gnome_vfs ];
propagatedBuildInputs = [ pygobject2 pygtk dbus-python ];
# gnome-python expects that .pth file is already installed by PyGTK in the
diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
index d4813eb2a93..177a9f47c31 100644
--- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtkmm, libglade }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtkmm2, libglade }:
stdenv.mkDerivation rec {
name = "libglademm-2.6.7";
-
+
src = fetchurl {
url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2";
sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q";
@@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool ];
-
- propagatedBuildInputs = [ gtkmm libglade ];
+
+ propagatedBuildInputs = [ gtkmm2 libglade ];
}
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index f67dc13c854..b1a2d6ae7fa 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -1,20 +1,11 @@
-{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2, rarian
-, libstartup_notification, overrides ? {} }:
+{ config, stdenv, pkgs, lib }:
-let overridden = set // overrides; set = with overridden; {
- # Backward compatibility.
- gtkdoc = self.gtk-doc;
- startup_notification = libstartup_notification;
- startupnotification = libstartup_notification;
- gnomedocutils = self.gnome-doc-utils;
- gnomeicontheme = self.gnome_icon_theme;
- gnome_common = gnome-common;
- inherit rarian;
+lib.makeScope pkgs.newScope (self: with self; {
#### PLATFORM
libIDL = callPackage ./platform/libIDL {
- gettext = if stdenv.isDarwin then gettext else null;
+ gettext = if stdenv.isDarwin then pkgs.gettext else null;
};
ORBit2 = callPackage ./platform/ORBit2 { };
@@ -23,9 +14,7 @@ let overridden = set // overrides; set = with overridden; {
libglade = callPackage ./platform/libglade { };
- libgnomeprint = callPackage ./platform/libgnomeprint {
- bison = bison2;
- };
+ libgnomeprint = callPackage ./platform/libgnomeprint { };
libgnomeprintui = callPackage ./platform/libgnomeprintui { };
@@ -47,7 +36,6 @@ let overridden = set // overrides; set = with overridden; {
gnome_python = callPackage ./bindings/gnome-python { };
gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { };
- python_rsvg = overridden.gnome_python_desktop;
gnome_vfs = callPackage ./platform/gnome-vfs { };
@@ -63,14 +51,11 @@ let overridden = set // overrides; set = with overridden; {
gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { };
- # Required for nautilus
- inherit (libunique);
-
gtkglext = callPackage ./platform/gtkglext { };
#### DESKTOP
- gvfs = gvfs.override { gnome = self; };
+ gvfs = pkgs.gvfs.override { gnome = self; };
# Removed from recent GNOME releases, but still required
scrollkeeper = callPackage ./desktop/scrollkeeper { };
@@ -85,4 +70,22 @@ let overridden = set // overrides; set = with overridden; {
libglademm = callPackage ./bindings/libglademm { };
-}; in overridden
+} // lib.optionalAttrs (config.allowAliases or true) {
+ inherit (pkgs)
+ # GTK Libs
+ glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
+
+ # Included for backwards compatibility
+ libsoup libwnck gtk-doc gnome-doc-utils rarian;
+
+ gtk = pkgs.gtk2;
+ gtkmm = pkgs.gtkmm2;
+ python_rsvg = self.gnome_python_desktop;
+
+ gtkdoc = pkgs.gtk-doc;
+ startup_notification = pkgs.libstartup_notification;
+ startupnotification = pkgs.libstartup_notification;
+ gnomedocutils = pkgs.gnome-doc-utils;
+ gnomeicontheme = self.gnome_icon_theme;
+ gnome_common = gnome-common;
+})
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
index dd7e269f94e..0f2a98c61f6 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }:
+{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
stdenv.mkDerivation rec {
name = "gnome-icon-theme-2.91.93";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "cc7f15e54e2640697b58c26e74cc3f6ebadeb4ef6622bffe9c1e6874cc3478d6";
};
- nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
+ nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk2 ];
# remove a tree of dirs with no files within
postInstall = '' rm -r "$out/share/locale" '';
diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index b40cb98cbef..03440c02c14 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -1,5 +1,5 @@
{stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib
-, gnome-common, gtk, pango
+, gnome-common, gtk2, pango
, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }:
with stdenv.lib;
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- atk cairo glib gtk
+ atk cairo glib gtk2
pango libxml2Python perl intltool
gettext
] ++ optionals stdenv.isDarwin [
diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index 0c8efc57c71..c774468852e 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk, ncurses
+{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk2, ncurses
, pythonSupport ? false, python27Packages}:
let
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool glib gtk ncurses ] ++
+ buildInputs = [ intltool glib gtk2 ncurses ] ++
stdenv.lib.optionals pythonSupport [python pygtk];
configureFlags = [
diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
index 834ec220158..369880c4fc1 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk, libGLU_combined, pango, pangox_compat, xorg }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk2, libGLU_combined, pango, pangox_compat, xorg }:
stdenv.mkDerivation rec {
name = "gtkglext-1.2.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
buildInputs = with xorg;
- [ pkgconfig glib gtk libGLU_combined pango libX11 libXmu ];
+ [ pkgconfig glib gtk2 libGLU_combined pango libX11 libXmu ];
propagatedBuildInputs = [ pangox_compat ];
patches = [
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
index b4615683939..5ff687adcf6 100644
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk, intltool,
+{ stdenv, fetchurl, pkgconfig, gtk2, intltool,
GConf, enchant, isocodes, gnome_icon_theme }:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
patches = [ ./01_remove-disable-deprecated.patch ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk intltool GConf enchant isocodes gnome_icon_theme ];
+ buildInputs = [ gtk2 intltool GConf enchant isocodes gnome_icon_theme ];
NIX_LDFLAGS = [ "-lgthread-2.0" ];
}
diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
index a71d6eb789b..0be9d7acb9c 100644
--- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk, libtool
+{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk2, libtool
, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
stdenv.mkDerivation rec {
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig intltool ];
- buildInputs = [ bison popt gtk libxml2 GConf libglade libtool ];
+ buildInputs = [ bison popt gtk2 libxml2 GConf libglade libtool ];
propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
}
diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix
index 1f4af86ffeb..c61ecc16f15 100644
--- a/pkgs/desktops/gnome-2/platform/libglade/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, gtk, libxml2, python, gettext}:
+{stdenv, fetchurl, pkgconfig, gtk2, libxml2, python, gettext}:
stdenv.mkDerivation {
name = "libglade-2.6.4";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk python gettext ];
+ buildInputs = [ gtk2 python gettext ];
NIX_LDFLAGS = "-lgmodule-2.0";
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
index 2be8c29e493..72928d82037 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk, intltool, libart_lgpl, libglade }:
+{ stdenv, fetchurl, pkgconfig, gtk2, intltool, libart_lgpl, libglade }:
stdenv.mkDerivation rec {
name = "libgnomecanvas-${minVer}.3";
@@ -13,5 +13,5 @@ stdenv.mkDerivation rec {
buildInputs = [ libglade ];
nativeBuildInputs = [ pkgconfig intltool ];
- propagatedBuildInputs = [ libart_lgpl gtk ];
+ propagatedBuildInputs = [ libart_lgpl gtk2 ];
}
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
index 9d22488c25d..d2539889fdb 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libgnomecanvas, gtkmm }:
+{ stdenv, fetchurl, pkgconfig, libgnomecanvas, gtkmm2 }:
stdenv.mkDerivation {
name = "libgnomecanvasmm-2.26.0";
@@ -9,5 +9,5 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libgnomecanvas gtkmm ];
+ buildInputs = [ libgnomecanvas gtkmm2 ];
}
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
index 2365e166d5e..ee0282147de 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }:
+{ stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl }:
stdenv.mkDerivation rec {
name = "libgnomecups-0.2.3";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
patches = [ ./glib.patch ./cups_1.6.patch ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk gettext intltool libart_lgpl ];
+ buildInputs = [ gtk2 gettext intltool libart_lgpl ];
propagatedBuildInputs = [ libxml2 ];
}
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
index 6945ad1f04b..453a4459fdd 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl
-, libgnomecups, bison, flex }:
+{ stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl
+, libgnomecups, bison2, flex }:
stdenv.mkDerivation rec {
name = "libgnomeprint-2.18.8";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
patches = [ ./bug653388.patch ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk gettext intltool libart_lgpl libgnomecups bison flex ];
+ buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison2 flex ];
propagatedBuildInputs = [ libxml2 ];
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
index a8072aa3752..215c9eb3e5e 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}:
+{stdenv, fetchurl, pkgconfig, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome_icon_theme}:
stdenv.mkDerivation {
name = "libgnomeprintui-2.18.6";
@@ -9,5 +9,5 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme];
+ buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome_icon_theme];
}
diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
index b9db3422723..cf34c7e7c68 100644
--- a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2 }:
+{stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2 }:
stdenv.mkDerivation {
name = "libgtkhtml-2.11.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk gettext ];
+ buildInputs = [ gtk2 gettext ];
propagatedBuildInputs = [ libxml2 ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index 5de7d93f49c..4815103893f 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 libxml2 python3Packages.python python3Packages.pyatspi
python3Packages.pygobject3 python3Packages.ipython
- at-spi2-core dbus libwnck3 gnome3.defaultIconTheme
+ at-spi2-core dbus libwnck3 gnome3.adwaita-icon-theme
];
wrapPrefixVariables = [ "PYTHONPATH" ];
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 310f8ccb63b..fa406e6f4db 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -1,5 +1,7 @@
{ stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight
-, pkgconfig, gtk3, glib, libnotify, gtkspell3
+, pkgconfig, gtk3, glib, libnotify, gtkspell3, evolution-data-server
+, adwaita-icon-theme, gnome-desktop, libgdata
+, libgweather, glib-networking, gsettings-desktop-schemas
, wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite
, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu
, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
@@ -14,17 +16,17 @@ in stdenv.mkDerivation rec {
sha256 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h";
};
- propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];
+ propagatedUserEnvPkgs = [ evolution-data-server ];
buildInputs = [
- gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
- gnome3.evolution-data-server libsecret libical gcr
- webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3
- libcanberra-gtk3 bogofilter gnome3.libgdata sqlite
+ gtk3 glib gdk_pixbuf adwaita-icon-theme librsvg db icu
+ evolution-data-server libsecret libical gcr
+ webkitgtk shared-mime-info gnome-desktop gtkspell3
+ libcanberra-gtk3 bogofilter libgdata sqlite
gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit
- nss nspr libnotify procps highlight gnome3.libgweather
- gnome3.gsettings-desktop-schemas
- gnome3.glib-networking openldap
+ nss nspr libnotify procps highlight libgweather
+ gsettings-desktop-schemas
+ glib-networking openldap
];
nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index fe307bca797..5ee26eba6b7 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive
+{ stdenv, fetchurl, glib, gtk3, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive
, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ];
- buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ];
+ buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ];
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 61eda942194..8310f426be6 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -1,5 +1,6 @@
{ stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib
+, pkgconfig, gtk3, glib, adwaita-icon-theme
+, libpeas, gtksourceview, gsettings-desktop-schemas
, wrapGAppsHook, itstool, libsoup, libxml2
, gnome3, gspell }:
@@ -16,9 +17,9 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib
- gnome3.defaultIconTheme libsoup
- gnome3.libpeas gnome3.gtksourceview
- gnome3.gsettings-desktop-schemas gspell
+ adwaita-icon-theme libsoup
+ libpeas gtksourceview
+ gsettings-desktop-schemas gspell
];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix
index d9f1e7850af..388808b7d64 100644
--- a/pkgs/desktops/gnome-3/apps/ghex/default.nix
+++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2,
+{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, gtk3,
wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -10,13 +10,16 @@ stdenv.mkDerivation rec {
sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "ghex"; attrPath = "gnome3.ghex"; };
- };
-
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
- buildInputs = [ gnome3.gtk intltool itstool libxml2 ];
+ buildInputs = [ gtk3 intltool itstool libxml2 ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "ghex";
+ attrPath = "gnome3.ghex";
+ };
+ };
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Ghex;
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index 39e0f2ba23e..9adffc7922c 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib libxml2 python3 python3.pkgs.pygobject3
gnome3.gsettings-desktop-schemas
- gdk_pixbuf gnome3.defaultIconTheme
+ gdk_pixbuf gnome3.adwaita-icon-theme
];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 357cd42d66b..21690287245 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
libvirt-glib glib gtk3 gtk-vnc freerdp libxml2
libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
- gnome3.defaultIconTheme librsvg acl libgudev libsecret
+ gnome3.adwaita-icon-theme librsvg acl libgudev libsecret
libcap_ng numactl xen libapparmor
];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index 8cc8712a15d..9b48e323191 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3
-, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup
+, gettext, libxml2, gnome3, gtk3, evolution-data-server, libsoup
, glib, gnome-online-accounts, gsettings-desktop-schemas }:
let
@@ -22,8 +22,8 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ];
buildInputs = [
- gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
- gsettings-desktop-schemas gnome3.defaultIconTheme
+ gtk3 evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
+ gsettings-desktop-schemas gnome3.adwaita-icon-theme
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 047f9bc2210..101b9f4a62e 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3
-, gobject-introspection, gjs, libunistring }:
+, gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }:
stdenv.mkDerivation rec {
name = "gnome-characters-${version}";
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ];
buildInputs = [
- glib gtk3 gjs pango gnome3.gsettings-desktop-schemas
- gnome3.defaultIconTheme libunistring
+ glib gtk3 gjs pango gsettings-desktop-schemas
+ adwaita-icon-theme libunistring
# typelib
- gnome3.gnome-desktop
+ gnome-desktop
];
mesonFlags = [
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 30323cf62f5..c614dc6486c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl
, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils
, vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop
+, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, geocode-glib
, gnome3, gdk_pixbuf, geoclue2, libgweather }:
stdenv.mkDerivation rec {
@@ -26,8 +27,8 @@ stdenv.mkDerivation rec {
gobject-introspection # for finding vapi files
];
buildInputs = [
- gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme
- gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound
+ gtk3 glib gsettings-desktop-schemas gdk_pixbuf adwaita-icon-theme
+ gnome-desktop geocode-glib geoclue2 libgweather gsound
];
preFixup = ''
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index d2792304016..186f3a14d27 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gtk3 glib gnome3.gsettings-desktop-schemas
- gdk_pixbuf gnome3.defaultIconTheme evince
+ gdk_pixbuf gnome3.adwaita-icon-theme evince
libsoup webkitgtk gjs gobject-introspection
tracker tracker-miners libgdata
gnome-desktop libzapojit libgepub
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index c6140a53fd9..89f4cc01e50 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils
libxml2 libxslt docbook_xsl docbook_xml_dtd_43
];
- buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
+ buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
postPatch = ''
chmod +x meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 2f7e5bbe807..d7df923339a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
geocode-glib libchamplain libsoup
gdk_pixbuf librsvg libgweather
gnome3.gsettings-desktop-schemas evolution-data-server
- gnome-online-accounts gnome3.defaultIconTheme
+ gnome-online-accounts gnome3.adwaita-icon-theme
webkitgtk
];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 3edf1f5dd40..98d3cfb5539 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -17,8 +17,8 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
buildInputs = with gst_all_1; [
- gtk3 glib libmediaart gnome-online-accounts
- gdk_pixbuf gnome3.defaultIconTheme python3
+ gtk3 glib libmediaart gnome-online-accounts gobject-introspection
+ gdk_pixbuf gnome3.adwaita-icon-theme python3
grilo grilo-plugins libnotify libdazzle libsoup
gnome3.gsettings-desktop-schemas tracker
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
index dcee87dc799..9bc71bb4338 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk3 wrapGAppsHook libgtop intltool itstool libxml2
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
propagatedUserEnvPkgs = [ nmap inetutils ];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
index e39ce00fd65..78c39651ad6 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
gnome3.gnome-online-accounts zeitgeist
gnome3.gsettings-desktop-schemas
evolution-data-server
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
mesonFlags = [
diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
index 508b8af3f4f..8c0c216965d 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib gegl babl libgdata libdazzle
gnome3.gsettings-desktop-schemas
- gdk_pixbuf gnome3.defaultIconTheme
+ gdk_pixbuf gnome3.adwaita-icon-theme
gfbgraph grilo-plugins grilo
gnome-online-accounts tracker
gexiv2 geocode-glib dleyna-renderer
diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
index 3f8ce7f4a51..2d9c313e641 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
gtk3
glib
upower
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
index 37b48a74482..23b671ebfc0 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook
-, gettext, gnome3, glib, gtk, libpeas
+, gettext, gnome3, glib, gtk3, libpeas
, gnome-online-accounts, gsettings-desktop-schemas
-, evolution-data-server, libxml2, libsoup, libical, rest, json-glib }:
+, evolution-data-server, libxml2, libsoup, libical, librest, json-glib }:
let
pname = "gnome-todo";
@@ -18,11 +18,11 @@ in stdenv.mkDerivation rec {
meson ninja pkgconfig gettext python3 wrapGAppsHook
];
buildInputs = [
- glib gtk libpeas gnome-online-accounts
- gsettings-desktop-schemas gnome3.defaultIconTheme
+ glib gtk3 libpeas gnome-online-accounts
+ gsettings-desktop-schemas gnome3.adwaita-icon-theme
# Plug-ins
evolution-data-server libxml2 libsoup libical
- rest json-glib
+ librest json-glib
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index 6a827b7f0e3..5ae279f57f0 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
buildInputs = [
gtk3 gjs gobject-introspection gnome-desktop
- libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas
+ libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas
];
# The .service file isn't wrapped with the correct environment
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 9ef2b57e6d1..84f7b519d1e 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib gcr
gnome3.gsettings-desktop-schemas gnupg
- gnome3.defaultIconTheme gpgme
+ gnome3.adwaita-icon-theme gpgme
libsecret avahi libsoup p11-kit
openssh openldap
];
diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
index 00037f526b6..ae360d73b87 100644
--- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
buildInputs = [
- gtk3 vte libxml2 gtk-vnc libsecret gnome3.defaultIconTheme librsvg
+ gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg
];
NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index 4fa40a6c1b0..b091395ab37 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnome3
-, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor-icon-theme }:
+, iconnamingutils, gtk3, gdk_pixbuf, librsvg, hicolor-icon-theme }:
stdenv.mkDerivation rec {
name = "adwaita-icon-theme-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gdk_pixbuf librsvg ];
- nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
+ nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ];
# remove a tree of dirs with no files within
postInstall = '' rm -rf "$out/locale" '';
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index c29e3ff5200..cf73524a0ca 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
- buildInputs = [ gtk3 glib gnome3.defaultIconTheme ];
+ buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ];
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix
index fe2b50f296a..bad06bae405 100644
--- a/pkgs/desktops/gnome-3/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/core/caribou/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2
, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook
-, wrapGAppsHook }:
+, wrapGAppsHook, libgee }:
let
pname = "caribou";
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
libXtst gtk2
];
- propagatedBuildInputs = [ gnome3.libgee libxklavier ];
+ propagatedBuildInputs = [ libgee libxklavier ];
postPatch = ''
patchShebangs .
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 9c1d7d7d1a9..1f55071c83d 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3
-, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }:
+, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42, fetchpatch }:
let
pname = "dconf";
@@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
sha256 = "1dq2dn7qmxr4fxzx9wnag89ck24gxq17p2n4gl81h4w8qdy3m6jl";
};
+ patches = [
+ # Fix the build on Darwin
+ # Issue: https://gitlab.gnome.org/GNOME/dconf/issues/47
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/dconf/commit/49f4d916e1151af3975df52c522c69de98ed2fbb.patch";
+ sha256 = "00klkr1jzli9ap0aj6399m1bj2bxxz48pmcj4r16dsy6dfdl6325";
+ })
+ ];
+
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 1a4ef2a1cf4..19f2783be3d 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
gcr libsecret libpulseaudio gdk_pixbuf
libnotify clutter libsoup gnutls libgee p11-kit
libcanberra-gtk3 telepathy-farstream farstream
- gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas
+ gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
librsvg
# Spell-checking
enchant isocodes
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index c8ca0016d57..37cdce40f34 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu
+{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk3, glib, icu
, wrapGAppsHook, gnome3, libxml2, libxslt, itstool
, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
, sqlite, gcr, isocodes, desktop-file-utils, python3
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
+ gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
sqlite isocodes p11-kit icu
- gdk_pixbuf gnome3.defaultIconTheme gcr
+ gdk_pixbuf gnome3.adwaita-icon-theme gcr
glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav json-glib libdazzle
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 94d39964bc4..1a01bd307ea 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -1,7 +1,8 @@
{ fetchurl, stdenv, pkgconfig, intltool, libxml2
, glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3
, poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook
-, librsvg, gobject-introspection, yelp-tools, gspell
+, librsvg, gobject-introspection, yelp-tools, gspell, adwaita-icon-theme, gsettings-desktop-schemas
+, libgxps
, recentListSize ? null # 5 is not enough, allow passing a different number
, supportXPS ? false # Open XML Paper Specification via libgxps
, autoreconfHook, pruneLibtoolFiles
@@ -26,10 +27,10 @@ stdenv.mkDerivation rec {
buildInputs = [
glib gtk3 pango atk gdk_pixbuf libxml2
- gnome3.gsettings-desktop-schemas
+ gsettings-desktop-schemas
poppler ghostscriptX djvulibre libspectre libarchive
- libsecret librsvg gnome3.adwaita-icon-theme gspell
- ] ++ stdenv.lib.optional supportXPS gnome3.libgxps;
+ libsecret librsvg adwaita-icon-theme gspell
+ ] ++ stdenv.lib.optional supportXPS libgxps;
configureFlags = [
"--disable-nautilus" # Do not build nautilus plugin
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
(if supportXPS then "--enable-xps" else "--disable-xps")
];
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
preConfigure = stdenv.lib.optionalString (recentListSize != null) ''
sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index a27bc2cc9ae..62ed7aaa3d8 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,7 +1,8 @@
{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection
, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr
, p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre
-, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:
+, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib
+, glib, gtk3, gnome-online-accounts, libgweather, libgdata }:
stdenv.mkDerivation rec {
name = "evolution-data-server-${version}";
@@ -25,14 +26,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala
];
- buildInputs = with gnome3; [
- glib libsoup libxml2 gtk gnome-online-accounts
+ buildInputs = [
+ glib libsoup libxml2 gtk3 gnome-online-accounts
gcr p11-kit libgweather libgdata libaccounts-glib json-glib
icu sqlite kerberos openldap webkitgtk glib-networking
libcanberra-gtk3 pcre
];
- propagatedBuildInputs = [ libsecret nss nspr libical db ];
+ propagatedBuildInputs = [ libsecret nss nspr libical db libsoup ];
cmakeFlags = [
"-DENABLE_UOA=OFF"
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 135200ee3c4..c985d01a5e6 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
, accountsservice, libX11, gnome3, systemd, autoreconfHook
-, gtk, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
+, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
, librsvg, coreutils, xwayland, fetchpatch }:
stdenv.mkDerivation rec {
name = "gdm-${version}";
- version = "3.30.2";
+ version = "3.30.3";
src = fetchurl {
url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1handy65r1n0zby09jr492b3643wszzigdkxp7q2ypgxb3hyv45y";
+ sha256 = "15f7lz7z75krgbq8vb800afj96h8mw2fpy1s28za2911x5vgq0ak";
};
# Only needed to make it build
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool gnome3.dconf ];
buildInputs = [
glib accountsservice systemd
- gobject-introspection libX11 gtk
+ gobject-introspection libX11 gtk3
libcanberra-gtk3 pam plymouth librsvg
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index b065025327f..e09d0b4e6f9 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
glib gtk3 udev libnotify libcanberra-gtk3
- gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas
+ gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
];
mesonFlags = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 4a37599b136..037509b9c54 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib libxml2 gtksourceview3 mpfr gmp
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libsoup libmpc
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index a7347f74ca4..253bbc4e196 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas
folks gnome-desktop telepathy-glib
libxml2 gnome-online-accounts cheese
- gnome3.defaultIconTheme libchamplain clutter-gtk geocode-glib
+ gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 58afc0ab85d..5e90998b539 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -5,17 +5,20 @@
, cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
, libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd
, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese, gnome-session
-, fontconfig, sound-theme-freedesktop, grilo, python3 }:
+, fontconfig, sound-theme-freedesktop, grilo, python3
+, gtk3, glib, glib-networking, gsettings-desktop-schemas
+, gnome-desktop, gnome-settings-daemon, gnome-online-accounts
+, vino, gnome-bluetooth, tracker, adwaita-icon-theme }:
let
pname = "gnome-control-center";
- version = "3.30.2";
+ version = "3.30.3";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0rn4r0ng4pd9smpay4rf4dkcl09b2ipr9srryybhd1srmd02ps51";
+ sha256 = "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r";
};
nativeBuildInputs = [
@@ -23,13 +26,13 @@ in stdenv.mkDerivation rec {
shared-mime-info python3
];
- buildInputs = with gnome3; [
- ibus gtk glib glib-networking upower gsettings-desktop-schemas
+ buildInputs = [
+ ibus gtk3 glib glib-networking upower gsettings-desktop-schemas
libxml2 gnome-desktop gnome-settings-daemon polkit libgtop
gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk
accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify
grilo libpwquality cracklib vino libcanberra-gtk3 libgudev libsecret
- gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk cheese
+ gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese
networkmanager modemmanager gnome-bluetooth tracker
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
index 59191bddd9a..57eb4b3d44a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
@@ -1,19 +1,15 @@
--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -504,14 +504,10 @@
+@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array,
g_return_val_if_fail (script->s_infile != NULL, FALSE);
add_args (array,
- "bwrap",
- "--ro-bind", "/usr", "/usr",
-- "--ro-bind", "/lib", "/lib",
-- "--ro-bind", "/lib64", "/lib64",
+- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
+ "@bubblewrap_bin@",
-+ "--ro-bind", "/nix/store", "/nix/store",
- "--proc", "/proc",
- "--dev", "/dev",
-- "--symlink", "usr/bin", "/bin",
-- "--symlink", "usr/sbin", "/sbin",
- "--chdir", "/",
- "--setenv", "GIO_USE_VFS", "local",
- "--unshare-all",
++ "--ro-bind", "@storeDir@", "@storeDir@",
++ "--ro-bind", "/run/current-system", "/run/current-system",
+ NULL);
+
+ /* These directories might be symlinks into /usr/... */
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index b98a6a2d676..bac8504eeec 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib
-, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland
+, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland, fetchpatch
, libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }:
stdenv.mkDerivation rec {
name = "gnome-desktop-${version}";
- version = "3.30.2";
+ version = "3.30.2.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0k6iccfj9naw42dl2mgljfvk12dmvg06plg86qd81nksrf9ycxal";
+ sha256 = "07s95fpfl3kjq51yxbrx6q87w812pq6bl0xdn0zzyi6qvg33m00v";
};
enableParallelBuilding = true;
@@ -30,6 +30,12 @@ stdenv.mkDerivation rec {
(substituteAll {
src = ./bubblewrap-paths.patch;
bubblewrap_bin = "${bubblewrap}/bin/bwrap";
+ inherit (builtins) storeDir;
+ })
+ (fetchpatch {
+ name = "fix-missing-font-cache";
+ url = https://gitlab.gnome.org/GNOME/gnome-desktop/commit/b87de7495160dbf48f01aa1ddb361fc2556ffd0c.patch;
+ sha256 = "1aw7lw93kcflmqmbx25cwja25441i8xzvgjm1pfsxvw3vr8j6scb";
})
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
index 1019a809d7f..a15d2d7f6e6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt
, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43
-, gnome3, gtk, glib }:
+, gnome3, gtk3, glib }:
stdenv.mkDerivation rec {
name = "gnome-dictionary-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool
desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43
];
- buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
+ buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 5d224623c3c..629dfe0421b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -1,5 +1,5 @@
{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
-, meson, ninja, gtk, glib, wrapGAppsHook, python3, libnotify
+, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify
, itstool, gnome3, libxml2
, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
@@ -12,17 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; };
- };
-
nativeBuildInputs = [
meson ninja pkgconfig gettext itstool libxslt docbook_xsl
wrapGAppsHook python3 libxml2
];
+
buildInputs = [
- gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
- udisks2 gnome3.defaultIconTheme
+ gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
+ udisks2 gnome3.adwaita-icon-theme
gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas
];
@@ -31,6 +28,13 @@ stdenv.mkDerivation rec {
patchShebangs meson_post_install.py
'';
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-disk-utility";
+ attrPath = "gnome3.gnome-disk-utility";
+ };
+ };
+
meta = with stdenv.lib; {
homepage = https://en.wikipedia.org/wiki/GNOME_Disks;
description = "A udisks graphical front-end";
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 06a5b258c80..3e8f7d3617f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -1,5 +1,5 @@
{ stdenv, meson, ninja, gettext, fetchurl
-, pkgconfig, gtk3, glib, libxml2
+, pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme
, wrapGAppsHook, gnome3 }:
stdenv.mkDerivation rec {
@@ -11,18 +11,21 @@ stdenv.mkDerivation rec {
sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-font-viewer"; attrPath = "gnome3.gnome-font-viewer"; };
- };
-
doCheck = true;
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ];
- buildInputs = [ gtk3 glib gnome3.gnome-desktop gnome3.defaultIconTheme ];
+ buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme ];
# Do not run meson-postinstall.sh
preConfigure = "sed -i '2,$ d' meson-postinstall.sh";
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-font-viewer";
+ attrPath = "gnome3.gnome-font-viewer";
+ };
+ };
+
meta = with stdenv.lib; {
description = "Program that can preview fonts and create thumbnails for fonts";
maintainers = gnome3.maintainers;
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
index 4ceb0335c18..d12e558c276 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook
-, webkitgtk, json-glib, rest, libsecret, gtk-doc, gobject-introspection
+{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook
+, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection
, gettext, icu, glib-networking
, libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos
}:
let
pname = "gnome-online-accounts";
- version = "3.30.1";
+ version = "3.30.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0havx26cfy0ln17jzmzbrrx35afknv2s9mdy34j0p7wmbqr8m5ky";
+ sha256 = "1p1gdgryziklrgngn6m13xnvfx4gb01h723nndfi9944r24fbiq5";
};
outputs = [ "out" "man" "dev" "devdoc" ];
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc
];
buildInputs = [
- glib gtk webkitgtk json-glib rest libsecret glib-networking icu libsoup
+ glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup
gcr kerberos
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index 6deefaa3673..ed4c1a3da13 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
-, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
+, libgdata, grilo, libzapojit, grilo-plugins, gnome-online-accounts, libmediaart
+, tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "gnome-online-miners-${version}";
@@ -10,19 +11,24 @@ stdenv.mkDerivation rec {
sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-online-miners"; attrPath = "gnome3.gnome-online-miners"; };
- };
-
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
- buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl
- gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
- gnome3.gnome-online-accounts gnome3.libmediaart
- gnome3.tracker gnome3.gfbgraph json-glib gnome3.rest
- dleyna-server ];
+ buildInputs = [
+ glib libgdata libxml2 libsoup gmp openssl
+ grilo libzapojit grilo-plugins
+ gnome-online-accounts libmediaart
+ tracker gfbgraph json-glib librest
+ dleyna-server
+ ];
enableParallelBuilding = true;
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-online-miners";
+ attrPath = "gnome3.gnome-online-miners";
+ };
+ };
+
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
description = "A set of crawlers that go through your online content and index them locally in Tracker";
diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
index 6fab2d5b0b7..4a22fc53519 100644
--- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
@@ -2,15 +2,15 @@
, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk_pixbuf, gnome3 }:
stdenv.mkDerivation rec {
- name = "gnome-remote-desktop-${version}";
- version = "0.1.6";
+ pname = "gnome-remote-desktop";
+ version = "0.1.7";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "jadahl";
repo = "gnome-remote-desktop";
rev = version;
- sha256 = "1d49kxhi1bn8ssh6nybg7d6zajqwc653czbsms2d59dbhj8mn75f";
+ sha256 = "0gmazc8ww0lyhx9iclhi982bkpjsnflrzv4qfm3q6hcy0il21fsc";
};
nativeBuildInputs = [ meson ninja pkgconfig python3 wrapGAppsHook ];
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- substituteInPlace meson.build --replace pipewire-0.1 pipewire-0.2
-
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
'';
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index fc39ea81223..3ce2a4433ac 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ];
buildInputs = [
- gtk3 glib libcanberra-gtk3 gnome3.defaultIconTheme
+ gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 2f44a4e168d..34921d46b4c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas
+{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas
, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- glib gtk libICE gnome-desktop json-glib xorg.xtrans gnome3.defaultIconTheme
+ glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome3.adwaita-icon-theme
gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index c76ba218c9a..7a2271e128d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -1,7 +1,7 @@
-{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst
-, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit
+{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, gtk3, glib, libnotify, lcms2, libXtst
+, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit, gsettings-desktop-schemas
, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
-, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }:
+, gnome-desktop, geocode-glib, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }:
stdenv.mkDerivation rec {
name = "gnome-settings-daemon-${version}";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ];
- buildInputs = with gnome3; [
- ibus gtk glib gsettings-desktop-schemas networkmanager
+ buildInputs = [
+ ibus gtk3 glib gsettings-desktop-schemas networkmanager
libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib
libcanberra-gtk3 upower colord libgweather xkeyboard_config nss
polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 76e5bd13522..693a3bec486 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -2,9 +2,10 @@
, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
-, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr
-, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd
-, sassc, systemd, gst_all_1 }:
+, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou
+, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop
+, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3
+, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon }:
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
@@ -26,16 +27,16 @@ in stdenv.mkDerivation rec {
meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
sassc desktop-file-utils libxslt.bin
];
- buildInputs = with gnome3; [
+ buildInputs = [
systemd caribou
gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
libcroco libsecret libsoup polkit gdk_pixbuf librsvg
clutter networkmanager libstartup_notification telepathy-glib
libXtst gjs mutter libpulseaudio evolution-data-server
- libical gtk gstreamer gdm libcanberra-gtk3 geoclue2
- defaultIconTheme gnome3.gnome-bluetooth
- gnome3.gnome-clocks # schemas needed
- at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon
+ libical gtk3 gstreamer gdm libcanberra-gtk3 geoclue2
+ adwaita-icon-theme gnome-bluetooth
+ gnome-clocks # schemas needed
+ at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon
gst_all_1.gst-plugins-good # recording
gobject-introspection
@@ -45,7 +46,7 @@ in stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [
# Needed to support on-screen keyboard used with touch screen devices
# see https://github.com/NixOS/nixpkgs/issues/25968
- gnome3.caribou
+ caribou
];
patches = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 3c45842fdd4..cab777f4feb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd
+, gtk3, gsettings-desktop-schemas, gnome-desktop
, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }:
stdenv.mkDerivation rec {
@@ -24,8 +25,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome3.gtk glib packagekit appstream-glib libsoup
- gnome3.gsettings-desktop-schemas gnome3.gnome-desktop
+ gtk3 glib packagekit appstream-glib libsoup
+ gsettings-desktop-schemas gnome-desktop
gspell json-glib libsecret ostree
polkit flatpak fwupd
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index a1e3ece3db4..4b02411b486 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
polkit # for ITS file
];
buildInputs = [
- bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.defaultIconTheme librsvg
+ bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg
gnome3.gsettings-desktop-schemas systemd
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 4765edbcf7e..6bde15ba762 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus
-, gtk, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala
+, gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala
, desktop-file-utils, itstool, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- gtk gsettings-desktop-schemas vte libuuid dconf
+ gtk3 gsettings-desktop-schemas vte libuuid dconf
# For extension
nautilus
];
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
index b6c40b28ab1..3d5cfb85d67 100644
--- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig intltool ];
- buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.defaultIconTheme ];
+ buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.adwaita-icon-theme ];
postFixup = ''
gtk-update-icon-cache "$out"/share/icons/HighContrast
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 6a5d2fde501..134ba41d653 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -1,5 +1,5 @@
{ stdenv, intltool, fetchurl, apacheHttpd, nautilus
-, pkgconfig, gtk3, glib, libxml2, systemd
+, pkgconfig, gtk3, glib, libxml2, systemd, adwaita-icon-theme
, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd
, gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
doCheck = true;
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
preConfigure = ''
sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \
@@ -26,15 +26,19 @@ stdenv.mkDerivation rec {
-i data/dav_user_2.4.conf
'';
- configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd"
- "--with-modules-path=${apacheHttpd.dev}/modules"
- "--with-systemduserunitdir=$(out)/etc/systemd/user"
- "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
+ configureFlags = [
+ "--with-httpd=${apacheHttpd.out}/bin/httpd"
+ "--with-modules-path=${apacheHttpd.dev}/modules"
+ "--with-systemduserunitdir=$(out)/etc/systemd/user"
+ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0"
+ ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk3 glib intltool itstool libxml2 libtool
- wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg
- nautilus libnotify libcanberra-gtk3 systemd ];
+ buildInputs = [
+ gtk3 glib intltool itstool libxml2 libtool
+ wrapGAppsHook file gdk_pixbuf adwaita-icon-theme librsvg
+ nautilus libnotify libcanberra-gtk3 systemd
+ ];
postInstall = ''
mkdir -p $out/share/gsettings-schemas/$name
diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
index ab2ead7d344..02e0c29fdaa 100644
--- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite
-, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite, librest
+, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av, libgdata, libmediaart
, gmime, json-glib, avahi, tracker, dleyna-server, itstool, totem-pl-parser }:
let
@@ -15,10 +15,10 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool ];
buildInputs = [
- gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
+ gnome3.grilo libxml2 gupnp gssdp libgdata
lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts
- totem-pl-parser gnome3.rest gmime json-glib
- avahi gnome3.libmediaart tracker dleyna-server
+ totem-pl-parser librest gmime json-glib
+ avahi libmediaart tracker dleyna-server
];
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index a968bfd2b56..2b7794a9a8e 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, defaultIconTheme
+{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, adwaita-icon-theme
, glib, desktop-file-utils, gtk-doc, autoconf, automake, libtool
, wrapGAppsHook, gnome3, itstool, libxml2, yelp-tools
, docbook_xsl, docbook_xml_dtd_412, gsettings-desktop-schemas
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
yelp-tools libxml2 desktop-file-utils gobject-introspection
];
- buildInputs = [ gtk3 glib gsettings-desktop-schemas defaultIconTheme ];
+ buildInputs = [ gtk3 glib gsettings-desktop-schemas adwaita-icon-theme ];
configureFlags = [
"--with-unicode-data=${unicode-data}"
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
index e80212713aa..2988dd1b47e 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@@ -1,7 +1,8 @@
{ fetchurl, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
-, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
+, glib, gtk3, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
+, gsettings-desktop-schemas, gnome-desktop
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
-, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
+, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
stdenv.mkDerivation rec {
name = "mutter-${version}";
@@ -32,10 +33,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
- buildInputs = with gnome3; [
- glib gobject-introspection gtk gsettings-desktop-schemas upower
+ buildInputs = [
+ glib gobject-introspection gtk3 gsettings-desktop-schemas upower
gnome-desktop cairo pango cogl clutter zenity libstartup_notification
- gnome3.geocode-glib libinput libgudev libwacom
+ geocode-glib libinput libgudev libwacom
libcanberra-gtk3 zenity xkeyboard_config libxkbfile
libxkbcommon pipewire
];
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 9a1418cbe0a..518b0ec1c48 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,7 +1,8 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
+{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
-, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
+, gsettings-desktop-schemas, glib, gtk3, gnome-desktop
+, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
stdenv.mkDerivation rec {
name = "mutter-${version}";
@@ -12,9 +13,15 @@ stdenv.mkDerivation rec {
sha256 = "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; };
- };
+ patches = [
+ # https://gitlab.gnome.org/GNOME/mutter/issues/270
+ # Fixes direction of the desktop switching animation when using workspace
+ # grid extension with desktops arranged horizontally.
+ (fetchpatch {
+ url = https://gitlab.gnome.org/GNOME/mutter/commit/92cccf53dfe9e077f1d61ac4f896fd391f8cb689.patch;
+ sha256 = "11vmypypjss50xg7hhdbqrxvgqlxx4lnwy59089qsfl3akg4kk2i";
+ })
+ ];
configureFlags = [
"--with-x"
@@ -36,10 +43,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
- buildInputs = with gnome3; [
- glib gobject-introspection gtk gsettings-desktop-schemas upower
+ buildInputs = [
+ glib gobject-introspection gtk3 gsettings-desktop-schemas upower
gnome-desktop cairo pango cogl clutter zenity libstartup_notification
- gnome3.geocode-glib libinput libgudev libwacom
+ geocode-glib libinput libgudev libwacom
libcanberra-gtk3 zenity xkeyboard_config libxkbfile
libxkbcommon pipewire
];
@@ -51,6 +58,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "mutter";
+ attrPath = "gnome3.mutter";
+ };
+ };
+
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = gnome3.maintainers;
diff --git a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
index 051b7618612..e3ad75b869c 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
+++ b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
@@ -1,6 +1,6 @@
--- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
+++ a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -514,14 +514,10 @@ add_bwrap (GPtrArray *array,
+@@ -514,14 +514,11 @@ add_bwrap (GPtrArray *array,
g_return_val_if_fail (script->s_infile != NULL, FALSE);
add_args (array,
@@ -8,8 +8,9 @@
- "--ro-bind", "/usr", "/usr",
- "--ro-bind", "/lib", "/lib",
- "--ro-bind", "/lib64", "/lib64",
-+ "@bubblewrap_bin@",
-+ "--ro-bind", "@storeDir@", "@storeDir@",
++ "@bubblewrap_bin@",
++ "--ro-bind", "@storeDir@", "@storeDir@",
++ "--ro-bind", "/run/current-system", "/run/current-system",
"--proc", "/proc",
"--dev", "/dev",
- "--symlink", "usr/bin", "/bin",
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index b581d8f0983..715686460a3 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2
-, desktop-file-utils, python3, wrapGAppsHook , gtk, gnome3, gnome-autoar
+, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar
, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf
, substituteAll, bubblewrap
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
- glib-networking shared-mime-info libexif gtk exempi libnotify libselinux
+ glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux
tracker tracker-miners gexiv2 libseccomp bubblewrap
gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
];
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index ef79f972ff0..742819e0ba1 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook
-, cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp
+, cairo, gdk_pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp
, libxml2, sane-backends, vala, gnome3, gobject-introspection }:
stdenv.mkDerivation rec {
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb
- gtk libwebp packagekit sane-backends vala
+ cairo gdk_pixbuf colord glib gnome3.adwaita-icon-theme gusb
+ gtk3 libwebp packagekit sane-backends vala
];
nativeBuildInputs = [
meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 3565931e4df..d4a66b6c493 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1
, clutter-gtk, clutter-gst, python3Packages, shared-mime-info
, pkgconfig, gtk3, glib, gobject-introspection, totem-pl-parser
-, wrapGAppsHook, itstool, libxml2, vala, gnome3
+, wrapGAppsHook, itstool, libxml2, vala, gnome3, grilo, grilo-plugins
+, libpeas, adwaita-icon-theme, gnome-desktop, gsettings-desktop-schemas
, gdk_pixbuf, tracker, nautilus }:
stdenv.mkDerivation rec {
@@ -15,15 +16,15 @@ stdenv.mkDerivation rec {
doCheck = true;
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobject-introspection wrapGAppsHook ];
buildInputs = [
- gtk3 glib gnome3.grilo clutter-gtk clutter-gst totem-pl-parser gnome3.grilo-plugins
+ gtk3 glib grilo clutter-gtk clutter-gst totem-pl-parser grilo-plugins
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
- gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info
- gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop
- gnome3.gsettings-desktop-schemas tracker nautilus
+ gst_all_1.gst-plugins-ugly gst_all_1.gst-libav libpeas shared-mime-info
+ gdk_pixbuf libxml2 adwaita-icon-theme gnome-desktop
+ gsettings-desktop-schemas tracker nautilus
python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins
];
diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
index 7127ab71b1f..85bb32972f4 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt
+{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, gexiv2, tracker
, meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server
, exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif
, libgrss, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid
@@ -35,9 +35,9 @@ in stdenv.mkDerivation rec {
flac
giflib
glib
- gnome3.gexiv2
+ gexiv2
totem-pl-parser
- gnome3.tracker
+ tracker
gst_all_1.gst-plugins-base
gst_all_1.gstreamer
icu
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
index 6ec2b0a17ed..b3f06c2dcc1 100644
--- a/pkgs/desktops/gnome-3/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ];
buildInputs = [
- gnome3.defaultIconTheme gtk3 glib libXtst libnotify libsoup
+ gnome3.adwaita-icon-theme gtk3 glib libXtst libnotify libsoup
libsecret gnutls libgcrypt avahi zlib libjpeg
libXdamage libXfixes libXext networkmanager
] ++ optionals telepathySupport [ dbus-glib telepathy-glib ];
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 26bcb317190..644c2793831 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib webkitgtk sqlite
libxml2 libxslt gnome3.yelp-xsl
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
];
diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix
index e80c437afda..a347c8f2f9d 100644
--- a/pkgs/desktops/gnome-3/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/core/zenity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3
+{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3, gtk3
, gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -10,18 +10,21 @@ stdenv.mkDerivation rec {
sha256 = "1wipnp46pd238z9ck5rsckbaw7yla6c936fswq5w94k4c6bgcplr";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "zenity"; attrPath = "gnome3.zenity"; };
- };
-
preBuild = ''
mkdir -p $out/include
'';
- buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
+ buildInputs = [ gtk3 libxml2 libxslt libX11 itstool ];
nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which wrapGAppsHook ];
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "zenity";
+ attrPath = "gnome3.zenity";
+ };
+ };
+
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = gnome3.maintainers;
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 34b3faf71a4..41b0ccf6268 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -28,7 +28,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gtk3.out # for gtk-update-icon-cache
glib-networking gvfs dconf gnome-backgrounds gnome-control-center
gnome-menus gnome-settings-daemon gnome-shell
- gnome-themes-extra defaultIconTheme gnome-shell-extensions
+ gnome-themes-extra adwaita-icon-theme gnome-shell-extensions
pkgs.hicolor-icon-theme
];
@@ -51,22 +51,11 @@ lib.makeScope pkgs.newScope (self: with self; {
hitori gnome-taquin
];
- inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
- libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
- easytag meld orca rhythmbox shotwell gnome-usage
- clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
-
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
gnome3 = self // { recurseForDerivations = false; };
- gtk = gtk3;
- gtkmm = gtkmm3;
vala = pkgs.vala_0_42;
- gegl_0_4 = pkgs.gegl_0_4.override { inherit gtk; };
- rest = librest;
-
-# Simplify the nixos module and gnome packages
- defaultIconTheme = adwaita-icon-theme;
+ gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; };
# ISO installer
# installerIso = callPackage ./installer.nix {};
@@ -372,8 +361,8 @@ lib.makeScope pkgs.newScope (self: with self; {
bijiben = gnome-notes; # added 2018-09-26
evolution_data_server = evolution-data-server; # added 2018-02-25
- geocode_glib = geocode-glib; # added 2018-02-25
- glib_networking = glib-networking; # added 2018-02-25
+ geocode_glib = pkgs.geocode-glib; # added 2018-02-25
+ glib_networking = pkgs.glib-networking; # added 2018-02-25
gnome_common = gnome-common; # added 2018-02-25
gnome_control_center = gnome-control-center; # added 2018-02-25
gnome_desktop = gnome-desktop; # added 2018-02-25
@@ -399,4 +388,13 @@ lib.makeScope pkgs.newScope (self: with self; {
yelp_xsl = yelp-xsl; # added 2018-02-25
yelp_tools = yelp-tools; # added 2018-02-25
+ # added 2019-02-08
+ inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
+ libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
+ easytag meld orca rhythmbox shotwell gnome-usage
+ clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
+ defaultIconTheme = adwaita-icon-theme;
+ gtk = gtk3;
+ gtkmm = gtkmm3;
+ rest = librest;
})
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 052cd49998d..4a634de9447 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ];
buildInputs = [
glib gtk3 webkitgtk amtk
- gnome3.defaultIconTheme gsettings-desktop-schemas
+ gnome3.adwaita-icon-theme gsettings-desktop-schemas
];
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
index c8440037d3c..9fbce7c6cc0 100644
--- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb,
- boost, sqlite, libgtop, glibmm, gtkmm, vte, gtksourceview, gsettings-desktop-schemas,
+ boost, sqlite, libgtop, glibmm, gtkmm3, vte, gtksourceview, gsettings-desktop-schemas,
gtksourceviewmm, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 gdb boost sqlite libgtop
- glibmm gtkmm vte gtksourceview gtksourceviewmm
+ glibmm gtkmm3 vte gtksourceview gtksourceviewmm
gsettings-desktop-schemas
];
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
index 62420bf42b2..4e94f07692b 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "gnome-shell-dash-to-dock-${version}";
- version = "64";
+ version = "65";
src = fetchFromGitHub {
owner = "micheleg";
repo = "dash-to-dock";
rev = "extensions.gnome.org-v" + version;
- sha256 = "1cfkdi4raim50wif47fly4c0lzyamysv40qd5ppr1h824bamzxcm";
+ sha256 = "0ln49l9s0yfl30pi77pz7xlmh63l9vjppi863kry5lay10dsvz47";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
new file mode 100644
index 00000000000..a1cc96d8b7b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "gnome-shell-extension-sound-output-device-chooser";
+ version = "unstable-2018-12-30";
+
+ src = fetchFromGitHub {
+ owner = "kgshank";
+ repo = "gse-sound-output-device-chooser";
+ rev = "3ec8aded413034e7943eb36ee509405873ccc575";
+ sha256 = "1svc3d3pr2j7fr0660a0zj2n320vld8zkkddf5iphbdwivmkrh3n";
+ };
+
+ dontBuild = true;
+
+ uuid = "sound-output-device-chooser@kgshank.net";
+ installPhase = ''
+ mkdir -p $out/share/gnome-shell/extensions
+ cp -r ${uuid} $out/share/gnome-shell/extensions
+ '';
+
+ meta = with stdenv.lib; {
+ description = "GNOME Shell extension adding audio device chooser to panel";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ jtojnar ];
+ homepage = https://github.com/kgshank/gse-sound-output-device-chooser;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix
new file mode 100644
index 00000000000..b0e45c2b7bf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "gnome-shell-extension-window-corner-preview";
+ version = "unstable-2019-02-27";
+
+ src = fetchFromGitHub {
+ owner = "medenagan";
+ repo = "window-corner-preview";
+ rev = "9c1e97c7f7ecd530abac572050f6ec89c1ac7571";
+ sha256 = "12yx3zfnqkpy9g8mhniw02q61axgb14aqiyj6pdfcdmd6hrgsmz6";
+ };
+
+ dontBuild = true;
+
+ uuid = "window-corner-preview@fabiomereu.it";
+ installPhase = ''
+ mkdir -p $out/share/gnome-shell/extensions
+ cp -r ${uuid} $out/share/gnome-shell/extensions
+ '';
+
+ meta = with stdenv.lib; {
+ description = "GNOME Shell extension showing a video preview on the corner of the screen";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jtojnar ];
+ homepage = https://github.com/medenagan/window-corner-preview;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix
index b8171ef3185..33980f2d035 100644
--- a/pkgs/desktops/gnome-3/games/atomix/default.nix
+++ b/pkgs/desktops/gnome-3/games/atomix/default.nix
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ];
- buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.defaultIconTheme ];
+ buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.adwaita-icon-theme ];
postPatch = ''
chmod +x meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
index 4e302e9f8b1..a3bb2df918a 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook ];
buildInputs = [
- gtk3 librsvg libgnome-games-support gnome3.defaultIconTheme
+ gtk3 librsvg libgnome-games-support gnome3.adwaita-icon-theme
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 110e2e5c439..8955bcbc498 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 ];
- buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.defaultIconTheme ];
+ buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.adwaita-icon-theme ];
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index 8e5cf198d9d..5812f16d296 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ];
- buildInputs = [ glib gtk3 librsvg gnome3.defaultIconTheme ];
+ buildInputs = [ glib gtk3 librsvg gnome3.adwaita-icon-theme ];
postPatch = ''
chmod +x meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index 0b4d6d770b0..ab1a54c0575 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig vala wrapGAppsHook intltool itstool libxml2 appstream-glib desktop-file-utils ];
- buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.defaultIconTheme ];
+ buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.adwaita-icon-theme ];
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index 29763abba55..c64ee968f19 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk3 wrapGAppsHook librsvg intltool itstool libxml2
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index 7896595de18..6ec18e55cf0 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# gobject-introspection for finding vapi files
nativeBuildInputs = [ meson ninja vala gobject-introspection pkgconfig gettext itstool python3 libxml2 wrapGAppsHook ];
- buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgnome-games-support libgee ];
+ buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ];
postPatch = ''
chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file
diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index e36ca2a639d..ad522c4f56a 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ];
buildInputs = [
- gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme
+ gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.adwaita-icon-theme
libgee libgnome-games-support
];
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index 19a6b60fb5b..b881dbbf800 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3
- libxml2 gnome3.defaultIconTheme libgnome-games-support libgee
+ libxml2 gnome3.adwaita-icon-theme libgnome-games-support libgee
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index eaa9f3a1c8d..0996b9bf10b 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook
-, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }:
+, libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }:
stdenv.mkDerivation rec {
name = "gnome-sudoku-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];
- buildInputs = [ gtk3 gnome3.libgee json-glib qqwing ];
+ buildInputs = [ gtk3 libgee json-glib qqwing ];
postPatch = ''
chmod +x post_install.py # patchShebangs requires executable file
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 75f511b17d0..583072d8470 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk3 wrapGAppsHook librsvg libcanberra-gtk3
- intltool itstool libxml2 gnome3.defaultIconTheme
+ intltool itstool libxml2 gnome3.adwaita-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index fe81b429e99..f3f1fdbc415 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme
+ gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.adwaita-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix
index 8d4be7f1c6b..ebbbe9d1cee 100644
--- a/pkgs/desktops/gnome-3/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/games/hitori/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk3 wrapGAppsHook intltool itstool libxml2
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index a60ebe9590b..b1996e0fd59 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool libxml2 ];
- buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg libcanberra-gtk3 ];
+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libcanberra-gtk3 ];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index ccd90c071fe..bbc65f3e5ba 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2
meson ninja python3
];
- buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg clutter clutter-gtk ];
+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg clutter clutter-gtk ];
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
index c57ab1a9e14..d3ddcea77f7 100644
--- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];
buildInputs = [
- gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg
libcanberra-gtk3 clutter libxml2 clutter-gtk
];
diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
index 5e0f01174e4..3c017d71382 100644
--- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ];
- buildInputs = [ glib gtk3 gnome3.defaultIconTheme clutter clutter-gtk ];
+ buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme clutter clutter-gtk ];
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix
index e6cdd3c88b7..399562c0d99 100644
--- a/pkgs/desktops/gnome-3/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/games/tali/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg
libxml2 itstool intltool wrapGAppsHook ];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 8f1080ccc2e..154ebb04a4b 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,62 +1,65 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant
-, wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils
-, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes
-, gobject-introspection, libpthreadstubs, sqlite, gcr
-, gnome3, librsvg, gnome-doc-utils, webkitgtk, fetchpatch }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja
+, desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme
+, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext
+, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3
+, xvfb_run, dbus, shared-mime-info, libunwind, glib-networking }:
-let
- pname = "geary";
- version = "0.12.4";
-in
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ pname = "geary";
+ version = "0.13.2";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "01ykhkjfkprvh9kp4rzrl6xs2pqibiw44ckvqsn5cs3xy2rlq8mm";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "1fp3zzgpkm1l4d0g5194wnriz2spxa9kgrgy98kvvffl7ac860kk";
};
patches = [
- # Fix build with webkitgtk-2.22
+ # gobject-introspection is not needed
+ # https://gitlab.gnome.org/GNOME/geary/merge_requests/138
(fetchpatch {
- url = https://gitlab.gnome.org/GNOME/geary/commit/5d0f711426d76f878cf9b71f7e8f785199c7cde1.patch;
- sha256 = "1yifng5lfsc6wp7irmi8gjdcfig1cr0chf7rdv3asrk567nmwrsi";
- })
- (fetchpatch {
- url = https://gitlab.gnome.org/GNOME/geary/commit/0d966950a2cba888873cd3a7f4f42bb7a017dc6d.patch;
- sha256 = "1y6v4fnik4w3paj9nl0yqs54998sx1zr9w3940d579p6dsa8f3fg";
- })
- (fetchpatch {
- url = https://gitlab.gnome.org/GNOME/geary/commit/e091f24b00ec421e1aadd5e360d1550e658ad5ef.patch;
- sha256 = "0d5hc4h9c1hnn2sk18nkpmzdvwm3h746n2zj8n22ax9rj6lxl38l";
- })
- # Fix build with vala 0.40.12
- # See: https://gitlab.gnome.org/GNOME/vala/blob/0.40.12/NEWS#L22
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/geary/commit/088cb2c0aa35ad4b54ea5a0a2edaf0ff96c64b45.patch";
- sha256 = "0cnjmbd3snm8ggmprqa32f7i3w86gs3ylab9p5ffj921dcpvvlb2";
+ url = https://gitlab.gnome.org/GNOME/geary/commit/d2f1b1076aa942d140e83fdf03b66621c11229f5.patch;
+ sha256 = "1dsj4ybnibpi572w9hafm0w90jbjv7wzdl6j8d4c2qg5h7knlvfk";
})
];
- nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobject-introspection ];
+ nativeBuildInputs = [
+ desktop-file-utils gettext itstool libxml2 meson ninja
+ pkgconfig vala wrapGAppsHook python3
+ ];
+
buildInputs = [
- gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite
- libpthreadstubs gnome3.gsettings-desktop-schemas gcr isocodes
- gdk_pixbuf librsvg gnome3.defaultIconTheme
+ adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts
+ gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3
+ libgee libnotify libsecret sqlite webkitgtk glib-networking
+ libunwind
];
- cmakeFlags = [
- "-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes"
+ checkInputs = [ xvfb_run dbus ];
+
+ mesonFlags = [
+ "-Dcontractor=true" # install the contractor file (Pantheon specific)
];
- # TODO: This is bad, upstream should fix their code.
- PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${webkitgtk.dev}/share/gir-1.0";
+ postPatch = ''
+ chmod +x build-aux/post_install.py
+ patchShebangs build-aux/post_install.py
+ '';
preFixup = ''
# Add geary to path for geary-attach
gappsWrapperArgs+=(--prefix PATH : "$out/bin")
'';
+ doCheck = true;
+
+ checkPhase = ''
+ NO_AT_BRIDGE=1 \
+ XDG_DATA_DIRS=:$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share \
+ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+ meson test -v --no-stdsplit
+ '';
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
@@ -68,7 +71,7 @@ stdenv.mkDerivation rec {
homepage = https://wiki.gnome.org/Apps/Geary;
description = "Mail client for GNOME 3";
maintainers = gnome3.maintainers;
- license = licenses.lgpl2;
+ license = licenses.lgpl21Plus;
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index a447d2aa590..9f24d04337c 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, fetchpatch, vala, intltool, pkgconfig, gtk3, glib
, json-glib, wrapGAppsHook, libpeas, bash, gobject-introspection
+, libsoup, gtksourceview, gsettings-desktop-schemas, adwaita-icon-theme
, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret
, meson, ninja, python3
}:
@@ -35,9 +36,9 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [
- gtk3 glib json-glib libgee libpeas gnome3.libsoup
- libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas
- libsecret gobject-introspection gnome3.adwaita-icon-theme
+ gtk3 glib json-glib libgee libpeas libsoup
+ libgit2-glib gtkspell3 gtksourceview gsettings-desktop-schemas
+ libsecret gobject-introspection adwaita-icon-theme
];
nativeBuildInputs = [ meson ninja python3 vala wrapGAppsHook intltool pkgconfig ];
diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
index 716988252d5..f9387c11b81 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
@@ -10,7 +10,7 @@
, gnome-session
, gnome3
, gsettings-desktop-schemas
-, gtk
+, gtk3
, ibus
, intltool
, libcanberra-gtk3
@@ -85,7 +85,7 @@ let
gnome-bluetooth
gnome-desktop
gsettings-desktop-schemas
- gtk
+ gtk3
ibus
libcanberra-gtk3
libpulseaudio
diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
index 8fbe24220b6..3cdab30ce8d 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit
-, systemd, wrapGAppsHook, desktop-file-utils }:
+, gtk3, systemd, wrapGAppsHook, desktop-file-utils }:
stdenv.mkDerivation rec {
name = "gnome-packagekit-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ];
- buildInputs = [ gnome3.gtk packagekit systemd polkit ];
+ buildInputs = [ gtk3 packagekit systemd polkit ];
postPatch = ''
patchShebangs meson_post_install.sh
diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
index f9cc0a8aa4f..db00758fb55 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
@@ -11,7 +11,7 @@
, gnome-flashback
, gnome-menus
, gnome3
-, gtk
+, gtk3
, itstool
, libgweather
, libsoup
@@ -77,7 +77,7 @@ in stdenv.mkDerivation rec {
glib
gnome-desktop
gnome-menus
- gtk
+ gtk3
libgweather
libsoup
libwnck3
diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix
index be8ab81457e..5afc92aa482 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix
@@ -7,7 +7,7 @@
, gnome-common
, gnome-desktop
, gnome3
-, gtk
+, gtk3
, gsettings-desktop-schemas
, pkgconfig
, intltool
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
- gtk
+ gtk3
gnome-desktop
dbus-glib
pam
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index 77edf27fbdd..47de1de59ca 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
gtk3 glib gnome3.gsettings-desktop-schemas
- gdk_pixbuf gnome3.defaultIconTheme
+ gdk_pixbuf gnome3.adwaita-icon-theme
libnotify gnome3.gnome-shell python3Packages.pygobject3
libsoup gnome3.gnome-settings-daemon gnome3.nautilus
gnome3.mutter gnome3.gnome-desktop gobject-introspection
diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix
index 86e12b58536..c42356aa16a 100644
--- a/pkgs/desktops/gnome-3/misc/metacity/default.nix
+++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix
@@ -4,7 +4,7 @@
, glib
, gnome3
, gsettings-desktop-schemas
-, gtk
+, gtk3
, libcanberra-gtk3
, libgtop
, libstartup_notification
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
glib
gsettings-desktop-schemas
- gtk
+ gtk3
libcanberra-gtk3
libgtop
libstartup_notification
diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
index 0a9b9bcfe9b..c77d5d89fe3 100644
--- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
dbus-glib libcanberra gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gnome3.gsettings-desktop-schemas
- gnome3.gnome-shell gtk3 gnome3.defaultIconTheme
+ gnome3.gnome-shell gtk3 gnome3.adwaita-icon-theme
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix
index 479491b35d8..f5331751c70 100644
--- a/pkgs/desktops/lxqt/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/compton-conf/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "compton-conf";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1vxbh0vr7wknr7rbmdbmy5md1fdkw3zwlgpbv16cwdplbv9m97xi";
+ sha256 = "0bx21r83ahmsqf7bm1h17pi4y9js1iqsv7nwnlq58rc0ddkkhcdb";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 70675e1408c..3ce1ea068a7 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "libfm-qt";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1siqqn4waglymfi7c7lrmlxkylddw8qz0qfwqxr1hnmx3dsj9c36";
+ sha256 = "00rn5i16h659zyp1dx213nc3jz7rx9phiw71zf6nspxzxsb8w2sc";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index 1b19275ece9..19335860599 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "liblxqt";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1cpl6sd2fifpflahm8fvrrscrv03sinfm03m7yc1k59y6nsbwi36";
+ sha256 = "0g2502lcws5j74p82qhfryz9n51cvi85hb50r5s227xhkv91q65k";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index 852c4bddec8..d351f3e0d6e 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg }:
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, lxqt-build-tools }:
stdenv.mkDerivation rec {
pname = "libqtxdg";
- version = "3.3.0";
+ version = "3.3.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0qgqqgy15h0d1fwk4mnbv2hirz8njjjlng64bv33rc6wwrsaa50b";
+ sha256 = "0y3s0hva64m64j9lqgnja1li8zhlywqzv8xwjg8pyd2nr9h918db";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake lxqt-build-tools ];
buildInputs = [ qtbase qtsvg ];
preConfigure = ''
cmakeFlagsArray+=(
- "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix"
- "-DCMAKE_INSTALL_INCLUDEDIR=include"
- "-DCMAKE_INSTALL_LIBDIR=lib"
+ "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix"
+ "-DCMAKE_INSTALL_INCLUDEDIR=include"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
)
'';
diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index a0a83ad3469..affa0cc8c9d 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "lximage-qt";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0zx9903ym5a9zk4m9khr22fj5sy57mg2v8wnk177wjm11lhic5v8";
+ sha256 = "175l2w5w6iag01v05jq90pxx0al24wpw3mgsbcgqhl4z6h860r32";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
index 013be8eea4f..7778eb92263 100644
--- a/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-about/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lxqt-about";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "14b13v1r5ncz4ycg25ac9ppafiifc37qws8kcw078if72rp9n121";
+ sha256 = "0dj2rhbhnkzmv1iqqyq0bcp03imwnvxdr7rnpqnrs9kkjacm8zvr";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
index 528f9a390f9..5ea6b0d0882 100644
--- a/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lxqt-admin";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0sdb514hgha5yvmbzi6nm1yx1rmbkh5fam09ybidjwpdwl2l4pxx";
+ sha256 = "121qj46app2bqdr24g5sz2mdjfd9w86wpgkwap46s0zgxm4li44i";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index d2c583b53fa..e7ba00bc8a8 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "lxqt-config";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1pp2pw43zh8kwi2cxk909wn6bw7kba95b6bv96l2gmzhdqpfw2a7";
+ sha256 = "0x1k08587i2pakxlrj2n0l82r179sfywnzn2cphxiy89r5zpn7vi";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index 5382be304ae..0502426e82d 100644
--- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lxqt-globalkeys";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "14bfkh54mn3jyq8g9ipy3xmc3n9lmlqpvm26kpqig7567hbncv7n";
+ sha256 = "0q7hfbs4dhsgyzch2msq2hsfzzfgbc611ki9x1x132n7zqk76pmp";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index 53826f62bcc..7eed84b3390 100644
--- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lxqt-notificationd";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1nawcxy2qnrngcxvwjwmmh4fn7mhnfgy1g77rn90243jvy29wv5f";
+ sha256 = "1ihaf2i361j2snyy6kg8ccpfnc8hppvacmxjqzb1lpyaf1ajd139";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index f880aed63f8..7ba2f00b5c5 100644
--- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lxqt-openssh-askpass";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "19xcc6i7jg35780r4dfg4vwfp9x4pz5sqzagxnpzspz61jaj5ibv";
+ sha256 = "04jmvhhlhhspwzj4hfq7fnaa3h7h02z3rlq8p55hzlzkvshqqh1q";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index f691357f25f..4363c9f8392 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "lxqt-panel";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0jr7ylf6d35m0ckn884arjk4armknnw8iyph00gcphn5bqycbn8l";
+ sha256 = "1py3i7qgm6h2iwjwqfjml1rp06s7ls1d7z5i9iizsmfshdzkaq86";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index 862e0c08ced..792a323e682 100644
--- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "lxqt-policykit";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "05k39819nsdyg2pp1vk6g2hdpxqp78h6bhb0hp5rclf9ap5fpvvc";
+ sha256 = "0mh9jw09r0mk8xmgvmzk3yyfix0pzqya28rcx71fqjpbdv1sc44l";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index 9ebff5d4de5..6bdf5ce2c0c 100644
--- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lxqt-powermanagement";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "08xdnb54lji09izzzfip8fw0gp17qkx66jm6i04zby4whx4mqniv";
+ sha256 = "1nhp4a28bpczhwz8b8da355zsxr1qwmkrm3bwllwp39liw947clx";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
index dc2d8c58caf..54236bfbb7e 100644
--- a/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix
@@ -3,13 +3,13 @@ menu-cache, muparser, pcre }:
stdenv.mkDerivation rec {
pname = "lxqt-runner";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1qyacig9ksnjrhws8cpk6arlaxn7kl0z39l3c62ql3m89mibsm88";
+ sha256 = "01a8ycpkzcbh85y4025pd3nbpnzxh98ll1xwz4ykz13yvm0l2n1w";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index 5b4d7b606c7..40ef5697a54 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lxqt-session";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0nla1ki23p1bwzw5hbmh9l8yg3b0f55kflgnvyfakmvpivjbz3k6";
+ sha256 = "0s6b0lblb795zz1p7sy677c1iznhmdzc4vw3jkc2agmsrhm7if7s";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
index 7e3ca84109f..6deef1bf56b 100644
--- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lxqt-sudo";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0l8fq06kfsrmvg2fr8lqdsxr6fwxmxsa9zwaa3fs9inzaylm0jkh";
+ sha256 = "1my0wpic20493rdlabp9ghag1g3nhwafk2yklkgczlajmarakgpc";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix
index a0d0a973ad7..2360d1970c9 100644
--- a/pkgs/desktops/lxqt/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/obconf-qt/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "obconf-qt";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "00v5w8qr3vs0k91flij9lz7y1cpp2g8ivgnmmm43ymjfiz5j6l27";
+ sha256 = "15dizs072ylmld1lxwgqkvybqy8ms8zki5586xm305jnlmrkb4lq";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
index dcc3ead31bf..00359e2ffed 100644
--- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "pavucontrol-qt";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1vyjm6phgbxglk65c889bd73b0p2ffb5bsc89dmb07qzllyrjb4h";
+ sha256 = "124dk41v8l5pv7afi1h7fgbhm8zj605yfd8b769sn7id2bqj7bis";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index aa7479b02f8..320d451f087 100644
--- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "pcmanfm-qt";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0hf4qyn12mpr6rrla9mf6ka5gb4y36amk7d14ayr7yka1r16p8lz";
+ sha256 = "1zchxlbyiifing94mqwh45pp7z3ihldknqiaz0kanq1cnma1jj6k";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
index d46b7e14e33..c17ef21c676 100644
--- a/pkgs/desktops/lxqt/qps/default.nix
+++ b/pkgs/desktops/lxqt/qps/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "qps";
- version = "1.10.19";
+ version = "1.10.20";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1vyi1vw4z5j2sp9yhhv91wl2sbg4fh0djqslg1ssc7fww2ka6dx3";
+ sha256 = "1g8j4cjy5x33jzjkx6vwyl5qbf9i2z2w01ipgk7nrik5drf9crbf";
};
nativeBuildInputs = [ cmake lxqt-build-tools ];
diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix
index f9a2e5ff0a1..748d33aa2ce 100644
--- a/pkgs/desktops/lxqt/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/qterminal/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "qterminal";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "071qz248j9gcqzchnrz8xamm07g4r2xyrmnb0a2vjkjd63pk2r8f";
+ sha256 = "0bq6lvns56caijdmjm05nsj9vg69v9x5vid24bfxasck6q8nw24w";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
index 9e0798ecb52..e47d8e05082 100644
--- a/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/qtermwidget/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qtermwidget";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0wv8fssbc2w7kkpq9ngsa8wyjraggdhsbz36gyxyv8fy5m78jq0n";
+ sha256 = "1pz8dwb86jpga4vfyn5v9n2s6dx3zh74yfp1kjsmsmhf878zs6lv";
};
nativeBuildInputs = [ cmake lxqt-build-tools ];
diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index cc7f113b7d1..14fa977e023 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "screengrab";
- version = "1.100";
+ version = "1.101";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1iqrmf581x9ab6zzjxm2509gg6fkn7hwril4v0aki7n7dgxw1c4g";
+ sha256 = "111gnkhp77qkch7xqr7k3h8zrg4871gapyd4vvlpaj0gjhirjg6h";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/update.sh b/pkgs/desktops/lxqt/update.sh
index f3dfc4d5975..47d3dfb3d5f 100755
--- a/pkgs/desktops/lxqt/update.sh
+++ b/pkgs/desktops/lxqt/update.sh
@@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
root=../../..
export NIXPKGS_ALLOW_UNFREE=1
-lxqt_version=0.14.0
+lxqt_version=0.14.1
lxqtrepo=https://downloads.lxqt.org/${lxqt_version}.html
version() {
diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index abb1b8c28a1..d71bb08dd5c 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
python
gnome3.gtksourceview
gnome3.libpeas
- gnome3.defaultIconTheme
+ gnome3.adwaita-icon-theme
mate.mate-desktop
];
diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
index c8ade1c9c35..9aed8ffcc27 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
pname = "calculator";
- version = "1.5.1";
+ version = "1.5.2";
name = "elementary-${pname}-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0vc27kjmfkly2jkqjiyzlybxyjqhwal3xrxca5b4abfgb379yswa";
+ sha256 = "1vdgl89hdf9q1ya6as7310hlr0xls3w7js2gzsd9z8arb6037ccl";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index 28983db7f91..c165df26f60 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "calendar";
- version = "4.2.3";
+ version = "5.0";
name = "elementary-${pname}-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "100wy8lkp4nrxj57ywyx44ckm3k7n8h5l6av92hr5pyx8fxn9m48";
+ sha256 = "0yiis5ig98gjw4s2qh8lppkdmv1cgi6qchxqncsjdki7yxyyni35";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 0b16c56be3d..7b6ee323091 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, substituteAll
-, python3, glibcLocales, desktop-file-utils, gtk3, granite, libgee, elementary-icon-theme
+, python3, desktop-file-utils, gtk3, granite, libgee, elementary-icon-theme
, appstream, libpeas, editorconfig-core-c, gtksourceview3, gtkspell3, libsoup
, vte, webkitgtk, zeitgeist, ctags, libgit2-glib, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "code";
- version = "3.0.2";
+ version = "3.1.0";
name = "elementary-${pname}-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0zmm4a7galrs9phiplf6cygwq3rplghv7r8g47mi4nlndgxqyssg";
+ sha256 = "04clzms1gw7dr611kr8bhca2dww0x65186al4sjqmln4g12ry1gx";
};
passthru = {
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
appstream
desktop-file-utils
- glibcLocales
meson
ninja
pkgconfig
@@ -52,11 +51,8 @@ stdenv.mkDerivation rec {
zeitgeist
];
- # See: https://github.com/elementary/code/pull/626
- LIBRARY_PATH = stdenv.lib.makeLibraryPath [ editorconfig-core-c ];
-
# install script fails with UnicodeDecodeError because of printing a fancy elipsis character
- LC_ALL = "en_US.UTF-8";
+ LC_ALL = "C.UTF-8";
# ctags needed in path by outline plugin
preFixup = ''
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 3494474c49c..9855a1394e5 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -61,11 +61,6 @@ stdenv.mkDerivation rec {
substituteInPlace filechooser-module/FileChooserDialog.vala --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas
'';
- # xdg.mime will create this
- postInstall = ''
- rm $out/share/applications/mimeinfo.cache
- '';
-
meta = with stdenv.lib; {
description = "File browser designed for elementary OS";
homepage = https://github.com/elementary/files;
diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index 8bca7b3b6b5..7b374236a12 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "music";
- version = "5.0.2";
+ version = "5.0.3";
name = "elementary-${pname}-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "06mpikzdm01r9j7g15b7fgi4lcnp8cc0wmj17dfli5nmncxghx89";
+ sha256 = "0qbny4484kr7lihg54rbhfwah9k43iivk3rivfvn7i5w66vn5spl";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
index 192b6ff358f..2644d31d798 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
@@ -2,15 +2,9 @@
, ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee
, libcanberra, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
-let
-
- redacted-script = callPackage ./redacted-script.nix {};
-
-in
-
stdenv.mkDerivation rec {
pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
- version = "1.6.1";
+ version = "1.6.2";
name = "elementary-${pname}-${version}";
@@ -18,7 +12,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = "screenshot";
rev = version;
- sha256 = "1vvj550md7vw7n057h8cy887a0nmsbwry67dxrxyz6bsvpk8sb6g";
+ sha256 = "1z61j96jk9zjr3bn5hgsp25m4v8h1rqwxm0kg8c34bvl06f13v8q";
};
passthru = {
@@ -52,11 +46,6 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
- postInstall = ''
- mkdir -p $out/share/fonts/truetype
- cp -rva ${redacted-script}/share/fonts/truetype/redacted-elementary $out/share/fonts/truetype
- '';
-
meta = with stdenv.lib; {
description = "Screenshot tool designed for elementary OS";
homepage = https://github.com/elementary/screenshot;
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix
deleted file mode 100644
index db1d9d240c4..00000000000
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchFromGitHub, pantheon }:
-
-stdenv.mkDerivation rec {
- name = "elementary-redacted-script-${version}";
- version = "5.1.0";
-
- src = fetchFromGitHub {
- owner = "elementary";
- repo = "fonts";
- rev = version;
- sha256 = "16x2w7w29k4jx2nwc5932h9rqvb216vxsziazisv2rpll74kn8b2";
- };
-
- dontConfigure = true;
-
- installPhase = ''
- mkdir -p $out/share/fonts/truetype/redacted-elementary
- cp -a redacted/*.ttf $out/share/fonts/truetype/redacted-elementary
- '';
-
- meta = with stdenv.lib; {
- description = "Redacted Script Font for elementary";
- homepage = https://github.com/elementary/fonts;
- license = licenses.ofl;
- maintainers = pantheon.maintainers;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index f38f15e3c6d..c87723007bb 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-keyboard";
- version = "2.3.4";
+ version = "2.3.5";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1997hnhlcp2jmf3z70na42vl1b7i5vxhp7k5ga5sl68dv0g4126y";
+ sha256 = "17iijb7imxw5zv7vkrbc1vsp87k900yqgyv7ycz1gw37xb4klsyp";
};
passthru = {
@@ -43,8 +43,6 @@ stdenv.mkDerivation rec {
})
];
- LIBRARY_PATH = stdenv.lib.makeLibraryPath [ libgnomekbd ];
-
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard";
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
index 2f7e79f9f9b..fe04d2b698b 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "stylesheet";
- version = "5.2.1";
+ version = "5.2.2";
name = "elementary-gtk-theme-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "03l8m87f7z25svxk0hhcqnn4qnnqvasr5qwzq3s87lx25gwjml29";
+ sha256 = "10b44dz7ndrckvq25pdxav59rzjcjbcpxb64z4nz62rfshvnrn8q";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
new file mode 100644
index 00000000000..061feb4b2d9
--- /dev/null
+++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, pantheon }:
+
+stdenv.mkDerivation rec {
+ pname = "elementary-redacted-script";
+ version = "unstable-2016-06-03";
+
+ src = fetchFromGitHub {
+ owner = "png2378";
+ repo = "redacted-elementary";
+ rev = "346440ff9ce19465e6d5c3d6d67a8573f992c746";
+ sha256 = "1jpd13sxkarclr0mlm66wzgpjh52ghzjzn4mywhyshyyskwn7jg1";
+ };
+
+ dontBuild = true;
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/truetype/redacted-elementary
+ cp -a truetype/*.ttf $out/share/fonts/truetype/redacted-elementary
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Font for concealing text";
+ homepage = https://github.com/png2378/redacted-elementary;
+ license = licenses.ofl;
+ maintainers = pantheon.maintainers;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index a7b8a01eeb0..8271abc1506 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -62,6 +62,8 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { };
+ notes-up = pkgs.notes-up.override { withPantheon = true; };
+
#### APPS
elementary-calculator = callPackage ./apps/elementary-calculator { };
@@ -215,6 +217,8 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-icon-theme = callPackage ./artwork/elementary-icon-theme { };
+ elementary-redacted-script = callPackage ./artwork/elementary-redacted-script { };
+
elementary-sound-theme = callPackage ./artwork/elementary-sound-theme { };
elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { };
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index fddd4143616..a6ec70a6b58 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, substituteAll, writeScript, pantheon, gnome-keyring, gnome-session, wingpanel, orca, at-spi2-core, elementary-default-settings, writeTextFile, writeShellScriptBin, elementary-settings-daemon }:
+{ stdenv, fetchFromGitHub, substituteAll, writeScript, pantheon, gnome-keyring, gnome-session, wingpanel, orca, at-spi2-core, elementary-default-settings, writeTextFile, writeShellScriptBin, elementary-settings-daemon, runtimeShell }:
let
@@ -15,7 +15,7 @@ let
#
dockitems-script = writeScript "dockitems-script" ''
- #!${stdenv.shell}
+ #!${runtimeShell}
elementary_default_settings="${elementary-default-settings}"
dock_items="$elementary_default_settings/share/elementary/config/plank/dock1/launchers"/*
@@ -66,8 +66,8 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = ''
- mkdir -p $out/share
- cp -avr applications $out/share/
+ mkdir -p $out/share/applications
+ cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list
mkdir -p $out/etc/xdg/autostart
cp -av ${gnome-keyring}/etc/xdg/autostart/* $out/etc/xdg/autostart
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list b/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list
new file mode 100644
index 00000000000..3b5e3b0e77a
--- /dev/null
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list
@@ -0,0 +1,168 @@
+[Default Applications]
+application/ogg=io.elementary.music.desktop
+application/oxps=org.gnome.Evince.desktop
+application/pdf=org.gnome.Evince.desktop
+application/postscript=org.gnome.Evince.desktop
+application/vnd.ms-xpsdocument=org.gnome.Evince.desktop
+application/vnd.rn-realmedia=io.elementary.videos.desktop
+application/x-ar=org.gnome.FileRoller.desktop
+application/x-arj=org.gnome.FileRoller.desktop
+application/x-bzdvi=org.gnome.Evince.desktop
+application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop
+application/x-bzip=org.gnome.FileRoller.desktop
+application/x-bzpdf=org.gnome.Evince.desktop
+application/x-bzpostscript=org.gnome.Evince.desktop
+application/x-cbr=org.gnome.Evince.desktop
+application/x-cbt=org.gnome.Evince.desktop
+application/x-cbz=org.gnome.Evince.desktop
+application/x-compress=org.gnome.FileRoller.desktop
+application/x-compressed-tar=org.gnome.FileRoller.desktop
+application/x-dvi=org.gnome.Evince.desktop
+application/x-ear=org.gnome.FileRoller.desktop
+application/x-extension-m4a=io.elementary.videos.desktop
+application/x-extension-mp4=io.elementary.videos.desktop
+application/x-flac=io.elementary.music.desktop
+application/x-gtar=org.gnome.FileRoller.desktop
+application/x-gzdvi=org.gnome.Evince.desktop
+application/x-gzip=org.gnome.FileRoller.desktop
+application/x-gzpdf=org.gnome.Evince.desktop
+application/x-gzpostscript=org.gnome.Evince.desktop
+application/x-lha=org.gnome.FileRoller.desktop
+application/x-lhz=org.gnome.FileRoller.desktop
+application/x-lzop=org.gnome.FileRoller.desktop
+application/x-matroska=io.elementary.videos.desktop
+application/x-ogg=io.elementary.music.desktop
+application/x-perl=io.elementary.code.desktop
+application/x-rar-compressed=org.gnome.FileRoller.desktop
+application/x-rar=org.gnome.FileRoller.desktop
+application/x-rpm=org.gnome.FileRoller.desktop
+application/x-tar=org.gnome.FileRoller.desktop
+application/x-war=org.gnome.FileRoller.desktop
+application/x-xz-compressed-tar=org.gnome.FileRoller.desktop
+application/x-xz=org.gnome.FileRoller.desktop
+application/x-xzpdf=org.gnome.Evince.desktop
+application/x-zip-compressed=org.gnome.FileRoller.desktop
+application/x-zip=org.gnome.FileRoller.desktop
+application/x-zoo=org.gnome.FileRoller.desktop
+application/xhtml+xml=org.gnome.Epiphany.desktop
+application/zip=org.gnome.FileRoller.desktop
+audio/3gpp=io.elementary.music.desktop
+audio/ac3=io.elementary.music.desktop
+audio/AMR-WB=io.elementary.music.desktop
+audio/AMR=io.elementary.music.desktop
+audio/basic=io.elementary.music.desktop
+audio/flac=io.elementary.music.desktop
+audio/midi=io.elementary.music.desktop
+audio/mp4=io.elementary.music.desktop
+audio/mpeg=io.elementary.music.desktop
+audio/mpegurl=io.elementary.music.desktop
+audio/ogg=io.elementary.music.desktop
+audio/prs.sid=io.elementary.music.desktop
+audio/vnd.rn-realaudio=io.elementary.music.desktop
+audio/x-ape=io.elementary.music.desktop
+audio/x-flac=io.elementary.music.desktop
+audio/x-gsm=io.elementary.music.desktop
+audio/x-it=io.elementary.music.desktop
+audio/x-m4a=io.elementary.music.desktop
+audio/x-matroska=io.elementary.music.desktop
+audio/x-mod=io.elementary.music.desktop
+audio/x-mp3=io.elementary.music.desktop
+audio/x-mpeg=io.elementary.music.desktop
+audio/x-mpegurl=io.elementary.music.desktop
+audio/x-ms-asf=io.elementary.music.desktop
+audio/x-ms-asx=io.elementary.music.desktop
+audio/x-ms-wax=io.elementary.music.desktop
+audio/x-ms-wma=io.elementary.music.desktop
+audio/x-musepack=io.elementary.music.desktop
+audio/x-pn-aiff=io.elementary.music.desktop
+audio/x-pn-au=io.elementary.music.desktop
+audio/x-pn-realaudio-plugin=io.elementary.music.desktop
+audio/x-pn-realaudio=io.elementary.music.desktop
+audio/x-pn-wav=io.elementary.music.desktop
+audio/x-pn-windows-acm=io.elementary.music.desktop
+audio/x-real-audio=io.elementary.music.desktop
+audio/x-realaudio=io.elementary.music.desktop
+audio/x-sbc=io.elementary.music.desktop
+audio/x-scpls=io.elementary.music.desktop
+audio/x-speex=io.elementary.music.desktop
+audio/x-tta=io.elementary.music.desktop
+audio/x-vorbis+ogg=io.elementary.music.desktop
+audio/x-vorbis=io.elementary.music.desktop
+audio/x-wav=io.elementary.music.desktop
+audio/x-wavpack=io.elementary.music.desktop
+audio/x-xm=io.elementary.music.desktop
+image/bmp=io.elementary.photos-viewer.desktop
+image/gif=io.elementary.photos-viewer.desktop
+image/jpeg=io.elementary.photos-viewer.desktop
+image/jpg=io.elementary.photos-viewer.desktop
+image/pjpeg=io.elementary.photos-viewer.desktop
+image/png=io.elementary.photos-viewer.desktop
+image/tiff=io.elementary.photos-viewer.desktop
+image/vnd.djvu=org.gnome.Evince.desktop
+image/vnd.rn-realpix=io.elementary.videos.desktop
+image/webp=io.elementary.photos-viewer.desktop
+image/x-bmp=io.elementary.photos-viewer.desktop
+image/x-bzeps=org.gnome.Evince.desktop
+image/x-eps=org.gnome.Evince.desktop
+image/x-gzeps=org.gnome.Evince.desktop
+image/x-png=io.elementary.photos-viewer.desktop
+inode/directory=io.elementary.files.desktop
+misc/ultravox=io.elementary.videos.desktop
+multipart/x-zip=org.gnome.FileRoller.desktop
+text/calendar=io.elementary.calendar.desktop
+text/html=org.gnome.Epiphany.desktop
+text/mathml=io.elementary.code.desktop
+text/plain=io.elementary.code.desktop
+text/x-chdr=io.elementary.code.desktop
+text/x-csrc=io.elementary.code.desktop
+text/x-dtd=io.elementary.code.desktop
+text/x-java=io.elementary.code.desktop
+text/x-python=io.elementary.code.desktop
+text/x-sql=io.elementary.code.desktop
+text/xml=io.elementary.code.desktop
+video/3gpp=io.elementary.videos.desktop
+video/dv=io.elementary.videos.desktop
+video/fli=io.elementary.videos.desktop
+video/flv=io.elementary.videos.desktop
+video/mp2t=io.elementary.videos.desktop
+video/mp4=io.elementary.videos.desktop
+video/mp4v-es=io.elementary.videos.desktop
+video/mpeg=io.elementary.videos.desktop
+video/msvideo=io.elementary.videos.desktop
+video/ogg=io.elementary.videos.desktop
+video/quicktime=io.elementary.videos.desktop
+video/vivo=io.elementary.videos.desktop
+video/vnd.divx=io.elementary.videos.desktop
+video/vnd.rn-realvideo=io.elementary.videos.desktop
+video/vnd.vivo=io.elementary.videos.desktop
+video/webm=io.elementary.videos.desktop
+video/x-anim=io.elementary.videos.desktop
+video/x-avi=io.elementary.videos.desktop
+video/x-flc=io.elementary.videos.desktop
+video/x-fli=io.elementary.videos.desktop
+video/x-flic=io.elementary.videos.desktop
+video/x-flv=io.elementary.videos.desktop
+video/x-m4v=io.elementary.videos.desktop
+video/x-matroska=io.elementary.videos.desktop
+video/x-mpeg=io.elementary.videos.desktop
+video/x-ms-asf=io.elementary.videos.desktop
+video/x-ms-asx=io.elementary.videos.desktop
+video/x-ms-wm=io.elementary.videos.desktop
+video/x-ms-wmv=io.elementary.videos.desktop
+video/x-ms-wmx=io.elementary.videos.desktop
+video/x-ms-wvx=io.elementary.videos.desktop
+video/x-msvideo=io.elementary.videos.desktop
+video/x-nsv=io.elementary.videos.desktop
+video/x-ogm+ogg=io.elementary.videos.desktop
+video/x-theora+ogg=io.elementary.videos.desktop
+video/x-totem-stream=io.elementary.videos.desktop
+x-content/image-dcf=io.elementary.photos.desktop
+x-content/image-picturecd=io.elementary.photos.desktop
+x-content/video-dvd=io.elementary.videos.desktop
+x-content/video-svcd=io.elementary.videos.desktop
+x-content/video-vcd=io.elementary.videos.desktop
+x-scheme-handler/http=org.gnome.Epiphany.desktop
+x-scheme-handler/https=org.gnome.Epiphany.desktop
+x-scheme-handler/mailto=org.gnome.Evolution.desktop
+x-scheme-handler/trash=io.elementary.files.desktop
+
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 97acc2c791b..ba14621e8bd 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "gala";
- version = "unstable-2018-12-16";
+ version = "unstable-2019-02-09"; # Is tracking https://github.com/elementary/gala/commits/stable/juno
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
- rev = "7f1e392e03000df0bd47e7832bb3adab81f39ae5";
- sha256 = "1syqq0xfyg5nbnnmy0wp5d66k1bvq9qn27lvr37abxxqig9acpc8";
+ rev = "1a96644c6aac405927499dacb308dea13512e919";
+ sha256 = "1zi7xyzhsypf52zzfwf7dwcxgd0skxbsssv1vsxgmswszg23p7i3";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index e2faccedbb7..be5cd93eb0d 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-keyboard";
- version = "2.1.1";
+ version = "2.1.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0x0bdd9svw4sffx8pa0pqlh6mrj3fqp4mgrb4n7ys26k2w20ngnb";
+ sha256 = "0lrd474m6p8di73hqjilqnnl7qg72ky5narkgcvm4lk8dyi78mz0";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index 53754c31d87..08b0710977f 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-nightlight";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "17pa048asbkhzz5945hjp96dnghdl72nqp1zq0b999nawnfrb339";
+ sha256 = "0kw83ws91688xg96k9034dnz15szx2kva9smh1nb7xmdbpzn3qph";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
index b910f6a7180..8227ca6f57e 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-session";
- version = "2.2.2";
+ version = "2.2.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "15ghhiabk74m7fm5pzr2qmdwpc330jczvvkwbf5pf7qczfyipjln";
+ sha256 = "1y0blff02p3w23sv17yg7fq0yq0g2k8j7vjmk92k664fx72kjjzh";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
index 003e431bcf7..65a4b1abd2c 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-sound";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0hxbr5dp8d1czq8ffw339r41c7srqb72vr48hxph8g091d3mcgcl";
+ sha256 = "0lgjl969c7s31nszh6d4pr1vsxfdsizplsihvd8r02mm1mlxmsda";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index a5ca227bbc2..c34beab7600 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pantheon, wrapGAppsHook, pkgconfig, meson, ninja
+{ stdenv, fetchFromGitHub, pantheon, fetchpatch, wrapGAppsHook, pkgconfig, meson, ninja
, vala, gala, gtk3, libgee, granite, gettext, glib-networking, mutter, json-glib
, python3, gobject-introspection }:
@@ -40,7 +40,14 @@ stdenv.mkDerivation rec {
mutter
];
- patches = [ ./indicators.patch ];
+ patches = [
+ ./indicators.patch
+ # Fix wingpanel potentially overlapping windows: https://github.com/elementary/wingpanel/pull/198
+ (fetchpatch {
+ url = "https://github.com/elementary/wingpanel/commit/fc1b8ea3d6cfc5d6e4034af177eecd4542a59833.patch";
+ sha256 = "0w5z56di5lxwg9vb96f9y4r2q05znwpn814m2w12l3impf5xsdqs";
+ })
+ ];
postPatch = ''
chmod +x meson/post_install.py
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index 99ca20afe98..3829cf551f7 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -1,5 +1,6 @@
{ fetchurl, fetchgit, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst
, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit
+, geocode-glib, gtk3
, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss, pantheon, accountsservice }:
@@ -75,16 +76,16 @@ stdenv.mkDerivation rec {
wrapGAppsHook
];
- buildInputs = with gnome3; [
+ buildInputs = [
accountsservice
alsaLib
colord
geoclue2
geocode-glib
glib
- gnome-desktop
- gsettings-desktop-schemas
- gtk
+ gnome3.gnome-desktop
+ gnome3.gsettings-desktop-schemas
+ gtk3
ibus
lcms2
libXtst
diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
index fc77e163e8f..ae1ee50a121 100644
--- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
+++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
@@ -1,7 +1,7 @@
{
mkDerivation,
extra-cmake-modules, gettext, kdoctools, python,
- kcoreaddons, knotifications, kwayland, kwidgetsaddons,
+ kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem,
cups, pcre, pipewire
}:
@@ -10,6 +10,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
buildInputs = [
cups pcre pipewire
- kcoreaddons knotifications kwayland kwidgetsaddons
+ kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
];
}
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index abf03d4277b..e5182a12d43 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -3,7 +3,7 @@
lib.makeScope pkgs.newScope (self: with self; {
#### NixOS support
- inherit (pkgs.gnome2) libglade libwnck vte gtksourceview;
+ inherit (pkgs.gnome2) libglade vte gtksourceview;
inherit (pkgs.gnome3) dconf;
inherit (pkgs.perlPackages) URI;
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
index 541b30ec1b3..80153332934 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Mailwatch plugin for Xfce panel";
platforms = platforms.linux;
- maintainers = [ ];
+ maintainers = [ maintainers.matthiasbeyer ];
};
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
index 5331c29a454..8a602b8b4a1 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "MPD plugin for Xfce panel";
platforms = platforms.linux;
- maintainers = [ ];
+ maintainers = [ maintainers.matthiasbeyer ];
};
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
index 57cd48c6f27..73ab7782ebd 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
description = "A simple XFCE panel plugin that lets the user run an alarm at a specified time or at the end of a specified countdown period";
platforms = platforms.linux;
license = licenses.gpl2;
- maintainers = [ ];
+ maintainers = [ maintainers.matthiasbeyer ];
};
}
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix
index 269df6a07cd..2df5d16dbac 100644
--- a/pkgs/development/arduino/arduino-core/default.nix
+++ b/pkgs/development/arduino/arduino-core/default.nix
@@ -2,8 +2,8 @@
, libusb, libusb1, unzip, zlib, ncurses, readline
, withGui ? false, gtk2 ? null, withTeensyduino ? false
/* Packages needed for Teensyduino */
-, upx, fontconfig, xorg, gcc, xdotool, xvfb_run
-, atk, glib, pango, gdk_pixbuf, libpng12, expat, freetype
+, upx, fontconfig, xorg, gcc
+, atk, glib, pango, gdk_pixbuf, libpng12, expat, freetype,
}:
assert withGui -> gtk2 != null;
@@ -68,19 +68,32 @@ stdenv.mkDerivation rec {
sha256 = "0ww72qfk7fyvprz15lc80i1axfdacb5fij4h5j5pakrg76mng2c3";
};
+ teensyduino_version = "145";
teensyduino_src = fetchurl {
- url = "https://www.pjrc.com/teensy/td_140/TeensyduinoInstall.${teensy_architecture}";
+ url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}";
sha256 =
lib.optionalString ("${teensy_architecture}" == "linux64")
- "0127a1ak31252dbmr5niqa5mkvbm8dnz1cfcnmydzx9qn9rk00ir"
+ "0n8812znwdyvy7d1321p4r6j5pixg1sr31z5pfr7i0ikw0jxfrxb"
+ lib.optionalString ("${teensy_architecture}" == "linux32")
- "01mxj5xsr7gka652c9rp4szy5mkcka8mljk044v4agk3sxvx3v3i"
+ "1p74rb8g4v6kd09a0af1yra8xjzy3iyv5w5b6h6ljfhb022v3l57"
+ lib.optionalString ("${teensy_architecture}" == "linuxarm")
- "1dff3alhvk9x8qzy3n85qrg6rfmy6l9pj6fmrlzpli63lzykvv4i";
+ "0jd9dvr8zx9hlyn6j979d66qdvzgv3dmx5x9yviqvrn1f3w4hfbf";
+ };
+ # Used because teensyduino requires jars be a specific size
+ arduino_dist_src = fetchurl {
+ url = "http://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz";
+ sha256 =
+ lib.optionalString ("${teensy_architecture}" == "linux64")
+ "1f8s3by5lc6fazyaa9zc9kz3ar8zj8jabab1fy5jzh49fbd8bydx"
+ + lib.optionalString ("${teensy_architecture}" == "linux32")
+ "1r9ral9aq5vp02dwgagifk5h403l7knxdyi1w23rqpcbbpa423lw"
+ + lib.optionalString ("${teensy_architecture}" == "linuxarm")
+ "0sz18wns00kysmb2zv7a67dy9wpxiawq3ykfr07wjyg8h1fy3p6h";
};
+
buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline
- ] ++ stdenv.lib.optionals withTeensyduino [ upx xvfb_run xdotool ];
+ ] ++ stdenv.lib.optionals withTeensyduino [ upx ];
downloadSrcList = builtins.attrValues externalDownloads;
downloadDstList = builtins.attrNames externalDownloads;
@@ -116,8 +129,8 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/share/arduino
- cp -r ./build/linux/work/* "$out/share/arduino/" #*/
- echo ${version} > $out/share/arduino/lib/version.txt
+ cp -r ./build/linux/work/* "$out/share/arduino/"
+ echo -n ${version} > $out/share/arduino/lib/version.txt
${stdenv.lib.optionalString withGui ''
mkdir -p $out/bin
@@ -135,6 +148,18 @@ stdenv.mkDerivation rec {
''}
${stdenv.lib.optionalString withTeensyduino ''
+ # Back up the original jars
+ mv $out/share/arduino/lib/arduino-core.jar $out/share/arduino/lib/arduino-core.jar.bak
+ mv $out/share/arduino/lib/pde.jar $out/share/arduino/lib/pde.jar.bak
+ # Extract jars from the arduino distributable package
+ mkdir arduino_dist
+ cd arduino_dist
+ tar xfJ ${arduino_dist_src} arduino-${version}/lib/arduino-core.jar arduino-${version}/lib/pde.jar
+ cd ..
+ # Replace the built jars with the official arduino jars
+ mv arduino_dist/arduino-${version}/lib/{arduino-core,pde}.jar $out/share/arduino/lib/
+ # Delete the directory now that the jars are copied out
+ rm -r arduino_dist
# Extract and patch the Teensyduino installer
cp ${teensyduino_src} ./TeensyduinoInstall.${teensy_architecture}
chmod +w ./TeensyduinoInstall.${teensy_architecture}
@@ -143,39 +168,12 @@ stdenv.mkDerivation rec {
--set-rpath "${teensy_libpath}" \
./TeensyduinoInstall.${teensy_architecture}
chmod +x ./TeensyduinoInstall.${teensy_architecture}
-
- # Run the GUI-only installer in a virtual X server
- # Script thanks to AUR package. See:
- #
- echo "Running Teensyduino installer..."
- # Trick the GUI into using HOME as the install directory.
- export HOME=$out/share/arduino
- # Run the installer in a virtual X server in memory.
- xvfb-run -n 99 ./TeensyduinoInstall.${teensy_architecture} &
- sleep 4
- echo "Waiting for Teensyduino to install (about 1 minute)..."
- # Control the installer GUI with xdotool.
- DISPLAY=:99 xdotool search --class "teensyduino" \
- windowfocus \
- key space sleep 1 \
- key Tab sleep 0.4 \
- key Tab sleep 0.4 \
- key Tab sleep 0.4 \
- key Tab sleep 0.4 \
- key space sleep 1 \
- key Tab sleep 0.4 \
- key Tab sleep 0.4 \
- key Tab sleep 0.4 \
- key Tab sleep 0.4 \
- key space sleep 1 \
- key Tab sleep 0.4 \
- key space sleep 35 \
- key space sleep 2 &
- # Wait for xdotool to terminate and swallow the inevitable XIO error
- wait $! || true
-
+ ./TeensyduinoInstall.${teensy_architecture} --dir=$out/share/arduino
# Check for successful installation
[ -d $out/share/arduino/hardware/teensy ] || exit 1
+ # After the install, copy the built jars back
+ mv $out/share/arduino/lib/arduino-core.jar.bak $out/share/arduino/lib/arduino-core.jar
+ mv $out/share/arduino/lib/pde.jar.bak $out/share/arduino/lib/pde.jar
''}
'';
diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix
index 9e160acf2d4..abe3c9e5122 100644
--- a/pkgs/development/beam-modules/build-mix.nix
+++ b/pkgs/development/beam-modules/build-mix.nix
@@ -61,8 +61,9 @@ let
export HEX_OFFLINE=1
export HEX_HOME=`pwd`
export MIX_ENV=prod
+ export MIX_NO_DEPS=1
- MIX_ENV=prod mix compile ${debugInfoFlag} --no-deps-check
+ mix compile ${debugInfoFlag}
runHook postBuild
''
diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
index 345bd125025..09422a7a862 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "2018.09.08";
src = fetchFromGitHub {
- owner = "cseed";
+ owner = "yosyshq";
repo = "arachne-pnr";
rev = "840bdfdeb38809f9f6af4d89dd7b22959b176fdd";
sha256 = "1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl";
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index ae6af8dd4b4..646963eedbc 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4 }:
+{ stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }:
let
options = rec {
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
cp -r . "$out/share/ccl-installation"
mkdir -p "$out/bin"
- echo -e '#!${stdenv.shell}\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}"
+ echo -e '#!${runtimeShell}\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}"
chmod a+x "$out"/bin/"${CCL_RUNTIME}"
ln -s "$out"/bin/"${CCL_RUNTIME}" "$out"/bin/ccl
'';
diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix
index 3d9fe3a59cf..960a54489da 100644
--- a/pkgs/development/compilers/cmdstan/default.nix
+++ b/pkgs/development/compilers/cmdstan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchurl, python, runtimeShell }:
stdenv.mkDerivation rec {
name = "cmdstan-2.17.1";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
ln -s $out/opt/cmdstan/bin/stanc $out/bin/stanc
ln -s $out/opt/cmdstan/bin/stansummary $out/bin/stansummary
cat > $out/bin/stan < TZDatabaseDirFile
- echo ${curl.out}/lib/libcurl.so > LibcurlPathFile
- make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)"
- cd ..
- '';
-
- # Disable tests on Darwin for now because of
- # https://github.com/NixOS/nixpkgs/issues/41099
- doCheck = true;
-
- checkPhase = ''
- cd dmd
- make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHARED=0 SHELL=$SHELL
- cd ../druntime
- make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release
- cd ..
- '';
-
- dontStrip = true;
-
- installPhase = ''
- cd dmd
- mkdir $out
- mkdir $out/bin
- cp ${pathToDmd} $out/bin
-
- mkdir -p $out/share/man/man1
- mkdir -p $out/share/man/man5
- cp -r docs/man/man1/* $out/share/man/man1/
- cp -r docs/man/man5/* $out/share/man/man5/
-
- cd ../druntime
- mkdir $out/include
- mkdir $out/include/d2
- cp -r import/* $out/include/d2
-
- cd ../phobos
- mkdir $out/lib
- cp generated/${osname}/release/${bits}/libphobos2.* $out/lib
-
- cp -r std $out/include/d2
- cp -r etc $out/include/d2
-
- wrapProgram $out/bin/dmd \
- --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
- --set-default CC "${targetPackages.stdenv.cc}/bin/cc"
-
- cd $out/bin
- tee dmd.conf << EOF
- [Environment]
- DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"} -fPIC
- EOF
- '';
-
- meta = with stdenv.lib; {
- description = "Official reference compiler for the D language";
- homepage = http://dlang.org/;
- # Everything is now Boost licensed, even the backend.
- # https://github.com/dlang/dmd/pull/6680
- license = licenses.boost;
- maintainers = with maintainers; [ ThomasMader ];
- platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
- };
+ dmdConfFile = writeTextFile {
+ name = "dmd.conf";
+ text = (lib.generators.toINI {} {
+ "Environment" = {
+ DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
+ };
+ });
};
- # Need to test Phobos in a fixed-output derivation, otherwise the
- # network stuff in Phobos would fail if sandbox mode is enabled.
- #
- # Disable tests on Darwin for now because of
- # https://github.com/NixOS/nixpkgs/issues/41099
- phobosUnittests = if !stdenv.hostPlatform.isDarwin then
- stdenv.mkDerivation rec {
- name = "phobosUnittests-${version}";
- version = dmdBuild.version;
-
- enableParallelBuilding = dmdBuild.enableParallelBuilding;
- preferLocalBuild = true;
- inputString = dmdBuild.outPath;
- outputHashAlgo = "sha256";
- outputHash = builtins.hashString "sha256" inputString;
-
- srcs = dmdBuild.srcs;
-
- sourceRoot = ".";
-
- nativeBuildInputs = dmdBuild.nativeBuildInputs;
- buildInputs = dmdBuild.buildInputs;
-
- buildPhase = ''
- cd phobos
- echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile
- echo ${curl.out}/lib/libcurl.so > LibcurlPathFile
- make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${dmdBuild}/bin/dmd DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)"
- '';
-
- installPhase = ''
- echo -n $inputString > $out
- '';
- }
- else
- "";
-
in
stdenv.mkDerivation rec {
- inherit phobosUnittests;
name = "dmd-${version}";
- phases = "installPhase";
- buildInputs = dmdBuild.buildInputs;
+ inherit version;
+
+ enableParallelBuilding = true;
+
+ srcs = [
+ (fetchFromGitHub {
+ owner = "dlang";
+ repo = "dmd";
+ rev = "v${version}";
+ sha256 = dmdSha256;
+ name = "dmd";
+ })
+ (fetchFromGitHub {
+ owner = "dlang";
+ repo = "druntime";
+ rev = "v${version}";
+ sha256 = druntimeSha256;
+ name = "druntime";
+ })
+ (fetchFromGitHub {
+ owner = "dlang";
+ repo = "phobos";
+ rev = "v${version}";
+ sha256 = phobosSha256;
+ name = "phobos";
+ })
+ ];
+
+ patches = [
+ (fetchpatch {
+ name = "fix-loader-import.patch";
+ url = "https://github.com/dlang/dmd/commit/e7790436c4af1910b8c079dac9bb69627d7dea4b.patch";
+ sha256 = "0w69hajx8agywc7m2hph5m27g2yclz8ml0gjjyjk9k6ii3jv45kx";
+ })
+ ];
+
+ patchFlags = [ "--directory=dmd" "-p1" ];
+
+ sourceRoot = ".";
+
+ # https://issues.dlang.org/show_bug.cgi?id=19553
+ hardeningDisable = [ "fortify" ];
+
+ postUnpack = ''
+ patchShebangs .
+ '';
+
+ postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
+ substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
+ ''
+
+ + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+ substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)"
+ '';
+
+ nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ]
+
+ ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
+ Foundation
+ ]);
+
+ buildInputs = [ curl tzdata ];
+
+ bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
+ osname = if stdenv.hostPlatform.isDarwin then
+ "osx"
+ else
+ stdenv.hostPlatform.parsed.kernel.name;
+ top = "$(echo $NIX_BUILD_TOP)";
+ pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd";
+
+ # Buid and install are based on http://wiki.dlang.org/Building_DMD
+ buildPhase = ''
+ cd dmd
+ make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2
+ cd ../druntime
+ make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd}
+ cd ../phobos
+ echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile
+ echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > LibcurlPathFile
+ make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)"
+ cd ..
+ '';
+
+ doCheck = true;
+
+ checkPhase = ''
+ cd dmd
+ # https://github.com/NixOS/nixpkgs/pull/55998#issuecomment-465871846
+ #make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL
+ cd ../druntime
+ make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release
+ cd ../phobos
+ make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)"
+ cd ..
+ '';
+
+ dontStrip = true;
installPhase = ''
- mkdir $out
- cp -r --symbolic-link ${dmdBuild}/* $out/
+ cd dmd
+ mkdir $out
+ mkdir $out/bin
+ cp ${pathToDmd} $out/bin
+
+ mkdir -p $out/share/man/man1
+ mkdir -p $out/share/man/man5
+ cp -r docs/man/man1/* $out/share/man/man1/
+ cp -r docs/man/man5/* $out/share/man/man5/
+
+ cd ../druntime
+ mkdir $out/include
+ mkdir $out/include/dmd
+ cp -r import/* $out/include/dmd
+
+ cd ../phobos
+ mkdir $out/lib
+ cp generated/${osname}/release/${bits}/libphobos2.* $out/lib
+
+ cp -r std $out/include/dmd
+ cp -r etc $out/include/dmd
+
+ wrapProgram $out/bin/dmd \
+ --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
+ --set-default CC "${targetPackages.stdenv.cc}/bin/cc"
+
+ substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out
'';
- meta = dmdBuild.meta;
+
+ meta = with stdenv.lib; {
+ description = "Official reference compiler for the D language";
+ homepage = http://dlang.org/;
+ # Everything is now Boost licensed, even the backend.
+ # https://github.com/dlang/dmd/pull/6680
+ license = licenses.boost;
+ maintainers = with maintainers; [ ThomasMader ];
+ platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+ };
}
diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix
index 0c4a48656b7..cedaf3ef859 100644
--- a/pkgs/development/compilers/fasm/bin.nix
+++ b/pkgs/development/compilers/fasm/bin.nix
@@ -3,11 +3,11 @@
stdenvNoCC.mkDerivation rec {
name = "fasm-bin-${version}";
- version = "1.73.08";
+ version = "1.73.09";
src = fetchurl {
url = "https://flatassembler.net/fasm-${version}.tgz";
- sha256 = "1l4my3fran06h5jiygswx4fsj53dvpfgg9ksfbdzsdg20r672997";
+ sha256 = "197bcj9aa5wpkvrlaafc1smxjss0fwdspq5fwhwgyy9cc7z5g0ym";
};
installPhase = ''
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 66b98cc6d64..ce3395f0be0 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -37,7 +37,7 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;
-let version = "8.2.0";
+let version = "8.3.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -132,7 +132,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
- sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r";
+ sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4";
};
inherit patches;
diff --git a/pkgs/development/compilers/ghc/8.6.2.nix b/pkgs/development/compilers/ghc/8.6.2.nix
deleted file mode 100644
index 07d4420804d..00000000000
--- a/pkgs/development/compilers/ghc/8.6.2.nix
+++ /dev/null
@@ -1,230 +0,0 @@
-{ stdenv, targetPackages
-
-# build-tools
-, bootPkgs
-, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
-
-, libiconv ? null, ncurses
-
-, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
-, # LLVM is conceptually a run-time-only depedendency, but for
- # non-x86, we need LLVM to bootstrap later stages, so it becomes a
- # build-time dependency too.
- buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
- # library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
-
-, # If enabled, use -fPIC when compiling static libs.
- enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
-
-, # Whether to build dynamic libs for the standard library (on the target
- # platform). Static libs are always built.
- enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
-
-, # Whetherto build terminfo.
- enableTerminfo ? !stdenv.targetPlatform.isWindows
-
-, # What flavour to build. An empty string indicates no
- # specific flavour and falls back to ghc default values.
- ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
-}:
-
-assert !enableIntegerSimple -> gmp != null;
-
-let
- inherit (stdenv) buildPlatform hostPlatform targetPlatform;
-
- inherit (bootPkgs) ghc;
-
- # TODO(@Ericson2314) Make unconditional
- targetPrefix = stdenv.lib.optionalString
- (targetPlatform != hostPlatform)
- "${targetPlatform.config}-";
-
- buildMK = ''
- BuildFlavour = ${ghcFlavour}
- ifneq \"\$(BuildFlavour)\" \"\"
- include mk/flavours/\$(BuildFlavour).mk
- endif
- DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
- INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
- '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
- Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
- CrossCompilePrefix = ${targetPrefix}
- HADDOCK_DOCS = NO
- BUILD_SPHINX_HTML = NO
- BUILD_SPHINX_PDF = NO
- '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
- GhcLibHcOpts += -fPIC
- GhcRtsHcOpts += -fPIC
- '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
- EXTRA_CC_OPTS += -std=gnu99
- '';
-
- # Splicer will pull out correct variations
- libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
- ++ stdenv.lib.optional (!enableIntegerSimple) gmp
- ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
-
- toolsForTarget =
- if hostPlatform == buildPlatform then
- [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm
- else assert targetPlatform == hostPlatform; # build != host == target
- [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
-
- targetCC = builtins.head toolsForTarget;
-
-in
-stdenv.mkDerivation (rec {
- version = "8.6.2";
- name = "${targetPrefix}ghc-${version}";
-
- src = fetchurl {
- url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "1mbn3n2ynmpfpb7jfnhpzzli31qqxqyi8ws71blws3i846fq3ana";
- };
-
- enableParallelBuilding = true;
-
- outputs = [ "out" "doc" ];
-
- patches = [(fetchpatch rec { # https://phabricator.haskell.org/D5123
- url = "http://tarballs.nixos.org/sha256/${sha256}";
- name = "D5123.diff";
- sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
- })];
-
- postPatch = "patchShebangs .";
-
- # GHC is a bit confused on its cross terminology.
- preConfigure = ''
- for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
- export "''${env#TARGET_}=''${!env}"
- done
- # GHC is a bit confused on its cross terminology, as these would normally be
- # the *host* tools.
- export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
- export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
- # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
- export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
- export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
- export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
- export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
- export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
- export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
- echo -n "${buildMK}" > mk/build.mk
- sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
- '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
- export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
- export NIX_LDFLAGS+=" -no_dtrace_dof"
- '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
- sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
- '' + stdenv.lib.optionalString targetPlatform.isMusl ''
- echo "patching llvm-targets for musl targets..."
- echo "Cloning these existing '*-linux-gnu*' targets:"
- grep linux-gnu llvm-targets | sed 's/^/ /'
- echo "(go go gadget sed)"
- sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
- echo "llvm-targets now contains these '*-linux-musl*' targets:"
- grep linux-musl llvm-targets | sed 's/^/ /'
-
- echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
- # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
- for x in configure aclocal.m4; do
- substituteInPlace $x \
- --replace '*-android*|*-gnueabi*)' \
- '*-android*|*-gnueabi*|*-musleabi*)'
- done
- '';
-
- # TODO(@Ericson2314): Always pass "--target" and always prefix.
- configurePlatforms = [ "build" "host" ]
- ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- # `--with` flags for libraries needed for RTS linker
- configureFlags = [
- "--datadir=$doc/share/doc/ghc"
- "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
- ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
- "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
- ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
- "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
- ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
- "--enable-bootstrap-with-devel-snapshot"
- ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
- "CFLAGS=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
- "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
- ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
- # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
- "--disable-large-address-space"
- ];
-
- # Make sure we never relax`$PATH` and hooks support for compatability.
- strictDeps = true;
-
- # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
- dontAddExtraLibs = true;
-
- nativeBuildInputs = [
- perl autoconf automake m4 python3 sphinx
- ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
- ];
-
- # For building runtime libs
- depsBuildTarget = toolsForTarget;
-
- buildInputs = [ perl ] ++ (libDeps hostPlatform);
-
- propagatedBuildInputs = [ targetPackages.stdenv.cc ]
- ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
-
- depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
- depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
-
- # required, because otherwise all symbols from HSffi.o are stripped, and
- # that in turn causes GHCi to abort
- stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
- checkTarget = "test";
-
- hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
-
- postInstall = ''
- # Install the bash completion file.
- install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
- # Patch scripts to include "readelf" and "cat" in $PATH.
- for i in "$out/bin/"*; do
- test ! -h $i || continue
- egrep --quiet '^#!' <(head -n 1 $i) || continue
- sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
- done
- '';
-
- passthru = {
- inherit bootPkgs targetPrefix;
-
- inherit llvmPackages;
- inherit enableShared;
-
- # Our Cabal compiler name
- haskellCompilerName = "ghc-8.6.2";
- };
-
- meta = {
- homepage = http://haskell.org/ghc;
- description = "The Glasgow Haskell Compiler";
- maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
- inherit (ghc.meta) license platforms;
- };
-
-} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
- dontStrip = true;
- dontPatchELF = true;
- noAuditTmpdir = true;
-})
diff --git a/pkgs/development/compilers/ghc/8.6.3.nix b/pkgs/development/compilers/ghc/8.6.3.nix
index c57e4d96ae2..a2378b59568 100644
--- a/pkgs/development/compilers/ghc/8.6.3.nix
+++ b/pkgs/development/compilers/ghc/8.6.3.nix
@@ -153,7 +153,7 @@ stdenv.mkDerivation (rec {
configureFlags = [
"--datadir=$doc/share/doc/ghc"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
- ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${libffi}/include" "--with-ffi-libraries=${libffi}/lib"
+ ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${libffi.dev}/include" "--with-ffi-libraries=${libffi.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
"--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
@@ -172,6 +172,9 @@ stdenv.mkDerivation (rec {
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;
+ # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
+ dontAddExtraLibs = true;
+
nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.4.nix
similarity index 95%
rename from pkgs/development/compilers/ghc/8.6.1.nix
rename to pkgs/development/compilers/ghc/8.6.4.nix
index b54164ccc69..140cea22442 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.4.nix
@@ -6,6 +6,9 @@
, libiconv ? null, ncurses
+, # GHC can be built with system libffi or a bundled one.
+ libffi ? null
+
, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
@@ -65,6 +68,7 @@ let
# Splicer will pull out correct variations
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
+ ++ [libffi]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
@@ -78,12 +82,12 @@ let
in
stdenv.mkDerivation (rec {
- version = "8.6.1";
+ version = "8.6.4";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c";
+ sha256 = "0fihs1sr0hpk67dn9cmrsav13kkcp9hz8ggdqcrs80rj8vj0fpav";
};
enableParallelBuilding = true;
@@ -149,6 +153,7 @@ stdenv.mkDerivation (rec {
configureFlags = [
"--datadir=$doc/share/doc/ghc"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+ ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${libffi.dev}/include" "--with-ffi-libraries=${libffi.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
"--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
@@ -168,7 +173,7 @@ stdenv.mkDerivation (rec {
strictDeps = true;
# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
- dontAddExtraLibs = true;
+ dontAddExtraLibs = true;
nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
@@ -213,7 +218,7 @@ stdenv.mkDerivation (rec {
inherit enableShared;
# Our Cabal compiler name
- haskellCompilerName = "ghc-8.6.1";
+ haskellCompilerName = "ghc-8.6.4";
};
meta = {
diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 14a21078389..06187987b6c 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -105,4 +105,6 @@ in stdenv.mkDerivation {
meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
meta.maintainers = [lib.maintainers.elvishjerricco];
+ meta.broken = true;
+ meta.hydraPlatforms = [];
}
diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index 1c9bc0a3009..db3731c2fca 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
-, mailcap
+, mailcap, runtimeShell
, buildPackages, targetPackages }:
let
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
# This source produces shell script at run time,
# and thus it is not corrected by patchShebangs.
substituteInPlace misc/cgo/testcarchive/carchive_test.go \
- --replace '#!/usr/bin/env bash' '#!${stdenv.shell}'
+ --replace '#!/usr/bin/env bash' '#!${runtimeShell}'
# Patch the mimetype database location which is missing on NixOS.
substituteInPlace src/mime/type_unix.go \
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
'' + optionalString stdenv.isLinux ''
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
'' + optionalString stdenv.isAarch32 ''
- echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash
+ echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash
'' + optionalString stdenv.isDarwin ''
substituteInPlace src/race.bash --replace \
"sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix
new file mode 100644
index 00000000000..d7bbd4eaf0f
--- /dev/null
+++ b/pkgs/development/compilers/go/1.12.nix
@@ -0,0 +1,244 @@
+{ stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
+, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
+, mailcap, runtimeShell
+, buildPackages, targetPackages }:
+
+let
+
+ inherit (stdenv.lib) optionals optionalString;
+
+ goBootstrap = runCommand "go-bootstrap" {} ''
+ mkdir $out
+ cp -rf ${buildPackages.go_bootstrap}/* $out/
+ chmod -R u+w $out
+ find $out -name "*.c" -delete
+ cp -rf $out/bin/* $out/share/go/bin/
+ '';
+
+ goarch = platform: {
+ "i686" = "386";
+ "x86_64" = "amd64";
+ "aarch64" = "arm64";
+ "arm" = "arm";
+ "armv5tel" = "arm";
+ "armv6l" = "arm";
+ "armv7l" = "arm";
+ }.${platform.parsed.cpu.name} or (throw "Unsupported system");
+
+in
+
+stdenv.mkDerivation rec {
+ name = "go-${version}";
+ version = "1.12";
+
+ src = fetchurl {
+ url = "https://dl.google.com/go/go${version}.src.tar.gz";
+ sha256 = "1wl8kq21fbzmv4plnaza5acz8dhbaaq6smjzk3r6cf3l6qrkvi09";
+ };
+
+ # perl is used for testing go vet
+ nativeBuildInputs = [ perl which pkgconfig patch procps ];
+ buildInputs = [ cacert pcre ]
+ ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
+ ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
+
+
+ propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
+
+ hardeningDisable = [ "all" ];
+
+ prePatch = ''
+ patchShebangs ./ # replace /bin/bash
+
+ # This source produces shell script at run time,
+ # and thus it is not corrected by patchShebangs.
+ substituteInPlace misc/cgo/testcarchive/carchive_test.go \
+ --replace '#!/usr/bin/env bash' '#!${runtimeShell}'
+
+ # Patch the mimetype database location which is missing on NixOS.
+ substituteInPlace src/mime/type_unix.go \
+ --replace '/etc/mime.types' '${mailcap}/etc/mime.types'
+
+ # Disabling the 'os/http/net' tests (they want files not available in
+ # chroot builds)
+ rm src/net/{listen,parse}_test.go
+ rm src/syscall/exec_linux_test.go
+
+ # !!! substituteInPlace does not seems to be effective.
+ # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
+ sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
+ sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
+ # Disable the unix socket test
+ sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
+ # Disable the hostname test
+ sed -i '/TestHostname/areturn' src/os/os_test.go
+ # ParseInLocation fails the test
+ sed -i '/TestParseInSydney/areturn' src/time/format_test.go
+ # Remove the api check as it never worked
+ sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
+ # Remove the coverage test as we have removed this utility
+ sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
+ # Remove the timezone naming test
+ sed -i '/TestLoadFixed/areturn' src/time/time_test.go
+ # Remove disable setgid test
+ sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go
+ # Remove cert tests that conflict with NixOS's cert resolution
+ sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
+ # TestWritevError hangs sometimes
+ sed -i '/TestWritevError/areturn' src/net/writev_test.go
+ # TestVariousDeadlines fails sometimes
+ sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go
+
+ sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
+ sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
+
+ # Disable cgo lookup tests not works, they depend on resolver
+ rm src/net/cgo_unix_test.go
+
+ '' + optionalString stdenv.isLinux ''
+ sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
+ '' + optionalString stdenv.isAarch32 ''
+ echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash
+ '' + optionalString stdenv.isDarwin ''
+ substituteInPlace src/race.bash --replace \
+ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
+ sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
+ sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
+ sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
+
+ sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
+ sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go
+ sed -i '/TestRead0/areturn' src/os/os_test.go
+ sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
+
+ sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
+ sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go
+
+ sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
+
+ sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
+
+ # TestCurrent fails because Current is not implemented on Darwin
+ sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go
+ sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go
+
+ touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
+ '';
+
+ patches = [
+ ./remove-tools-1.11.patch
+ ./remove-test-pie.patch
+ ./creds-test.patch
+ ./go-1.9-skip-flaky-19608.patch
+ ./go-1.9-skip-flaky-20072.patch
+ ./skip-external-network-tests.patch
+ ./skip-nohup-tests.patch
+ # breaks under load: https://github.com/golang/go/issues/25628
+ ./skip-test-extra-files-on-386.patch
+ ];
+
+ postPatch = ''
+ find . -name '*.orig' -exec rm {} ';'
+ '' + optionalString stdenv.isDarwin ''
+ echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"
+ substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil
+ '';
+
+ GOOS = stdenv.targetPlatform.parsed.kernel.name;
+ GOARCH = goarch stdenv.targetPlatform;
+ # GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
+ # Go will nevertheless build a for host system that we will copy over in
+ # the install phase.
+ GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
+ GOHOSTARCH = goarch stdenv.buildPlatform;
+
+ # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
+ # to be different from CC/CXX
+ CC_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then
+ "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc"
+ else if (stdenv.buildPlatform != stdenv.targetPlatform) then
+ "${stdenv.cc.targetPrefix}cc"
+ else
+ null;
+ CXX_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then
+ "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++"
+ else if (stdenv.buildPlatform != stdenv.targetPlatform) then
+ "${stdenv.cc.targetPrefix}c++"
+ else
+ null;
+
+ GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
+ GO386 = 387; # from Arch: don't assume sse2 on i686
+ CGO_ENABLED = 1;
+ # Hopefully avoids test timeouts on Hydra
+ GO_TEST_TIMEOUT_SCALE = 3;
+
+ # Indicate that we are running on build infrastructure
+ # Some tests assume things like home directories and users exists
+ GO_BUILDER_NAME = "nix";
+
+ GOROOT_BOOTSTRAP="${goBootstrap}/share/go";
+
+ postConfigure = ''
+ export GOCACHE=$TMPDIR/go-cache
+ # this is compiled into the binary
+ export GOROOT_FINAL=$out/share/go
+
+ export PATH=$(pwd)/bin:$PATH
+
+ # Independent from host/target, CC should produce code for the building system.
+ export CC=${buildPackages.stdenv.cc}/bin/cc
+ ulimit -a
+ '';
+
+ postBuild = ''
+ (cd src && ./make.bash)
+ '';
+
+ doCheck = stdenv.hostPlatform == stdenv.targetPlatform;
+
+ checkPhase = ''
+ runHook preCheck
+ (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild)
+ runHook postCheck
+ '';
+
+ preInstall = ''
+ rm -r pkg/{bootstrap,obj}
+ # Contains the wrong perl shebang when cross compiling,
+ # since it is not used for anything we can deleted as well.
+ rm src/regexp/syntax/make_perl_groups.pl
+ '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
+ mv bin/*_*/* bin
+ rmdir bin/*_*
+ ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
+ rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
+ ''}
+ '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then ''
+ rm -rf bin/*_*
+ ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
+ rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
+ ''}
+ '' else "");
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $GOROOT_FINAL
+ cp -a bin pkg src lib misc api doc $GOROOT_FINAL
+ ln -s $GOROOT_FINAL/bin $out/bin
+ runHook postInstall
+ '';
+
+ setupHook = ./setup-hook.sh;
+
+ disallowedReferences = [ goBootstrap ];
+
+ meta = with stdenv.lib; {
+ branch = "1.12";
+ homepage = http://golang.org/;
+ description = "The Go Programming language";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ cstrahan orivej velovix mic92 ];
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/development/compilers/julia/0002-use-system-suitesparse.patch b/pkgs/development/compilers/julia/0002-use-system-suitesparse.patch
deleted file mode 100644
index 17f49ad5ca9..00000000000
--- a/pkgs/development/compilers/julia/0002-use-system-suitesparse.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e2b0ed6664fe4adfd0f9ce8fa14732d47b30ab5c Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Sat, 10 Oct 2015 16:18:53 -0500
-Subject: [PATCH 2/3] use system suitesparse
-
----
- base/sparse/cholmod.jl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/base/sparse/cholmod.jl b/base/sparse/cholmod.jl
-index ec7e980..f834cc1 100644
---- a/base/sparse/cholmod.jl
-+++ b/base/sparse/cholmod.jl
-@@ -151,7 +151,7 @@ function __init__()
-
- # Register gc tracked allocator if CHOLMOD is new enough
- if current_version >= v"3.0.0"
-- cnfg = cglobal((:SuiteSparse_config, :libsuitesparseconfig), Ptr{Void})
-+ cnfg = cglobal((:SuiteSparse_config, :libsuitesparse), Ptr{Void})
- unsafe_store!(cnfg, cglobal(:jl_malloc, Ptr{Void}), 1)
- unsafe_store!(cnfg, cglobal(:jl_calloc, Ptr{Void}), 2)
- unsafe_store!(cnfg, cglobal(:jl_realloc, Ptr{Void}), 3)
---
-2.5.2
-
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
deleted file mode 100644
index 4c0b1359bd8..00000000000
--- a/pkgs/development/compilers/julia/default.nix
+++ /dev/null
@@ -1,201 +0,0 @@
-{ stdenv, fetchurl, fetchzip
-# build tools
-, gfortran, m4, makeWrapper, patchelf, perl, which, python2
-# libjulia dependencies
-, libunwind, readline, utf8proc, zlib
-, llvm
-# standard library dependencies
-, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
-# linear algebra
-, openblas, arpack, suitesparse
-# Darwin frameworks
-, CoreServices, ApplicationServices
-}:
-
-with stdenv.lib;
-
-# All dependencies must use the same OpenBLAS.
-let
- arpack_ = arpack;
- suitesparse_ = suitesparse;
-in
-let
- arpack = arpack_.override { inherit openblas; };
- suitesparse = suitesparse_.override { inherit openblas; };
-in
-
-let
- dsfmtVersion = "2.2.3";
- dsfmt = fetchurl {
- url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz";
- sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
- };
-
- libuvVersion = "d8ab1c6a33e77bf155facb54215dd8798e13825d";
- libuv = fetchurl {
- url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
- sha256 = "0q5ahc9dzca2yc6cjbhpfi9nwc4yhhjbgxgsychksn13d24gv7ba";
- };
-
- rmathVersion = "0.1";
- rmath-julia = fetchurl {
- url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
- sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
- };
-
- virtualenvVersion = "15.0.0";
- virtualenv = fetchurl {
- url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
- sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
- };
-
- majorVersion = "0";
- minorVersion = "6";
- maintenanceVersion = "4";
- version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
-in
-
-stdenv.mkDerivation rec {
- pname = "julia";
- inherit version;
- name = "${pname}-${version}";
-
- src = fetchzip {
- url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
- sha256 = "09axkkj914al7lzvcvhb33hz5wp083lk18llsvrn622fqhmyqabl";
- };
- prePatch = ''
- mkdir deps/srccache
- cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
- cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
- cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
- cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz"
- '';
-
- patches = [
- ./0001.1-use-system-utf8proc.patch
- ./0002-use-system-suitesparse.patch
- ];
-
- postPatch = ''
- patchShebangs . contrib
- for i in backtrace replutil cmdlineargs compile; do
- mv test/$i.jl{,.off}
- touch test/$i.jl
- done
-
- sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i test/libgit2.jl
- sed -e 's/Failed to resolve /failed to resolve /g' -i test/libgit2.jl
- '';
-
- buildInputs = [
- arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
- pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
- zlib llvm
- ]
- ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
- ;
-
- nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
-
- makeFlags =
- let
- arch = head (splitString "-" stdenv.hostPlatform.system);
- march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
- or (throw "unsupported architecture: ${arch}");
- # Julia requires Pentium 4 (SSE2) or better
- cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
- or (throw "unsupported architecture: ${arch}");
- in [
- "ARCH=${arch}"
- "MARCH=${march}"
- "JULIA_CPU_TARGET=${cpuTarget}"
- "PREFIX=$(out)"
- "prefix=$(out)"
- "SHELL=${stdenv.shell}"
-
- "USE_SYSTEM_BLAS=1"
- "USE_BLAS64=${if openblas.blas64 then "1" else "0"}"
- "LIBBLAS=-lopenblas"
- "LIBBLASNAME=libopenblas"
-
- "USE_SYSTEM_LAPACK=1"
- "LIBLAPACK=-lopenblas"
- "LIBLAPACKNAME=libopenblas"
-
- "USE_SYSTEM_SUITESPARSE=1"
- "SUITESPARSE_LIB=-lsuitesparse"
- "SUITESPARSE_INC=-I${suitesparse}/include"
-
- "USE_SYSTEM_ARPACK=1"
- "USE_SYSTEM_FFTW=1"
- "USE_SYSTEM_GMP=1"
- "USE_SYSTEM_LIBGIT2=1"
- "USE_SYSTEM_LIBUNWIND=1"
-
- "USE_SYSTEM_LLVM=1"
- "LLVM_VER=3.9.1"
-
- "USE_SYSTEM_MPFR=1"
- "USE_SYSTEM_OPENLIBM=1"
- "USE_SYSTEM_OPENSPECFUN=1"
- "USE_SYSTEM_PATCHELF=1"
- "USE_SYSTEM_PCRE=1"
- "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
- "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
- "USE_SYSTEM_READLINE=1"
- "USE_SYSTEM_UTF8PROC=1"
- "USE_SYSTEM_ZLIB=1"
- ];
-
- NIX_CFLAGS_COMPILE = [ "-fPIC" ];
-
- LD_LIBRARY_PATH = makeLibraryPath [
- arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
- openspecfun pcre2 suitesparse llvm
- ];
-
- dontStrip = true;
- dontPatchELF = true;
-
- enableParallelBuilding = true;
-
- doCheck = !stdenv.isDarwin;
- checkTarget = "testall";
- # Julia's tests require read/write access to $HOME
- preCheck = ''
- export HOME="$NIX_BUILD_TOP"
- '';
-
- preBuild = ''
- sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
- sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
- export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
- '';
-
- postInstall = ''
- # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
- # as using a wrapper with LD_LIBRARY_PATH causes segmentation
- # faults when program returns an error:
- # $ julia -e 'throw(Error())'
- find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do
- if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then
- ln -sv $lib $out/lib/julia/$(basename $lib)
- fi
- done
- '';
-
- passthru = {
- inherit majorVersion minorVersion maintenanceVersion;
- site = "share/julia/site/v${majorVersion}.${minorVersion}";
- };
-
- meta = {
- description = "High-level performance-oriented dynamical language for technical computing";
- homepage = https://julialang.org/;
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ raskin ];
- platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
- broken = stdenv.isi686;
- };
-}
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index c2d834aa127..82c4188344f 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
let
- version = "1.3.20";
+ version = "1.3.21";
in stdenv.mkDerivation rec {
inherit version;
name = "kotlin-${version}";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
- sha256 = "1w7k09sxlvyy53p4mxnl4qsnsyivpabhsmradbybfgf50nsmyl1d";
+ sha256 = "0mpb9l46jj4i4cgkrclblgd953ggq6gxivzn5qprmyp0cznzpiyv";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index 80ccb0dbbd3..a290d2b6cfe 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -2,8 +2,8 @@
, python, libconfig, lit, gdb, unzip, darwin, bash
, callPackage, makeWrapper, targetPackages
, bootstrapVersion ? false
-, version ? "1.12.0"
-, ldcSha256 ? "1fdma1w8j37wkr0pqdar11slkk36qymamxnk6d9k8ybhjmxaaawm"
+, version ? "1.14.0"
+, ldcSha256 ? "147vlzzzjx2n6zyz9wj54gj046i1mw5p5wixwzi5wkllgxghyy9c"
}:
let
@@ -18,208 +18,156 @@ let
else
"";
- ldcBuild = stdenv.mkDerivation rec {
- name = "ldcBuild-${version}";
-
- enableParallelBuilding = true;
-
- src = fetchurl {
- url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz";
- sha256 = ldcSha256;
- };
-
- postUnpack = ''
- patchShebangs .
- ''
-
- + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) ''
- # http://forum.dlang.org/thread/xtbbqthxutdoyhnxjhxl@forum.dlang.org
- rm -r ldc-${version}-src/tests/dynamiccompile
-
- # https://github.com/NixOS/nixpkgs/issues/34817
- rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall
-
- # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
- rm -r ldc-${version}-src/tests/debuginfo/classtypes_gdb.d
- rm -r ldc-${version}-src/tests/debuginfo/nested_gdb.d
-
- rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/test16096.sh
- rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ldc_output_filenames.sh
- rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/crlf.sh
- rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/issue15574.sh
- rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/test6461.sh
- ''
-
- + stdenv.lib.optionalString (!bootstrapVersion) ''
- echo ${tzdata}/share/zoneinfo/ > ldc-${version}-src/TZDatabaseDirFile
-
- # Remove cppa test for now because it doesn't work.
- rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/cppa.d
- rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp
- '';
-
- datetimePath = if bootstrapVersion then
- "phobos/std/datetime.d"
- else
- "phobos/std/datetime/timezone.d";
-
- postPatch = ''
- # https://issues.dlang.org/show_bug.cgi?id=15391
- substituteInPlace runtime/phobos/std/net/curl.d \
- --replace libcurl.so ${curl.out}/lib/libcurl.so
-
- substituteInPlace tests/d2/dmd-testsuite/Makefile \
- --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash"
- ''
-
- + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) ''
- # Was not able to compile on darwin due to "__inline_isnanl"
- # being undefined.
- substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan
- '';
-
- nativeBuildInputs = [ cmake makeWrapper llvm bootstrapLdc python lit gdb unzip ]
-
- ++ stdenv.lib.optional (bootstrapVersion) [
- libconfig
- ]
-
- ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
- Foundation
- ]);
-
-
- buildInputs = [ curl tzdata ];
-
- #"-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc"
- # Xcode 9.0.1 fixes that bug according to ldc release notes
- #"-DRT_ARCHIVE_WITH_LDC=OFF"
- #"-DD_FLAGS=TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/"
- #"-DCMAKE_BUILD_TYPE=Release"
- #"-DCMAKE_SKIP_RPATH=ON"
-
- #-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc
- #
- cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) ''
- "-DD_FLAGS=-d-version=TZDatabaseDir;-J$PWD"
- '';
-
- preConfigure = stdenv.lib.optionalString (!bootstrapVersion) ''
- cmakeFlagsArray=(
- ${cmakeFlagsString}
- )
- '';
-
- postConfigure = ''
- export DMD=$PWD/bin/ldmd2
- '';
-
- makeFlags = [ "DMD=$DMD" ];
-
- doCheck = !bootstrapVersion;
-
- checkPhase = ''
- # Build and run LDC D unittests.
- ctest --output-on-failure -R "ldc2-unittest"
- # Run LIT testsuite.
- ctest -V -R "lit-tests"
- # Run DMD testsuite.
- DMD_TESTSUITE_MAKE_ARGS=-j$NIX_BUILD_CORES ctest -V -R "dmd-testsuite"
- '';
-
- postInstall = ''
- wrapProgram $out/bin/ldc2 \
- --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
- --set-default CC "${targetPackages.stdenv.cc}/bin/cc"
- '';
-
- meta = with stdenv.lib; {
- description = "The LLVM-based D compiler";
- homepage = https://github.com/ldc-developers/ldc;
- # from https://github.com/ldc-developers/ldc/blob/master/LICENSE
- license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
- maintainers = with maintainers; [ ThomasMader ];
- platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
- };
- };
-
- # Need to test Phobos in a fixed-output derivation, otherwise the
- # network stuff in Phobos would fail if sandbox mode is enabled.
- #
- # Disable tests on Darwin for now because of
- # https://github.com/NixOS/nixpkgs/issues/41099
- # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
- ldcUnittests = if (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) then
- stdenv.mkDerivation rec {
- name = "ldcUnittests-${version}";
-
- enableParallelBuilding = ldcBuild.enableParallelBuilding;
- preferLocalBuild = true;
- inputString = ldcBuild.outPath;
- outputHashAlgo = "sha256";
- outputHash = builtins.hashString "sha256" inputString;
-
- src = ldcBuild.src;
-
- postUnpack = ldcBuild.postUnpack;
-
- postPatch = ldcBuild.postPatch;
-
- nativeBuildInputs = ldcBuild.nativeBuildInputs
-
- ++ [
- ldcBuild
- ];
-
- buildInputs = ldcBuild.buildInputs;
-
- preConfigure = ''
- cmakeFlagsArray=(
- ${ldcBuild.cmakeFlagsString}
- "-DD_COMPILER=${ldcBuild.out}/bin/ldmd2"
- )
- '';
-
- postConfigure = ldcBuild.postConfigure;
-
- makeFlags = ldcBuild.makeFlags;
-
- buildCmd = if bootstrapVersion then
- "ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\""
- else
- "make -j$NIX_BUILD_CORES DMD=${ldcBuild.out}/bin/ldc2 phobos2-test-runner phobos2-test-runner-debug";
-
- testCmd = if bootstrapVersion then
- "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\""
- else
- "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest\"";
-
- buildPhase = ''
- ${buildCmd}
- ln -s ${ldcBuild.out}/bin/ldmd2 $PWD/bin/ldmd2
- ${testCmd}
- '';
-
- installPhase = ''
- echo -n $inputString > $out
- '';
- }
- else
- "";
-
in
stdenv.mkDerivation rec {
- inherit ldcUnittests;
name = "ldc-${version}";
- phases = "installPhase";
- buildInputs = ldcBuild.buildInputs;
- installPhase = ''
- mkdir $out
- cp -r --symbolic-link ${ldcBuild}/* $out/
+ enableParallelBuilding = true;
+
+ src = fetchurl {
+ url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz";
+ sha256 = ldcSha256;
+ };
+
+ # https://issues.dlang.org/show_bug.cgi?id=19553
+ hardeningDisable = [ "fortify" ];
+
+ postUnpack = ''
+ patchShebangs .
+ ''
+
+ + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) ''
+ # https://github.com/NixOS/nixpkgs/issues/34817
+ rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall
+ ''
+
+ + stdenv.lib.optionalString (!bootstrapVersion) ''
+ echo ${tzdata}/share/zoneinfo/ > ldc-${version}-src/TZDatabaseDirFile
+
+ echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > ldc-${version}-src/LibcurlPathFile
'';
- meta = ldcBuild.meta;
+ postPatch = ''
+ # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow
+ substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash"
+ ''
+
+ + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) ''
+ substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
+ ''
+
+ + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) ''
+ substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)"
+ ''
+
+ + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) ''
+ # Was not able to compile on darwin due to "__inline_isnanl"
+ # being undefined.
+ # TODO Remove with version > 0.17.6
+ substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan
+ '';
+
+ nativeBuildInputs = [ cmake makeWrapper llvm unzip ]
+
+ ++ stdenv.lib.optional (!bootstrapVersion) [
+ bootstrapLdc python lit
+ ]
+
+ ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [
+ # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
+ gdb
+ ]
+
+ ++ stdenv.lib.optional (bootstrapVersion) [
+ libconfig
+ ]
+
+ ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
+ Foundation
+ ]);
+
+
+ buildInputs = [ curl tzdata ];
+
+ cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) ''
+ "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J$PWD"
+ "-DCMAKE_BUILD_TYPE=Release"
+ '';
+
+ preConfigure = stdenv.lib.optionalString (!bootstrapVersion) ''
+ cmakeFlagsArray=(
+ ${cmakeFlagsString}
+ )
+ '';
+
+ postConfigure = ''
+ export DMD=$PWD/bin/ldmd2
+ '';
+
+ makeFlags = [ "DMD=$DMD" ];
+
+ fixNames = if stdenv.hostPlatform.isDarwin then ''
+ fixDarwinDylibNames() {
+ local flags=()
+
+ for fn in "$@"; do
+ flags+=(-change "$(basename "$fn")" "$fn")
+ done
+
+ for fn in "$@"; do
+ if [ -L "$fn" ]; then continue; fi
+ echo "$fn: fixing dylib"
+ install_name_tool -id "$fn" "''${flags[@]}" "$fn"
+ done
+ }
+
+ fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib")
+ ''
+ else
+ "";
+
+ # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746
+ additionalExceptions = if stdenv.hostPlatform.isDarwin then
+ "|druntime-test-shared"
+ else
+ "";
+
+ doCheck = !bootstrapVersion;
+
+ checkPhase = stdenv.lib.optionalString doCheck ''
+ # Build default lib test runners
+ make -j$NIX_BUILD_CORES all-test-runners
+
+ ${fixNames}
+
+ # Run dmd testsuite
+ export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD CC=$CXX"
+ ctest -V -R "dmd-testsuite"
+
+ # Build and run LDC D unittests.
+ ctest --output-on-failure -R "ldc2-unittest"
+
+ # Run LIT testsuite.
+ ctest -V -R "lit-tests"
+
+ # Run default lib unittests
+ ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}"
+ '';
+
+ postInstall = ''
+ wrapProgram $out/bin/ldc2 \
+ --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
+ --set-default CC "${targetPackages.stdenv.cc}/bin/cc"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "The LLVM-based D compiler";
+ homepage = https://github.com/ldc-developers/ldc;
+ # from https://github.com/ldc-developers/ldc/blob/master/LICENSE
+ license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
+ maintainers = with maintainers; [ ThomasMader ];
+ platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+ };
}
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index ca6723172d7..261a1d0f94c 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -79,8 +79,8 @@ in stdenv.mkDerivation rec {
"-DLLVM_ENABLE_RTTI=ON"
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
- "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
- "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
+ "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
+ "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}"
] ++ stdenv.lib.optional enableSharedLibraries [
"-DLLVM_LINK_LLVM_DYLIB=ON"
] ++ stdenv.lib.optional (!isDarwin)
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 678ec759425..6c935fd88de 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -120,8 +120,8 @@ in stdenv.mkDerivation rec {
"-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
- "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
- "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
+ "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
+ "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}"
] ++ stdenv.lib.optional enableSharedLibraries [
"-DLLVM_LINK_LLVM_DYLIB=ON"
] ++ stdenv.lib.optional (!isDarwin)
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index 6344304b84b..2b543b9d793 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -44,11 +44,6 @@ stdenv.mkDerivation rec {
linkCxxAbi = stdenv.isLinux;
- postInstall = ''
- mv $out/lib/libc++.a $out/lib/libc++_static.a
- cp ${./libc++.a} $out/lib/libc++.a
- '';
-
setupHooks = [
../../../../../build-support/setup-hooks/role.bash
./setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/4/libc++/libc++.a b/pkgs/development/compilers/llvm/4/libc++/libc++.a
deleted file mode 100644
index f676948115e..00000000000
--- a/pkgs/development/compilers/llvm/4/libc++/libc++.a
+++ /dev/null
@@ -1 +0,0 @@
-INPUT(-lc++_static -lc++abi)
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index aac9c4275ad..5cd7901fe22 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -100,8 +100,8 @@ in stdenv.mkDerivation (rec {
"-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
- "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
- "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
+ "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
+ "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}"
]
++ stdenv.lib.optional enableSharedLibraries
"-DLLVM_LINK_LLVM_DYLIB=ON"
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index 6dc81e10163..b182f1250e7 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -38,11 +38,6 @@ stdenv.mkDerivation rec {
linkCxxAbi = stdenv.isLinux;
- postInstall = ''
- mv $out/lib/libc++.a $out/lib/libc++_static.a
- cp ${./libc++.a} $out/lib/libc++.a
- '';
-
setupHooks = [
../../../../../build-support/setup-hooks/role.bash
./setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/5/libc++/libc++.a b/pkgs/development/compilers/llvm/5/libc++/libc++.a
deleted file mode 100644
index f676948115e..00000000000
--- a/pkgs/development/compilers/llvm/5/libc++/libc++.a
+++ /dev/null
@@ -1 +0,0 @@
-INPUT(-lc++_static -lc++abi)
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index b90b6b7b58c..3a165e9da7b 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -38,11 +38,6 @@ stdenv.mkDerivation rec {
linkCxxAbi = stdenv.isLinux;
- postInstall = ''
- mv $out/lib/libc++.a $out/lib/libc++_static.a
- cp ${./libc++.a} $out/lib/libc++.a
- '';
-
setupHooks = [
../../../../../build-support/setup-hooks/role.bash
./setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/6/libc++/libc++.a b/pkgs/development/compilers/llvm/6/libc++/libc++.a
deleted file mode 100644
index f676948115e..00000000000
--- a/pkgs/development/compilers/llvm/6/libc++/libc++.a
+++ /dev/null
@@ -1 +0,0 @@
-INPUT(-lc++_static -lc++abi)
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index f16f3f72137..16a716d32fa 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -94,7 +94,7 @@ in stdenv.mkDerivation (rec {
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_ENABLE_RTTI=ON"
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
- "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
+ "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
"-DLLVM_ENABLE_DUMP=ON"
] ++ optionals enableSharedLibraries [
diff --git a/pkgs/development/compilers/llvm/7/bintools.nix b/pkgs/development/compilers/llvm/7/bintools.nix
new file mode 100644
index 00000000000..72a2a733193
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/bintools.nix
@@ -0,0 +1,19 @@
+{ runCommand, stdenv, llvm, lld, version }:
+
+let
+ prefix =
+ if stdenv.hostPlatform != stdenv.targetPlatform
+ then "${stdenv.targetPlatform.config}-"
+ else "";
+in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
+ mkdir -p $out/bin
+ for prog in ${lld}/bin/*; do
+ ln -s $prog $out/bin/${prefix}$(basename $prog)
+ done
+ for prog in ${llvm}/bin/*; do
+ ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||")
+ ln -sf $prog $out/bin/${prefix}$(basename $prog)
+ done
+ rm -f $out/bin/${prefix}cat
+ ln -s ${lld}/bin/lld $out/bin/${prefix}ld
+''
diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix
index bc6767e8766..e4252647ce6 100644
--- a/pkgs/development/compilers/llvm/7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/7/clang/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
, fixDarwinDylibNames
, enableManpages ? false
+, enablePolly ? false # TODO: get this info from llvm (passthru?)
}:
let
- gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
self = stdenv.mkDerivation ({
name = "clang-${version}";
@@ -30,6 +30,9 @@ let
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+ ] ++ stdenv.lib.optionals enablePolly [
+ "-DWITH_POLLY=ON"
+ "-DLINK_POLLY_INTO_TOOLS=ON"
];
patches = [ ./purity.patch ];
@@ -77,8 +80,8 @@ let
passthru = {
isClang = true;
inherit llvm;
- } // stdenv.lib.optionalAttrs stdenv.targetPlatform.isLinux {
- inherit gcc;
+ } // stdenv.lib.optionalAttrs (stdenv.targetPlatform.isLinux || (stdenv.cc.isGNU && stdenv.cc.cc ? gcc)) {
+ gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
};
meta = {
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index dff9cb9c49c..b44ba62ee92 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -7,8 +7,19 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
- configureFlags = [
+ cmakeFlags = [
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
+ "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+ "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+ ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "-DCMAKE_C_FLAGS=-nodefaultlibs"
+ "-DCMAKE_CXX_COMPILER_WORKS=ON"
+ "-DCOMPILER_RT_BUILD_BUILTINS=ON"
+ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+ "-DCOMPILER_RT_BUILD_XRAY=OFF"
+ "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
+ "-DCOMPILER_RT_BUILD_PROFILE=OFF"
+ "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
];
outputs = [ "out" "dev" ];
@@ -16,7 +27,8 @@ stdenv.mkDerivation rec {
patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
- ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin ./compiler-rt-clock_gettime.patch;
+ ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch
+ ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin ./compiler-rt-clock_gettime.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
@@ -26,11 +38,23 @@ stdenv.mkDerivation rec {
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace cmake/config-ix.cmake \
--replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
+ '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ substituteInPlace lib/builtins/int_util.c \
+ --replace "#include " ""
+ substituteInPlace lib/builtins/clear_cache.c \
+ --replace "#include " ""
+ substituteInPlace lib/builtins/cpu_model.c \
+ --replace "#include " ""
'';
# Hack around weird upsream RPATH bug
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
ln -s "$out/lib"/*/* "$out/lib"
+ '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o
+ ln -s $out/lib/*/cclang_rt.crtend-*.o $out/lib/linux/crtend.o
+ ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o
+ ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o
'';
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch b/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch
new file mode 100644
index 00000000000..032b04708d1
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch
@@ -0,0 +1,595 @@
+Get crtbegin and crtend without compiler GCC! PR is at https://reviews.llvm.org/D28791
+
+Index: compiler-rt/CMakeLists.txt
+===================================================================
+--- compiler-rt/CMakeLists.txt
++++ compiler-rt/CMakeLists.txt
+@@ -29,6 +29,8 @@
+
+ option(COMPILER_RT_BUILD_BUILTINS "Build builtins" ON)
+ mark_as_advanced(COMPILER_RT_BUILD_BUILTINS)
++option(COMPILER_RT_BUILD_CRT "Build crtbegin.o/crtend.o" ON)
++mark_as_advanced(COMPILER_RT_BUILD_CRT)
+ option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON)
+ mark_as_advanced(COMPILER_RT_BUILD_SANITIZERS)
+ option(COMPILER_RT_BUILD_XRAY "Build xray" ON)
+Index: compiler-rt/cmake/Modules/AddCompilerRT.cmake
+===================================================================
+--- compiler-rt/cmake/Modules/AddCompilerRT.cmake
++++ compiler-rt/cmake/Modules/AddCompilerRT.cmake
+@@ -132,7 +132,7 @@
+ # Adds static or shared runtime for a list of architectures and operating
+ # systems and puts it in the proper directory in the build and install trees.
+ # add_compiler_rt_runtime(
+-# {STATIC|SHARED}
++# {OBJECT|STATIC|SHARED}
+ # ARCHS
+ # OS
+ # SOURCES
+@@ -144,8 +144,8 @@
+ # PARENT_TARGET
+ # ADDITIONAL_HEADERS )
+ function(add_compiler_rt_runtime name type)
+- if(NOT type MATCHES "^(STATIC|SHARED)$")
+- message(FATAL_ERROR "type argument must be STATIC or SHARED")
++ if(NOT type MATCHES "^(OBJECT|STATIC|SHARED)$")
++ message(FATAL_ERROR "type argument must be OBJECT, STATIC or SHARED")
+ return()
+ endif()
+ cmake_parse_arguments(LIB
+@@ -204,7 +204,10 @@
+ message(FATAL_ERROR "Architecture ${arch} can't be targeted")
+ return()
+ endif()
+- if(type STREQUAL "STATIC")
++ if(type STREQUAL "OBJECT")
++ set(libname "${name}-${arch}")
++ set(output_name_${libname} ${libname}${COMPILER_RT_OS_SUFFIX})
++ elseif(type STREQUAL "STATIC")
+ set(libname "${name}-${arch}")
+ set_output_name(output_name_${libname} ${name} ${arch})
+ else()
+@@ -270,12 +273,34 @@
+ set(COMPONENT_OPTION COMPONENT ${libname})
+ endif()
+
+- add_library(${libname} ${type} ${sources_${libname}})
+- set_target_compile_flags(${libname} ${extra_cflags_${libname}})
+- set_target_link_flags(${libname} ${extra_link_flags_${libname}})
+- set_property(TARGET ${libname} APPEND PROPERTY
+- COMPILE_DEFINITIONS ${LIB_DEFS})
+- set_target_output_directories(${libname} ${output_dir_${libname}})
++ if(type STREQUAL "OBJECT")
++ string(TOUPPER ${CMAKE_BUILD_TYPE} config)
++ get_property(cflags SOURCE ${sources_${libname}} PROPERTY COMPILE_FLAGS)
++ separate_arguments(cflags)
++ add_custom_command(
++ OUTPUT ${output_dir_${libname}}/${libname}.o
++ COMMAND ${CMAKE_C_COMPILER} ${sources_${libname}} ${cflags} ${extra_cflags_${libname}} -c -o ${output_dir_${libname}}/${libname}.o
++ DEPENDS ${sources_${libname}}
++ COMMENT "Building C object ${libname}.o")
++ add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${libname}.o)
++ install(FILES ${output_dir_${libname}}/${libname}.o
++ DESTINATION ${install_dir_${libname}}
++ ${COMPONENT_OPTION})
++ else()
++ add_library(${libname} ${type} ${sources_${libname}})
++ set_target_compile_flags(${libname} ${extra_cflags_${libname}})
++ set_target_link_flags(${libname} ${extra_link_flags_${libname}})
++ set_property(TARGET ${libname} APPEND PROPERTY
++ COMPILE_DEFINITIONS ${LIB_DEFS})
++ set_target_output_directories(${libname} ${output_dir_${libname}})
++ install(TARGETS ${libname}
++ ARCHIVE DESTINATION ${install_dir_${libname}}
++ ${COMPONENT_OPTION}
++ LIBRARY DESTINATION ${install_dir_${libname}}
++ ${COMPONENT_OPTION}
++ RUNTIME DESTINATION ${install_dir_${libname}}
++ ${COMPONENT_OPTION})
++ endif()
+ set_target_properties(${libname} PROPERTIES
+ OUTPUT_NAME ${output_name_${libname}})
+ set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Runtime")
+@@ -299,13 +324,6 @@
+ )
+ endif()
+ endif()
+- install(TARGETS ${libname}
+- ARCHIVE DESTINATION ${install_dir_${libname}}
+- ${COMPONENT_OPTION}
+- LIBRARY DESTINATION ${install_dir_${libname}}
+- ${COMPONENT_OPTION}
+- RUNTIME DESTINATION ${install_dir_${libname}}
+- ${COMPONENT_OPTION})
+
+ # We only want to generate per-library install targets if you aren't using
+ # an IDE because the extra targets get cluttered in IDEs.
+Index: compiler-rt/cmake/config-ix.cmake
+===================================================================
+--- compiler-rt/cmake/config-ix.cmake
++++ compiler-rt/cmake/config-ix.cmake
+@@ -227,6 +227,7 @@
+ ${ARM32} ${ARM64} ${MIPS32} ${MIPS64} ${S390X})
+ set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64}
+ ${MIPS32} ${MIPS64} ${PPC64} ${S390X})
++set(ALL_CRT_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64})
+ set(ALL_DFSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64})
+ set(ALL_FUZZER_SUPPORTED_ARCH ${X86_64} ${ARM64})
+
+@@ -474,6 +475,7 @@
+ SANITIZER_COMMON_SUPPORTED_ARCH)
+
+ else()
++ filter_available_targets(CRT_SUPPORTED_ARCH ${ALL_CRT_SUPPORTED_ARCH})
+ # Architectures supported by compiler-rt libraries.
+ filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH
+ ${ALL_SANITIZER_COMMON_SUPPORTED_ARCH})
+@@ -563,6 +565,12 @@
+
+ # TODO: Add builtins support.
+
++if (CRT_SUPPORTED_ARCH AND OS_NAME MATCHES "Linux")
++ set(COMPILER_RT_HAS_CRT TRUE)
++else()
++ set(COMPILER_RT_HAS_CRT FALSE)
++endif()
++
+ if (COMPILER_RT_HAS_SANITIZER_COMMON AND DFSAN_SUPPORTED_ARCH AND
+ OS_NAME MATCHES "Linux")
+ set(COMPILER_RT_HAS_DFSAN TRUE)
+Index: compiler-rt/lib/CMakeLists.txt
+===================================================================
+--- compiler-rt/lib/CMakeLists.txt
++++ compiler-rt/lib/CMakeLists.txt
+@@ -17,6 +17,10 @@
+ add_subdirectory(builtins)
+ endif()
+
++if(COMPILER_RT_BUILD_CRT)
++ add_subdirectory(crt)
++endif()
++
+ function(compiler_rt_build_runtime runtime)
+ string(TOUPPER ${runtime} runtime_uppercase)
+ if(COMPILER_RT_HAS_${runtime_uppercase})
+Index: compiler-rt/lib/crt/CMakeLists.txt
+===================================================================
+--- /dev/null
++++ compiler-rt/lib/crt/CMakeLists.txt
+@@ -0,0 +1,101 @@
++add_compiler_rt_component(crt)
++
++function(check_cxx_section_exists section output)
++ cmake_parse_arguments(ARG "" "" "SOURCE;FLAGS" ${ARGN})
++ if(NOT ARG_SOURCE)
++ set(ARG_SOURCE "int main() { return 0; }\n")
++ endif()
++
++ string(RANDOM TARGET_NAME)
++ set(TARGET_NAME "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cmTC_${TARGET_NAME}.dir")
++ file(MAKE_DIRECTORY ${TARGET_NAME})
++
++ file(WRITE "${TARGET_NAME}/CheckSectionExists.c" "${ARG_SOURCE}\n")
++
++ string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions
++ ${CMAKE_C_COMPILE_OBJECT})
++
++ set(try_compile_flags "${ARG_FLAGS}")
++ if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET)
++ list(APPEND try_compile_flags "-target ${CMAKE_C_COMPILER_TARGET}")
++ endif()
++
++ string(REPLACE ";" " " extra_flags "${try_compile_flags}")
++
++ set(test_compile_command "${CMAKE_C_COMPILE_OBJECT}")
++ foreach(substitution ${substitutions})
++ if(substitution STREQUAL "")
++ string(REPLACE ""
++ "${CMAKE_C_COMPILER}" test_compile_command ${test_compile_command})
++ elseif(substitution STREQUAL "