From c4cad4508229bf6e1b93ea51ffb6af985d965513 Mon Sep 17 00:00:00 2001 From: Sergei Khoma Date: Sun, 3 Jun 2018 20:03:34 +0300 Subject: [PATCH 01/50] fix typo based on https://www.ec2instances.info/ --- nixos/modules/virtualisation/amazon-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 6cb9e07ae820..b0354009a7f6 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -60,7 +60,7 @@ let cfg = config.ec2; in # Mount all formatted ephemeral disks and activate all swap devices. # We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options # because the set of devices is dependent on the instance type - # (e.g. "m1.large" has one ephemeral filesystem and one swap device, + # (e.g. "m1.small" has one ephemeral filesystem and one swap device, # while "m1.large" has two ephemeral filesystems and no swap # devices). Also, put /tmp and /var on /disk0, since it has a lot # more space than the root device. Similarly, "move" /nix to /disk0 From 95fab6a09c4fd42eb9f69b9abd554735117dadd0 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Mon, 15 Oct 2018 13:17:12 +1000 Subject: [PATCH 02/50] linuxPackages.bpftrace: init at unstable-2018-10-27 --- .../linux/bpftrace/bcc-source.patch | 32 ++++++++ pkgs/os-specific/linux/bpftrace/default.nix | 57 +++++++++++++++ .../linux/bpftrace/disable-gtests.patch | 73 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 164 insertions(+) create mode 100644 pkgs/os-specific/linux/bpftrace/bcc-source.patch create mode 100644 pkgs/os-specific/linux/bpftrace/default.nix create mode 100644 pkgs/os-specific/linux/bpftrace/disable-gtests.patch diff --git a/pkgs/os-specific/linux/bpftrace/bcc-source.patch b/pkgs/os-specific/linux/bpftrace/bcc-source.patch new file mode 100644 index 000000000000..a4c9947f0c34 --- /dev/null +++ b/pkgs/os-specific/linux/bpftrace/bcc-source.patch @@ -0,0 +1,32 @@ +From fc0a5bd2ddb5827c5288ee284c1f2d834d79e432 Mon Sep 17 00:00:00 2001 +From: Rodney Lorrimar +Date: Tue, 16 Oct 2018 09:55:59 +1000 +Subject: [PATCH 1/3] Don't use ExternalProject for bcc sources + +--- + CMakeLists.txt | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eae850a..b20fb33 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,6 +31,15 @@ if (OFFLINE_BUILDS) + UPDATE_DISCONNECTED 1 + BUILD_COMMAND ${CMAKE_COMMAND} --build . --target bcc-static + ) ++elseif (NIX_BUILDS) ++ include(ExternalProject) ++ ExternalProject_Add(bcc ++ DOWNLOAD_COMMAND rmdir bcc && ln -sf $ENV{bccSrc} bcc ++ STEP_TARGETS build update ++ EXCLUDE_FROM_ALL 1 ++ UPDATE_DISCONNECTED 1 ++ BUILD_COMMAND ${CMAKE_COMMAND} --build . --target bcc-static ++ ) + else() + include(ExternalProject) + ExternalProject_Add(bcc +-- +2.17.1 + diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix new file mode 100644 index 000000000000..12773a957165 --- /dev/null +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub +, cmake, pkgconfig, flex, bison +, llvmPackages, kernel, linuxHeaders, elfutils, libelf, bcc +}: + +stdenv.mkDerivation rec { + name = "bpftrace-unstable-${version}"; + version = "2018-10-27"; + + src = fetchFromGitHub { + owner = "iovisor"; + repo = "bpftrace"; + rev = "c07b54f61fd7b7b49e0a254e746d6f442c5d780d"; + sha256 = "1mpcjfyay9akmpqxag2ndwpz1qsdx8ii07jh9fky4w40wi9cipyg"; + }; + + # bpftrace requires an unreleased version of bcc, added to the cmake + # build as an ExternalProject. + # https://github.com/iovisor/bpftrace/issues/184 + bccSrc = fetchFromGitHub { + owner = "iovisor"; + repo = "bcc"; + rev = "afd00154865f3b2da6781cf92cecebaca4853950"; + sha256 = "0ad78smrnipr1f377i5rv6ksns7v2vq54g5badbj5ldqs4x0hygd"; + }; + + buildInputs = [ + llvmPackages.llvm llvmPackages.clang-unwrapped kernel + elfutils libelf bccSrc + ]; + + nativeBuildInputs = [ cmake pkgconfig flex bison ] + # libelf is incompatible with elfutils-libelf + ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies; + + patches = [ + ./bcc-source.patch + # https://github.com/iovisor/bpftrace/issues/184 + ./disable-gtests.patch + ]; + + configurePhase = '' + mkdir build + cd build + cmake ../ \ + -DKERNEL_HEADERS_DIR=${linuxHeaders} \ + -DNIX_BUILDS:BOOL=ON \ + -DCMAKE_INSTALL_PREFIX=$out + ''; + + meta = with stdenv.lib; { + description = "High-level tracing language for Linux eBPF"; + homepage = https://github.com/iovisor/bpftrace; + license = licenses.asl20; + maintainers = with maintainers; [ rvl ]; + }; +} diff --git a/pkgs/os-specific/linux/bpftrace/disable-gtests.patch b/pkgs/os-specific/linux/bpftrace/disable-gtests.patch new file mode 100644 index 000000000000..941d85a41126 --- /dev/null +++ b/pkgs/os-specific/linux/bpftrace/disable-gtests.patch @@ -0,0 +1,73 @@ +From 221eea24674fffb3b657b2bd0c923071b69d48a7 Mon Sep 17 00:00:00 2001 +From: Rodney Lorrimar +Date: Tue, 16 Oct 2018 09:56:47 +1000 +Subject: [PATCH 2/3] Disable tests + +Would prefer to use gtest library in the normal way rather through +ExternalProject. +--- + CMakeLists.txt | 4 ++-- + tests/CMakeLists.txt | 18 +++++++++++------- + 2 files changed, 13 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b20fb33..7025d17 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,7 +20,7 @@ add_compile_options("-Wno-format-security") + #add_compile_options("-Wstrict-overflow=5") + #add_compile_options("-Wdisabled-optimization") + +-enable_testing() ++# enable_testing() + + if (OFFLINE_BUILDS) + include(ExternalProject) +@@ -79,7 +79,7 @@ include_directories(${CLANG_INCLUDE_DIRS}) + add_subdirectory(src/arch) + add_subdirectory(src/ast) + add_subdirectory(src) +-add_subdirectory(tests) ++# add_subdirectory(tests) + add_subdirectory(resources) + add_subdirectory(tools) + add_subdirectory(man) +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index c283efa..6b5bff0 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -45,6 +45,8 @@ if (OFFLINE_BUILDS) + EXCLUDE_FROM_ALL 1 + UPDATE_DISCONNECTED 1 + ) ++elseif (NIX_BUILDS) ++ + else() + include(ExternalProject) + ExternalProject_Add(gtest-git +@@ -54,13 +56,15 @@ else() + EXCLUDE_FROM_ALL 1 + ) + endif() +-add_dependencies(bpftrace_test gtest-git-build) +-ExternalProject_Get_Property(gtest-git source_dir binary_dir) +-target_include_directories(bpftrace_test PUBLIC ${source_dir}/googletest/include) +-target_include_directories(bpftrace_test PUBLIC ${source_dir}/googlemock/include) +-target_link_libraries(bpftrace_test ${binary_dir}/googlemock/gtest/libgtest.a) +-target_link_libraries(bpftrace_test ${binary_dir}/googlemock/gtest/libgtest_main.a) +-target_link_libraries(bpftrace_test ${binary_dir}/googlemock/libgmock.a) ++ ++find_library(LIBGTEST "gtest") ++if(LIBGTEST) ++ set(LIBRARY_DEPENDENCIES ++ ${LIBRARY_DEPENDENCIES} ++ ${LIBGTEST} ++ ) ++endif() ++ + target_link_libraries(bpftrace_test ${CMAKE_THREAD_LIBS_INIT}) + + add_test(NAME bpftrace_test COMMAND bpftrace_test) +-- +2.17.1 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e808b70fb41e..276135f183e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14210,6 +14210,8 @@ with pkgs; python = python3; }; + bpftrace = callPackage ../os-specific/linux/bpftrace { }; + bbswitch = callPackage ../os-specific/linux/bbswitch {}; beegfs-module = callPackage ../os-specific/linux/beegfs/kernel-module.nix { }; From efca8b4b97cab7653cc369973fb6267d160c494a Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Wed, 6 Jun 2018 22:04:35 +0200 Subject: [PATCH 03/50] make-derivation: use pname-version as default name if both are present --- pkgs/stdenv/generic/make-derivation.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index e06faed30a1e..8fd58c3cbe91 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -12,7 +12,9 @@ rec { # * https://nixos.org/nix/manual/#ssec-derivation # Explanation about derivations in general mkDerivation = - { name ? "" + { name ? if builtins.hasAttr "pname" attrs && builtins.hasAttr "version" attrs + then "${attrs.pname}-${attrs.version}" + else "" # These types of dependencies are all exhaustively documented in # the "Specifying Dependencies" section of the "Standard From 149a55eca77279c683a48d274a2f295d8027977c Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 7 Jun 2018 16:16:14 +0200 Subject: [PATCH 04/50] make-derivation: get position info from version --- pkgs/stdenv/generic/make-derivation.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 8fd58c3cbe91..dcf73a38a1d7 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -67,6 +67,8 @@ rec { , pos ? # position used in error messages and for meta.position (if attrs.meta.description or null != null then builtins.unsafeGetAttrPos "description" attrs.meta + else if attrs.version or null != null + then builtins.unsafeGetAttrPos "version" attrs else builtins.unsafeGetAttrPos "name" attrs) , separateDebugInfo ? false , outputs ? [ "out" ] From 2962f94fec198cd378471e2b6acc89d0af6ae226 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 29 Oct 2018 14:58:12 +0100 Subject: [PATCH 05/50] make-derivation: add check that the name is consistent with pname and version --- pkgs/stdenv/generic/make-derivation.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index dcf73a38a1d7..6f31e09b1251 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -82,6 +82,10 @@ rec { , ... } @ attrs: + # Check that the name is consistent with pname and version: + assert lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"] + -> lib.strings.hasSuffix "${attrs.pname}-${attrs.version}" attrs.name; + let # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when # no package has `doCheck = true`. From 5be927db142448207c6a1d0c6e58ac5eb2af1fc5 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 29 Oct 2018 15:17:13 +0100 Subject: [PATCH 06/50] make-derivation: use `?` instead of `builtins.hasAttr` As suggested by @edolstra --- pkgs/stdenv/generic/make-derivation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 6f31e09b1251..9f6fee937101 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -12,7 +12,7 @@ rec { # * https://nixos.org/nix/manual/#ssec-derivation # Explanation about derivations in general mkDerivation = - { name ? if builtins.hasAttr "pname" attrs && builtins.hasAttr "version" attrs + { name ? if attrs ? pname && attrs ? version then "${attrs.pname}-${attrs.version}" else "" From c7e026bec483582bf2b8ac624519555f9476751c Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 29 Oct 2018 18:25:59 +0100 Subject: [PATCH 07/50] make-derivation: use `lib.assertMsg` As suggested by @Profpatsch --- pkgs/stdenv/generic/make-derivation.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 9f6fee937101..2ff7db947fe0 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -83,8 +83,10 @@ rec { , ... } @ attrs: # Check that the name is consistent with pname and version: - assert lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"] - -> lib.strings.hasSuffix "${attrs.pname}-${attrs.version}" attrs.name; + assert lib.assertMsg + (lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"] + -> lib.strings.hasSuffix "${attrs.pname}-${attrs.version}" attrs.name) + "mkDerivation: `name` must be consistent with `pname-version`"; let # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when From 1f7fc09176dc9b0260b8e2778f1e6c3139eae6a9 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 30 Oct 2018 14:27:28 +0100 Subject: [PATCH 08/50] make-derivation: use a more descriptive assert message As suggested by @Profpatsch --- pkgs/stdenv/generic/make-derivation.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 2ff7db947fe0..cb3731da1934 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -86,7 +86,8 @@ rec { assert lib.assertMsg (lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"] -> lib.strings.hasSuffix "${attrs.pname}-${attrs.version}" attrs.name) - "mkDerivation: `name` must be consistent with `pname-version`"; + ("mkDerivation: `name` (\"${attrs.name}\") must be consistent " + + "with `pname-version` \"${attrs.pname}-${attrs.version}\""); let # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when From 73344be7bfd18dbeb5893b5dc12f567358782fb5 Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 1 Nov 2018 09:12:12 +0900 Subject: [PATCH 09/50] thunderbird-bin: 60.2.1 -> 60.3.0 --- .../thunderbird-bin/release_sources.nix | 466 +++++++++--------- 1 file changed, 233 insertions(+), 233 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index a97dfce27448..576fbcc7b8a0 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.2.1"; + version = "60.3.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ar/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ar/thunderbird-60.3.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "026d4f74378ab0c94e14689161187793ec614a3c492a20d41401714d3a51a5478d060d0a6072a48e20dca88e7d0f4853efc293d36999ddfea431de466dcf94d6"; + sha512 = "7cbd8c54fb220ad3f781cbc908d42f2723109786a1d7a947646bcc231e8849035c014335daa4ab85f9cd69646fa870cbfac3a0e0ec45d3fa82d0f0b74591b6a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ast/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ast/thunderbird-60.3.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "a9156cd525d072711a78f7c45261d50e9057f1f797fe0847c0b52ebdcb42a9f283432da036c870209aedc37183b2fd4df12527e128f46a06d5eb289bdb11d379"; + sha512 = "936a6366add759a89db391394479ff2e7865248b46c81cf45457ddb6fa6b37660ca9efa6f125fe97b22f6db2cdfae7ad0abefdc3874820fa3ef0bee91f6caa74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/be/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/be/thunderbird-60.3.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d75dc81e7ed655e5bc539362b4ea212ef47bed496c483a6401c8cc52fe2aa7c89f12024ef5364e8e44826c5df2a7cc0eae01a55cbfb22c78b7d29744e05c2389"; + sha512 = "4580436c4719a2ca5821d9676aa6bfd5f2c731cdf0bdc2969fd0177bfd2c3cc2570479de60515e59b152e0aec4611c437fedce7d0bd13c7a06bcebafff0bd20d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/bg/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/bg/thunderbird-60.3.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "4302c20cec5239d3cffd1c5756537059f98eb19ebe6332ce255ddeb555f8f07b6ce03c18ccfd2adc7b1a51c954a0ef3dfbd98ca2a5238cf510d4abea48d10df9"; + sha512 = "fafc3c2d186616be2b56e1087df528d3fb93ce431ae24c286c0209177a9dcf5f229ec5aa521d68ae531c5d763ca4c2e339945a7f874825e73ad63f86d13b510b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/br/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/br/thunderbird-60.3.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "c22bd6606886c50fd782f1646f03917d9988a76020fc5e1a210e39a771980badcea965332ddc80f6f08fd062be4f08a499cbf7ea3585c78cb7089d40b40b92af"; + sha512 = "71fe4d4e67971bfdc56ff6ad73eecffe15d2b808e07b25a7b4c827094b95afa7c04d451081dc45045e0d1eb83b15a3c8e964186a615f72a0a545dece221318d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ca/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ca/thunderbird-60.3.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7827c61dcc0294b85db7709029021daf52148a9d00b1d06c3a05f2e3591ca1e9e75a84bed3ac01da3a7f4af7bb2842b7574ec519849c8a5cde30600f0d237c85"; + sha512 = "0be271223abd6f0fe79d0914b037cea5ea765ac1486a78922123666bec1ce8ec3bcbfa54c7fa552101adbe4a22bed0628eabed39391e4ca1dbccb118157fbded"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/cs/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/cs/thunderbird-60.3.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "dd51fee0d4e2c87e841c1e13aeff54c49e375bb95ed69f539320815cb551d57853032d42346516627024f88ba77154a8f1aeba651f3e90b5d5ef206dfeb23c5b"; + sha512 = "5d9f911af1f29928ddfb96d114fc7e484370e69f9f1aabdad753dae5ba0b6ad476d7b0c373919a2ccec3c2528f4fc78ee874a72fe691ad3e7d2e3e9e1650f76a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/cy/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/cy/thunderbird-60.3.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "29c32c26fc56d1fe7ae47fc93d121b8591e75f0d42b25ef3e1f9d98f3bfa66bdce551d96c8f98f553bca6425173da43f9e9a13f3f006db1259f1b69a68abb7cc"; + sha512 = "18c7dabbcdb5235bcfe0dd01746f39d82d88bc71c2a4c4986ee268d15ab5a5cc060273f4783b2e472dafbcdcd98f29f8ad2c2b33ed87a9a3c484f61dbf0a7492"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/da/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/da/thunderbird-60.3.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f57484cf06388193dbf3e6ec9c8c631829e6e0914dd785fa81b007bcd9789cdffc777d6f5df5939a1e125f66f9cd2a04d0b4a9dac5250aa615c7033bffb70d97"; + sha512 = "f6dcc69ed4509b6d81b856cf6981d7d00e3ca3689f3e28b64b858d64f96ef96196a4b9b2c14ee5292507b5ba00bedbfd5ecf4b2db241068b36d8ee786eacf1c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/de/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/de/thunderbird-60.3.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "d12857d40c23f3817809e09e1edf9cf1131939d2aa5e830da2e9a13b4971096f33691deed0a29188510c2f84aeaa2a7ab704f54ced3c79885ea7b883cbd88f49"; + sha512 = "a60ab91787961d405c926027570d161e9f6cfef77f6e8d40a24e97ac5c0c9b515a31dde5b9386e7b2a855f4970ff7533be4252474136e242a998cafab123de66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/dsb/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/dsb/thunderbird-60.3.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c65ce176520eaafe2afe54cf3ff6266bdeaef437c29f82e5580f286c31bb97881fe9724435995b5debd14306332ce2d379e45a30350296473f140d8caaeaee6f"; + sha512 = "c827f7b392fe42cd2f6432870552239bd73e808ddfad10ac2c86968915697dfe119c965469baa6e2098bfd0fb61c36fbb5ed17378e423531b64b0ebd153602d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/el/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/el/thunderbird-60.3.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "8aad41efc6bae79e6e5f238ad6209f0cec7ff3ed0f82a4ef22a0e1e12c3ffb2577ff105983b1f1892591e1b2a58f2d8bb8d9ea51051ec930649dfa954341b219"; + sha512 = "287be8c4ca83f7238833cad36de9476907bcf9c8c915626dd0c5114328160e75d95bfe25a0db10900f3c2a727e76f583fe1902a76c208106480fc3349c2ed917"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/en-GB/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/en-GB/thunderbird-60.3.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "b75eab236a8749a185083c33b8f28492d903ee84b2b5a9aa3659e04eae7bc72cc93493a6cafa39ca29ebd0c065301e1091d21a23836b41bc4a5b60f4e61f6668"; + sha512 = "aae1c22caeab14d262054af5855f6e983b34fc54e8f9d8cd0f49f5ae7ad3425d74f26025d85b4948a7d519ba771f7298ca7bf14fbd67c3d8ed84f0e9e394b9da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/en-US/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/en-US/thunderbird-60.3.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "71308c1d6691894ef60144f7bc119709491eaa3af400197e4fec61f25231266b085e925fe1163d6de8d3d1f3ce34475a299968e9405341a9881c512fbd6e4362"; + sha512 = "53b3872c3e4c49080e34540f95d5dec680b2320890601249eeb09e26d8aec66bce8e46e40368c8cfbc6937186a894a078348f64065ead28d32453a310a43891f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/es-AR/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/es-AR/thunderbird-60.3.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "061f0ea13b7c213ef2020aa2cf9ebee51b6b72f0de9b65ccb095f7e67152f5325d6806af90b5f600b7498d8cbd18916079e81914affd29308e04de0c7535939e"; + sha512 = "9ae6f2a7c93a1d7a4efa22bdc8f6f5df8fb5a46f42507146eec7ceed6ee47d175d6c7791decc661be0c7d3cfd7513cc9a050138fe6661daf192f5f6064bc6a8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/es-ES/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/es-ES/thunderbird-60.3.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "39c7b2806400cd57cd3e778d57f174a45eaa6e15bf1975d7e82f082d31d965e13a43ef130952e00300df9a13470c780c60f0ec9b398210b183593492d30c158a"; + sha512 = "6dcc03919a384f7dcfae1264e3176d57ced792cb40ce7aa469a1c5229c9c97bcc83a0e58947f0ed14ff0ff74ddc529c74e7bcd3e38fb89edcdc4038f491a1c08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/et/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/et/thunderbird-60.3.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "29b0399f7d896b09bb74b9ab78d10686061052493b880f72ee31c00db7cc226e3fe04e9519ff23e139c9644045bf9d6a45a8570d105a9675cbbbc310a930370f"; + sha512 = "eb18921995d209a95444ae213740596ebb0d70d362662741a94a196e75c8b5857ff999ab4c822c95eed1ba3339038b82c725dc46e05d21bc4a5692323a87c589"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/eu/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/eu/thunderbird-60.3.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "d53ced6a20ff89966888d9241fe483d0a6a5586ae8da4a6d9584f6298a8c254a06e2e1e4527536e38c42f92cc14b778cc8264f402efa6abbaba6ca52486c5e06"; + sha512 = "5fc6dd684e9f1ec9be951929f2bbed0e75f5e2c0215206496a2efecb361f194a2009fe5bf2e91f09cae63dfc3f08b51e47a2a82d6b59d425df8dcf4ba316b271"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fi/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/fi/thunderbird-60.3.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "2fdf8b87cee0829e78d130ebf87b5d4bf62266abf17475d349440f7dca043ff7e1c14feef1f69b630cc81afb42bca52440643d0e2f833ce0a61f19e1c1f25721"; + sha512 = "9da23f9aba9cc5f8939bdcf632f764566acbafc48bd05dc04036eae5fc04f41df506a4f80f3543b60a09b057939c074f3ae9eefc2353f765256dc9e0db1aa8e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/fr/thunderbird-60.3.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "288f8346cf90dd666cbb082f1761ad8fdd77a33e43bcca1cfa58c1f84c86bd6c3f7cd6d1d4effdb9ed77c6a50d07b8e5ef3505dc2e2098dc3c38ec32e7fa99c2"; + sha512 = "0c844ef274cf892cadceea78c93efde1f7a110bfd0bdbe3cfdba5c23fef0e2fbb7b3fc3dc59f9b6edbb5c346a6d5ac06b69f4b19541942d09c5d088d6b0e0322"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fy-NL/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/fy-NL/thunderbird-60.3.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "836a74aaf424a93304e12a412f0104ed5d577bd10ad1beceed1b78f2dac65d096103e9999298e25cdb8fea9d616fb4f814ad8c3bca84aeaff0cdcdc38b8763e9"; + sha512 = "0df85e025f9a72255a23ca93a692a0f79a69c9447f8391ff97eea075077a147c6eb164f4851dee47d771dd3db3bacb3dcac71aed91b39fc34dbd65c8ae67bcf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ga-IE/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ga-IE/thunderbird-60.3.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8c680f783e26193a26c507491b82128b123ed89e73dba328391d18264c5780ad88b9f077d4d12868dab6968f4be7e8f1c0dbe397196b556a5af31c07c1b1072e"; + sha512 = "e1feb134d5ed55269fead90efea01f4d74ab03517def2fb9418435c5c699735d14ef3f64bfd33109b87bedefcb90034b1c12da74b798eb0e6b7bc74766d3f425"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/gd/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/gd/thunderbird-60.3.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "e5b092f6b1b79b93225c0cae4022bde8452598d8c36b9e5ebd8fb4b9449d265df048526c30a1207b9ebeb7a5ad421ae77085306dbeb9d1d5b9c34decb98da1af"; + sha512 = "3483c8655e81938554d95492952b967770cd659b625c25dc8864e59dfd5b6cc94bef725f495e725d6ceb24bc05edeb1d2c3ce41a303bc313715788ab03b75c9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/gl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/gl/thunderbird-60.3.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "ec235f57cdc56a66885f2d8098ab9ce80ab3fb87fb30b4c5cc97cde874ae321e326b3ce4fc9e69a6c7f0e61e43cbfb28c0392349151b25ee25a2503e13bf5c3a"; + sha512 = "012ca498f3907f077c9e75e2bceb53fd0a781752b98319cf3b7ccb94a9112896dc2360d45acc440d7c50bdad0a15e125ad8123e13203a3a017e905c2f0e3d252"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/he/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/he/thunderbird-60.3.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "fc9f1ef3dd117b6b4198a09997e3e4095036dddcbf50a32b94a36f53ec886bfdb33debaa2c69b68c14ba7af945c1a35891b11fe9ae8602c11842d381bdf0286b"; + sha512 = "1d7f92a0274bed7390ad0f813066dd7d71bd66f03ea8203d71f025a8f8a8fb4480e2b660ecbc052290a27351662d3f7811c1311eb8ff02e63ffc5f0c8745edfd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hr/thunderbird-60.3.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "4d548d121cc8111711ff7a35383ffe859cdd99a692b255dc71d52cb4cfa90614a5415a58f000ce447209c998b03fa545608333a53c5230fe01527aa882eea295"; + sha512 = "6d19c5ad55486b3aff055476a29353179bf8ff7e9285618f29490c430817af2ff3bc51cfa75c52c82d804a7bce0e367e8ee4d444a03b0bdf4bda57ab75bcd016"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hsb/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hsb/thunderbird-60.3.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "2f98ebdaa190aeebbe60fe20d6246d027425c3d5408abfefcbd50857ba800e9fc53b0177f54cf8b710a013bfc59e4a58b237991058a123cd2f8f0e1f4afaa1b6"; + sha512 = "452927013a6ddc2f2f0dfe3a69a585641df06aac24f6458bb269095abe35101bff6c1a37d21afe8f37f1856a7a3311d49409bd0c456b52eb494cf846e426e2dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hu/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hu/thunderbird-60.3.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "b54703d9b7eb868a771538c0f5ffb0e881efd9137ed29b684dc149e77b3f9a675d0b59feac21c8b1f54c35545b9a2ea2274bcb485ce583102a406e916c3c25f2"; + sha512 = "bbda4eceb8258bf46ed5a90d4bff27a769e0f74a14d76f50e77fc3b2f1b53863fe8a68f0e375aadcd0d60b177f7f31edc6876666dfb95e955083078f813896b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hy-AM/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hy-AM/thunderbird-60.3.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "f3e3918538df95e6a278bd680d019b39c5382078c79eece57f23810aeadd43fd61810967aa384f222f6d21d5d815cf3bd7520a7d31e44b3d2e6c024ff6b46a47"; + sha512 = "79ca9e61fcfb62da522c2cd23a39e1ec8be14dd09bbf3d1cee23bd2a74a9a94a4b9b20af6f37e2a6a75d4b416fbf2b8c3f5196ea4fa52495dc0628a2ae5b26bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/id/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/id/thunderbird-60.3.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3b1956f69a4b82a900dca97f90b29d7cb685c79e6d6063b58bd8de629fd604dca58d058c8b0855ae46daf9517edb1451c40f669cc98e986ada02e317b131b19c"; + sha512 = "2959a8ed196509a6a844db918b283bb3b133b1489cf229e0649ea0033fcd0536cc8fa792554adc7148c41267dabc92309670da6fbaaa1329bb65340192ced249"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/is/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/is/thunderbird-60.3.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "fa5e7574bd73c1d85d300b151a5d1c7852fb035ca5e4599b675008170074736045ee034169108eafe6171371ee94b84003922088e8e0dc4b1c05ba7837499c4f"; + sha512 = "f78de4c7e0125b14a5930cb081bae4b49010b47726268b4e6ce01a0eb0e26b627d5ba47284c060031175787146406d4bca86404fa3d79f3ea67a67443e813862"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/it/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/it/thunderbird-60.3.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a2bd51df6adf2caf4bb22edd02b3b70d94abb1d3ce22731a3188c718161b492f860be1cdd94c39c4a64e6ccbbbe80092310448ff08d671d870ec565b36466b33"; + sha512 = "2a855ca03a703a7e843c7101ff02be356e5851fd2f6d01d1c1a6012946fb5bc57c018fc4e9804cdf66a7febc91c80c278fd420f068bef36bf1daff6f8a3c7640"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ja/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ja/thunderbird-60.3.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "b065494dbefeb8ed79b40b255bc8551dca4f0606c204f00d7c0cc0534fa1aeff45d0b7fa80454fe8ae8803b002600d3e332f7b3138894005922aac48cbdf9ef3"; + sha512 = "323222bffb53d7a8c983bd5a2e06d388fa64689e4a31f888e6919b1c5fd9fb192840fb6c914db1ef988ae0f7505339d086b5388e9690eb77d377ef8037880eef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/kab/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/kab/thunderbird-60.3.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a22017107f11151f2b383d11d6a6b8aa45571c3c4def1ce422fa4b108b546273a362279889c60bf5b01dff73b497879d881b0f8960be97ad92526ceb0ae16488"; + sha512 = "432426fa6185ef49dc7a204f97e38214dbc70e63a960036ca96d85c1a8fe10e7818dec80013c7d812d40808303cc09b70bf1bac8534eebde089e0d41387be797"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/kk/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/kk/thunderbird-60.3.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9d9abbd85a6bda636aacf361dafa05b7f64dff8a7cebe81d2ff9b6d5eca9c800753cfbd3e9dd66ca17edea0bdf8b656d242f47e53f5aab364b14a88d2917da0d"; + sha512 = "a0d4da436365759f0019250f42bb05304a5c80886268a0ac2ea76bb52167670be71fd036392efa6965d699171341b23e2360f795770de0ebc5f4973ce6cdadfe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ko/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ko/thunderbird-60.3.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "083b33b6b50af83380e2976fffcfe9d4fa3fc64199bd6895606392842888ac66734deff738788dbbe449ee7c7a1e06608caa25320c12b1d49885825f7dd8a500"; + sha512 = "ed28830ab1af7482115e53b0a4486d74d2b87b98f8c12a45f6a54c2221de5fae7b7450f1cf07a095d68638bf9f8b25778784606d857067b2ddb142079b411fc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/lt/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/lt/thunderbird-60.3.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "33c16ff80c9cea364bf2d4a501d3d7f04eb6a04c70785d99e0d8d5fa2272acfdaeeb09b45e618ea1c08b9da083f7fdbbfd571eb84699d0d93718e103810983aa"; + sha512 = "52d36def8bf79c58002e42d7912598630140646cfd23254821524c42faeba3782d2d9f16db4ecb432457298bad342648e2271ff71a2d1e6fcfd386134da2265f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ms/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ms/thunderbird-60.3.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "92368bcdf6157b7fbcaad6f5abd40a6dfea2c12d3aaa6eb58a2cc118621ee8df50f34f506aa124413264a44cedadd1755e5dd827f4ad6df069fab9d6cf3b08ec"; + sha512 = "d368bd578add39df284174dbf1eb97e5e3eda26b141af1c729db98f93782fb8da7dc44fdae0ce9a3c070c5905a73dd0dd25fd665144e7af33f975867997437b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nb-NO/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/nb-NO/thunderbird-60.3.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d06ccb94bbe15947b8cc1d685e6ab8f8001e717e104cd1af6799a02c47ac79ce8e1b5315feb6ea3683f9d89b72202e1e2e41a0226f994931304880535a25e2dc"; + sha512 = "ef795c45d7ccf4b8c89abf804d5e758e14534b9d12a1424ae0fc58bb5681dc24e49d6972c128855f886b996dbeaa8a7af0a1af6f4959fbcacf575307332e528a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/nl/thunderbird-60.3.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "2650806011a205cf6dfb1756c270a6a8ec33dc36cfa67d85bbf70264bd306a2b98edf973eac001ac79657fc624f2c56d39c24e7ada9b53b6aaf5825d701c4df5"; + sha512 = "c4d62cdbc421c08d1fd4d8579d58993d51f6cca207d1619240d95b2d9f0484e7e93f4dc6e103d09918fefa384349e5d676973b43a6113f807c28879d829a6d3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nn-NO/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/nn-NO/thunderbird-60.3.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "bd58db3533496758873a273d988f9b53f2d201a176b936b549ca543bd3e612e0898c83a42f761885a9b9ac58f5a3dfd38e93e9f807afed02717dc6b47f574c5c"; + sha512 = "f06459d02dc5d0be311d06c62cdb2a11199722d635411fd63773b01c9103ed232070b3cd9c6c3984e658a54007f8fbf728c51346cdd3a1eee243ecc3bda8bd9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/pl/thunderbird-60.3.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "3d2961721fb1d70b4a40b447ff4364039159115b096eb75aff418db20709e102bbf3f752e04bbbc735506b2b4d45554d38b1d217459efa7405676908831fe4f0"; + sha512 = "77b27ba6c8bc519aae04f1576d278690f24a165a53bee7f1341aa81d2441fe86bc02115a3ec6e3dd3f40d466d6a39bcca615d70e9504945355e706b69d9e68d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pt-BR/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/pt-BR/thunderbird-60.3.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "3610306eeb52cc29ea739b1d5140bf0e4cec8536aed99278a82ea0847a592975e5a9fd23d4763032d3a178a9a830e5a8c87bbe6b0be7765a4f961c00fab05f6a"; + sha512 = "a480dae9a78d473a1614047d2e973f4706ab5a2b754fdecd83cb1eea988f78c53760fbaeea3e98206400a3809e419a5615aa745bd759d652d6f7ce8680d096db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pt-PT/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/pt-PT/thunderbird-60.3.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "30ad1102cd1abdf091cee8971ecd537ee7727e0ff3ef31bc535f830c3c50f8598330b98ab5acd5b1c22d9b4a245f9952b7f6ea0e8ca373c58aaf57f4ae78d554"; + sha512 = "af3fb38963879e99e2c3344ebeca0d300f87b96c4dc031f50dfb5c75e04e1189c930b2df46aa4a343ad93b9461ac38439936ca9a3bc83948668b662f6be69599"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/rm/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/rm/thunderbird-60.3.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8581718d7ef1b0e3c6ffbc2dd38f9a183577d80613a79bfdeed4aefdaddb6fe060429c76ac0ecf4c18a4a445499a444f5b0315ec32f3da00ebdd2d1a3e70d262"; + sha512 = "454264f5629854bdc037c4d826ef31a5fb4857f14aee5780669832e298b788ca98d22c521360dfa5d4f3ff25a18ecc267120a8455423785c801b1a51115ad90c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ro/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ro/thunderbird-60.3.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "e9393e95ef620474fa40188bcc3deb110b21c58eedeb2791cd7d17d0621f45f345fe219eaeaf4a5d71d80e303ad23b5d8ab93c8b5f7d085c3eead902ce239e5c"; + sha512 = "5c23f69b167807abd0823f2b0e81e58695fe7cc53f6edd5ed5f67da77ab3b461637cc3d84dc0c77680421cf70dcaae1190f653aeec82cd6e2e89d429a30f0f1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ru/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ru/thunderbird-60.3.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "dfa9aba3a85bc6f3264849b54d8f6ef14a5cbfcab2eec6f71b5130eaad6b7d8dfdfa2b9572f965fc19b51f80868183008e441961ee0072a1500eef183111f1c4"; + sha512 = "2a2cd091d81da62e24fe7b454fd28477f6089b0982a21973d2e68d78548d90d33eea34c324fe7389100a7938dad226be6f4a3095eed0587b047a9a0691d2f190"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/si/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/si/thunderbird-60.3.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b669455b70def2b7a8e08cf8f7c77db857ef0062b4f791a91ad636e7fcd0eba0aaa5199bbe49d7895a6872370e8cd442e142d017ec6855327d0f555129fa2d68"; + sha512 = "75ca936cc8f3f17803e2e4f086da82598f6f78c4977c239bac929b950b388c61bf675d904638dd4b801afc7a9b58bd9ab0b04b2cecf5f2487e64ef0a599c2ad4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sk/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sk/thunderbird-60.3.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "0719f9073db07793a4f061cf430b3aff539ec3e124ae2a7b6596ca5505e0d0ba96d1af1a3e1dfeebc55601be1ea7a173c5c89657036606b0fdf92c07a35efc7d"; + sha512 = "cd34d310fd49a8c7fa47731ac8972c25b2d32a4000ccbc8ff0dc4c7b2d0c5905942176b6f85d777683204c9d35f4c49c5195740afa8971e4782441a1ea38a0a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sl/thunderbird-60.3.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "66d8ab801f86a5a6a68d5fb48ebb255c3348fe7a0e9eee975fee7c939712cf5cc3bcec084c853600235f8f9774c4bfe66507fae856bc4c9a88d170bc3d6d4e6a"; + sha512 = "cacdb9aa0d01f9641863b52b0c2ec2c61e3c60c03fb7fc1da1fa42cbcedb94797543fe6984538d3ff75594726dc61a1676a2644abd6595902bcafad36d4d370a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sq/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sq/thunderbird-60.3.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "eeb3d2396f8de38cbd9495a82c766183e1640bb05c48dcb4accf770c4c00fb4823be55c5cab6561dbd2dc413316f383265cdae9e0809da1150b9afde678bf4aa"; + sha512 = "6930f66acf54dd47e2cfcb50d2b451a90a4533f54c895d16a872dfb28266d33596929cfa81fbc21536ab1ab7f933d4fb9853979c8be9a621c416817ada423fd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sr/thunderbird-60.3.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "e251e7c1970e68849bfaa6bd9a34894e9b710c7adba1cd54ea063274e7f07735795879a01b4dde2256eb612539d3fd433507fc9c586a28ec803cd636194ca12f"; + sha512 = "ac987c431c719e2c4a61a421a0b2d03bde011579782b29f589efa7f5361879762c0df5d57e809b9386072004e2c85f5aeb770185c6ad3978ce1de0fdc6b6346c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sv-SE/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sv-SE/thunderbird-60.3.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c6d2d165eaa2e46adc9131cbc4aa203308852ee80ccbdc226def37be9505c4e2649e70b668ce38d061dbfebc284e0d604db1094418a02092f189ddd3e7317419"; + sha512 = "078765f08b2f6f53f319037f1237bc68ffeebfa1437fd921051a1f804f8f6e4fdcf7faa377c0fc066f8adf49a0bd6429981708ac3e0dfaffee3f196c9f97c8e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/tr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/tr/thunderbird-60.3.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "d23cb1cac7becb82cedb768376e200108e08814e55c8308492cc65a687d5d9aa5fd38ae742c39572ead41b2d2c3e03dbf2222f88fb0b94ceba6183d6b8a4d0e0"; + sha512 = "4ac98caac0d51467059c90ef0867b78847c7260b4fa36187ccd670f7275ebc1cdd93fbfb934575f82d2cc7f0b0cae6b781842a883e5a8242b3f8d6295d18ae33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/uk/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/uk/thunderbird-60.3.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "7385c719fb86a3c6d64c5d6ed8bea81cb7366cf1cdc97858dd177fb1435f24f3d3d257c60a319dd2db82da1274b9a2e14b73d3eaf20684ca955a0bd7b7b7e3a5"; + sha512 = "9a187b5a401eec58a0c15dceb0ad0e894036f4d2af3e3d129444e31169c1fafff7228093ebb0acf37b9896d72eb88d02d04f8bf16be14092bb27086816a06a65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/vi/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/vi/thunderbird-60.3.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "369be97c79232b58ce2a096814d63c3ee805e2fca8ba40566ddace637c5d9d3686c06e8e0a158ce38395d7056dcc85416251b73ae7b50bdeb79c26fd65044200"; + sha512 = "53388ca676a3c15b41c8ac68a75de4aa10cec3953ff30bec1f67008a26d64a16af8e996b9196e1a23db0f00d835ec5bd22e3bf7e411fa6f8e4d276256afc2a69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/zh-CN/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/zh-CN/thunderbird-60.3.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "934d49874ab0811ad2959de1c43c94e5c94ac52e45dca2e8a6c91ca32c033bbf7c076ab46fbaff5c1f508301d0635b3ada957f09d9f591647d202d09484940c8"; + sha512 = "05de7f60510764ddb49b81b907b2b0f3047b38da361a3ac655266b2ecd90320721b3023d943a5fa8fb20ae632625b7dba394bfa85e54434718d392c035abf29f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/zh-TW/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/zh-TW/thunderbird-60.3.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "50253f13fe918a1f9b066fc9c8b3245aea8fc79502ff7b5130150cf207da080b569fe0aabc5c19cfd77fb79eebe9a9d48f103d6748ea2070bd06476c0bb90e4d"; + sha512 = "f2aeb51217083f284af5150179f4173212d9837e4b85225610db78524fad92ca5c29bf6461543e5ca6cdd2c31f11886837651912682d5e07a82f1bce9a82e879"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ar/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ar/thunderbird-60.3.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "3f0da183490797d4046272a85c9584e95f5b0c66edb94ec4e84906f78f009f8558e4e2c4fcf03f83e8d857aebc13febea3305eb02c6c63ac32474749bd28046b"; + sha512 = "ccd98be198eeaa462e60815fd23a64b854294a63965302477006eb0650dacbf0a9b84d2252bf93a7203410ffece84da42170450303d8e398253f1675e870102d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ast/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ast/thunderbird-60.3.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "e3e0e9d7b30b7a790c681c650e4da123246bb9fc5005dd382f5eb85f3bee9b2e3f79f5a9688f4b5e25da1c1bcb09721ae8c7cce32309e0c554a992fbf1b418ef"; + sha512 = "95e3737727be104753390535d4b963316d95f80ebaf3e323d791287a12e3b3c137f991e4752dd1d6a7a9e9683d945c047963f7c2f7dc9041abf367a2e85741e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/be/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/be/thunderbird-60.3.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ad8c3794452cf734234421b2e7b0e90553f2012e62c1d7ea887610f74aec4af5d60b1ef37765d9cdef93c23367135fdfee800df0f7bcb59cac1761356877e3e0"; + sha512 = "4d20ea0dfdf556b10d5a47795739aeccb992f5d5970d30c5d90040ec759dd269ec2a146d47074c19d5bae8f8add2bba37b8dfc9b5f16d1eeef88f0dadcd85543"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/bg/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/bg/thunderbird-60.3.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "30076e64f51084059186998f36014047ec53f0ec9d9ea2589808c20793403b777f484569eed31d4ecbfd5dec890e1cd219bf071102140d1b4f5ed401225a411d"; + sha512 = "085f87242fe9416d6078c1c921bee327772eceaf84787d8ab407fb836c70ef8cd955ef98ca5532952d6ff085005d197f240a92d71cda6f36c0cd171c840ec937"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/br/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/br/thunderbird-60.3.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "9bf11610fdac1278c66bbe7123269e3ebe4e24b619f8b1ee89769460656825c3a170ad730f5297ca5dc1181833ce833b3a812306d5a6339fb80408992eb9f89e"; + sha512 = "4f95501c6fbfb6c24ae126f7d9e9244c76a84be001f97b0f052f4fd447fa2f8a9357838abb058839072ca5b77409ddf0ff3dde908a4fab884bf120d86c22483c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ca/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ca/thunderbird-60.3.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "95a643963817f5105c76d195c1b3ce4def01e0e5262c730a9cf1ee247512e562d16d56e53968d0078cef12514b9294f30ab59f93e4e25c068553d8ed9633dc59"; + sha512 = "31329841c564aa4bf488d324b19d62cce15397e2c7bda7714c218907a404447187612b353ce712c647a8a5251ce41b7b07a9dc79e9c9991275e09276216c41fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/cs/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/cs/thunderbird-60.3.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "a20498a81b5f3a70a0995552875eb8eb2635b1d8d3508540368f6ec9938493927050a17cdbc944e9f0712622666d13ca6e15088cacdfd687de21b83bad7d7b48"; + sha512 = "f0daaad120fc7a8958f45193151307b386f703c745835c069db7627bd74a8be594d30e4706463468b6ca861c0e628176325bfcff02e3b24ee9e7ebc35ceb76f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/cy/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/cy/thunderbird-60.3.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "9a7ffb9eb9c3d561ba328e43daf232ca2261a30430a17d49010e283f7ae1e190475e3b0c87ab931e26ba6713eb1cd079a1f6f6ac1cd5cf5e991dcee940eae041"; + sha512 = "e44f4003847e7c72c681f9cb8e8b02c05420a88d99a0f2831fe02e256410ed4a2d41070d3674227a436a9045fc3ccdd242532cd5aec8c31a93d7bac2f85e3308"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/da/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/da/thunderbird-60.3.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "186a96ba0ade51ac1ef53aeb02b2c140f0b1da048d24dc41f97497ec1b37afeba5226cebcd1b1f0226391f20f972aa385f41220844897bf1cf8ed8f64fd895b8"; + sha512 = "7462c01d3b9e7ea07047115983985b8d9bf7e71f75ac091248b41bd1e50813971843dcf6da71dfbc5f7f74a5d5fdc50c1b464cec90c4c3e649c9efe3f045e5e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/de/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/de/thunderbird-60.3.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "68aaa7c30f119407f5a7adfcde55865f06841ca60b7819bc4966b16df12af87e32f24d631e483341a171e712979e90d9086fe43a1b1cdd92a512e178d6374ae8"; + sha512 = "0c6e1fa83a9a886062ca3123671091b9001c2f54d1b0988a7b68e4e5900c036f436d3686bb0cf346a92e7426b9153f6f58a992766f0df215dca33317b81d04bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/dsb/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/dsb/thunderbird-60.3.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "0bb90eec8123035e1833b746ac3ad1558ef01fe4647c94706a4988d1c8ed53b01f8621f3ac2aeffda640a8e6fd05cb71b3edca369a7b445608a8eae5dc12dc9d"; + sha512 = "de2ae2d5e7abf26e021671d4cc8b1ed69817b4ef2361416405f60737d6eb117b10fbf3fcac7d75a204ce483ac6d0623e0b78a27c8229d11214cb6ce02fa70756"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/el/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/el/thunderbird-60.3.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8f2072017f5edf494c091e712e26b253ae4809fbb81d1ee22063ad02f2cbde06f04d9873c61691245ddd249c489c4b3f58230ca12cb390abee8375114331121d"; + sha512 = "b52519e5a0040b92c59eefd9a6b6908711b9685fbdd46b9c26149a83c37e0b31aaa591259e6ec40088443a7c9ca2fbe5fc4a4ee046a226a6493eb17c12d1bab5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/en-GB/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/en-GB/thunderbird-60.3.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "8a91106d035033e9a358f99d1b28cebad978586bf2e363b0856333583e6b1fbee191f3a8518efab85c188fa60c8c5d3d4452fffdd8b5f3a7998e213d5e6eaf05"; + sha512 = "9c0bb3da4f47a6541b8d4d2db5eaf37f04a0190f6761f6dd09aa67a58de66b81321b9985470c09cb6887c660939615971bdae6626c49fbc77365bbb93434449c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/en-US/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/en-US/thunderbird-60.3.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "e104e90333fd9ad786cd59cb323a2a87a532b242aa7e6127ba38df00b9d747278cafda32b359258c9e6ade5a945c4a227ad81595e30717b1a06e314c511e975b"; + sha512 = "da73b44eb926b981ba6855b9b1e79a030740499ce6d374922a47e311e4b6bbe8c9f39da19bfa705392edd0c0c3e0de1ae86d76a81cd1508ecee50c69bc69e43d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/es-AR/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/es-AR/thunderbird-60.3.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a7cfeb77ce146102b8583fa086536c58760ff30b69c8f9373be2277815ed57c1132ffdd04edf782ab8224f2ef231ae4c2c581dc13c174db6ff382a72975279b2"; + sha512 = "fd66717fb818610199eb628e22c5067892740c04924b406ce951afb5ee2a6e7a872224c6419c185b327a4e59f984bdf144628903f8a7bed10d4ea9247afc188f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/es-ES/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/es-ES/thunderbird-60.3.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "7700206c19f5b8a434e323cd3f64df90696b04790620e6e20d23519dc92a8f3abcdcd8799d7d3843968e78cd8a6cf282924f3ebe442eebd40282fc035e096c0c"; + sha512 = "078d8eb9a7f1373ec90f0e3a1f22881546489fbfaec1fc4c26c6b85867233194c595d417221f6bd801338798bcf46506390d43d835604f8e188a4010a4610500"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/et/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/et/thunderbird-60.3.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "14768d992308cee0fcb30d8c676d89f8e30bebc86f4fb4087c06d38afc41df418666446c65e995e74c67a6a6214c05338fd9471e02d5d5101e438b414c9873e3"; + sha512 = "c10994ebbe72d3dc4fa27b8dab56baf1625f6d128f961bc935139d224874959f3fe7f6b0d30ec7e72a8c6d49fc81761da1231170cac8d0d74da4354b59e1a407"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/eu/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/eu/thunderbird-60.3.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "b8a33488d452443ee7393d77db68760b96d3f868050f49521a76b522fcddb7f4a573be06810c091e8b02d76b681c393554c01fc6800e420f9adf4c3e42bdb436"; + sha512 = "0ca85492207350ad85731606bc298765b594a33db3c7889771cd92676e1e04240b4bf4ed9c540b94e61306c0e581ef656ed05e2dda9e333cb107285dd5fc98d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fi/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/fi/thunderbird-60.3.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "670db16b381e68e2f6faa353d91120a787ce360143d72c4a9041a4684688314e3dc466b2beb9166b76a822f8d96348b41bb32410678d711e39947c932424f295"; + sha512 = "9d5082cd17e1975152daca9247f103f0a6ddf09cad6c017f3d0ff9f185af58d88f6802e2bcc48206c97c40828335580584dd4ad62b322829169b509a48c353ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/fr/thunderbird-60.3.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b3474043fb1b3a6fd1d396d6b0490d8db71c135846e4ef74d22e80abf41ab4ca1faf346c9928424e13ef9c12d6cad19f389b4cd38c45385688b5b4587bcc0a0d"; + sha512 = "33d0496886cd0ada4f944a409d5cef5294d5dd7a3a10874558538a1b5a31e212ae9b3d5661c9e719a64419859e9b1d2945f475b91106b3f30aecf617ee6dab18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fy-NL/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/fy-NL/thunderbird-60.3.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "41b9f80ae6e8ce765d8fb057bd49af032532cee9d5f2c4b17a4d3833fbe8ace4c7ed4336433273e59f98a1b4cadef1ed49f77a95eca868a39e76e7454d7bf91a"; + sha512 = "64ad8e580e8b1f8acdbb52245dbeacc22cb15471f9aabd091bfb262669c81e59e2fcaa2b31ce7fbd2d634896a9b0d22884d4151b3d90bc50b75de7f2680be852"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ga-IE/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ga-IE/thunderbird-60.3.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "f89277340c6deb07e73fd7a7227fa216960c89269e9d4ada0f8a6863ee60ba004317beb207a1128930fb8c28477963bb66ffb0a76e86dfcc371579672b0eb26f"; + sha512 = "0fa4eebfc335022de2118a1bf5b27f83969ab26bf2d03d011d732cb8f2614bd75a60629a4f6c410a4fdf8ac8b3043c849aced85d7cf21bcbd263025ee0338234"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/gd/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/gd/thunderbird-60.3.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "d3ac6c868fb504b71823b5a3139155f6f441839c33f10cf73d8e0bafab5e7d9f7bfae3b884b41fee1ced4c10565321bd13900575855d42f70958e569e7756743"; + sha512 = "7cd1f55355fa2eecc6e6f79bb642800a014de93d80c273b57c9e910111684cd5f59d26ef4fbfa1bf6a6b1aee12f19cb2a0d376a9822fe8230ee9c7f81deef54c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/gl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/gl/thunderbird-60.3.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "88f41447654685280aef548951609cb0ce7054a67c632a66892d1707d6d3dad3fe037dcea6ac8222080c0fc2f19d77f622506e82b6ea93114462b131fd4de308"; + sha512 = "b5c1853b7a225116bb0c6cbca7dcac6256c8d46382fba5af5bdbfd7fec0bf6ce01def72ca1fd26c8243c7f1d77de7fabcf691dc956eaa911997915629a03fac9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/he/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/he/thunderbird-60.3.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "faa622a8b7fb3c5ba4156cfb6ab4414c0a56a820a1593b555e817c3edcefc59fede6b681a0c6722cb540c81ccc425bb27d2895ff84f5ce2e61eaa7b37114be42"; + sha512 = "9155a7f37288baccadf31063a9955a1b7f6a9a7172c2650c5fc5ea32f3f473e5a682a6e269efae4429f23dda15a2afe00119594e4a5e9225eb298fd8ab48ae84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hr/thunderbird-60.3.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "74321b6e6833014d60b698d7f83337c846452fc1e2148634150f192425607595795036e13d55ea0366c4d3e7c998c9c3766f50abebd606dd2ce7c3e6fbbf4963"; + sha512 = "7fd14cf6e2844d264c8931e740f0281efd3b205bbd3bef08906628e6a65a703642c0794e85c8f2d56d944b6bc5b0d4590c369c668a13f54379e91d16d124b29c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hsb/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hsb/thunderbird-60.3.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "5964563cc323a606dd33019888ac483bda47f0da073e3d64ba329521cb7a192ae9014cdd2d44e48091d2f3f0219dab11a60497842e42e37a7b3be9415843fd76"; + sha512 = "eec8cd8a07f1d044387fd540d7ab848c562f36bebae19ab4b90dee0043f0578b21af9b1894d88db344adbee1127df5822e50caa8563c15fe5f2996c8888c35ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hu/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hu/thunderbird-60.3.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "20ed810d74584d9c79b0dad65c50ab8422f841aa2e4974dcdef249aaf4901315c79ee1f071c4d03cd83fbb973eae35fa730aa0db88fb46617454ad5a4371f107"; + sha512 = "af2a83eb2cdcd184c36c4f190690b50747a7df4e9b962f4858e41657ca1ce589e9e7167192a3a678d60458cf7fca89a3788607c100b96522d58d465b3f84dfc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hy-AM/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hy-AM/thunderbird-60.3.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "90973c56fb46c3c150efad6cfd48d24916983302dc459f386c5fa11ebeb4b32d7b7d4a35e8b3e0ff7358b4af9c13e112d01eb30abc069dfaa8ef8aa3af043955"; + sha512 = "0647b06bb64dd7f749029d95c242acf3a9c27e75c234198275d8d533d3376d5b26e9c872a75b966d6dcf2ccedc9054d26c56a474286d4108d298b69687be908a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/id/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/id/thunderbird-60.3.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "9838d3e9a9fd30e03885f4195a951e285230a33757672c54c60edeecfedd220e6a8951d9bbfad34688ab0d16fe38507b3f8524d1ff3a987482cf761d67a17dc1"; + sha512 = "3a9a6fc713a8fdd9e28db9f381632ca65f00d78e642922091a6df4386bff2db0f1925118a2362073bab3565cc6741a64804c17e577568e665a3ba2414bd43c87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/is/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/is/thunderbird-60.3.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b951f6db2e2a70a6bf43e5cc7ce203d59b9062aad44bae3634db03dfe202aac723bb8b2283deeace96e8401c772f43aa985b76259de538f62dd970e285b09a42"; + sha512 = "a041121fd514c3af8fca1451992cf15642a5bfbff14336769afb5de56017362e35cbd3c3a9717a1ef861b3b47f5951670f37bac50ed318c60bb932196aaf4798"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/it/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/it/thunderbird-60.3.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "389ec0d921b42e4238ce13546df6bdd1256381e95aea9e9e18e46524feeb4837b2be534fa452a4cae51d3fb060e059dbdffe7f26f017adc4f88aebea19f656ae"; + sha512 = "246dcdba4a29d3ef657edf9850727baccc3c6246a56cdf9b0634faf54ed2b2736cccf6c544fe34ada3efcfcff5ad334ad3a4b1f29e986518dc88816d727b42c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ja/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ja/thunderbird-60.3.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d012b6339c6e18aa49c4f6a4db40aae3315128b89938bbc64fee94a90db8cbd65b27bda9742a7a761c52fa974d9b5ab5e1d98ab485123c33be318d216ea8628e"; + sha512 = "f6ada0506ce125d46721710dae96f086da51abb15c3b20c5d5425946362534d8c99d67e3002131390e774b2ef867f422db215b51f368074b54f1f91e7fece482"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/kab/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/kab/thunderbird-60.3.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "06b05f5d4c97008706eca67eb9b513b35122716a3083bdf3f3fb97cf0a6f1606c97a097a5c979657234562e505203f66bba483879fc2070c97514000326cdc23"; + sha512 = "3838eb63f96e916402bd158aacb082ae97a9044cd0a6133206da0f6f8d389c361b55e84295b8c483a4be5920aa12b2eb3961525cb011327efcd720856fff41ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/kk/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/kk/thunderbird-60.3.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "0ea99590b068925f137a63bfad3a0cce2e380f80388a94910836e7f517f0375d43f6f1325c6660eab13a97d1b9685102cef921f99135504abe70650ba7de9697"; + sha512 = "a3d010da794cf16d8ddfc14ca50f8504c8063091dc2770eb673281bf52c47faca96f5fce87bba5a691294117e23c46edf5a54b8c8b56d9a57902c088e247142c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ko/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ko/thunderbird-60.3.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "e89d27c4cae745c902f61d9534b6582e2af3806714e596dffac1a0d49416a0ab4eca76d9810853c759312c192679b2aae4a6cdb289c5b5d1f472450757c71ccb"; + sha512 = "8243d3ae0cb32d8805887d41764f5bc06dab1d2777c32e5d3b3a95dc52755f79e5d11fad4f93553262749a2cc6151462091a3a1228d83c4bda7ab04a6c427b1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/lt/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/lt/thunderbird-60.3.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "3f86701c031aa174ffaacb532f198f7911045a855f8526e8a47ed26695e86bd40d1d83140cdab123e40a9759317724296f4ec7d788781b767590f0135b0c79c5"; + sha512 = "8c9456bf6add79ef4cfc46b0400a7de4e6ff37e45788e524565bddbbc31152072ed6f10a033d5c77bfcbf46809132e87722dc5b77ac063a63cec6086d630e8d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ms/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ms/thunderbird-60.3.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "d44ddf44d0c0b5190f3b282be2e3f98dbd28a584727970ceb8b3569672634ae476b85c4dda4659d1a58d8ae36adb9db1c5a4d341f9f1f7d861af64287e546316"; + sha512 = "a0df7d3fc076370728909e32f9205c98b5c0f14b829148348f02c4f10a20ff21bd3e37ba54784b93f6b577c5710f0c021181146f50119789fbecbf7afd86285f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nb-NO/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/nb-NO/thunderbird-60.3.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "d0455dbd94fddabbd474037325c792e3e30fc4aba419d04f0425bdd33db17a1532c955a992b1bf3ffe2c16f440c6ed5c15a5ca6e259c74a5ee1e3f84f457de5e"; + sha512 = "b363b84cec28b80b80a89ad0aa91d81952a7503aa985b705cd0f6045f309287d0a3671c96fc871cbc1dc51d62f30d00532914f1e06255e240593dfcf9b7f8ef5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/nl/thunderbird-60.3.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b4c24a1b73078a9196178d5ff0f386502afc451f0108321bb45641b30bbbe8225ffd54e00b883515b4849bc76ad8c4dfce525ae5e2aea378ffc31ffa5867dca1"; + sha512 = "1f9184da2d2b28649f7051f00e68491694ab19de23a318429ea29dccf9175520dfe1c8fd4ab9040d9b4e8ec2f0b65a884d1c130d3df034193a9c8bb23b23f024"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nn-NO/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/nn-NO/thunderbird-60.3.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "56ee8a0911a7a7034f18f246d1a607733842846f31d9715611b1e3df5aeb5b70f4d13e4af6785be53ba75a79e845066ffc7ce2aaa8d7319dc92d6ff04a2a5901"; + sha512 = "f85bbd7f6a3bebe7485c678318183082dc09ac259316d35874eeab67b77358495c2a8a6e01d09364bf4b9da0608b99541704894b78946ddd3e2833694a1a9fe4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/pl/thunderbird-60.3.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "256331ad82a25c162681e4cc79f5f1c1127b09672e8bb663968950fcfbeeeadce26acb9ecbe10322552ec7d11e80612fab8582906380880e90ae6caa84be6cd3"; + sha512 = "ffa67d8f9f8f923341bc8a9235503af0dd20798e65f406d7aefd4fa30a06371ba265b3b8b67f31ca0792cad09033ef46b7f064d6270c76af9191c3122933bd4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pt-BR/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/pt-BR/thunderbird-60.3.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "67c7d28061ce5d1f2062092c308be8f88f7a718be637d359c400e56a772e5ff3722bbe3388b5673262dd12373b9728e6e58afbf9a713dabce5d3172532a8257e"; + sha512 = "bd92b016722347ae7662e8d44bbe205b8db19a9a3f9c5e537db4e9bf7d84e8bb69ca860d34b2b78219f01c6130ffd8e79aaf842545397766dc1199e1df8af3c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pt-PT/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/pt-PT/thunderbird-60.3.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "ce818347a10f580eaeb7f97d343a73149db571527ab207e3eef9108aca7309222e0ed7bda41d523d6e371abd6518d3cccfdc760d28eab692e23746b30940b556"; + sha512 = "f97d92c60f64380ee35c2eb41cc7c494e09b48a367a14ec1f2cf05f6bedda4bfc5014b41d456e0434a328c663e1adefc104b59c2c6366ccbf51c5a6466bb8e09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/rm/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/rm/thunderbird-60.3.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c2cf9e67ebc7aeeb8642fc2f32d721f4c9656456d9fc7d04df31672b9c6b07352d87f25d58d75267d9a8388dbaca238d605373559dca4bc238b02bc7a27dd837"; + sha512 = "03ab5b1eef8082489471159786027b8fdca8cadedd396c28e5c00bca31554ba4ce14b8e810b055c9852f1d8964c8b1bd83b34e1a79b840146806ad701ff8a4a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ro/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ro/thunderbird-60.3.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "f567baa16a96617e01753136f74744cc72c147ef59e40861292048fafb37745e0f8654d355c5e60752a4b86236b378fc15d09f656998a920ab970c6f7ca6e4cd"; + sha512 = "e7fd6217ecb683dd78ababecb4dc17e7705a04c6761f445b34fffdb32527818f5b71361a8613ef54250956462f305faa59267698c89c6ea64eae2c5bb80c1dc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ru/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ru/thunderbird-60.3.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e28699b8884f7859323870987fe425af0a8408152a3d373007b634aea1868ab1de483830c07da7efa1fd49c96b5be6c52f5bef91c21c8de0533216be57644fc6"; + sha512 = "051593bb3f0d0ce571aba9365455d97d392377b482db7fa0efa42a50ae52981c294e84f185abd0dd52a07fcbae852d55f0427ede0f5172632a8dac416ed528a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/si/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/si/thunderbird-60.3.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "e8ea29c2b77398611b79cebd674983f9458d07b4866597fa2bc35ce6d78bf81daebe4311e93604e4e5a391e632eaa9f6601eb75d022ef1b2dfc225b9cc61b0c9"; + sha512 = "0e859053b989734e1134c365a28a5fdb628fd61125cd6c4d3b7cf598e861dc8b08330ec017c148eda8fd02df49a7688d6b5d7e057ab75b387362dca884c9a90d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sk/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sk/thunderbird-60.3.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "587f54eb86b0d0069433e14dce5f24e07ebc355f35f22eaba3ee0982e257782fe4ce5799ee0f7c733fa5a571935d2404ff950acf25b9be61dced6250d76611bd"; + sha512 = "f7d8191bd1f8b78a1a04d669b5193d1067413f3d1f5600940129cf018e38aae85b2c7d274308ca56b2b871d3ec594703d5dde2d5ae12dafee0332ce37393142f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sl/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sl/thunderbird-60.3.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "196a31e47578bcf064b42c3d3ed1ac3b623a54b5694fab72e1177257d68c13013352228a09ec8dd4fc53d91a0e8036b2b7c815432fdd35c624852cd74f98541c"; + sha512 = "c6e9ec49518f19bbfb045b85aec4f11e43645a55892cd3e8570f90b0c4fcc90f4e57848ed5419708c5544aa5df93b1a61786ca1422976938795bc7c5c2743098"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sq/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sq/thunderbird-60.3.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "5a2b966e7119853fd98e976e555831058aa0c8cfdc463dcc79ca698aa4bb5d9b43b5fa2e6cb60a51cfee987c360c651de509463002aeb9c4e1fbe58b6fa4dd08"; + sha512 = "e5586b535c014b400535680964c0ec03ef9a4d9cbd3bea4701293f681635faf6218744d8a8cb8781310ad4797143610ce1821de5c24232e990a24a87a57a7f2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sr/thunderbird-60.3.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "62666fe7d94f3486d1d5df1cf479bd21a13b9bdc9a4f24fa1f280a838c008d28a2fd6e78ac445ea6ce126fc54b60151e3c4f9b3820e231c8593fa83aab1076fa"; + sha512 = "7bbd3dd52ed742cc59d474f9235a1370d5cb8d9a805df87fffbc9eb13fa50d3bcba630a720effdfaab42580148a9328ba09869b09d06151eaa5ded55db13cbf3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sv-SE/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sv-SE/thunderbird-60.3.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "b8f75bfdb3ad9ffa768a5ef4cdfed93004232d9d4f301b0e5b9ce56fd47d34efc779fafcb67c0b848a83ed59c1fa4bb17dbdb583599a99b78186489099159d92"; + sha512 = "157772822f5f28fbbc4fe2b19b38c1cee3e11d7c62c802620e3b3df17898cf61d3c7ffd1e77e2373ddbfd67452e177eabdd34c3a025f7b4bbcb587dc2fa607b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/tr/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/tr/thunderbird-60.3.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b72e4c0d1564248927e1f2d8922651e3f7e37e99de77dc548508d4c0c1951e0e59b461cad18cf0dca0145d7465fe7bac93ecb4841c18db2b57822b0014b2f83e"; + sha512 = "7748d29478930265e632973ccee211d3edef2e5ee5ff363145d57c9bbaf7257e8e963287eb854cce4de16ad976d54305be14bb848e164c9feaf223ad40e1c8e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/uk/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/uk/thunderbird-60.3.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7287cb6fce1c1482e0adf00598139b0e9e97371171a14b15ea42652c5890fb1c7de0aa213220444c68c5fe33a43f242f0475b5836deebcfe5fc6b52e21c195e5"; + sha512 = "c8cc86f2c802f05131d2ceb2ab3fb1c3fc72c9253efd40833046c2022de61d581222275d84584938a3720f0d20df6eeee4ca50751554fe53fd7551577db0591b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/vi/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/vi/thunderbird-60.3.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "07886cd20ea43fbac59055d5cf34776fd38616477f8c55f4af78031034f8198ef57d716b365ee7a08f267fef0e3b50ba188dd31b1ba1508545b85fd7001f4326"; + sha512 = "81bd7e3276e2b7ad50456d29fc84260b0cd694acaeea6818b0fdfcda91ed0e04b3c03b8721303c5b3a6cb8a7570c5b925922c9d6725a258c525250ff42c076e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/zh-CN/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/zh-CN/thunderbird-60.3.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "d34dde5c5f063d8d79a0aa032f54602570426bcce920810d1fc3c8e842827fdbb0b8b9dfa3e4049bf37de4c98356f7e87942bfdd3f7483bb6e3dc7ddd2ebd246"; + sha512 = "2d120d666559ce4c0bbb1045d03aaa7c9f851c929b91fd6addc20c3a81ca7accba550f49540e3249ee227caa19aaf24414db995d930f0e02f651d75c230e3429"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/zh-TW/thunderbird-60.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/zh-TW/thunderbird-60.3.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "e8de34531211a60099e677dd619e9e75883f0d5a935df4807b0075dc3d8c57c97dc364eef629896aa46066d290f7138ed67e002fe0cadf7e86b0c77cf99f080f"; + sha512 = "ad36e3c82d68215765a83cf0098bfc392b2e3f32dbdb7998f54e4b83885f5be53a65cf814990237d7cd35b4695a23f5a4dff363e185b5c75a5aa2248c96ab80e"; } ]; } From 0810d631a489fcd819eafc530c45e768570ace8d Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Thu, 1 Nov 2018 23:55:44 +0100 Subject: [PATCH 10/50] nixos/rspamd: Add support for included files By default rspamd will look for multiple files in /etc/rspamd/local.d and /etc/rspamd/override.d to be included in subsections of the merged final config for rspamd. Most of the config snippets in the official rspamd documentation are made to these files and so it makes sense for NixOS to support them and this is what this commit does. As part of rspamd 1.8.1 support was added for having custom Lua rules stored in $LOCAL_CONFDIR/rspamd.local.lua which means that it is now possible for NixOS to support such rules and so this commit also adds support for this to the rspamd module. --- nixos/modules/services/mail/rspamd.nix | 79 +++++++++++++++++++++++++- nixos/tests/rspamd.nix | 77 ++++++++++++++++++++++++- 2 files changed, 151 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index ff01a5dee53d..d83d6f1f750c 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -127,11 +127,15 @@ let options { pidfile = "$RUNDIR/rspamd.pid"; .include "$CONFDIR/options.inc" + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/options.inc" + .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc" } logging { type = "syslog"; .include "$CONFDIR/logging.inc" + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/logging.inc" + .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc" } ${concatStringsSep "\n" (mapAttrsToList (name: value: '' @@ -149,6 +153,41 @@ let ${cfg.extraConfig} ''; + rspamdDir = pkgs.linkFarm "etc-rspamd-dir" ( + (mapAttrsToList (name: file: { name = "local.d/${name}"; path = file.source; }) cfg.locals) ++ + (mapAttrsToList (name: file: { name = "override.d/${name}"; path = file.source; }) cfg.overrides) ++ + (optional (cfg.localLuaRules != null) { name = "rspamd.local.lua"; path = cfg.localLuaRules; }) ++ + [ { name = "rspamd.conf"; path = rspamdConfFile; } ] + ); + + configFileModule = prefix: { name, config, ... }: { + options = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether this file ${prefix} should be generated. This + option allows specific ${prefix} files to be disabled. + ''; + }; + + text = mkOption { + default = null; + type = types.nullOr types.lines; + description = "Text of the file."; + }; + + source = mkOption { + type = types.path; + description = "Path of the source file."; + }; + }; + config = { + source = mkIf (config.text != null) ( + let name' = "rspamd-${prefix}-" + baseNameOf name; + in mkDefault (pkgs.writeText name' config.text)); + }; + }; in { @@ -167,6 +206,41 @@ in description = "Whether to run the rspamd daemon in debug mode."; }; + locals = mkOption { + type = with types; loaOf (submodule (configFileModule "locals")); + default = {}; + description = '' + Local configuration files, written into /etc/rspamd/local.d/{name}. + ''; + example = literalExample '' + { "redis.conf".source = "/nix/store/.../etc/dir/redis.conf"; + "arc.conf".text = "allow_envfrom_empty = true;"; + } + ''; + }; + + overrides = mkOption { + type = with types; loaOf (submodule (configFileModule "overrides")); + default = {}; + description = '' + Overridden configuration files, written into /etc/rspamd/override.d/{name}. + ''; + example = literalExample '' + { "redis.conf".source = "/nix/store/.../etc/dir/redis.conf"; + "arc.conf".text = "allow_envfrom_empty = true;"; + } + ''; + }; + + localLuaRules = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Path of file to link to /etc/rspamd/rspamd.local.lua for local + rules written in Lua + ''; + }; + workers = mkOption { type = with types; attrsOf (submodule workerOpts); description = '' @@ -242,16 +316,17 @@ in gid = config.ids.gids.rspamd; }; - environment.etc."rspamd.conf".source = rspamdConfFile; + environment.etc."rspamd".source = rspamdDir; systemd.services.rspamd = { description = "Rspamd Service"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + restartTriggers = [ rspamdDir ]; serviceConfig = { - ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f"; + ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c /etc/rspamd/rspamd.conf -f"; Restart = "always"; RuntimeDirectory = "rspamd"; PrivateTmp = true; diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix index a12622b6aa0b..af765f37b91b 100644 --- a/nixos/tests/rspamd.nix +++ b/nixos/tests/rspamd.nix @@ -27,7 +27,7 @@ let $machine->succeed("id \"rspamd\" >/dev/null"); ${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "660" } sleep 10; - $machine->log($machine->succeed("cat /etc/rspamd.conf")); + $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf")); $machine->log($machine->succeed("systemctl cat rspamd.service")); $machine->log($machine->succeed("curl http://localhost:11334/auth")); $machine->log($machine->succeed("curl http://127.0.0.1:11334/auth")); @@ -55,7 +55,7 @@ in $machine->waitForFile("/run/rspamd.sock"); ${checkSocket "/run/rspamd.sock" "root" "root" "600" } ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } - $machine->log($machine->succeed("cat /etc/rspamd.conf")); + $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf")); $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); ''; @@ -86,9 +86,80 @@ in $machine->waitForFile("/run/rspamd.sock"); ${checkSocket "/run/rspamd.sock" "root" "root" "600" } ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } - $machine->log($machine->succeed("cat /etc/rspamd.conf")); + $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf")); $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); ''; }; + customLuaRules = makeTest { + name = "rspamd-custom-lua-rules"; + machine = { + environment.etc."tests/no-muh.eml".text = '' + From: Sheep1 + To: Sheep2 + Subject: Evil cows + + I find cows to be evil don't you? + ''; + environment.etc."tests/muh.eml".text = '' + From: Cow + To: Sheep2 + Subject: Evil cows + + Cows are majestic creatures don't Muh agree? + ''; + services.rspamd = { + enable = true; + locals."groups.conf".text = '' + group "cows" { + symbol { + NO_MUH = { + weight = 1.0; + description = "Mails should not muh"; + } + } + } + ''; + localLuaRules = pkgs.writeText "rspamd.local.lua" '' + local rspamd_logger = require "rspamd_logger" + rspamd_config.NO_MUH = { + callback = function (task) + local parts = task:get_text_parts() + if parts then + for _,part in ipairs(parts) do + local content = tostring(part:get_content()) + rspamd_logger.infox(rspamd_config, 'Found content %s', content) + local found = string.find(content, "Muh"); + rspamd_logger.infox(rspamd_config, 'Found muh %s', tostring(found)) + if found then + return true + end + end + end + return false + end, + score = 5.0, + description = 'Allow no cows', + group = "cows", + } + rspamd_logger.infox(rspamd_config, 'Work dammit!!!') + ''; + }; + }; + testScript = '' + ${initMachine} + $machine->waitForOpenPort(11334); + $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf")); + $machine->log($machine->succeed("cat /etc/rspamd/rspamd.local.lua")); + $machine->log($machine->succeed("cat /etc/rspamd/local.d/groups.conf")); + ${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "660" } + $machine->log($machine->succeed("curl --unix-socket /run/rspamd/rspamd.sock http://localhost/ping")); + $machine->log($machine->succeed("rspamc -h 127.0.0.1:11334 stat")); + $machine->log($machine->succeed("cat /etc/tests/no-muh.eml | rspamc -h 127.0.0.1:11334")); + $machine->log($machine->succeed("cat /etc/tests/muh.eml | rspamc -h 127.0.0.1:11334 symbols")); + $machine->waitUntilSucceeds("journalctl -u rspamd | grep -i muh >&2"); + $machine->log($machine->fail("cat /etc/tests/no-muh.eml | rspamc -h 127.0.0.1:11334 symbols | grep NO_MUH")); + $machine->log($machine->succeed("cat /etc/tests/muh.eml | rspamc -h 127.0.0.1:11334 symbols | grep NO_MUH")); + ''; + }; } From 1ccafe56f9b5bf967a30ad47b5ac947264cb0c4b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 2 Nov 2018 18:12:07 +0800 Subject: [PATCH 11/50] pythonPackages.broadlink: init at 0.9 --- .../python-modules/broadlink/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/broadlink/default.nix diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix new file mode 100644 index 000000000000..d1ecddded776 --- /dev/null +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchPypi, buildPythonPackage +, pyaes, pycrc }: + +buildPythonPackage rec { + pname = "broadlink"; + version = "0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "10dnd859yjh1h6qrxhvkslbsj5fh5g654xsq2yqblkkv3xd711rs"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace pyaes==1.6.0 pyaes + ''; + + propagatedBuildInputs = [ pyaes pycrc ]; + + # no tests available + doCheck = false; + + meta = with lib; { + description = "Python API for controlling Broadlink IR controllers"; + homepage = http://github.com/mjg59/python-broadlink; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c5870b529c1..f8b6990ce836 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -260,6 +260,8 @@ in { brotli = callPackage ../development/python-modules/brotli { }; + broadlink = callPackage ../development/python-modules/broadlink { }; + browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {}); From f8a415f793c5caa1f4469e84810fd33407a2e376 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 2 Nov 2018 18:12:19 +0800 Subject: [PATCH 12/50] home-assistant: make broadlink module available --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f1ee1eda95da..2a701dc870d5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -851,7 +851,7 @@ "sensor.bme680" = ps: with ps; [ ]; "sensor.bmw_connected_drive" = ps: with ps; [ ]; "sensor.bom" = ps: with ps; [ ]; - "sensor.broadlink" = ps: with ps; [ ]; + "sensor.broadlink" = ps: with ps; [ broadlink ]; "sensor.buienradar" = ps: with ps; [ ]; "sensor.canary" = ps: with ps; [ ]; "sensor.cert_expiry" = ps: with ps; [ ]; @@ -1139,7 +1139,7 @@ "switch.arduino" = ps: with ps; [ ]; "switch.arest" = ps: with ps; [ ]; "switch.bbb_gpio" = ps: with ps; [ ]; - "switch.broadlink" = ps: with ps; [ ]; + "switch.broadlink" = ps: with ps; [ broadlink ]; "switch.command_line" = ps: with ps; [ ]; "switch.deconz" = ps: with ps; [ ]; "switch.deluge" = ps: with ps; [ deluge-client ]; From c78761b5bdd814956364d851bbcb08cab4279876 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 2 Nov 2018 13:12:54 -0500 Subject: [PATCH 13/50] tor: 0.3.4.8 -> 0.3.4.9 https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-0.3.4.9 Please confirm the sha256 is correct for a verified tarball, I'm not setup (or know how offhand but docs look promising) to do this myself. --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index d7344884951c..d43b8598c18b 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -14,11 +14,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.4.8"; + name = "tor-0.3.4.9"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "08qhzcmzxp5xr2l5721vagksqnnbrzzzy5hmz5y9r8lrq2r4qsl2"; + sha256 = "0jhnvnp08hsfrzgsvg5xnfxyaw3nzgg9h24cwbwnz6iby20i05qs"; }; outputs = [ "out" "geoip" ]; From 2f0de54ddbfdb03540128f8d2abcc47221d42b25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Nov 2018 20:13:55 +0100 Subject: [PATCH 14/50] Drop obsolete GHC versions 7.10.3, 8.0.2, and 8.4.3. We keep the latest minor release of each one of the last 3 major releases, which currently are GHC versions 8.2.2, 8.4.4, and 8.6.1. We also have ghc-HEAD, but this doesn't count. Dropping these compilers implied that we have to drop the corresponding versions of ghcjs, too. We can also drop a shitload of obsolete compiler patches that newer versions no longer need. At some point, we can probably simplify the generic builder, too. --- pkgs/development/compilers/ghc/7.10.3.nix | 194 ------- pkgs/development/compilers/ghc/8.0.2.nix | 201 ------- pkgs/development/compilers/ghc/8.4.3.nix | 247 -------- .../ghc/ghc-8.0.2-no-cpp-warnings.patch | 23 - .../compilers/ghc/ghc-gold-linker.patch | 54 -- .../compilers/ghc/ghc-no-madv-free.patch | 18 - .../compilers/ghc/relocation.patch | 27 - .../compilers/ghcjs/7.10/boot.patch | 104 ---- .../compilers/ghcjs/7.10/default.nix | 50 -- .../compilers/ghcjs/7.10/shims.nix | 7 - .../compilers/ghcjs/7.10/stage2.nix | 344 ----------- .../compilers/ghcjs/8.0/boot.patch | 86 --- .../compilers/ghcjs/8.0/default.nix | 50 -- .../development/compilers/ghcjs/8.0/shims.nix | 7 - .../compilers/ghcjs/8.0/stage2.nix | 545 ------------------ .../configuration-ghc-7.10.x.nix | 239 -------- .../configuration-ghc-8.0.x.nix | 91 --- .../configuration-halvm-2.4.0.nix | 59 -- pkgs/top-level/haskell-packages.nix | 40 -- 19 files changed, 2386 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/7.10.3.nix delete mode 100644 pkgs/development/compilers/ghc/8.0.2.nix delete mode 100644 pkgs/development/compilers/ghc/8.4.3.nix delete mode 100644 pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch delete mode 100644 pkgs/development/compilers/ghc/ghc-gold-linker.patch delete mode 100644 pkgs/development/compilers/ghc/ghc-no-madv-free.patch delete mode 100644 pkgs/development/compilers/ghc/relocation.patch delete mode 100644 pkgs/development/compilers/ghcjs/7.10/boot.patch delete mode 100644 pkgs/development/compilers/ghcjs/7.10/default.nix delete mode 100644 pkgs/development/compilers/ghcjs/7.10/shims.nix delete mode 100644 pkgs/development/compilers/ghcjs/7.10/stage2.nix delete mode 100644 pkgs/development/compilers/ghcjs/8.0/boot.patch delete mode 100644 pkgs/development/compilers/ghcjs/8.0/default.nix delete mode 100644 pkgs/development/compilers/ghcjs/8.0/shims.nix delete mode 100644 pkgs/development/compilers/ghcjs/8.0/stage2.nix delete mode 100644 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix delete mode 100644 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix delete mode 100644 pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix deleted file mode 100644 index b69ae80d0db5..000000000000 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ /dev/null @@ -1,194 +0,0 @@ -{ stdenv, targetPackages - -# build-tools -, bootPkgs -, coreutils, fetchurl, perl -, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt - -, libiconv ? null, ncurses - -, useLLVM ? !stdenv.targetPlatform.isx86 -, # 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 ? true - -, # 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" -}: - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - docFixes = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3a.patch"; - sha256 = "1j45z4kcd3w1rzm4hapap2xc16bbh942qnzzdbdjcwqznsccznf0"; - }; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - '' + stdenv.lib.optionalString enableIntegerSimple '' - INTEGER_LIBRARY = integer-simple - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = YES - HADDOCK_DOCS = NO - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - ''; - - # Splicer will pull out correct variations - libDeps = platform: [ ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc") 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 = "7.10.3"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "1vsgmic8csczl62ciz51iv8nhrkm72lyhbz7p7id13y2w7fcx46g"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - docFixes - ./relocation.patch - ]; - - 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" - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld" - 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" - ''; - - # 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=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ 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; - - nativeBuildInputs = [ - perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 - ghc bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = 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"; - - hardeningDisable = [ "format" ]; - - 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-7.10.3"; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix deleted file mode 100644 index f7422d150ac0..000000000000 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ /dev/null @@ -1,201 +0,0 @@ -{ stdenv, targetPackages - -# build-tools -, bootPkgs -, coreutils, fetchpatch, fetchurl, perl, sphinx - -, libiconv ? null, ncurses - -, useLLVM ? !stdenv.targetPlatform.isx86 -, # 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 ? true - -, # 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 = YES - HADDOCK_DOCS = NO - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - ''; - - # Splicer will pull out correct variations - libDeps = platform: [ ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc") 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.0.2"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "man" "doc" ]; - - patches = [ - ./ghc-gold-linker.patch - (fetchpatch { # Unreleased 1.24.x commit - url = "https://github.com/haskell/cabal/commit/6394cb0b6eba91a8692a3d04b2b56935aed7cccd.patch"; - sha256 = "14xxjg0nb1j1pw0riac3v385ka92qhxxblfmwyvbghz7kry6axy0"; - stripLen = 1; - extraPrefix = "libraries/Cabal/"; - }) - ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch - ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch - ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch; - - 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" - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld" - 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" - ''; - - # 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") [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ 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; - - nativeBuildInputs = [ - perl sphinx - ghc bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = 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"; - - hardeningDisable = [ "format" ]; - - postInstall = '' - for bin in "$out"/lib/${name}/bin/*; do - isELF "$bin" || continue - paxmark m "$bin" - done - - # 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.0.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; - }; - -} diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix deleted file mode 100644 index e43f9a57d0a4..000000000000 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ /dev/null @@ -1,247 +0,0 @@ -{ stdenv, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 - -, 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" -, # Whether to backport https://phabricator.haskell.org/D4388 for - # deterministic profiling symbol names, at the cost of a slightly - # non-standard GHC API - deterministicProfiling ? false -}: - -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.4.3"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [(fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf"; - sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - }) (fetchpatch rec { # https://phabricator.haskell.org/D5123 - url = "http://tarballs.nixos.org/sha256/${sha256}"; - name = "D5123.diff"; - sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; - })] ++ stdenv.lib.optional deterministicProfiling - (fetchpatch rec { - url = "http://tarballs.nixos.org/sha256/${sha256}"; - name = "D4388.diff"; - sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s"; - }) - ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch; - - 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; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = 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" ]; - - postInstall = '' - for bin in "$out"/lib/${name}/bin/*; do - isELF "$bin" || continue - paxmark m "$bin" - done - - # 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.4.3"; - }; - - 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/ghc-8.0.2-no-cpp-warnings.patch b/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch deleted file mode 100644 index 90224df19f61..000000000000 --- a/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- b/includes/rts/storage/ClosureMacros.h 2017-05-21 12:54:09.000000000 +0200 -+++ a/includes/rts/storage/ClosureMacros.h 2017-05-21 12:55:57.000000000 +0200 -@@ -499,8 +499,17 @@ - - -------------------------------------------------------------------------- */ - --#define ZERO_SLOP_FOR_LDV_PROF (defined(PROFILING)) --#define ZERO_SLOP_FOR_SANITY_CHECK (defined(DEBUG) && !defined(THREADED_RTS)) -+#if defined(PROFILING) -+#define ZERO_SLOP_FOR_LDV_PROF 1 -+#else -+#define ZERO_SLOP_FOR_LDV_PROF 0 -+#endif -+ -+#if defined(DEBUG) && !defined(THREADED_RTS) -+#define ZERO_SLOP_FOR_SANITY_CHECK 1 -+#else -+#define ZERO_SLOP_FOR_SANITY_CHECK 0 -+#endif - - #if ZERO_SLOP_FOR_LDV_PROF || ZERO_SLOP_FOR_SANITY_CHECK - #define OVERWRITING_CLOSURE(c) overwritingClosure(c) - diff --git a/pkgs/development/compilers/ghc/ghc-gold-linker.patch b/pkgs/development/compilers/ghc/ghc-gold-linker.patch deleted file mode 100644 index edce7ef3a178..000000000000 --- a/pkgs/development/compilers/ghc/ghc-gold-linker.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 46fe80ab7c0013a929d0934e61429820042a70a9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= -Date: Fri, 21 Jul 2017 20:09:11 +0200 -Subject: [PATCH 1/2] base: Add `extra-libraries: m` because base uses libm - functions. - -Linking with gold needs this because in contrast to ld, gold -doesn't implicitly link libm. - -Found by Michael Bishop . ---- - libraries/base/base.cabal | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal -index f00fb8768e5..fd91f268ffe 100644 ---- a/libraries/base/base.cabal -+++ b/libraries/base/base.cabal -@@ -342,6 +342,10 @@ Library - WCsubst.h - consUtils.h - -+ -- Base uses libm functions. ld.bfd links libm implicitly when necessary. -+ -- Other linkers, like gold, don't, so we have to declare it explicitly. -+ extra-libraries: m -+ - -- OS Specific - if os(windows) - -- Windows requires some extra libraries for linking because the RTS - -From 900a8f4931e9bc6d3219d9263cfecfc6af8fc766 Mon Sep 17 00:00:00 2001 -From: michael bishop -Date: Sat, 22 Jul 2017 13:12:39 -0300 -Subject: [PATCH 2/2] also add -lm to ghc-prim - ---- - libraries/ghc-prim/ghc-prim.cabal | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal -index 00a029efedf..6db85dd69fc 100644 ---- a/libraries/ghc-prim/ghc-prim.cabal -+++ b/libraries/ghc-prim/ghc-prim.cabal -@@ -42,6 +42,10 @@ Library - UnliftedFFITypes - - build-depends: rts == 1.0.* -+ -+ -- Base uses libm functions. ld.bfd links libm implicitly when necessary. -+ -- Other linkers, like gold, don't, so we have to declare it explicitly. -+ extra-libraries: m - - exposed-modules: - GHC.CString diff --git a/pkgs/development/compilers/ghc/ghc-no-madv-free.patch b/pkgs/development/compilers/ghc/ghc-no-madv-free.patch deleted file mode 100644 index 8fea9f920126..000000000000 --- a/pkgs/development/compilers/ghc/ghc-no-madv-free.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c -index 99620ee..e052a84 100644 ---- a/rts/posix/OSMem.c -+++ b/rts/posix/OSMem.c -@@ -523,13 +523,7 @@ void osDecommitMemory(void *at, W_ size) - sysErrorBelch("unable to make released memory unaccessible"); - #endif - --#ifdef MADV_FREE -- // Try MADV_FREE first, FreeBSD has both and MADV_DONTNEED -- // just swaps memory out -- r = madvise(at, size, MADV_FREE); --#else - r = madvise(at, size, MADV_DONTNEED); --#endif - if(r < 0) - sysErrorBelch("unable to decommit memory"); - } diff --git a/pkgs/development/compilers/ghc/relocation.patch b/pkgs/development/compilers/ghc/relocation.patch deleted file mode 100644 index b9becfc86b54..000000000000 --- a/pkgs/development/compilers/ghc/relocation.patch +++ /dev/null @@ -1,27 +0,0 @@ -Adding support for the R_X86_64_REX_GOTPCRELX relocation type. -This relocation is treated by the linker the same as the R_X86_64_GOTPCRELX type -G + GOT + A - P to generate relative offsets to the GOT. -The REX prefix has no influence in this stage. - -This caused breakage when enabling relro/bindnow hardening e.g. in ghcPaclages.vector - -Source: https://phabricator.haskell.org/D2303#67070 -diff --git a/rts/Linker.c b/rts/Linker.c ---- a/rts/Linker.c -+++ b/rts/Linker.c -@@ -5681,7 +5681,13 @@ - *(Elf64_Sword *)P = (Elf64_Sword)value; - #endif - break; -- -+/* These two relocations were introduced in glibc 2.23 and binutils 2.26. -+ But in order to use them the system which compiles the bindist for GHC needs -+ to have glibc >= 2.23. So only use them if they're defined. */ -+#if defined(R_X86_64_REX_GOTPCRELX) && defined(R_X86_64_GOTPCRELX) -+ case R_X86_64_REX_GOTPCRELX: -+ case R_X86_64_GOTPCRELX: -+#endif - case R_X86_64_GOTPCREL: - { - StgInt64 gotAddress = (StgInt64) &makeSymbolExtra(oc, ELF_R_SYM(info), S)->addr; - diff --git a/pkgs/development/compilers/ghcjs/7.10/boot.patch b/pkgs/development/compilers/ghcjs/7.10/boot.patch deleted file mode 100644 index 9f4fa3a8b7ae..000000000000 --- a/pkgs/development/compilers/ghcjs/7.10/boot.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs -index db8b12e..7b815c5 100644 ---- a/src-bin/Boot.hs -+++ b/src-bin/Boot.hs -@@ -540,9 +540,7 @@ initPackageDB :: B () - initPackageDB = do - msg info "creating package databases" - initDB "--global" <^> beLocations . blGlobalDB -- traverseOf_ _Just initUser <^> beLocations . blUserDBDir - where -- initUser dir = rm_f (dir "package.conf") >> initDB "--user" (dir "package.conf.d") - initDB dbName db = do - rm_rf db >> mkdir_p db - ghcjs_pkg_ ["init", toTextI db] `catchAny_` return () -@@ -566,29 +564,22 @@ installDevelopmentTree = subTop $ do - msgD info $ "preparing development boot tree" - checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do - testGit "ghcjs-boot" >>= \case -- Just False -> failWith "ghcjs-boot already exists and is not a git repository" -- Just True -> do -- msg info "ghcjs-boot repository already exists but checkpoint not reached, cleaning first, then cloning" -- rm_rf "ghcjs-boot" -+ Just _ -> do -+ msg info "ghcjs-boot repository already exists; initializing ghcjs-boot" - initGhcjsBoot - Nothing -> do - msgD info "cloning ghcjs-boot git repository" - initGhcjsBoot - checkpoint' "shims-git" "shims repository already cloned" $ do - testGit "shims" >>= \case -- Just False -> failWith "shims already exists and is not a git repository" -- Just True -> do -- msgD info "shims repository already exists but checkpoint not reached, cleaning first, then cloning" -- rm_rf "shims" -- cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev -+ Just _ -> do -+ msgD info "shims repository already exists; moving on" - Nothing -> do - msgD info "cloning shims git repository" - cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev - where - initGhcjsBoot = sub $ do -- cloneGit bootDescr "ghcjs-boot" bsrcBootDevBranch bsrcBootDev - cd "ghcjs-boot" -- git_ ["submodule", "update", "--init", "--recursive"] - mapM_ patchPackage =<< allPackages - preparePrimops - buildGenPrim -@@ -1141,7 +1132,7 @@ cabalStage1 pkgs = sub $ do - globalFlags <- cabalGlobalFlags - flags <- cabalInstallFlags (length pkgs == 1) - let args = globalFlags ++ ("install" : pkgs) ++ -- [ "--solver=topdown" -- the modular solver refuses to install stage1 packages -+ [ "--allow-boot-library-installs" - ] ++ map ("--configure-option="<>) configureOpts ++ flags - checkInstallPlan pkgs args - cabal_ args -@@ -1162,7 +1153,7 @@ cabalInstall pkgs = do - -- uses somewhat fragile parsing of --dry-run output, find a better way - checkInstallPlan :: [Package] -> [Text] -> B () - checkInstallPlan pkgs opts = do -- plan <- cabal (opts ++ ["-v2", "--dry-run"]) -+ plan <- cabal (opts ++ ["-vverbose+nowrap", "--dry-run"]) - when (hasReinstalls plan || hasUnexpectedInstalls plan || hasNewVersion plan) (err plan) - where - hasReinstalls = T.isInfixOf "(reinstall)" -- reject reinstalls -@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do - , "--avoid-reinstalls" - , "--builddir", "dist" - , "--with-compiler", ghcjs ^. pgmLocText -+ , "--with-gcc", "@CC@" - , "--with-hc-pkg", ghcjsPkg ^. pgmLocText -- , "--prefix", toTextI instDir -+ , "--prefix", "@PREFIX@" -+ , "--libdir", "$prefix/lib/$compiler" -+ , "--libsubdir", "$pkgid" - , bool haddock "--enable-documentation" "--disable-documentation" - , "--haddock-html" ---- workaround for hoogle support being broken in haddock for GHC 7.10RC1 --#if !(__GLASGOW_HASKELL__ >= 709) - , "--haddock-hoogle" --#endif - , "--haddock-hyperlink-source" - -- don't slow down Windows builds too much, on other platforms we get this more - -- or less for free, thanks to dynamic-too -diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs -index 33a401f..e2405a7 100644 ---- a/src/Compiler/Info.hs -+++ b/src/Compiler/Info.hs -@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do - - -- | the directory to use if started without -B flag - getDefaultTopDir :: IO FilePath --getDefaultTopDir = do -- appdir <- getAppUserDataDirectory "ghcjs" -- return (appdir subdir "ghcjs") -- where -- targetARCH = arch -- targetOS = os -- subdir = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion -+getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@" - - getDefaultLibDir :: IO FilePath - getDefaultLibDir = getDefaultTopDir diff --git a/pkgs/development/compilers/ghcjs/7.10/default.nix b/pkgs/development/compilers/ghcjs/7.10/default.nix deleted file mode 100644 index f18a094aa3cf..000000000000 --- a/pkgs/development/compilers/ghcjs/7.10/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }: - -bootPkgs.callPackage ../base.nix { - version = "0.2.0"; - - inherit bootPkgs cabal-install; - - ghcjsSrc = fetchFromGitHub { - owner = "ghcjs"; - repo = "ghcjs"; - rev = "689c7753f50353dd05606ed79c51cd5a94d3922a"; - sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4"; - }; - ghcjsBootSrc = fetchgit { - url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "8c549931da27ba9e607f77195208ec156c840c8a"; - sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv"; - fetchSubmodules = true; - }; - - shims = import ./shims.nix { inherit fetchFromGitHub; }; - stage1Packages = [ - "array" - "base" - "binary" - "bytestring" - "containers" - "deepseq" - "directory" - "filepath" - "ghc-boot" - "ghc-boot-th" - "ghc-prim" - "ghci" - "ghcjs-prim" - "ghcjs-th" - "integer-gmp" - "pretty" - "primitive" - "process" - "rts" - "template-haskell" - "time" - "transformers" - "unix" - ]; - stage2 = import ./stage2.nix; - - patches = [ ./boot.patch ]; -} diff --git a/pkgs/development/compilers/ghcjs/7.10/shims.nix b/pkgs/development/compilers/ghcjs/7.10/shims.nix deleted file mode 100644 index fa706699449a..000000000000 --- a/pkgs/development/compilers/ghcjs/7.10/shims.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ fetchFromGitHub }: -fetchFromGitHub { - owner = "ghcjs"; - repo = "shims"; - rev = "b97015229c58eeab7c1d0bb575794b14a9f6efca"; - sha256 = "1p5adkqvmb1gsv9hnn3if0rdpnaq3v9a1zkfdy282yw05jaaaggz"; -} diff --git a/pkgs/development/compilers/ghcjs/7.10/stage2.nix b/pkgs/development/compilers/ghcjs/7.10/stage2.nix deleted file mode 100644 index 3483afc99ef0..000000000000 --- a/pkgs/development/compilers/ghcjs/7.10/stage2.nix +++ /dev/null @@ -1,344 +0,0 @@ -{ ghcjsBoot }: { callPackage }: - -{ - async = callPackage - ({ mkDerivation, base, HUnit, stdenv, stm, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "async"; - version = "2.0.1.6"; - src = "${ghcjsBoot}/boot/async"; - doCheck = false; - libraryHaskellDepends = [ base stm ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - jailbreak = true; - homepage = https://github.com/simonmar/async; - description = "Run IO operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; - }) {}; - aeson = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq - , dlist, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific - , stdenv, syb, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "aeson"; - version = "0.9.0.1"; - src = "${ghcjsBoot}/boot/aeson"; - doCheck = false; - libraryHaskellDepends = [ - attoparsec base bytestring containers deepseq dlist ghc-prim - hashable mtl scientific syb template-haskell text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring containers ghc-prim HUnit QuickCheck - template-haskell test-framework test-framework-hunit - test-framework-quickcheck2 text time unordered-containers vector - ]; - jailbreak = true; - homepage = https://github.com/bos/aeson; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - attoparsec = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , QuickCheck, quickcheck-unicode, scientific, stdenv - , test-framework, test-framework-quickcheck2, text, transformers - , vector - }: - mkDerivation { - pname = "attoparsec"; - version = "0.13.0.1"; - src = "${ghcjsBoot}/boot/attoparsec"; - doCheck = false; - libraryHaskellDepends = [ - array base bytestring containers deepseq scientific text - transformers - ]; - testHaskellDepends = [ - array base bytestring containers deepseq QuickCheck - quickcheck-unicode scientific test-framework - test-framework-quickcheck2 text transformers vector - ]; - jailbreak = true; - homepage = https://github.com/bos/attoparsec; - description = "Fast combinator parsing for bytestrings and text"; - license = stdenv.lib.licenses.bsd3; - }) {}; - case-insensitive = callPackage - ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit, stdenv - , test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "case-insensitive"; - version = "1.2.0.4"; - src = "${ghcjsBoot}/boot/case-insensitive"; - doCheck = false; - libraryHaskellDepends = [ base bytestring deepseq hashable text ]; - testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit text - ]; - jailbreak = true; - homepage = https://github.com/basvandijk/case-insensitive; - description = "Case insensitive string comparison"; - license = stdenv.lib.licenses.bsd3; - }) {}; - dlist = callPackage - ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }: - mkDerivation { - pname = "dlist"; - version = "0.7.1.1"; - src = "${ghcjsBoot}/boot/dlist"; - doCheck = false; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base Cabal QuickCheck ]; - jailbreak = true; - homepage = https://github.com/spl/dlist; - description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; - extensible-exceptions = callPackage - ({ mkDerivation, base, stdenv }: - mkDerivation { - pname = "extensible-exceptions"; - version = "0.1.1.4"; - src = "${ghcjsBoot}/boot/extensible-exceptions"; - doCheck = false; - libraryHaskellDepends = [ base ]; - jailbreak = true; - description = "Extensible exceptions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - hashable = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp - , QuickCheck, random, stdenv, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, unix - }: - mkDerivation { - pname = "hashable"; - version = "1.2.3.2"; - src = "${ghcjsBoot}/boot/hashable"; - doCheck = false; - libraryHaskellDepends = [ - base bytestring ghc-prim integer-gmp text - ]; - testHaskellDepends = [ - base bytestring ghc-prim HUnit QuickCheck random test-framework - test-framework-hunit test-framework-quickcheck2 text unix - ]; - jailbreak = true; - homepage = https://github.com/tibbe/hashable; - description = "A class for types that can be converted to a hash value"; - license = stdenv.lib.licenses.bsd3; - }) {}; - mtl = callPackage - ({ mkDerivation, base, stdenv, transformers }: - mkDerivation { - pname = "mtl"; - version = "2.2.1"; - src = "${ghcjsBoot}/boot/mtl"; - doCheck = false; - libraryHaskellDepends = [ base transformers ]; - jailbreak = true; - homepage = https://github.com/ekmett/mtl; - description = "Monad classes, using functional dependencies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - old-time = callPackage - ({ mkDerivation, base, old-locale, stdenv }: - mkDerivation { - pname = "old-time"; - version = "1.1.0.3"; - src = "${ghcjsBoot}/boot/old-time"; - doCheck = false; - libraryHaskellDepends = [ base old-locale ]; - jailbreak = true; - description = "Time library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - parallel = callPackage - ({ mkDerivation, array, base, containers, deepseq, stdenv }: - mkDerivation { - pname = "parallel"; - version = "3.2.0.6"; - src = "${ghcjsBoot}/boot/parallel"; - doCheck = false; - libraryHaskellDepends = [ array base containers deepseq ]; - jailbreak = true; - description = "Parallel programming library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - scientific = callPackage - ({ mkDerivation, array, base, bytestring, deepseq, ghc-prim - , hashable, integer-gmp, QuickCheck, smallcheck, stdenv, tasty - , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck - , text - }: - mkDerivation { - pname = "scientific"; - version = "0.3.3.8"; - src = "${ghcjsBoot}/boot/scientific"; - doCheck = false; - libraryHaskellDepends = [ - array base bytestring deepseq ghc-prim hashable integer-gmp text - ]; - testHaskellDepends = [ - base bytestring QuickCheck smallcheck tasty tasty-ant-xml - tasty-hunit tasty-quickcheck tasty-smallcheck text - ]; - jailbreak = true; - homepage = https://github.com/basvandijk/scientific; - description = "Numbers represented using scientific notation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - stm = callPackage - ({ mkDerivation, array, base, stdenv }: - mkDerivation { - pname = "stm"; - version = "2.4.4"; - src = "${ghcjsBoot}/boot/stm"; - doCheck = false; - libraryHaskellDepends = [ array base ]; - jailbreak = true; - description = "Software Transactional Memory"; - license = stdenv.lib.licenses.bsd3; - }) {}; - syb = callPackage - ({ mkDerivation, base, containers, HUnit, mtl, stdenv }: - mkDerivation { - pname = "syb"; - version = "0.5.1"; - src = "${ghcjsBoot}/boot/syb"; - doCheck = false; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base containers HUnit mtl ]; - jailbreak = true; - homepage = http://www.cs.uu.nl/wiki/GenericProgramming/SYB; - description = "Scrap Your Boilerplate"; - license = stdenv.lib.licenses.bsd3; - }) {}; - text = callPackage - ({ mkDerivation, array, base, binary, bytestring, deepseq, directory - , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode - , random, stdenv, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "text"; - version = "1.2.1.1"; - src = "${ghcjsBoot}/boot/text"; - doCheck = false; - libraryHaskellDepends = [ - array base binary bytestring deepseq ghc-prim integer-gmp - ]; - testHaskellDepends = [ - array base binary bytestring deepseq directory ghc-prim HUnit - integer-gmp QuickCheck quickcheck-unicode random test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - jailbreak = true; - homepage = https://github.com/bos/text; - description = "An efficient packed Unicode text type"; - license = stdenv.lib.licenses.bsd3; - }) {}; - unordered-containers = callPackage - ({ mkDerivation, base, ChasingBottoms, containers, deepseq, hashable - , HUnit, QuickCheck, stdenv, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "unordered-containers"; - version = "0.2.5.1"; - src = "${ghcjsBoot}/boot/unordered-containers"; - doCheck = false; - libraryHaskellDepends = [ base deepseq hashable ]; - testHaskellDepends = [ - base ChasingBottoms containers hashable HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - jailbreak = true; - homepage = https://github.com/tibbe/unordered-containers; - description = "Efficient hashing-based container types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - vector = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck - , random, stdenv, template-haskell, test-framework - , test-framework-quickcheck2, transformers - }: - mkDerivation { - pname = "vector"; - version = "0.11.0.0"; - src = "${ghcjsBoot}/boot/vector"; - doCheck = false; - libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; - testHaskellDepends = [ - base QuickCheck random template-haskell test-framework - test-framework-quickcheck2 transformers - ]; - jailbreak = true; - homepage = https://github.com/haskell/vector; - description = "Efficient Arrays"; - license = stdenv.lib.licenses.bsd3; - }) {}; - ghcjs-base = callPackage - ({ mkDerivation, aeson, array, attoparsec, base, bytestring - , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim - , hashable, HUnit, integer-gmp, primitive, QuickCheck - , quickcheck-unicode, random, scientific, stdenv, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "ghcjs-base"; - version = "0.2.0.0"; - src = "${ghcjsBoot}/ghcjs/ghcjs-base"; - doCheck = false; - libraryHaskellDepends = [ - aeson attoparsec base bytestring containers deepseq dlist ghc-prim - ghcjs-prim hashable integer-gmp primitive scientific text time - transformers unordered-containers vector - ]; - testHaskellDepends = [ - array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit - primitive QuickCheck quickcheck-unicode random test-framework - test-framework-hunit test-framework-quickcheck2 text - ]; - jailbreak = true; - homepage = https://github.com/ghcjs/ghcjs-base; - description = "Base library for GHCJS"; - license = stdenv.lib.licenses.mit; - }) {}; - Cabal = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, extensible-exceptions, filepath, HUnit - , old-time, pretty, process, QuickCheck, regex-posix, stdenv - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , time, unix - }: - mkDerivation { - pname = "Cabal"; - version = "1.22.8.0"; - src = "${ghcjsBoot}/boot/cabal/Cabal"; - doCheck = false; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - pretty process time unix - ]; - testHaskellDepends = [ - base bytestring containers directory extensible-exceptions filepath - HUnit old-time process QuickCheck regex-posix test-framework - test-framework-hunit test-framework-quickcheck2 unix - ]; - jailbreak = true; - homepage = http://www.haskell.org/cabal/; - description = "A framework for packaging Haskell software"; - license = stdenv.lib.licenses.bsd3; - }) {}; -} diff --git a/pkgs/development/compilers/ghcjs/8.0/boot.patch b/pkgs/development/compilers/ghcjs/8.0/boot.patch deleted file mode 100644 index bbb5b30468cb..000000000000 --- a/pkgs/development/compilers/ghcjs/8.0/boot.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs -index db8b12e..7b815c5 100644 ---- a/src-bin/Boot.hs -+++ b/src-bin/Boot.hs -@@ -540,9 +540,7 @@ initPackageDB :: B () - initPackageDB = do - msg info "creating package databases" - initDB "--global" <^> beLocations . blGlobalDB -- traverseOf_ _Just initUser <^> beLocations . blUserDBDir - where -- initUser dir = rm_f (dir "package.conf") >> initDB "--user" (dir "package.conf.d") - initDB dbName db = do - rm_rf db >> mkdir_p db - ghcjs_pkg_ ["init", toTextI db] `catchAny_` return () -@@ -566,29 +564,22 @@ installDevelopmentTree = subTop $ do - msgD info $ "preparing development boot tree" - checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do - testGit "ghcjs-boot" >>= \case -- Just False -> failWith "ghcjs-boot already exists and is not a git repository" -- Just True -> do -- msg info "ghcjs-boot repository already exists but checkpoint not reached, cleaning first, then cloning" -- rm_rf "ghcjs-boot" -+ Just _ -> do -+ msg info "ghcjs-boot repository already exists; initializing ghcjs-boot" - initGhcjsBoot - Nothing -> do - msgD info "cloning ghcjs-boot git repository" - initGhcjsBoot - checkpoint' "shims-git" "shims repository already cloned" $ do - testGit "shims" >>= \case -- Just False -> failWith "shims already exists and is not a git repository" -- Just True -> do -- msgD info "shims repository already exists but checkpoint not reached, cleaning first, then cloning" -- rm_rf "shims" -- cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev -+ Just _ -> do -+ msgD info "shims repository already exists; moving on" - Nothing -> do - msgD info "cloning shims git repository" - cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev - where - initGhcjsBoot = sub $ do -- cloneGit bootDescr "ghcjs-boot" bsrcBootDevBranch bsrcBootDev - cd "ghcjs-boot" -- git_ ["submodule", "update", "--init", "--recursive"] - mapM_ patchPackage =<< allPackages - preparePrimops - buildGenPrim -@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do - , "--avoid-reinstalls" - , "--builddir", "dist" - , "--with-compiler", ghcjs ^. pgmLocText -+ , "--with-gcc", "@CC@" - , "--with-hc-pkg", ghcjsPkg ^. pgmLocText -- , "--prefix", toTextI instDir -+ , "--prefix", "@PREFIX@" -+ , "--libdir", "$prefix/lib/$compiler" -+ , "--libsubdir", "$pkgid" - , bool haddock "--enable-documentation" "--disable-documentation" - , "--haddock-html" ---- workaround for hoogle support being broken in haddock for GHC 7.10RC1 --#if !(__GLASGOW_HASKELL__ >= 709) - , "--haddock-hoogle" --#endif - , "--haddock-hyperlink-source" - -- don't slow down Windows builds too much, on other platforms we get this more - -- or less for free, thanks to dynamic-too -diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs -index 33a401f..e2405a7 100644 ---- a/src/Compiler/Info.hs -+++ b/src/Compiler/Info.hs -@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do - - -- | the directory to use if started without -B flag - getDefaultTopDir :: IO FilePath --getDefaultTopDir = do -- appdir <- getAppUserDataDirectory "ghcjs" -- return (appdir subdir "ghcjs") -- where -- targetARCH = arch -- targetOS = os -- subdir = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion -+getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@" - - getDefaultLibDir :: IO FilePath - getDefaultLibDir = getDefaultTopDir diff --git a/pkgs/development/compilers/ghcjs/8.0/default.nix b/pkgs/development/compilers/ghcjs/8.0/default.nix deleted file mode 100644 index a786f536eb9b..000000000000 --- a/pkgs/development/compilers/ghcjs/8.0/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }: - -bootPkgs.callPackage ../base.nix { - version = "0.2.020170323"; - - inherit bootPkgs cabal-install; - - ghcjsSrc = fetchFromGitHub { - owner = "ghcjs"; - repo = "ghcjs"; - rev = "2b3759942fb5b2fc1a58d314d9b098d4622fa6b6"; - sha256 = "15asapg0va8dvcdycsx8dgk4xcpdnhml4h31wka6vvxf5anzz8aw"; - }; - ghcjsBootSrc = fetchgit { - url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "106e144cca6529a1b9612c11aea5d6ef65b96745"; - sha256 = "0gxg8iiwvm93x1dwhxypczn9qiz4m1xvj8i7cf4snfdy2jdyhi5l"; - fetchSubmodules = true; - }; - - shims = import ./shims.nix { inherit fetchFromGitHub; }; - stage1Packages = [ - "array" - "base" - "binary" - "bytestring" - "containers" - "deepseq" - "directory" - "filepath" - "ghc-boot" - "ghc-boot-th" - "ghc-prim" - "ghci" - "ghcjs-prim" - "ghcjs-th" - "integer-gmp" - "pretty" - "primitive" - "process" - "rts" - "template-haskell" - "time" - "transformers" - "unix" - ]; - stage2 = import ./stage2.nix; - - patches = [ ./boot.patch ]; -} diff --git a/pkgs/development/compilers/ghcjs/8.0/shims.nix b/pkgs/development/compilers/ghcjs/8.0/shims.nix deleted file mode 100644 index a9a7f8d45e27..000000000000 --- a/pkgs/development/compilers/ghcjs/8.0/shims.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ fetchFromGitHub }: -fetchFromGitHub { - owner = "ghcjs"; - repo = "shims"; - rev = "85395dce971e23a39e5f93af4ed139ca36d4e448"; - sha256 = "1kqgik75jx681s1kjx1s7dryigr3m940c3zb9vy0r3psxrw6sf2g"; -} diff --git a/pkgs/development/compilers/ghcjs/8.0/stage2.nix b/pkgs/development/compilers/ghcjs/8.0/stage2.nix deleted file mode 100644 index 18c7a76dd3af..000000000000 --- a/pkgs/development/compilers/ghcjs/8.0/stage2.nix +++ /dev/null @@ -1,545 +0,0 @@ -{ ghcjsBoot }: { callPackage }: - -{ - async = callPackage - ({ mkDerivation, base, HUnit, stdenv, stm, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "async"; - version = "2.1.1"; - src = "${ghcjsBoot}/boot/async"; - doCheck = false; - libraryHaskellDepends = [ base stm ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - jailbreak = true; - homepage = "https://github.com/simonmar/async"; - description = "Run IO operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; - }) {}; - aeson = callPackage - ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, directory - , dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, HUnit, integer-logarithms, QuickCheck - , quickcheck-instances, scientific, stdenv, tagged - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, th-abstraction, time - , time-locale-compat, unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "aeson"; - version = "1.2.2.0"; - src = "${ghcjsBoot}/boot/aeson"; - doCheck = false; - libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable scientific tagged template-haskell text - th-abstraction time time-locale-compat unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - attoparsec base base-compat base-orphans base16-bytestring - bytestring containers directory dlist filepath generic-deriving - ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck - quickcheck-instances scientific tagged template-haskell - test-framework test-framework-hunit test-framework-quickcheck2 text - time time-locale-compat unordered-containers uuid-types vector - ]; - jailbreak = true; - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - attoparsec = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive - , containers, criterion, deepseq, directory, filepath, ghc-prim - , http-types, parsec, QuickCheck, quickcheck-unicode, scientific - , stdenv, tasty, tasty-quickcheck, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "attoparsec"; - version = "0.13.1.0"; - src = "${ghcjsBoot}/boot/attoparsec"; - doCheck = false; - libraryHaskellDepends = [ - array base bytestring containers deepseq scientific text - transformers - ]; - testHaskellDepends = [ - array base bytestring deepseq QuickCheck quickcheck-unicode - scientific tasty tasty-quickcheck text transformers vector - ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers criterion deepseq - directory filepath ghc-prim http-types parsec scientific text - transformers unordered-containers vector - ]; - jailbreak = true; - homepage = "https://github.com/bos/attoparsec"; - description = "Fast combinator parsing for bytestrings and text"; - license = stdenv.lib.licenses.bsd3; - }) {}; - base-compat = callPackage - ({ mkDerivation, base, hspec, QuickCheck, stdenv, unix }: - mkDerivation { - pname = "base-compat"; - version = "0.9.3"; - src = "${ghcjsBoot}/boot/base-compat"; - doCheck = false; - libraryHaskellDepends = [ base unix ]; - testHaskellDepends = [ base hspec QuickCheck ]; - jailbreak = true; - description = "A compatibility layer for base"; - license = stdenv.lib.licenses.mit; - }) {}; - bytestring-builder = callPackage - ({ mkDerivation, base, bytestring, deepseq, stdenv }: - mkDerivation { - pname = "bytestring-builder"; - version = "0.10.8.1.0"; - src = "${ghcjsBoot}/boot/bytestring-builder"; - doCheck = false; - libraryHaskellDepends = [ base bytestring deepseq ]; - jailbreak = true; - description = "The new bytestring builder, packaged outside of GHC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - case-insensitive = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, hashable - , HUnit, stdenv, test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "case-insensitive"; - version = "1.2.0.8"; - src = "${ghcjsBoot}/boot/case-insensitive"; - doCheck = false; - libraryHaskellDepends = [ base bytestring deepseq hashable text ]; - testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit text - ]; - benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; - jailbreak = true; - homepage = "https://github.com/basvandijk/case-insensitive"; - description = "Case insensitive string comparison"; - license = stdenv.lib.licenses.bsd3; - }) {}; - dlist = callPackage - ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }: - mkDerivation { - pname = "dlist"; - version = "0.8.0.2"; - src = "${ghcjsBoot}/boot/dlist"; - doCheck = false; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base Cabal QuickCheck ]; - jailbreak = true; - homepage = "https://github.com/spl/dlist"; - description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; - extensible-exceptions = callPackage - ({ mkDerivation, base, stdenv }: - mkDerivation { - pname = "extensible-exceptions"; - version = "0.1.1.4"; - src = "${ghcjsBoot}/boot/extensible-exceptions"; - doCheck = false; - libraryHaskellDepends = [ base ]; - jailbreak = true; - description = "Extensible exceptions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - fail = callPackage - ({ mkDerivation, stdenv }: - mkDerivation { - pname = "fail"; - version = "4.9.0.0"; - src = "${ghcjsBoot}/boot/fail"; - jailbreak = true; - homepage = "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail"; - description = "Forward-compatible MonadFail class"; - license = stdenv.lib.licenses.bsd3; - }) {}; - hashable = callPackage - ({ mkDerivation, base, bytestring, criterion, ghc-prim, HUnit - , integer-gmp, QuickCheck, random, siphash, stdenv, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, unix - }: - mkDerivation { - pname = "hashable"; - version = "1.2.4.0"; - src = "${ghcjsBoot}/boot/hashable"; - doCheck = false; - libraryHaskellDepends = [ - base bytestring ghc-prim integer-gmp text - ]; - testHaskellDepends = [ - base bytestring ghc-prim HUnit QuickCheck random test-framework - test-framework-hunit test-framework-quickcheck2 text unix - ]; - benchmarkHaskellDepends = [ - base bytestring criterion ghc-prim integer-gmp siphash text - ]; - jailbreak = true; - homepage = "http://github.com/tibbe/hashable"; - description = "A class for types that can be converted to a hash value"; - license = stdenv.lib.licenses.bsd3; - }) {}; - integer-logarithms = callPackage - ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck - , smallcheck, stdenv, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck - }: - mkDerivation { - pname = "integer-logarithms"; - version = "1.0.2"; - src = "${ghcjsBoot}/boot/integer-logarithms"; - doCheck = false; - libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; - testHaskellDepends = [ - base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck - tasty-smallcheck - ]; - jailbreak = true; - homepage = "https://github.com/phadej/integer-logarithms"; - description = "Integer logarithms"; - license = stdenv.lib.licenses.mit; - }) {}; - mtl = callPackage - ({ mkDerivation, base, stdenv, transformers }: - mkDerivation { - pname = "mtl"; - version = "2.2.1"; - src = "${ghcjsBoot}/boot/mtl"; - doCheck = false; - libraryHaskellDepends = [ base transformers ]; - jailbreak = true; - homepage = "http://github.com/ekmett/mtl"; - description = "Monad classes, using functional dependencies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - nats = callPackage - ({ mkDerivation, stdenv }: - mkDerivation { - pname = "nats"; - version = "1.1.1"; - src = "${ghcjsBoot}/boot/nats"; - jailbreak = true; - homepage = "http://github.com/ekmett/nats/"; - description = "Natural numbers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - old-time = callPackage - ({ mkDerivation, base, old-locale, stdenv }: - mkDerivation { - pname = "old-time"; - version = "1.1.0.3"; - src = "${ghcjsBoot}/boot/old-time"; - doCheck = false; - libraryHaskellDepends = [ base old-locale ]; - jailbreak = true; - description = "Time library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - parallel = callPackage - ({ mkDerivation, array, base, containers, deepseq, stdenv }: - mkDerivation { - pname = "parallel"; - version = "3.2.1.0"; - src = "${ghcjsBoot}/boot/parallel"; - doCheck = false; - libraryHaskellDepends = [ array base containers deepseq ]; - jailbreak = true; - description = "Parallel programming library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - random = callPackage - ({ mkDerivation, base, stdenv, time }: - mkDerivation { - pname = "random"; - version = "1.1"; - src = "${ghcjsBoot}/boot/random"; - doCheck = false; - libraryHaskellDepends = [ base time ]; - testHaskellDepends = [ base ]; - jailbreak = true; - description = "random number library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - scientific = callPackage - ({ mkDerivation, base, binary, bytestring, containers, criterion - , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms - , QuickCheck, smallcheck, stdenv, tasty, tasty-ant-xml, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, vector - }: - mkDerivation { - pname = "scientific"; - version = "0.3.4.10"; - src = "${ghcjsBoot}/boot/scientific"; - doCheck = false; - libraryHaskellDepends = [ - base binary bytestring containers deepseq ghc-prim hashable - integer-gmp integer-logarithms text vector - ]; - testHaskellDepends = [ - base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml - tasty-hunit tasty-quickcheck tasty-smallcheck text - ]; - benchmarkHaskellDepends = [ base criterion ]; - jailbreak = true; - homepage = "https://github.com/basvandijk/scientific"; - description = "Numbers represented using scientific notation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - semigroups = callPackage - ({ mkDerivation, base, stdenv }: - mkDerivation { - pname = "semigroups"; - version = "0.18.3"; - src = "${ghcjsBoot}/boot/semigroups"; - doCheck = false; - libraryHaskellDepends = [ base ]; - jailbreak = true; - homepage = "http://github.com/ekmett/semigroups/"; - description = "Anything that associates"; - license = stdenv.lib.licenses.bsd3; - }) {}; - stm = callPackage - ({ mkDerivation, array, base, stdenv }: - mkDerivation { - pname = "stm"; - version = "2.4.4.1"; - src = "${ghcjsBoot}/boot/stm"; - doCheck = false; - libraryHaskellDepends = [ array base ]; - jailbreak = true; - description = "Software Transactional Memory"; - license = stdenv.lib.licenses.bsd3; - }) {}; - syb = callPackage - ({ mkDerivation, base, containers, HUnit, mtl, stdenv }: - mkDerivation { - pname = "syb"; - version = "0.6"; - src = "${ghcjsBoot}/boot/syb"; - doCheck = false; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base containers HUnit mtl ]; - jailbreak = true; - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = stdenv.lib.licenses.bsd3; - }) {}; - tagged = callPackage - ({ mkDerivation, base, deepseq, stdenv, template-haskell - , transformers, transformers-compat - }: - mkDerivation { - pname = "tagged"; - version = "0.8.5"; - src = "${ghcjsBoot}/boot/tagged"; - doCheck = false; - libraryHaskellDepends = [ - base deepseq template-haskell transformers transformers-compat - ]; - jailbreak = true; - homepage = "http://github.com/ekmett/tagged"; - description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; - license = stdenv.lib.licenses.bsd3; - }) {}; - text = callPackage - ({ mkDerivation, array, base, binary, bytestring, deepseq, directory - , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode - , random, stdenv, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "text"; - version = "1.2.2.1"; - src = "${ghcjsBoot}/boot/text"; - doCheck = false; - libraryHaskellDepends = [ - array base binary bytestring deepseq ghc-prim integer-gmp - ]; - testHaskellDepends = [ - array base binary bytestring deepseq directory ghc-prim HUnit - integer-gmp QuickCheck quickcheck-unicode random test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - jailbreak = true; - homepage = "https://github.com/bos/text"; - description = "An efficient packed Unicode text type"; - license = stdenv.lib.licenses.bsd3; - }) {}; - th-abstraction = callPackage - ({ mkDerivation, base, containers, ghc-prim, stdenv - , template-haskell - }: - mkDerivation { - pname = "th-abstraction"; - version = "0.2.6.0"; - src = "${ghcjsBoot}/boot/th-abstraction"; - doCheck = false; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - testHaskellDepends = [ base containers template-haskell ]; - jailbreak = true; - homepage = "https://github.com/glguy/th-abstraction"; - description = "Nicer interface for reified information about data types"; - license = stdenv.lib.licenses.isc; - }) {}; - time-locale-compat = callPackage - ({ mkDerivation, base, old-locale, stdenv, time }: - mkDerivation { - pname = "time-locale-compat"; - version = "0.1.1.3"; - src = "${ghcjsBoot}/boot/time-locale-compat"; - doCheck = false; - libraryHaskellDepends = [ base old-locale time ]; - jailbreak = true; - homepage = "https://github.com/khibino/haskell-time-locale-compat"; - description = "Compatibility of TimeLocale between old-locale and time-1.5"; - license = stdenv.lib.licenses.bsd3; - }) {}; - transformers-compat = callPackage - ({ mkDerivation, base, ghc-prim, stdenv, transformers }: - mkDerivation { - pname = "transformers-compat"; - version = "0.5.1.4"; - src = "${ghcjsBoot}/boot/transformers-compat"; - doCheck = false; - libraryHaskellDepends = [ base ghc-prim transformers ]; - jailbreak = true; - homepage = "http://github.com/ekmett/transformers-compat/"; - description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; - license = stdenv.lib.licenses.bsd3; - }) {}; - unordered-containers = callPackage - ({ mkDerivation, base, bytestring, ChasingBottoms, containers - , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit - , mtl, QuickCheck, random, stdenv, test-framework - , test-framework-hunit, test-framework-quickcheck2 - }: - mkDerivation { - pname = "unordered-containers"; - version = "0.2.7.2"; - src = "${ghcjsBoot}/boot/unordered-containers"; - doCheck = false; - libraryHaskellDepends = [ base deepseq hashable ]; - testHaskellDepends = [ - base ChasingBottoms containers hashable HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion deepseq deepseq-generics - hashable hashmap mtl random - ]; - jailbreak = true; - homepage = "https://github.com/tibbe/unordered-containers"; - description = "Efficient hashing-based container types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - uuid-types = callPackage - ({ mkDerivation, base, binary, bytestring, containers, criterion - , deepseq, hashable, HUnit, QuickCheck, random, stdenv, tasty - , tasty-hunit, tasty-quickcheck, text, unordered-containers - }: - mkDerivation { - pname = "uuid-types"; - version = "1.0.3"; - src = "${ghcjsBoot}/boot/uuid/uuid-types"; - doCheck = false; - libraryHaskellDepends = [ - base binary bytestring deepseq hashable random text - ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion deepseq random - unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/hvr/uuid"; - description = "Type definitions for Universally Unique Identifiers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - vector = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck - , random, stdenv, template-haskell, test-framework - , test-framework-quickcheck2, transformers - }: - mkDerivation { - pname = "vector"; - version = "0.11.0.0"; - src = "${ghcjsBoot}/boot/vector"; - doCheck = false; - libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; - testHaskellDepends = [ - base QuickCheck random template-haskell test-framework - test-framework-quickcheck2 transformers - ]; - jailbreak = true; - homepage = "https://github.com/haskell/vector"; - description = "Efficient Arrays"; - license = stdenv.lib.licenses.bsd3; - }) {}; - ghcjs-base = callPackage - ({ mkDerivation, aeson, array, attoparsec, base, bytestring - , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim - , hashable, HUnit, integer-gmp, primitive, QuickCheck - , quickcheck-unicode, random, scientific, stdenv, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "ghcjs-base"; - version = "0.2.0.0"; - src = "${ghcjsBoot}/ghcjs/ghcjs-base"; - doCheck = false; - libraryHaskellDepends = [ - aeson attoparsec base bytestring containers deepseq dlist ghc-prim - ghcjs-prim hashable integer-gmp primitive scientific text time - transformers unordered-containers vector - ]; - testHaskellDepends = [ - array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit - primitive QuickCheck quickcheck-unicode random test-framework - test-framework-hunit test-framework-quickcheck2 text - ]; - jailbreak = true; - homepage = "http://github.com/ghcjs/ghcjs-base"; - description = "base library for GHCJS"; - license = stdenv.lib.licenses.mit; - }) {}; - Cabal = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, exceptions, filepath, old-time, pretty - , process, QuickCheck, regex-posix, stdenv, tagged, tasty - , tasty-hunit, tasty-quickcheck, time, transformers, unix - }: - mkDerivation { - pname = "Cabal"; - version = "1.24.0.0"; - src = "${ghcjsBoot}/boot/cabal/Cabal"; - doCheck = false; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - pretty process time unix - ]; - testHaskellDepends = [ - base bytestring containers directory exceptions filepath old-time - pretty process QuickCheck regex-posix tagged tasty tasty-hunit - tasty-quickcheck transformers unix - ]; - jailbreak = true; - homepage = "http://www.haskell.org/cabal/"; - description = "A framework for packaging Haskell software"; - license = stdenv.lib.licenses.bsd3; - }) {}; -} diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix deleted file mode 100644 index 85efecc8ed3b..000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ /dev/null @@ -1,239 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_35; - - # Disable GHC 7.10.x core libraries. - array = null; - base = null; - binary = null; - bin-package-db = null; - bytestring = null; - Cabal = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-boot = null; - ghc-boot-th = null; - ghc-prim = null; - ghci = null; - haskeline = null; - hoopl = null; - hpc = null; - integer-gmp = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - terminfo = null; - time = null; - transformers = null; - unix = null; - xhtml = null; - - # These are now core libraries in GHC 8.4.x. - mtl = self.mtl_2_2_2; - parsec = self.parsec_3_1_13_0; - parsec_3_1_13_0 = addBuildDepends super.parsec_3_1_13_0 [self.fail self.semigroups]; - stm = self.stm_2_5_0_0; - text = self.text_1_2_3_1; - - # Build jailbreak-cabal with the latest version of Cabal. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; }; - - gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.buildHaskellPackages.Cabal_1_24_2_0; }; - - # https://github.com/mrkkrp/megaparsec/issues/282 - megaparsec = addBuildDepend (dontCheck super.megaparsec) self.fail; - - Extra = appendPatch super.Extra (pkgs.fetchpatch { - url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch"; - sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f"; - }); - - # Requires ghc 8.2 - ghc-proofs = dontDistribute super.ghc-proofs; - - # haddock: No input file(s). - nats = dontHaddock super.nats; - bytestring-builder = dontHaddock super.bytestring-builder; - - # Setup: At least the following dependencies are missing: base <4.8 - hspec-expectations = overrideCabal super.hspec-expectations (drv: { - postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; - }); - utf8-string = overrideCabal super.utf8-string (drv: { - postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal"; - }); - - # acid-state/safecopy#25 acid-state/safecopy#26 - safecopy = dontCheck (super.safecopy); - - # test suite broken, some instance is declared twice. - # https://bitbucket.org/FlorianHartwig/attobencode/issue/1 - AttoBencode = dontCheck super.AttoBencode; - - # Test suite fails with some (seemingly harmless) error. - # https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24 - syb = dontCheck super.syb; - - # Test suite has stricter version bounds - retry = dontCheck super.retry; - - # test/System/Posix/Types/OrphansSpec.hs:19:13: - # Not in scope: type constructor or class ‘Int32’ - base-orphans = dontCheck super.base-orphans; - - # Test suite fails with time >= 1.5 - http-date = dontCheck super.http-date; - - # Version 1.19.5 fails its test suite. - happy = dontCheck super.happy; - - # Upstream was notified about the over-specified constraint on 'base' - # but refused to do anything about it because he "doesn't want to - # support a moving target". Go figure. - barecheck = doJailbreak super.barecheck; - - # https://github.com/kazu-yamamoto/unix-time/issues/30 - unix-time = dontCheck super.unix-time; - - # diagrams/monoid-extras#19 - monoid-extras = overrideCabal super.monoid-extras (drv: { - prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal"; - }); - - # diagrams/statestack#5 - statestack = overrideCabal super.statestack (drv: { - prePatch = "sed -i 's|4\.8|4.9|' statestack.cabal"; - }); - - # diagrams/diagrams-core#83 - diagrams-core = overrideCabal super.diagrams-core (drv: { - prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal"; - }); - - timezone-olson = doJailbreak super.timezone-olson; - xmonad-extras = overrideCabal super.xmonad-extras (drv: { - postPatch = '' - sed -i -e "s,<\*,<¤,g" XMonad/Actions/Volume.hs - ''; - }); - - # Workaround for a workaround, see comment for "ghcjs" flag. - jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs"; - in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3 - self.webkitgtk3-javascriptcore ]; - - # https://github.com/lymar/hastache/issues/47 - hastache = dontCheck super.hastache; - - # The compat library is empty in the presence of mtl 2.2.x. - mtl-compat = dontHaddock super.mtl-compat; - - # https://github.com/bos/bloomfilter/issues/11 - bloomfilter = dontHaddock (appendConfigureFlag super.bloomfilter "--ghc-option=-XFlexibleContexts"); - - # https://github.com/ocharles/tasty-rerun/issues/5 - tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts"); - - # http://hub.darcs.net/ivanm/graphviz/issue/5 - graphviz = dontCheck (appendPatch super.graphviz ./patches/graphviz-fix-ghc710.patch); - - # https://github.com/HugoDaniel/RFC3339/issues/14 - timerep = dontCheck super.timerep; - - # Required to fix version 0.91.0.0. - wx = dontHaddock (appendConfigureFlag super.wx "--ghc-option=-XFlexibleContexts"); - - # Inexplicable haddock failure - # https://github.com/gregwebs/aeson-applicative/issues/2 - aeson-applicative = dontHaddock super.aeson-applicative; - - # GHC 7.10.1 is affected by https://github.com/srijs/hwsl2/issues/1. - hwsl2 = dontCheck super.hwsl2; - - # https://github.com/haskell/haddock/issues/427 - haddock = dontCheck self.haddock_2_16_1; - - # haddock-api >= 2.17 is GHC 8.0 only - haddock-api = self.haddock-api_2_16_1; - haddock-library = self.haddock-library_1_2_1; - - # The tests in vty-ui do not build, but vty-ui itself builds. - vty-ui = enableCabalFlag super.vty-ui "no-tests"; - - # https://github.com/fpco/stackage/issues/1112 - vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms) [ self.mtl self.mwc-random ]; - - # vector with ghc < 8.0 needs semigroups - vector = addBuildDepend super.vector self.semigroups; - - # too strict dependency on directory - tasty-ant-xml = doJailbreak super.tasty-ant-xml; - - # https://github.com/thoughtpolice/hs-ed25519/issues/13 - ed25519 = dontCheck super.ed25519; - - # Breaks a dependency cycle between QuickCheck and semigroups - hashable = dontCheck super.hashable; - unordered-containers = dontCheck super.unordered-containers; - - # GHC versions prior to 8.x require additional build inputs. - aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale"; - ansi-wl-pprint = addBuildDepend super.ansi-wl-pprint self.semigroups; - attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]); - bytes = addBuildDepend super.bytes self.doctest; - case-insensitive = addBuildDepend super.case-insensitive self.semigroups; - cmdargs = addBuildDepend super.cmdargs self.semigroups; - contravariant = addBuildDepend super.contravariant self.semigroups; - dependent-map = addBuildDepend super.dependent-map self.semigroups; - distributive = addBuildDepend (dontCheck super.distributive) self.semigroups; - Glob = addBuildDepends super.Glob (with self; [semigroups]); - hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; }); - hslogger = addBuildDepend super.hslogger self.HUnit; - intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); - lens = addBuildDepend super.lens self.generic-deriving; - mono-traversable = addBuildDepend super.mono-traversable self.semigroups; - natural-transformation = addBuildDepend super.natural-transformation self.semigroups; - optparse-applicative = addBuildDepends super.optparse-applicative [self.semigroups self.fail]; - parser-combinators = addBuildDepend super.parser-combinators self.semigroups; - QuickCheck = addBuildDepend super.QuickCheck self.semigroups; - reflection = addBuildDepend super.reflection self.semigroups; - semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]); - tar = addBuildDepend super.tar self.semigroups; - texmath = addBuildDepend super.texmath self.network-uri; - yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; }); - - # cereal must have `fail` in pre-ghc-8.0.x versions and tests require - # bytestring>=0.10.8.1. - cereal = dontCheck (addBuildDepend super.cereal self.fail); - - # The test suite requires Cabal 1.24.x or later to compile. - comonad = dontCheck super.comonad; - semigroupoids = dontCheck super.semigroupoids; - - # Newer versions require base >=4.9 && <5. - colour = self.colour_2_3_3; - - # https://github.com/atzedijkstra/chr/issues/1 - chr-pretty = doJailbreak super.chr-pretty; - chr-parse = doJailbreak super.chr-parse; - - # The autogenerated Nix expressions don't take into - # account `if impl(ghc >= x.y)`, which is a common method to depend - # on `semigroups` or `fail` when building with GHC < 8.0. - system-filepath = addBuildDepend super.system-filepath self.semigroups; - haskell-src-exts = addBuildDepend super.haskell-src-exts self.semigroups; - free = addBuildDepend super.free self.fail; - - # Newer versions don't build without base-4.9 - resourcet = self.resourcet_1_1_11; - conduit = self.conduit_1_2_13_1; - -} diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix deleted file mode 100644 index 43f769ff6fd5..000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_37; - - # Disable GHC 8.0.x core libraries. - array = null; - base = null; - binary = null; - bytestring = null; - Cabal = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-boot = null; - ghc-boot-th = null; - ghc-compact = null; - ghc-prim = null; - ghci = null; - haskeline = null; - hoopl = null; - hpc = null; - integer-gmp = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - terminfo = null; - time = null; - transformers = null; - unix = null; - xhtml = null; - - # These are now core libraries in GHC 8.4.x. - mtl = self.mtl_2_2_2; - parsec = self.parsec_3_1_13_0; - stm = self.stm_2_5_0_0; - text = self.text_1_2_3_1; - - # https://github.com/bmillwood/applicative-quoters/issues/6 - applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; - sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy"; - }); - - # Requires ghc 8.2 - ghc-proofs = dontDistribute super.ghc-proofs; - - # https://github.com/thoughtbot/yesod-auth-oauth2/pull/77 - yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2; - - # https://github.com/nominolo/ghc-syb/issues/20 - ghc-syb-utils = dontCheck super.ghc-syb-utils; - - # Newer versions require ghc>=8.2 - apply-refact = super.apply-refact_0_3_0_1; - - # This builds needs the latest Cabal version. - cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; }); - - # Add appropriate Cabal library to build this code. - stack = addSetupDepend super.stack self.Cabal_2_0_1_1; - - # inline-c > 0.5.6.0 requires template-haskell >= 2.12 - inline-c = super.inline-c_0_5_6_1; - inline-c-cpp = super.inline-c-cpp_0_1_0_0; - - # test dep hedgehog pulls in concurrent-output, which does not build - # due to processing version mismatch - either = dontCheck super.either; - - # test dep tasty has a version mismatch - indents = dontCheck super.indents; - - # Newer versions require GHC 8.2. - haddock-library = self.haddock-library_1_4_3; - haddock-api = self.haddock-api_2_17_4; - haddock = self.haddock_2_17_5; - - # GHC 8.0 doesn't have semigroups included by default - ListLike = addBuildDepend super.ListLike self.semigroups; - - # Add missing build depedency for this compiler. - base-compat-batteries = addBuildDepend super.base-compat-batteries self.bifunctors; - -} diff --git a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix deleted file mode 100644 index be90794f58d9..000000000000 --- a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_35; - - # Disable GHC 8.0.x core libraries. - array = null; - base = null; - binary = null; - bytestring = null; - Cabal = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-boot = null; - ghc-boot-th = null; - ghc-prim = null; - ghci = null; - haskeline = null; - hoopl = null; - hpc = null; - integer-gmp = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - terminfo = null; - time = null; - transformers = null; - unix = null; - xhtml = null; - - # cabal-install can use the native Cabal library. - cabal-install = super.cabal-install.override { Cabal = null; }; - - # jailbreak-cabal can use the native Cabal library. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; - - # https://github.com/bmillwood/applicative-quoters/issues/6 - applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; - sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy"; - }); - - # https://github.com/christian-marie/xxhash/issues/3 - xxhash = doJailbreak super.xxhash; - - # https://github.com/Deewiant/glob/issues/8 - Glob = doJailbreak super.Glob; - - # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715 - vector-algorithms = dontCheck super.vector-algorithms; - -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dea3ba954253..13250ea8814b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -8,8 +8,6 @@ let "ghc7103Binary" "ghc821Binary" "ghcjs" - "ghcjs710" - "ghcjs80" "ghcjs82" "ghcjs84" "integer-simple" @@ -47,28 +45,12 @@ in { ghc7103Binary = callPackage ../development/compilers/ghc/7.10.3-binary.nix { }; ghc821Binary = callPackage ../development/compilers/ghc/8.2.1-binary.nix { }; - ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix { - bootPkgs = packages.ghc7103Binary; - buildLlvmPackages = buildPackages.llvmPackages_35; - llvmPackages = pkgs.llvmPackages_35; - }; - ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix { - bootPkgs = packages.ghc7103Binary; - inherit (buildPackages.python27Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_37; - llvmPackages = pkgs.llvmPackages_37; - }; ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix { bootPkgs = packages.ghc821Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_39; llvmPackages = pkgs.llvmPackages_39; }; - ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix { - bootPkgs = packages.ghc821Binary; - buildLlvmPackages = buildPackages.llvmPackages_5; - llvmPackages = pkgs.llvmPackages_5; - }; ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix { bootPkgs = packages.ghc821Binary; buildLlvmPackages = buildPackages.llvmPackages_5; @@ -85,18 +67,6 @@ in { llvmPackages = pkgs.llvmPackages_5; }; ghcjs = compiler.ghcjs84; - # Use `import` because `callPackage inside`. - ghcjs710 = import ../development/compilers/ghcjs/7.10 { - bootPkgs = packages.ghc7103; - inherit (pkgs) cabal-install; - inherit (buildPackages) fetchgit fetchFromGitHub; - }; - # `import` on purpose; see above. - ghcjs80 = import ../development/compilers/ghcjs/8.0 { - bootPkgs = packages.ghc802; - inherit (pkgs) cabal-install; - inherit (buildPackages) fetchgit fetchFromGitHub; - }; ghcjs82 = callPackage ../development/compilers/ghcjs-ng { bootPkgs = packages.ghc822; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json; @@ -126,22 +96,12 @@ in { # Always get compilers from `buildPackages` packages = let bh = buildPackages.haskell; in { - ghc7103 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc7103; - ghc = bh.compiler.ghc7103; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; - }; ghc7103Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc7103Binary; ghc = bh.compiler.ghc7103Binary; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc802 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc802; - ghc = bh.compiler.ghc802; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; - }; ghc821Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc821Binary; ghc = bh.compiler.ghc821Binary; From bf26876a2829232b45061976ed455c2048ebab1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Nov 2018 20:16:56 +0100 Subject: [PATCH 15/50] zsh-git-prompt: don't hard-code any particular compiler version Just use whatever is the current default. --- pkgs/shells/zsh/zsh-git-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix index 7318da83d176..761ad071da95 100644 --- a/pkgs/shells/zsh/zsh-git-prompt/default.nix +++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix @@ -29,10 +29,10 @@ , python , git , lib -, ghcVersion ? "ghc802" +, haskellPackages }: -haskell.packages.${ghcVersion}.callPackage +haskellPackages.callPackage ({ mkDerivation, base, HUnit, parsec, process, QuickCheck, stdenv }: mkDerivation rec { pname = "zsh-git-prompt"; From 45db4162014e32ac3039dbabe524766789c58413 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Fri, 2 Nov 2018 13:03:35 -0700 Subject: [PATCH 16/50] folly: 2018.08.27.00 -> 2018.10.29.00 Folly disabled autotools-based builds in favor of CMake. --- pkgs/development/libraries/folly/default.nix | 27 +++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 9694765bb93f..1598dafaad05 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,26 +1,29 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, libevent -, double-conversion, glog, google-gflags, python, libiberty, openssl }: +{ stdenv, fetchFromGitHub, cmake, boost, libevent, double-conversion, glog +, google-gflags, libiberty, openssl }: stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.08.27.00"; + version = "2018.10.29.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0slnhn8q26mj23gm36c61b4ar857q8c844ifpvw4q329nndbrgcz"; + sha256 = "0bbp4w8wbawh3ilgkl7rwvbqkdczpvfn92f9lcvxj8sili0nldab"; }; - nativeBuildInputs = [ autoreconfHook python pkgconfig ]; - buildInputs = [ libiberty boost libevent double-conversion glog google-gflags openssl ]; + nativeBuildInputs = [ cmake ]; - postPatch = "cd folly"; - preBuild = '' - patchShebangs build - ''; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + # See CMake/folly-deps.cmake in the Folly source tree. + buildInputs = [ + boost + double-conversion + glog + google-gflags + libevent + libiberty + openssl + ]; enableParallelBuilding = true; From 411c665f336d6b8a44f27170abd2c0efc19d0c4d Mon Sep 17 00:00:00 2001 From: Kevin Quick Date: Fri, 2 Nov 2018 15:49:09 -0700 Subject: [PATCH 17/50] yices: 2.6.0 -> 2.6.1 --- pkgs/applications/science/logic/yices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 3121a83e5b98..0ab08db67465 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "yices-${version}"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { url = "https://github.com/SRI-CSL/yices2/archive/Yices-${version}.tar.gz"; name = "${name}-src.tar.gz"; - sha256 = "10ikq7ib8jhx7hlxfm6mp5qg6r8dflqs8242q5zaicn80qixpm12"; + sha256 = "14xvflv14qn8ssm8rklvckp6l1q94vn49qz2snz73j40nwzshaww"; }; nativeBuildInputs = [ autoreconfHook ]; From de8a3e3125baddc22ef0472ca941b49acf5ca8fd Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Fri, 2 Nov 2018 23:16:07 +0100 Subject: [PATCH 18/50] ansible_2_5: 2.5.2 -> 2.5.11 --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 2b6877cb25f5..b3abd230b74a 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -53,8 +53,8 @@ in rec { }; ansible_2_5 = generic { - version = "2.5.2"; - sha256 = "1r9sq30xz3jrvx6yqssj5wmkml1f75rx1amd7g89f3ryngrq6m59"; + version = "2.5.11"; + sha256 = "07rhgkl3a2ba59rqh9pyz1p661gc389shlwa2sw1m6wwifg4lm24"; }; ansible_2_6 = generic { From e63509a651d1ecac2ab712cbc9b7e7c00ed96cbd Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Fri, 2 Nov 2018 23:18:57 +0100 Subject: [PATCH 19/50] ansible_2_6: 2.6.2 -> 2.6.7 --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index b3abd230b74a..9ed4b36f20b8 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -58,8 +58,8 @@ in rec { }; ansible_2_6 = generic { - version = "2.6.2"; - sha256 = "1y5gd9h641p6pphwd7j99yyqglyj23rkmid7wgzk62611754qzkl"; + version = "2.6.7"; + sha256 = "10pakw9k9wd3cy1qk3ah2253ph7c7h3qzpal4k0s5lschzgy2fh0"; }; ansible2 = ansible_2_6; From c0d30e5f034cbc72dae15a8986b0a9d70fbe7540 Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Fri, 2 Nov 2018 23:21:53 +0100 Subject: [PATCH 20/50] ansible_2_7: init at 2.7.1 --- pkgs/tools/admin/ansible/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 9ed4b36f20b8..c86a108fc425 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -62,6 +62,11 @@ in rec { sha256 = "10pakw9k9wd3cy1qk3ah2253ph7c7h3qzpal4k0s5lschzgy2fh0"; }; - ansible2 = ansible_2_6; + ansible_2_7 = generic { + version = "2.7.1"; + sha256 = "0fg95x2nr3j4rwnlyd2n03h91xx9fssi34c32356vk3z6ir395g7"; + }; + + ansible2 = ansible_2_7; ansible = ansible2; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62cef2d50689..aa2ed6d2c592 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8059,6 +8059,7 @@ with pkgs; ansible_2_4 ansible_2_5 ansible_2_6 + ansible_2_7 ansible2 ansible; From a3739a908ce4c2e6dfe1fe08d537867825d84d5e Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Fri, 2 Nov 2018 23:46:13 +0100 Subject: [PATCH 21/50] ansible-lint: fix install tests --- pkgs/development/tools/ansible-lint/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix index c460662f4f88..5433725b3050 100644 --- a/pkgs/development/tools/ansible-lint/default.nix +++ b/pkgs/development/tools/ansible-lint/default.nix @@ -19,6 +19,10 @@ pythonPackages.buildPythonPackage rec { patchShebangs bin/ansible-lint ''; + preBuild = '' + export HOME="$TMP" + ''; + checkPhase = '' nosetests test ''; From fc96e53587aedcb58f74f20a17301fb19db5d040 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 3 Nov 2018 10:43:39 +0300 Subject: [PATCH 22/50] maxx: fix urls --- pkgs/desktops/maxx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix index 10fa745d9787..6f515068418e 100644 --- a/pkgs/desktops/maxx/default.nix +++ b/pkgs/desktops/maxx/default.nix @@ -18,11 +18,11 @@ in stdenv.mkDerivation { srcs = [ (fetchurl { - url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-NO-ARCH.tar.gz"; + url = "http://maxxdesktop.arcadedaydream.com/Indy-Releases/Installers/MaXX-${version}-NO-ARCH.tar.gz"; sha256 = "1d23j08wwrrn5cp7csv70pcz9jppcn0xb1894wkp0caaliy7g31y"; }) (fetchurl { - url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-x86_64.tar.gz"; + url = "http://maxxdesktop.arcadedaydream.com/Indy-Releases/Installers/MaXX-${version}-x86_64.tar.gz"; sha256 = "156p2lra184wyvibrihisd7cr1ivqaygsf0zfm26a12gx23b7708"; }) ]; From 09d49a1c5d708492dd22d671ea100dd44cba4b64 Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 1 Nov 2018 09:12:36 +0900 Subject: [PATCH 23/50] thunderbird: 60.2.1 -> 60.3.0 --- .../networking/mailreaders/thunderbird/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 419cc2fd2d84..69540d6092f8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -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.2.1"; + version = "60.3.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "018l9pq03nzlirpaf285qpwvb8s4msam8n91d15lzc1bc1caq9zcy2dnrnvn5av3jlapm9ckz028iar66nhqxi2kkqbmiaq0v4s6kfp"; + sha512 = "39sicxgfzfx4dm50nn2l8mimyjpvfigdpmkbxk6lvvbi8xxl527631xxq0gh1di6iyp590vpwk16z7hvdfbqj2pd3231knjkl991hvc"; }; # from firefox, but without sound libraries @@ -48,14 +48,6 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; patches = [ - # https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1479540 - # https://hg.mozilla.org/releases/mozilla-release/rev/bc651d3d910c - (fetchpatch { - name = "bc651d3d910c.patch"; - url = "https://hg.mozilla.org/releases/mozilla-release/raw-rev/bc651d3d910c"; - sha256 = "0iybkadsgsf6a3pq3jh8z1p110vmpkih8i35jfj8micdkhxzi89g"; - }) - # Remove buildconfig.html to prevent a dependency on clang etc. ../../browsers/firefox/no-buildconfig.patch ]; From f5af5b19f4f151d6e633b8d38234bbde5b7f335a Mon Sep 17 00:00:00 2001 From: Ikarulus Date: Wed, 31 Oct 2018 23:31:24 +0100 Subject: [PATCH 24/50] librepcb-unstable: 2018-06-28 -> 2018-10-31 --- pkgs/applications/science/electronics/librepcb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 33eb52c18ee7..c0831847b720 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "librepcb-${version}"; - version = "20180628"; + version = "20181031"; src = fetchFromGitHub { owner = "LibrePCB"; repo = "LibrePCB"; fetchSubmodules = true; - rev = "68577ecf8f39299ef4d81ff964b01c3908d1f10b"; - sha256 = "1ca4q8b8fhp19vq5yi55sq6xlsz14ihw3i0h7rq5fw0kigpjldmz"; + rev = "3cf8dba9fa88e5b392d639c9fdbcf3a44664170a"; + sha256 = "0kr4mii5w3kj3kqvhgq7zjxjrq44scx8ky0x77gyqmwvwfwk7nmx"; }; enableParallelBuilding = true; From c1324d571d7c9ce276d29cd789fc6bba95980acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Nov 2018 15:25:56 +0100 Subject: [PATCH 25/50] home-assistant: 0.81.2 -> 0.81.5 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 73cc01281493..54419022970d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.81.2"; + version = "0.81.5"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 932995513af6..427f35e2fbcd 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -79,7 +79,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.81.2"; + hassVersion = "0.81.5"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -94,7 +94,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0qg3kh99bqhsraa8jpqqrvaxz9l1gsbh3aazg3v0d6q6ng42y2bq"; + sha256 = "1fgf9hrv7q7g8s561sir951vd27a459mh3k685xzfnhkh4si47g4"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 4af2a4ec9220..89d77649d971 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20181026.1"; + version = "20181026.4"; src = fetchPypi { inherit pname version; - sha256 = "ea5e7fb769df2f096e2993c23d1aa3dc8652e0f0aa09a89863af22e095b80aa8"; + sha256 = "b0610206eee06042847d89a581ecfcd71255b0e1ecff77e302237e8aa175b00d"; }; propagatedBuildInputs = [ user-agents ]; From 4b095c6c05e031ef57808be954244b991cff83d6 Mon Sep 17 00:00:00 2001 From: Jonathan Queiroz Date: Sat, 3 Nov 2018 11:41:16 -0300 Subject: [PATCH 26/50] pythonPackages.fastpbkdf2: init at 0.2 (#47988) --- .../python-modules/fastpbkdf2/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/fastpbkdf2/default.nix diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/pkgs/development/python-modules/fastpbkdf2/default.nix new file mode 100644 index 000000000000..63a7565cf55a --- /dev/null +++ b/pkgs/development/python-modules/fastpbkdf2/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage +, openssl, pytest, cffi, six }: + +buildPythonPackage rec { + pname = "fastpbkdf2"; + version = "0.2"; + + # Fetching from GitHub as tests are missing in PyPI + src = fetchFromGitHub { + owner = "Ayrx"; + repo = "python-fastpbkdf2"; + rev = "v${version}"; + sha256 = "1hvvlk3j28i6nswb6gy3mq7278nq0mgfnpxh1rv6jvi7xhd7qmlc"; + }; + + buildInputs = [ openssl ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ cffi six ]; + + meta = with stdenv.lib; { + homepage = https://github.com/Ayrx/python-fastpbkdf2; + description = "Python bindings for fastpbkdf2"; + license = licenses.bsd3; + maintainers = with maintainers; [ jqueiroz ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efbb0a3acbbc..cc608eacb1a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -340,6 +340,8 @@ in { eradicate = callPackage ../development/python-modules/eradicate { }; + fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; + fido2 = callPackage ../development/python-modules/fido2 { }; filterpy = callPackage ../development/python-modules/filterpy { }; From e9d31c85a45c62c8685d30494d10e832031ecd8f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 2 Nov 2018 21:00:40 -0500 Subject: [PATCH 27/50] tootle: 0.1.5 -> 0.2.0 https://github.com/bleakgrey/tootle/releases/tag/0.2.0 --- pkgs/applications/misc/tootle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index d15b8111fb0b..d7a7de368776 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -7,7 +7,7 @@ let pname = "tootle"; - version = "0.1.5"; + version = "0.2.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { owner = "bleakgrey"; repo = pname; rev = version; - sha256 = "022h1rh1jk3m1f9al0s1rylmnqnkydyc81idfc8jf1g0frnvn5i6"; + sha256 = "1z3wyx316nns6gi7vlvcfmalhvxncmvcmmlgclbv6b6hwl5x2ysi"; }; nativeBuildInputs = [ meson ninja pkgconfig python3 vala gobjectIntrospection wrapGAppsHook ]; From 99c052bac4e5d2c9f0d8d37d18fc414566f6b205 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Sat, 3 Nov 2018 16:16:17 +0100 Subject: [PATCH 28/50] nixos/google-network-daemon: systemd job type simple instead of oneshot (#49692) --- nixos/modules/virtualisation/google-compute-image.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index caaf6c0aa59d..795858e5eae2 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -144,7 +144,6 @@ in path = with pkgs; [ iproute ]; serviceConfig = { ExecStart = "${gce}/bin/google_network_daemon --debug"; - Type = "oneshot"; }; }; From dff14ecfbf7246204f80d5d921ab44562ff9f329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sat, 3 Nov 2018 16:22:53 +0100 Subject: [PATCH 29/50] i2pd: 2.21.0 -> 2.21.1 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 9ecf69637872..7ab77b2d2ee7 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.21.0"; + version = "2.21.1"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "02zsig63cambwm479ckw4kl1dk00g1q2sbzsvn9vy1xpjy928n7v"; + sha256 = "0j892s9ga9fjc2q1rw3hp5il4mw1jc0aiw60y1rfaiflyv0wd696"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] From 74ef8234224ffed0624b42dc38cc7c47942ff1ab Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Sat, 3 Nov 2018 16:39:14 +0100 Subject: [PATCH 30/50] alacritty: fix build on darwin --- pkgs/applications/misc/alacritty/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index e4dffa98f39a..594173f11c62 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -73,7 +73,10 @@ in buildRustPackage rec { buildInputs = rpathLibs ++ lib.optionals stdenv.isDarwin darwinFrameworks; - outputs = [ "out" "terminfo" ]; + outputs = [ "out" "terminfo" ]; + + # https://github.com/NixOS/nixpkgs/issues/49693 + doCheck = !stdenv.isDarwin; postPatch = '' substituteInPlace copypasta/src/x11.rs \ From 5a1708b1abd7ac6024bb80782d6196afe2fe2e97 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sat, 3 Nov 2018 17:00:30 +0100 Subject: [PATCH 31/50] shutter: 0.94 -> 0.94.2 (#49546) * shutter: 0.94 -> 0.94.2 * shutter: dependencies refresh procps and perlPackages.FileBaseDir were missing Perl package JSONMaybeXS replaces JSONXS Moved makeWrapper to nativeBuildInputs --- pkgs/applications/graphics/shutter/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index a409060afdc6..7e7bf644ce79 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -1,27 +1,28 @@ { stdenv, fetchurl, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg -, hicolor-icon-theme +, hicolor-icon-theme, procps }: let perlModules = with perlPackages; [ Gnome2 Gnome2Canvas Gtk2 Glib Pango Gnome2VFS Gnome2Wnck Gtk2ImageView - Gtk2Unique FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig + Gtk2Unique FileBaseDir FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON - PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS + PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONMaybeXS commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo EncodeLocale TryTiny TypesSerialiser LWPMediaTypes ]; in stdenv.mkDerivation rec { - name = "shutter-0.94"; + name = "shutter-0.94.2"; src = fetchurl { - url = "https://launchpad.net/shutter/0.9x/0.94/+download/shutter-0.94.tar.gz"; - sha256 = "943152cdf9e1b2096d38e3da9622d8bf97956a08eda747c3e7fcc564a3f0f40d"; + url = "https://launchpad.net/shutter/0.9x/0.94.2/+download/shutter-0.94.2.tar.gz"; + sha256 = "0mas7npm935j4rhqqjn226822s9sa4bsxrkp0b5fjj3z096k6vw0"; }; - buildInputs = [ perl makeWrapper gdk_pixbuf librsvg ] ++ perlModules; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl procps gdk_pixbuf librsvg ] ++ perlModules; installPhase = '' mkdir -p "$out" From b0068a2abe734b2f5cbad8a4cbff29ffa1177cf4 Mon Sep 17 00:00:00 2001 From: Lysergia Date: Sat, 3 Nov 2018 12:24:00 -0400 Subject: [PATCH 32/50] lightdm-mini-greeter: 0.3.3 -> 0.3.4 (#49655) New upstream release. --- .../display-managers/lightdm-mini-greeter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index cf5c30a1ead7..91446f73507e 100644 --- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lightdm-mini-greeter-${version}"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "prikhi"; repo = "lightdm-mini-greeter"; rev = version; - sha256 = "1xlj5wqagp765rqw40ci4wir21qwyszasynk82x8308k5d3asvwb"; + sha256 = "1qi0bsqi8z2zv3303ww0kd7bciz6qx8na5bkvgrqlwyvq31czai5"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From f6aac1cc66c5aa516803fe06e8764a0130ab5ad4 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 3 Nov 2018 12:27:19 -0400 Subject: [PATCH 33/50] yoda: 1.7.1 -> 1.7.3 (#49654) --- pkgs/development/libraries/physics/yoda/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index c86b0ed3d1c8..664d1fa601ee 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yoda-${version}"; - version = "1.7.1"; + version = "1.7.3"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "0yq20fnckf6h0a53ghxsgia6ikq71ch9a0w0khq188r7rlg9gmzd"; + sha256 = "0n40qii2ych5yfx6drj79b3rk29dvc3gysjqs719qgl26d3hkxpb"; }; pythonPath = []; # python wrapper support @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Provides small set of data analysis (specifically histogramming) classes"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl3; homepage = https://yoda.hepforge.org; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; From df28b4b6e5a996a4971a0b32a98e654e4c44a54a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sat, 3 Nov 2018 17:56:04 +0100 Subject: [PATCH 34/50] x11basic: init at 1.26 --- .../compilers/x11basic/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/compilers/x11basic/default.nix diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix new file mode 100644 index 000000000000..a26bc41c5945 --- /dev/null +++ b/pkgs/development/compilers/x11basic/default.nix @@ -0,0 +1,48 @@ +{ stdenv, lib, fetchFromGitHub +, automake, autoconf, readline +, libX11, bluez, SDL2 +}: + +stdenv.mkDerivation rec { + pname = "X11basic"; + version = "1.26"; + name = pname + "-" + version; + + src = fetchFromGitHub { + owner = "kollokollo"; + repo = pname; + rev = version; + sha256 = "0rwj9cf496xailply0rgw695bzdladh2dhy7vdqac1pwbkl53nvd"; + }; + + buildInputs = [ + autoconf automake readline libX11 SDL2 bluez + ]; + + preConfigure = "cd src;autoconf"; + + configureFlags = [ + "--with-bluetooth" + "--with-usb" + "--with-readline" + "--with-sdl" + "--with-x" + "--enable-cryptography" + ]; + + preInstall = '' + touch x11basic.{eps,svg} + mkdir -p $out/{bin,lib} + mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + cp -r ../examples $out/share/. + ''; + + meta = with stdenv.lib; { + homepage = http://x11-basic.sourceforge.net/; + description = "A Basic interpreter and compiler with graphics capabilities."; + license = licenses.gpl2; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdf6b93539cc..38ade0014b1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19753,6 +19753,8 @@ with pkgs; gtk = gtk2; }; + x11basic = callPackage ../development/compilers/x11basic { }; + x11vnc = callPackage ../tools/X11/x11vnc { }; x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { }; From 2cb7f5fb1e502fe5502d37fce0a9b7a16ea24fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 26 Oct 2018 18:07:56 +0200 Subject: [PATCH 35/50] consul: 0.9.3 -> 1.3.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removes the old UI build tooling; it is no longer necessary because as of 1.2.0 it's bundled into the server binary. It doesn't even need to have JS built, because it's bundled into the release commit's source tree (see #48714). The UI is enabled by default, so the NixOS service is updated to directly use `ui = webUi;` now. Fixes #48714. Fixes #44192. Fixes #41243. Fixes #35602. Signed-off-by: Niklas Hambüchen --- nixos/modules/services/networking/consul.nix | 7 ++- pkgs/servers/consul/Gemfile | 5 -- pkgs/servers/consul/Gemfile.lock | 25 -------- pkgs/servers/consul/default.nix | 19 +++--- pkgs/servers/consul/gemset.nix | 62 -------------------- pkgs/servers/consul/ui-no-bundle-exec.patch | 17 ------ pkgs/servers/consul/ui.nix | 41 ------------- pkgs/top-level/all-packages.nix | 2 - 8 files changed, 16 insertions(+), 162 deletions(-) delete mode 100644 pkgs/servers/consul/Gemfile delete mode 100644 pkgs/servers/consul/Gemfile.lock delete mode 100644 pkgs/servers/consul/gemset.nix delete mode 100644 pkgs/servers/consul/ui-no-bundle-exec.patch delete mode 100644 pkgs/servers/consul/ui.nix diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index ab3f81037681..0e90fed788b9 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -6,9 +6,10 @@ let dataDir = "/var/lib/consul"; cfg = config.services.consul; - configOptions = { data_dir = dataDir; } // - (if cfg.webUi then { ui_dir = "${cfg.package.ui}"; } else { }) // - cfg.extraConfig; + configOptions = { + data_dir = dataDir; + ui = cfg.webUi; + } // cfg.extraConfig; configFiles = [ "/etc/consul.json" "/etc/consul-addrs.json" ] ++ cfg.extraConfigFiles; diff --git a/pkgs/servers/consul/Gemfile b/pkgs/servers/consul/Gemfile deleted file mode 100644 index 0e782af6b000..000000000000 --- a/pkgs/servers/consul/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -# A sample Gemfile -source "https://rubygems.org" - -gem "uglifier" -gem "sass" diff --git a/pkgs/servers/consul/Gemfile.lock b/pkgs/servers/consul/Gemfile.lock deleted file mode 100644 index 60a565f66951..000000000000 --- a/pkgs/servers/consul/Gemfile.lock +++ /dev/null @@ -1,25 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - execjs (2.7.0) - ffi (1.9.23) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - sass (3.5.6) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - uglifier (4.1.10) - execjs (>= 0.3.0, < 3) - -PLATFORMS - ruby - -DEPENDENCIES - sass - uglifier - -BUNDLED WITH - 1.14.6 diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 5cf192791000..d1dcd78667f0 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,22 +1,27 @@ -{ stdenv, buildGoPackage, consul-ui, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "consul-${version}"; - version = "0.9.3"; + version = "1.3.0"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; + # Note: Currently only release tags are supported, because they have the Consul UI + # vendored. See + # https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834 + # If you want to use a non-release commit as `src`, you probably want to improve + # this derivation so that it can build the UI's JavaScript from source. + # See https://github.com/NixOS/nixpkgs/pull/49082 for something like that. + # Or, if you want to patch something that doesn't touch the UI, you may want + # to apply your changes as patches on top of a release commit. src = fetchFromGitHub { owner = "hashicorp"; repo = "consul"; inherit rev; - sha256 = "1176frp7kimpycsmz9wrbizf46jgxr8jq7hz5w4q1x90lswvrxv3"; + sha256 = "1zv84snvrjm74w3v3rr27linsbxj00m73xd047sb78a4766xs2h0"; }; - # Keep consul.ui for backward compatability - passthru.ui = consul-ui; - preBuild = '' buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") ''; @@ -26,6 +31,6 @@ buildGoPackage rec { homepage = https://www.consul.io/; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; - maintainers = with maintainers; [ pradeepchhetri ]; + maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 ]; }; } diff --git a/pkgs/servers/consul/gemset.nix b/pkgs/servers/consul/gemset.nix deleted file mode 100644 index 2a5425ccf5f5..000000000000 --- a/pkgs/servers/consul/gemset.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - execjs = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1"; - type = "gem"; - }; - version = "2.7.0"; - }; - ffi = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; - type = "gem"; - }; - version = "1.9.23"; - }; - rb-fsevent = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; - type = "gem"; - }; - version = "0.10.3"; - }; - rb-inotify = { - dependencies = ["ffi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; - type = "gem"; - }; - version = "0.9.10"; - }; - sass = { - dependencies = ["sass-listen"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; - type = "gem"; - }; - version = "3.5.6"; - }; - sass-listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; - type = "gem"; - }; - version = "4.0.0"; - }; - uglifier = { - dependencies = ["execjs"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dycp9c5xiricla6sgvg0vf22i3axs5k1v1607dvl7nv1xkkaczi"; - type = "gem"; - }; - version = "4.1.10"; - }; -} \ No newline at end of file diff --git a/pkgs/servers/consul/ui-no-bundle-exec.patch b/pkgs/servers/consul/ui-no-bundle-exec.patch deleted file mode 100644 index 5707b871049b..000000000000 --- a/pkgs/servers/consul/ui-no-bundle-exec.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/ui/scripts/dist.sh b/ui/scripts/dist.sh -index 0ad6e28e..db340da0 100755 ---- a/ui/scripts/dist.sh -+++ b/ui/scripts/dist.sh -@@ -15,10 +15,9 @@ DEPLOY="../pkg/web_ui" - rm -rf $DEPLOY - mkdir -p $DEPLOY - --bundle check >/dev/null 2>&1 || bundle install --bundle exec sass styles/base.scss static/base.css -+sass styles/base.scss static/base.css - --bundle exec ruby scripts/compile.rb -+ruby scripts/compile.rb - - # Copy into deploy - shopt -s dotglob diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix deleted file mode 100644 index da9b518bad73..000000000000 --- a/pkgs/servers/consul/ui.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, consul, ruby, bundlerEnv, zip, nodejs }: - -let - # `sass` et al - gems = bundlerEnv { - name = "consul-ui-deps"; - gemdir = ./.; - }; -in - -stdenv.mkDerivation { - name = "consul-ui-${consul.version}"; - - src = consul.src; - - buildInputs = [ ruby gems zip nodejs ]; - - patches = [ ./ui-no-bundle-exec.patch ]; - - postPatch = "patchShebangs ./ui/scripts/dist.sh"; - - buildPhase = '' - # Build ui static files - cd ui - make dist - ''; - - installPhase = '' - # Install ui static files - mkdir -p $out - mv ../pkg/web_ui/* $out - ''; - - meta = with stdenv.lib; { - homepage = https://www.consul.io/; - description = "A tool for service discovery, monitoring and configuration"; - maintainers = with maintainers; [ cstrahan wkennington ]; - license = licenses.mpl20 ; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38ade0014b1b..d647840fc18d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1136,8 +1136,6 @@ with pkgs; consul = callPackage ../servers/consul { }; - consul-ui = callPackage ../servers/consul/ui.nix { }; - consul-alerts = callPackage ../servers/monitoring/consul-alerts { }; consul-template = callPackage ../tools/system/consul-template { }; From 32c2d485244efa80c704cd17e58dafdffd1616bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 26 Oct 2018 18:25:11 +0200 Subject: [PATCH 36/50] nixos manual: Add changelog for consul MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Niklas Hambüchen --- nixos/doc/manual/release-notes/rl-1903.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 6121d32346cb..fb5d475f693a 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -162,6 +162,14 @@ has been renamed to postgresql_9_6. + + + Package consul-ui and passthrough consul.ui have been removed. + The package consul now uses upstream releases that vendor the UI into the binary. + See #48714 + for details. + + Slurm introduces the new option From f25907413773c2455d1241b93eae8e06d538830e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 3 Nov 2018 14:46:18 -0400 Subject: [PATCH 37/50] lollypop: 0.9.607 -> 0.9.610 --- pkgs/applications/audio/lollypop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 034d2059283d..8df2be1a0391 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -4,7 +4,7 @@ , gobjectIntrospection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { - version = "0.9.607"; + version = "0.9.610"; name = "lollypop-${version}"; format = "other"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "04giwp4i7j1qad41fiqlb8s3w03f1ww0p2mhi8n162sajnflr1rd"; + sha256 = "0nn4cjw0c2ysd3y2a7l08ybcd21v993wsz99f7w0881jhws3q5p4"; }; nativeBuildInputs = with python3.pkgs; [ From ef16e1fe03113b4356aa795741039402cfefe04c Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 25 Oct 2018 20:17:47 -0400 Subject: [PATCH 38/50] nvidia-x11: 410.66 -> 410.73 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 44598588db9d..97e5b3aa70ad 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -19,10 +19,10 @@ rec { stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_410 else stable_390; stable_410 = generic { - version = "410.66"; - sha256_64bit = "05xjzvj0fgmkpz36dbd7hy2vzl6xxiflzx7kml3k7ad9gy2svdlg"; - settingsSha256 = "1nsxz1byshgjs3c03lyx6ya36dp0f2vg2l0d9pkh1i6cpzkp53kz"; - persistencedSha256 = "0m4wdpb8w4y323d8py105p9hizwmf2ai8frkl7h77sn3ski17zw6"; + version = "410.73"; + sha256_64bit = "07pzq8rvbsx3v8rgz98amyw0k1mn5mkygpd1q5gfn6r0h7vrrg5y"; + settingsSha256 = "19xc10b0c074wb9fv9n04dvmi8hrwl6srvvyrjfyj92gch49x6hw"; + persistencedSha256 = "0vhr7pysv4vk7v96yima0i9zsvvgxaxihjzxlfifpsdki57n2jz7"; }; # Last one supporting x86 From f0cee6b14f19dfe88aa502d123e11c0ba117b439 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 3 Nov 2018 14:03:34 -0500 Subject: [PATCH 39/50] grpc: only set -Wno-error on clang Apparently GCC errors on this: https://hydra.nixos.org/build/83561519/ --- pkgs/development/libraries/grpc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index e568ea9eb650..f4145c85199b 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { rm -vf BUILD ''; - NIX_CFLAGS_COMPILE = "-Wno-error=unknown-warning-option"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option"; enableParallelBuilds = true; From dfd0818aa5c3ef1d6686e8bf8677761740788cd9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 3 Nov 2018 14:17:21 -0500 Subject: [PATCH 40/50] release-cross: use ghc844 for tests This GHC version has much better support for cross compilation. It should hopefully fix our mingw breakages from #42407. /cc @ericson2314 --- pkgs/top-level/release-cross.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 6cf0cb57be4f..058182392e9b 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -30,7 +30,7 @@ let buildPackages.gcc = nativePlatforms; coreutils = nativePlatforms; haskell.packages.ghcHEAD.hello = nativePlatforms; - haskell.packages.ghc822.hello = nativePlatforms; + haskell.packages.ghc844.hello = nativePlatforms; }; linuxCommon = lib.recursiveUpdate gnuCommon { From ef4d78adedcfbb69392e7634bc6912c019b88bcc Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 3 Nov 2018 14:37:18 -0500 Subject: [PATCH 41/50] krb5: don't pull in keyutils with bionic keyutils breaks with bionic. since it's an optional dependency, it seems safe to just disable it with libkrb5 (which otherwise works fine with bionic libc). --- pkgs/development/libraries/kerberos/krb5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 4e3ba399cc3f..afb928aff6e9 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # Provides the mig command used by the build scripts ++ optional stdenv.isDarwin bootstrap_cmds; buildInputs = [ openssl ] - ++ optionals (stdenv.hostPlatform.isLinux) [ keyutils ] + ++ optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic") [ keyutils ] ++ optionals (!libOnly) [ openldap libedit ]; preConfigure = "cd ./src"; From da1f78bd2bd0c7b7c3fc8c902c314c0c391cfaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 3 Nov 2018 20:03:34 +0000 Subject: [PATCH 42/50] linux_beagleboard: remove The package is out-of-date and has no maintainer. It should be now possible to just mainline kernel. Support for that could be added by copying the right dtb file in our linux_rpi kernel. I do not have the hardware to test this. cc @dezgeg @dhess --- .../linux/kernel/linux-beagleboard.nix | 34 ------------------- pkgs/top-level/all-packages.nix | 9 ----- 2 files changed, 43 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-beagleboard.nix diff --git a/pkgs/os-specific/linux/kernel/linux-beagleboard.nix b/pkgs/os-specific/linux/kernel/linux-beagleboard.nix deleted file mode 100644 index e98104f11ca9..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-beagleboard.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ubootTools, dtc, ... } @ args: - -let - modDirVersion = "4.14.12"; - tag = "r23"; -in -stdenv.lib.overrideDerivation (buildLinux (args // rec { - version = "${modDirVersion}-ti-${tag}"; - inherit modDirVersion; - - src = fetchFromGitHub { - owner = "beagleboard"; - repo = "linux"; - rev = "${version}"; - sha256 = "07hdv2h12gsgafxsqqr7b0fir10rv9k66riklpjba2cg6x0p2nr4"; - }; - - kernelPatches = args.kernelPatches; - - features = { - efiBootStub = false; - } // (args.features or {}); - - extraMeta.hydraPlatforms = [ "armv7l-linux" ]; -} // (args.argsOverride or {}))) (oldAttrs: { - - # This kernel will run mkuboot.sh. - postPatch = '' - patchShebangs scripts/ - ''; - - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ dtc ubootTools ]; - -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38f3264838cf..0962ba73555c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14213,14 +14213,6 @@ with pkgs; klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); - linux_beagleboard = callPackage ../os-specific/linux/kernel/linux-beagleboard.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ]; - }; - linux_mptcp = linux_mptcp_94; linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = @@ -14511,7 +14503,6 @@ with pkgs; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. - linuxPackages_beagleboard = linuxPackagesFor pkgs.linux_beagleboard; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); From eadb9985819327f6bce7da87730d32e5018ee848 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 4 Nov 2018 00:14:52 +0100 Subject: [PATCH 43/50] gitlab module: fix config handling --- nixos/modules/services/misc/gitlab.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index ce1cb6ad37f2..aa72cda70453 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -552,10 +552,9 @@ in { gnupg ]; preStart = '' - ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret - cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db - cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config + rm -rf ${cfg.statePath}/config + mkdir ${cfg.statePath}/config if [ -e ${cfg.statePath}/lib ]; then rm ${cfg.statePath}/lib fi @@ -569,6 +568,8 @@ in { ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb ''} cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION + cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config + ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret # JSON is a subset of YAML ln -sf ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)} ${cfg.statePath}/config/gitlab.yml From b5be88c97a1cd51f0f08f52200638700840cb337 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 3 Nov 2018 19:44:24 -0500 Subject: [PATCH 44/50] pg_hll: 2.10.2-9af41684 -> 2.12 Signed-off-by: Austin Seipp --- pkgs/servers/sql/postgresql/pg_hll/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/pg_hll/default.nix b/pkgs/servers/sql/postgresql/pg_hll/default.nix index 6c453f6a40c3..f91a8b1bf252 100644 --- a/pkgs/servers/sql/postgresql/pg_hll/default.nix +++ b/pkgs/servers/sql/postgresql/pg_hll/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "pg_hll-${version}"; - version = "2.10.2-${builtins.substring 0 7 src.rev}"; + version = "2.12"; buildInputs = [ postgresql ]; src = fetchFromGitHub { owner = "citusdata"; repo = "postgresql-hll"; - rev = "9af41684d479a3097bab87d04936702c9e6baf5c"; - sha256 = "044x9v9kjhxb0idqb9f5i7c3yygxxsqliswl4kspqy9f9qcblckl"; + rev = "refs/tags/v${version}"; + sha256 = "1jdc9gjqc3dkjxv855q1p594j0awhrrymrcqnl5vw5vx2ny3bpgn"; }; installPhase = '' From cecee87f396c9fca6c47a8bd91e176c8550ea3ab Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 3 Nov 2018 19:46:05 -0500 Subject: [PATCH 45/50] pg_repack: reindent to 2-spaces More or less all the Postgres code uses this, so it's nice to be consistent. Signed-off-by: Austin Seipp --- .../sql/postgresql/pg_repack/default.nix | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix index a50605bd0409..14f71b1e2b3b 100644 --- a/pkgs/servers/sql/postgresql/pg_repack/default.nix +++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix @@ -1,35 +1,35 @@ { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: stdenv.mkDerivation rec { - name = "pg_repack-${version}"; - version = "1.4.4"; + name = "pg_repack-${version}"; + version = "1.4.4"; - buildInputs = [ postgresql openssl zlib readline ]; + buildInputs = [ postgresql openssl zlib readline ]; - src = fetchFromGitHub { - owner = "reorg"; - repo = "pg_repack"; - rev = "refs/tags/ver_${version}"; - sha256 = "0ynsmsxfkcp82ccpz2nrgg8wiil8yxqigvw6425lx8v80h5lszbw"; - }; + src = fetchFromGitHub { + owner = "reorg"; + repo = "pg_repack"; + rev = "refs/tags/ver_${version}"; + sha256 = "0ynsmsxfkcp82ccpz2nrgg8wiil8yxqigvw6425lx8v80h5lszbw"; + }; - installPhase = '' - install -D bin/pg_repack -t $out/bin/ - install -D lib/pg_repack.so -t $out/lib/ - install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/extension + installPhase = '' + install -D bin/pg_repack -t $out/bin/ + install -D lib/pg_repack.so -t $out/lib/ + install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Reorganize tables in PostgreSQL databases with minimal locks"; + longDescription = '' + pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore + the physical order of clustered indexes. Unlike CLUSTER and VACUUM FULL it works online, without holding an + exclusive lock on the processed tables during processing. pg_repack is efficient to boot, + with performance comparable to using CLUSTER directly. ''; - - meta = with stdenv.lib; { - description = "Reorganize tables in PostgreSQL databases with minimal locks"; - longDescription = '' - pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore - the physical order of clustered indexes. Unlike CLUSTER and VACUUM FULL it works online, without holding an - exclusive lock on the processed tables during processing. pg_repack is efficient to boot, - with performance comparable to using CLUSTER directly. - ''; - license = licenses.bsd3; - maintainers = with maintainers; [ danbst ]; - inherit (postgresql.meta) platforms; - inherit (src.meta) homepage; - }; + license = licenses.bsd3; + maintainers = with maintainers; [ danbst ]; + inherit (postgresql.meta) platforms; + inherit (src.meta) homepage; + }; } From a713251348ac4059a7c2da7ffabdbf2772d90fad Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 3 Nov 2018 19:49:00 -0500 Subject: [PATCH 46/50] timescaledb: 0.11.0 -> 1.0.0 Signed-off-by: Austin Seipp --- pkgs/servers/sql/postgresql/timescaledb/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix index fab515035ce6..07dcfb0b7018 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, postgresql }: +{ stdenv, fetchFromGitHub, cmake, postgresql, openssl }: # # To enable on NixOS: # config.services.postgresql = { @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "0.11.0"; + version = "1.0.0"; nativeBuildInputs = [ cmake ]; - buildInputs = [ postgresql ]; + buildInputs = [ postgresql openssl ]; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "06xysf45r0c2sjfl6vgdbrm7pn7nxx2n0k29bm88q0ipyyp9fr0v"; + sha256 = "1359jc0dw8q3f0iipqfadzs8lvri9qa5w59ziz00x1d09ppw2q40"; }; # Fix the install phase which tries to install into the pgsql extension dir, From d8abcdc1de4b918740b34e1862270118a401f13a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 3 Nov 2018 19:50:32 -0500 Subject: [PATCH 47/50] pg_topn: 2.0.2 -> 2.2.0 Signed-off-by: Austin Seipp --- pkgs/servers/sql/postgresql/topn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/topn/default.nix b/pkgs/servers/sql/postgresql/topn/default.nix index 6886c80cf50d..dae30aadabd0 100644 --- a/pkgs/servers/sql/postgresql/topn/default.nix +++ b/pkgs/servers/sql/postgresql/topn/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "pg_topn-${version}"; - version = "2.0.2"; + version = "2.2.0"; nativeBuildInputs = [ protobufc ]; buildInputs = [ postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "postgresql-topn"; rev = "refs/tags/v${version}"; - sha256 = "00hc3hgnqv9xaalizbcvprb7s55sydj2qgk3rhgrdlwg2g025h62"; + sha256 = "1i5fn517mdvzfhlcj7fh4z0iniynanshcn7kzhsq19sgci0g31fr"; }; installPhase = '' From 800184df21cfe4924e1e901f387cda49a9a8269c Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 3 Nov 2018 19:52:55 -0500 Subject: [PATCH 48/50] tsearch_extras: 0.3 -> 0.4 Signed-off-by: Austin Seipp --- pkgs/servers/sql/postgresql/tsearch_extras/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix index 5140ae1a228f..b43a9c51be0c 100644 --- a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix +++ b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "tsearch-extras-${version}"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { - owner = "zulip"; - repo = "tsearch_extras"; - rev = version; - sha256 = "0i3i99lw80jwd4xflgdqabxmn1dnm1gm7dzf1mqv2drllxcy3yix"; + owner = "zulip"; + repo = "tsearch_extras"; + rev = "84e78f00931c4ef261d98197d6b5d94fc141f742"; # no release tag? + sha256 = "18j0saqblg3jhrz38splk173xjwdf32c67ymm18m8n5y94h8d2ba"; }; nativenativeBuildInputs = [ pkgconfig ]; From dd21f83950471bcd1878268b525207df4445ad8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Fri, 2 Nov 2018 10:09:15 +0100 Subject: [PATCH 49/50] coq_8_9: init at 8.9+beta1 --- pkgs/applications/science/logic/coq/default.nix | 1 + pkgs/top-level/all-packages.nix | 13 +++++++------ pkgs/top-level/coq-packages.nix | 10 +++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 040d722f9410..5fab9788a94a 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -25,6 +25,7 @@ let "8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8"; "8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk"; "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; + "8.9+beta1" = "1yxv2klqal3mh6symi3gc6gv3xm684zlld2c0b6ijhjmp865cin8"; }."${version}"; coq-version = builtins.substring 0 3 version; ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bdb2be44800..7fc0c9fee9df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21364,13 +21364,14 @@ with pkgs; boogie = dotnetPackages.Boogie; inherit (callPackage ./coq-packages.nix { - inherit (ocaml-ng) ocamlPackages_4_02 - ocamlPackages_4_05 - ; + inherit (ocaml-ng) ocamlPackages_4_05; }) mkCoqPackages - coq_8_5 coq_8_6 coq_8_7 coq_8_8 - coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8 - coqPackages coq + coqPackages_8_5 coq_8_5 + coqPackages_8_6 coq_8_6 + coqPackages_8_7 coq_8_7 + coqPackages_8_8 coq_8_8 + coqPackages_8_9 coq_8_9 + coqPackages coq ; coq2html = callPackage ../applications/science/logic/coq2html { diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index a4f44b6fc6f7..3ba90f3b5943 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,8 +1,4 @@ -{ lib, callPackage, newScope, recurseIntoAttrs -, gnumake3 -, ocamlPackages_4_02 -, ocamlPackages_4_05 -}: +{ lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05 }: let mkCoqPackages' = self: coq: @@ -70,11 +66,15 @@ in rec { coq_8_8 = callPackage ../applications/science/logic/coq { version = "8.8.2"; }; + coq_8_9 = callPackage ../applications/science/logic/coq { + version = "8.9+beta1"; + }; coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; coqPackages_8_7 = mkCoqPackages coq_8_7; coqPackages_8_8 = mkCoqPackages coq_8_8; + coqPackages_8_9 = mkCoqPackages coq_8_9; coqPackages = coqPackages_8_8; coq = coqPackages.coq; From 6e052567047166460db229074e48d7e6c393957e Mon Sep 17 00:00:00 2001 From: davidak Date: Sun, 4 Nov 2018 04:03:57 +0100 Subject: [PATCH 50/50] radeon-crimson: fix download --- pkgs/os-specific/linux/ati-drivers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index d5d42faa913e..cda7e03cd066 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -61,8 +61,8 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www2.ati.com/drivers/linux/radeon-crimson-15.12-15.302-151217a-297685e.zip"; - sha256 = "0n0ynqmjkjp5dl5q07as7ps3rlyyn63hq4mlwgd7c7v82ky2skvh"; - curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux+x86_64"; + sha256 = "704f2dfc14681f76dae3b4120c87b1ded33cf43d5a1d800b6de5ca292bb61e58"; + curlOpts = "--referer https://www.amd.com/en/support"; }; hardeningDisable = [ "pic" "format" ];