From 88de3d02314ec069fb8cc66c6e8d87e598174804 Mon Sep 17 00:00:00 2001 From: DavHau Date: Sun, 28 Jun 2020 13:42:11 +0000 Subject: [PATCH 001/164] python-jsonrpc-server: make version overridable --- .../python-modules/python-jsonrpc-server/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 586c6edfa829..d5535a328e26 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; postPatch = '' - sed -i 's/version=versioneer.get_version(),/version="${version}",/g' setup.py + sed -i "s/version=versioneer.get_version(),/version=\"$version\",/g" setup.py # https://github.com/palantir/python-jsonrpc-server/issues/36 sed -i -e 's!ujson<=!ujson>=!' setup.py ''; From 815eaa5206dcc9ffefb2d8dacf10aca1f89c45f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Aug 2020 05:28:05 +0000 Subject: [PATCH 002/164] stm32cubemx: 5.6.1 -> 6.0.1 --- pkgs/development/tools/misc/stm32cubemx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/stm32cubemx/default.nix b/pkgs/development/tools/misc/stm32cubemx/default.nix index 80549d8848f3..9fe34aecade2 100644 --- a/pkgs/development/tools/misc/stm32cubemx/default.nix +++ b/pkgs/development/tools/misc/stm32cubemx/default.nix @@ -1,7 +1,7 @@ { stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }: let - version = "5.6.1"; + version = "6.0.1"; desktopItem = makeDesktopItem { name = "stm32CubeMX"; exec = "stm32cubemx"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "1y4a340wcjl88kjw1f1x85ffp4b5g1psryn9mgkd717w2bfpf29l"; + sha256 = "15vxca1pgpgxgiz4wisrw0lylffdwnn4n46z9n0q37f8hmzlrk8f"; stripRoot= false; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { microcontrollers and microprocessors, as well as the generation of the corresponding initialization C code for the Arm® Cortex®-M core or a partial Linux® Device Tree for Arm® Cortex®-A core), through a - step-by-step process. + step-by-step process. ''; homepage = "https://www.st.com/en/development-tools/stm32cubemx.html"; license = licenses.unfree; From 14245d48a433f9470cb9a2072cc2c433078b6f35 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 27 Sep 2020 21:36:20 -0700 Subject: [PATCH 003/164] openafs_1_8: Add upstream patches for Linux kernel 5.8 and 5.9 Signed-off-by: Anders Kaseorg --- pkgs/servers/openafs/1.8/module.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index db44dbe2200d..8cb04ea7cdb5 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -18,6 +18,25 @@ in stdenv.mkDerivation { buildInputs = [ kerberos ]; + patches = [ + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/d7fc5bf9bf031089d80703c48daf30d5b15a80ca.patch"; + sha256 = "0469ydzgvyvrl1b2s1qbl9cd8c5c1nb99c3z52z5i685da5z6pab"; + }) + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/335f37be13d2ff954e4aeea617ee66502170805e.patch"; + sha256 = "0jr6cgplnip61cjlcd3fvgsc6n3jhfk93mm9m7ak04w1vc26dk9x"; + }) + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/facff58b840a47853592510617ba7a1da2e3eaa9.patch"; + sha256 = "0izafg6bi5iaigq3jjx0zlg1cxwaddz3238hk0s08fcb6nyhkvx1"; + }) + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/e7902252f15acfc28453c531f6fa3b29c9c91b92.patch"; + sha256 = "1jy4v8yx8p6mhma6b3h3g94mb38bw7hg7q6lnyc8bijkbnl0d1rl"; + }) + ]; + hardeningDisable = [ "pic" ]; configureFlags = [ From 5f6707d1b5420cf2826202ccae9b11aefef72277 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Fri, 16 Oct 2020 13:47:11 +0200 Subject: [PATCH 004/164] Revert "python3.pkgs.yq: make stdin a tty for tests" This reverts commit 40a58cc65bec0ed5b784178239e55f7c7ac969f5. --- pkgs/development/python-modules/yq/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index 05f608ff4e9c..389cdbd26a0a 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -10,7 +10,6 @@ , flake8 , jq , pytest -, unixtools , toml }: @@ -23,6 +22,10 @@ buildPythonPackage rec { sha256 = "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl"; }; + postPatch = '' + substituteInPlace test/test.py --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}" + ''; + propagatedBuildInputs = [ pyyaml xmltodict @@ -32,7 +35,6 @@ buildPythonPackage rec { doCheck = true; checkInputs = [ - unixtools.script pytest coverage flake8 @@ -40,8 +42,7 @@ buildPythonPackage rec { toml ]; - # tests fails if stdin is not a tty - checkPhase = "echo | script -c 'pytest ./test/test.py'"; + checkPhase = "pytest ./test/test.py"; pythonImportsCheck = [ "yq" ]; From 26093e5f5677a4b7a8f4a46ba9dc7b0d737380a2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Oct 2020 02:01:45 +0200 Subject: [PATCH 005/164] Literate: 2019-01-01 -> unstable-2020-09-02 Fixes #100902 --- .../tools/literate-programming/Literate/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index c418c16b6704..428e6e444a21 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchgit, dmd, dub }: stdenv.mkDerivation { - name = "Literate-2019-01-08"; + pname = "Literate"; + version = "unstable-2020-09-02"; src = fetchgit { url = "https://github.com/zyedidia/Literate.git"; - rev = "e20c5c86713701d4d17fd2881779d758a27a3e5a"; - sha256 = "1pr7iipcnp6jxi13341p5b3szdrvs7aixpfbwifj6lgbb45vg9sm"; + rev = "533991cca6ec7a608a778396d32d51b35182d944"; + sha256 = "09h1as01z0fw0bj0kf1g9nlhvinya7sqq2x8qb6zmhvqqm6v4n49"; }; buildInputs = [ dmd dub ]; From 7dcbc0ebd51bb2be66f228405d87678ecbe406ff Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Sat, 31 Oct 2020 11:49:31 -0500 Subject: [PATCH 006/164] vivaldi: 3.3.2022.47-1 -> 3.4.2066.90-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 29a48939facc..aa4dd7f8e443 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.3.2022.47-1"; + version = "3.4.2066.90-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0lraliqb5r8akh8lfmw2sy90s58sbghcpc598nlz2d89f91yq7vz"; + sha256 = "059vcr2j0vr8szqcxfqnzxwy5i8z53g71fwhm22nc0477jbrsxz1"; }; unpackPhase = '' From eed2008a2de97454fd10a928c537c63acdb00b2c Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 1 Nov 2020 20:29:29 -0800 Subject: [PATCH 007/164] nss: fix build on ppc64[le] NSS configure scripts use the abbreviated form ppc64/ppc64le: https://github.com/nss-dev/nss/blob/NSS_3_57_RTM/coreconf/config.gypi#L209 Whereas nixpkgs uses the longer form: `nix eval nixpkgs.pkgsCross.powernv.hostPlatform.parsed.cpu.name` `powerpc64le` --- pkgs/development/libraries/nss/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index e9ca475802d6..dad0d4cfe1b9 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -68,6 +68,9 @@ in stdenv.mkDerivation rec { else if platform.isx86_32 then "ia32" else if platform.isAarch32 then "arm" else if platform.isAarch64 then "arm64" + else if platform.isPower && platform.is64bit then ( + if platform.isLittleEndian then "ppc64le" else "ppc64" + ) else platform.parsed.cpu.name; # yes, this is correct. nixpkgs uses "host" for the platform the binary will run on whereas nss uses "host" for the platform that the build is running on target = getArch stdenv.hostPlatform; From 84276fd18cb1be74dd03c6b543a73e42ae9cddb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 8 Nov 2020 08:22:07 +0100 Subject: [PATCH 008/164] python3Packages.datasets: 1.0.1 -> 1.1.2 Changelog: https://github.com/huggingface/datasets/releases/tag/1.1.2 https://github.com/huggingface/datasets/releases/tag/1.1.0 https://github.com/huggingface/datasets/releases/tag/1.0.2 --- pkgs/development/python-modules/datasets/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index b953ed1dd1af..4214304a9c93 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , dill , filelock +, multiprocess , numpy , pandas , pyarrow @@ -13,18 +14,19 @@ buildPythonPackage rec { pname = "datasets"; - version = "1.0.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = version; - sha256 = "14f7847b8md5kf631zl8x2f53wy8zbzxypq4wdgzvwsjz4k7v4jn"; + hash = "sha256-upXZ2rOfmjnJbDo6RMGeHv/fe10RQAf/zwDWWKdt6SA="; }; propagatedBuildInputs = [ dill filelock + multiprocess numpy pandas pyarrow From 445dde63041d516195926d2a2358541f9fbc8b7e Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 4 Nov 2020 21:13:06 +0700 Subject: [PATCH 009/164] Initial implementation of mmix cross-compile --- lib/systems/doubles.nix | 3 ++ lib/systems/examples.nix | 5 +++ lib/systems/inspect.nix | 1 + lib/systems/parse.nix | 33 ++++++++------ lib/tests/systems.nix | 6 ++- .../bintools-wrapper/default.nix | 1 + pkgs/development/tools/mmixware/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 8 files changed, 79 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/tools/mmixware/default.nix diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 517a7296afd2..d8bfc48a96f8 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -36,6 +36,8 @@ let "riscv64-none" "riscv32-none" "vc4-none" + "mmix-mmixware" + "js-ghcjs" "aarch64-genode" "i686-genode" "x86_64-genode" @@ -56,6 +58,7 @@ in { i686 = filterDoubles predicates.isi686; x86_64 = filterDoubles predicates.isx86_64; mips = filterDoubles predicates.isMips; + mmix = filterDoubles predicates.isMmix; riscv = filterDoubles predicates.isRiscV; vc4 = filterDoubles predicates.isVc4; js = filterDoubles predicates.isJavaScript; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 87c05a0b0524..c869429d3ae7 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -109,6 +109,11 @@ rec { platform = platforms.riscv-multiplatform "32"; }; + mmix = { + config = "mmix-unknown-mmixware"; + libc = "newlib"; + }; + msp430 = { config = "msp430-elf"; libc = "newlib"; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 8fa630572509..7adbc98f9a9d 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -17,6 +17,7 @@ rec { isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; isMips = { cpu = { family = "mips"; }; }; + isMmix = { cpu = { family = "mmix"; }; }; isRiscV = { cpu = { family = "riscv"; }; }; isSparc = { cpu = { family = "sparc"; }; }; isWasm = { cpu = { family = "wasm"; }; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 6bd44a007466..6ba3c40c665a 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -93,6 +93,8 @@ rec { mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; }; mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; }; + mmix = { bits = 64; significantByte = bigEndian; family = "mmix"; }; + powerpc = { bits = 32; significantByte = bigEndian; family = "power"; }; powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; }; powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; }; @@ -268,19 +270,20 @@ rec { kernels = with execFormats; with kernelFamilies; setTypes types.openKernel { # TODO(@Ericson2314): Don't want to mass-rebuild yet to keeping 'darwin' as # the nnormalized name for macOS. - macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; }; - ios = { execFormat = macho; families = { inherit darwin; }; }; - freebsd = { execFormat = elf; families = { inherit bsd; }; }; - linux = { execFormat = elf; families = { }; }; - netbsd = { execFormat = elf; families = { inherit bsd; }; }; - none = { execFormat = unknown; families = { }; }; - openbsd = { execFormat = elf; families = { inherit bsd; }; }; - solaris = { execFormat = elf; families = { }; }; - wasi = { execFormat = wasm; families = { }; }; - redox = { execFormat = elf; families = { }; }; - windows = { execFormat = pe; families = { }; }; - ghcjs = { execFormat = unknown; families = { }; }; - genode = { execFormat = elf; families = { }; }; + macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; }; + ios = { execFormat = macho; families = { inherit darwin; }; }; + freebsd = { execFormat = elf; families = { inherit bsd; }; }; + linux = { execFormat = elf; families = { }; }; + netbsd = { execFormat = elf; families = { inherit bsd; }; }; + none = { execFormat = unknown; families = { }; }; + openbsd = { execFormat = elf; families = { inherit bsd; }; }; + solaris = { execFormat = elf; families = { }; }; + wasi = { execFormat = wasm; families = { }; }; + redox = { execFormat = elf; families = { }; }; + windows = { execFormat = pe; families = { }; }; + ghcjs = { execFormat = unknown; families = { }; }; + genode = { execFormat = elf; families = { }; }; + mmixware = { execFormat = unknown; families = { }; }; } // { # aliases # 'darwin' is the kernel for all of them. We choose macOS by default. darwin = kernels.macos; @@ -382,7 +385,7 @@ rec { else if (elemAt l 1) == "elf" then { cpu = elemAt l 0; vendor = "unknown"; kernel = "none"; abi = elemAt l 1; } else { cpu = elemAt l 0; kernel = elemAt l 1; }; - "3" = # Awkwards hacks, beware! + "3" = # Awkward hacks, beware! if elemAt l 1 == "apple" then { cpu = elemAt l 0; vendor = "apple"; kernel = elemAt l 2; } else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu") @@ -393,6 +396,8 @@ rec { then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "wasi"; } else if (elemAt l 2 == "redox") then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "redox"; } + else if (elemAt l 2 == "mmixware") + then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "mmixware"; } else if hasPrefix "netbsd" (elemAt l 2) then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; } else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"]) diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index f691b2da3165..eed7ee725bc4 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -11,12 +11,14 @@ let expr = lib.sort lib.lessThan x; expected = lib.sort lib.lessThan y; }; -in with lib.systems.doubles; lib.runTests { - testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ js ++ genode ++ redox); +in +with lib.systems.doubles; lib.runTests { + testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox); testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-none" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ]; testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; testmips = mseteq mips [ "mipsel-linux" ]; + testmmix = mseteq mmix [ "mmix-mmixware" ]; testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 786f0f9c5983..9c5aef135fd6 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -179,6 +179,7 @@ stdenv.mkDerivation { mips64 = "btsmip"; mips64el = "ltsmip"; }.${targetPlatform.parsed.cpu.name} + else if targetPlatform.isMmix then "mmix" else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc" else if targetPlatform.isSparc then "sparc" else if targetPlatform.isMsp430 then "msp430" diff --git a/pkgs/development/tools/mmixware/default.nix b/pkgs/development/tools/mmixware/default.nix new file mode 100644 index 000000000000..0b0d394b4e1e --- /dev/null +++ b/pkgs/development/tools/mmixware/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitLab, tetex }: + +stdenv.mkDerivation { + pname = "mmixware"; + version = "unstable-2019-02-19"; + + src = fetchFromGitLab { + domain = "gitlab.lrz.de"; + owner = "mmix"; + repo = "mmixware"; + rev = "a330d68aafcfe739ecaaece888a669b8e7d9bcb8"; + sha256 = "0bq0d19vqhfbpk4mcqzmd0hygbkhapl1mzlfkcr6afx0fhlhi087"; + }; + + hardeningDisable = [ "format" ]; + + postPatch = '' + substituteInPlace Makefile --replace 'rm abstime.h' "" + ''; + + nativeBuildInputs = [ tetex ]; + enableParallelBuilding = true; + + makeFlags = [ "all" "doc" "CFLAGS=-O2" ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/doc + cp *.ps $out/share/doc + install -Dm755 mmixal -t $out/bin + install -Dm755 mmix -t $out/bin + install -Dm755 mmotype -t $out/bin + install -Dm755 mmmix -t $out/bin + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "MMIX simulator and assembler"; + homepage = "https://www-cs-faculty.stanford.edu/~knuth/mmix-news.html"; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + license = licenses.publicDomain; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d017efe6dfb1..e67708b4255f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5642,6 +5642,8 @@ in mmake = callPackage ../tools/misc/mmake { }; + mmixware = callPackage ../development/tools/mmixware { }; + modemmanager = callPackage ../tools/networking/modem-manager {}; modem-manager-gui = callPackage ../applications/networking/modem-manager-gui {}; From aa08b8eb73e5904e66974d44ba4fbc2dbca5fe59 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 9 Nov 2020 15:36:08 -0500 Subject: [PATCH 010/164] qt5.qtwebengine: remove dead conditions for pre 5.12 support This doesn't change the derivation. --- .../libraries/qt-5/modules/qtwebengine.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 049b0349a4f8..ff2b444ac275 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -1,5 +1,5 @@ -{ qtModule, qtCompatVersion, - qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel +{ qtModule +, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel , bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which @@ -54,14 +54,6 @@ qtModule { '' ( cd src/3rdparty/chromium; patchShebangs . ) '' - # Patch Chromium build files - + optionalString (lib.versionOlder qtCompatVersion "5.12") '' - substituteInPlace ./src/3rdparty/chromium/build/common.gypi --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - '' # Prevent Chromium build script from making the path to `clang` relative to # the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR` # from `src/core/config/mac_osx.pri`. @@ -91,10 +83,10 @@ qtModule { '' # Following is required to prevent a build error: # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it - + (optionalString (lib.versionAtLeast qtCompatVersion "5.11") '' + + '' substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ --replace '$sysroot/usr' "${darwin.xnu}" - '') + '' + '' # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ From ee2501f124b817f29cb2ef65b8fc8bbe59cc143f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 9 Nov 2020 21:11:59 -0500 Subject: [PATCH 011/164] qt5.qtwebengine: don't override `patches` in qtModule This fixes darwin build. Fixes: 90db9641 ('qt5.qtwebengine: fix build with bison-3.7') --- pkgs/development/libraries/qt-5/5.12/default.nix | 9 +++++++++ pkgs/development/libraries/qt-5/5.14/default.nix | 11 ++++++++++- pkgs/development/libraries/qt-5/5.15/default.nix | 11 ++++++++++- .../libraries/qt-5/modules/qtwebengine.nix | 11 ----------- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index fcceb6d6cf2b..329ddd171626 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -97,6 +97,15 @@ let url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951"; sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; }) + + # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 + (fetchpatch { + name = "qtwebengine-bison-3.7-build.patch"; + url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; + sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + }) ] ++ optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-darwin-fix-failed-static-assertion.patch diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 469157a5f727..b17d9b97b183 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -70,7 +70,16 @@ let qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; - qtwebengine = [ ] + qtwebengine = [ + # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 + (fetchpatch { + name = "qtwebengine-bison-3.7-build.patch"; + url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; + sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + }) + ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ (fetchpatch { diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 1a90c610a5b5..3a31ca3a9480 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -70,7 +70,16 @@ let qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; - qtwebengine = [ ] + qtwebengine = [ + # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 + (fetchpatch { + name = "qtwebengine-bison-3.7-build.patch"; + url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; + sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + }) + ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ ./qtwebkit.patch ] ++ optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index ff2b444ac275..b98b711c0f5d 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -38,17 +38,6 @@ qtModule { # which cannot be set at the same time as -Wformat-security hardeningDisable = [ "format" ]; - patches = [ - # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 - (fetchpatch { - name = "qtwebengine-bison-3.7-build.patch"; - url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; - sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; - stripLen = 1; - extraPrefix = "src/3rdparty/"; - }) - ]; - postPatch = # Patch Chromium build tools '' From 51c2129eb8e145dca78a14088941cbc254e27e30 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 9 Nov 2020 14:40:52 +0100 Subject: [PATCH 012/164] monero: 0.17.1.1 -> 0.17.1.3 --- pkgs/applications/blockchains/monero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 29acbd0f37b3..1010da81da34 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.1"; + version = "0.17.1.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "18x27dm24k04vx0yz57zi02rk0wrmbn4wr8alqf48dq6z9wr0fhp"; + sha256 = "1ddkdfd8i5q509qziwcx1f6nm8axs4a1ppzv2y5lgsqpq375if6j"; fetchSubmodules = true; }; From 52ee36a710695c299598ac9901b018a2d6bce147 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 9 Nov 2020 14:41:12 +0100 Subject: [PATCH 013/164] monero-gui: 0.17.1.1 -> 0.17.1.4 --- .../blockchains/monero-gui/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 8cd03f34286f..6275a26118f6 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,5 +1,6 @@ { stdenv, wrapQtAppsHook, makeDesktopItem , fetchFromGitHub +, fetchpatch , cmake, qttools, pkgconfig , qtbase, qtdeclarative, qtgraphicaleffects , qtmultimedia, qtxmlpatterns @@ -27,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.1"; + version = "0.17.1.4"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "0aqhp4rmqsgwjb875kgh6qwz0wyyiag1fksyic9cnhgg5j5y95nx"; + sha256 = "1ixjfdlvwr2an2s9jaql240bk7jpq5hhm5c4hww0bicyy3fp12ng"; }; nativeBuildInputs = [ @@ -58,7 +59,14 @@ stdenv.mkDerivation rec { chmod -R +w source/monero ''; - patches = [ ./move-log-file.patch ]; + patches = [ + ./move-log-file.patch + # fix build failure due to invalid use of CMAKE_PREFIX_PATH + (fetchpatch { + url = "https://github.com/monero-project/monero-gui/commit/ef2be82c21b0934522ad8e110805b66f5948da1f.patch"; + sha256 = "1rhazk2xwa5dv1cmkrkq8yr08qxslg4k929cvlliabrx20kbr5z5"; + }) + ]; postPatch = '' # set monero-gui version From 739b762e5685ed9a252f6793cfd64886ad2b8f6e Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 11 Nov 2020 18:39:04 +0100 Subject: [PATCH 014/164] Revert "firefox: set build timeout at eight hours" The default timeout is 10h on Hydra currently, so this timeout setting is pointless or counterproductive. This commit seems to have been made in error https://github.com/NixOS/nixpkgs/pull/96767#issuecomment-724104413 This reverts commit c57fedb14b27292f6433287740e2eec303363ec3. --- pkgs/applications/networking/browsers/firefox/packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e7dd034a8ac4..de0180834d2f 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -26,7 +26,6 @@ rec { broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = lib.licenses.mpl20; - timeout = 28800; # eight hours }; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; From ec5fc9b7a4077c167fcc71812fbac4b04bebdf88 Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 12 Nov 2020 03:12:23 +0900 Subject: [PATCH 015/164] thunderbird-bin: 78.4.2 -> 78.4.3 --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index ec2d3c9af128..9a411d4a82df 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.4.2"; + version = "78.4.3"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/af/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/af/thunderbird-78.4.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "8b1c2e12bd1de45251131d9fe444b06681577cafc019219dac4aa13b3abf989b"; + sha256 = "03d4e32b23408b003de5347b2a26d9e3e734f7c3e811510ba81114eff80e6fa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ar/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ar/thunderbird-78.4.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "708ce9ae434ae78bd21d2c8a608a732d6ebdc88c2cc3c91c748d2b6a4eab24bd"; + sha256 = "5aefbc61f46d59de19061a0e76949642e254a13867881b40b6bac289791c281e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ast/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ast/thunderbird-78.4.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "46aadaa73a4e214c016f05eb9e0dc0a3daa6a87fc72988c696bf243d475d0285"; + sha256 = "1e328339808efed1db23ed372841ff65f64e1bda8e1d4be81fd00039468bbb1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/be/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/be/thunderbird-78.4.3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "06abeef2331df228ad303d9280d077ef4a74af8658c4ac0147ae59e181dfc42e"; + sha256 = "f42230768f2907fb3d23a03a56fc20f14ff5ded7b4418debb3e77c4942eb7db8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/bg/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/bg/thunderbird-78.4.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "3aa13c52a514f5331bf626f9e3138bfe995c6a223559a9fbd6d590858484d9c1"; + sha256 = "27a72288cbaaaaee6a24a36bb2e463a0426810e97938cbfe012dceb1a3800fd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/br/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/br/thunderbird-78.4.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "1f2d9ee7090e96e3e5611011c9fef8389b514dda4edbf47e889019312df6ab5f"; + sha256 = "fa1b6c891e3d9d097857a08181030e1df2201240ae466c4adc6fc0be0982d002"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ca/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ca/thunderbird-78.4.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "f48d5d02a04212ca14cd4c175102a0e45483299d8a4615ff96232431c4ffa4a5"; + sha256 = "6bcc123c7ecccbf42022e302b63683cdf77f6f6f2a615b12c5ea9e6a081fb900"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/cak/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cak/thunderbird-78.4.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "28b541daeac6aa6274f4185f9471ce8b2a46e18fe55ae1e373246d9f23d78ec6"; + sha256 = "392cc166ee9be6c5cf8294f727f97cb21b6ad7ebb77d263bba273f02cb15e661"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/cs/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cs/thunderbird-78.4.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d4f061ac86da0b6279b81b30c8949cca93aca5b2f90d0e5dafc5cdecc2868e05"; + sha256 = "60f5ea97e75f965ac0947e51c8cb8e709e5fa8f67ea478babe936032dee5a912"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/cy/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cy/thunderbird-78.4.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "824c703a570ae23d8e7b86d93baabb193842ac36fbc9d4ec65ae686e3d540de1"; + sha256 = "93aa92633d2414ad59aedea8b1a820b158a21c042cbfaedd8abd2b5a41e31c5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/da/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/da/thunderbird-78.4.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8dd27d2596346853e3fddab12ad0dabd700c5216310922e768faacb019b5b3d9"; + sha256 = "dc263e9d186f4ca8cd404b6e5bd13f9d2874e0e2507eaa55e99a6b5ab3b05179"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/de/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/de/thunderbird-78.4.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "3920c60073ee3066fbe35a1d2c34ab03a7b7e2dfbbe22af97fa32814000f6942"; + sha256 = "d9dbf07f3c57f688b08f75673074562ad9d4a9b138159f353415d63f9ccac80b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/dsb/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/dsb/thunderbird-78.4.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "fd09bbf80996e3aaf12dba79c366c4cfff41a0db0cdf7f6ed4d9722fd2623ff1"; + sha256 = "084ef3ef3628d003c75dea9a9fa5897424e6e564cb18fb5bca33b341c8c511cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/el/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/el/thunderbird-78.4.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "a9df959b2df9c381b9881fe3015e654ac82ca441a3cfc25036c1e658401bf810"; + sha256 = "4e91e7d21d0a3d524de7e41201ce8af58518a7e0292c11fc2961a84e9b7d04fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/en-CA/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-CA/thunderbird-78.4.3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "126e6fffa28b9c2a7eb7bb49254786fd0884aba62524dcf7d8352d6542903f77"; + sha256 = "922220811fb0083e8dc51c7cbd703530acdfeb0e9403d1a0909ba1618db020bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/en-GB/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-GB/thunderbird-78.4.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "099ef4c54072c6a4a134badd02a51255573e876c8b630c3b9eaecfde997f9e03"; + sha256 = "090806f6ebf12efbc5c20a920451feeb0d88d1e7366a074553b79080869687c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/en-US/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-US/thunderbird-78.4.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e6041bd8ad2a21f0a8f8d78fd395239f1f41e2948584770673aaa0f3a9978b3e"; + sha256 = "7fa3769297600c47c54902bac696e718053c48fc02e54698cb05ef81a4eec873"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/es-AR/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/es-AR/thunderbird-78.4.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "d4055f3134cd255f8e91ee2ef012bd4e4443e6db519cb7bf2543d4e193f59f61"; + sha256 = "51be3a453bb3e3f1353b88ab31fffa3fc0c135cb91facb7807c967a9d4afa659"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/es-ES/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/es-ES/thunderbird-78.4.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "39f3c8e5262b1125f21e2bc0e51d53b09283ef4922a7bbec6146605ea0bd1d51"; + sha256 = "8828e5ff82e84c5f69afd60ae5dbba445d766e2a2d7fbbcd8f0dc8f255d8fc02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/et/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/et/thunderbird-78.4.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "60331d65f98b68397a0d53a08a169b97654aae3d26efe48f494f575e1a51fe13"; + sha256 = "d58404701341bcd9b859f1afb87cb3340fc4b8334cc9490e8ea21446e3f308eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/eu/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/eu/thunderbird-78.4.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "206026522eb361b599dccf433887b1314b554adfea90ee558f36d116ae6c8f70"; + sha256 = "5570472164329f23d3f0be51911402c2b454ea704419ef16b46b359a2c93e821"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fa/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fa/thunderbird-78.4.3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "88f1421d251e0bc5288f2c8ca333345ec97ca0a86d491b242471d1af82c04776"; + sha256 = "cc56e14f1fa17e8b4ec9431ae9ada10159bd90bcade39432c647ba401791e3fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fi/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fi/thunderbird-78.4.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "4abbc607c3d6ec03a8416636e88ffdfd61fc0b062aa135d14fb3918c284f9ebd"; + sha256 = "5175e312e8957490b013dd515b84fe4dfcdf57d30c6806f8bdee67caf39659f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fr/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fr/thunderbird-78.4.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "406437d8cf7a695b636c3c1005df5a65f174bbb10d0d961ddda08833ee2c808d"; + sha256 = "5239f8a07f0f6bc4f69b3d4315570dab33c331ab775479a9df39479b71542cc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/fy-NL/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fy-NL/thunderbird-78.4.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "456f51fbef14e1de16fdb3d7c31b6736e0e7b43c509ac38bdb8a88cb4a2de0d9"; + sha256 = "5747be2c7f9d5463f9c14fd02fd5e66a8f6c4c8adca3a1bf8c3b4333f1ea2adf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ga-IE/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ga-IE/thunderbird-78.4.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "0f1ab856deed39280ab9d6a43afd6f719470d4aafc4404e0662da0e14b64308a"; + sha256 = "8e15ffc9235742ad88a1ecaf587a178f5aeb0bc57e075b33f792e2d458362ab9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/gd/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/gd/thunderbird-78.4.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "07f2fc13f34a70d4e6ecc65d465e33f5bcff63196996fe057f8584ef2e7e595c"; + sha256 = "72f53918cd04e587319d59100da05657a3084f97d70acba7d1ef7b7321add6ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/gl/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/gl/thunderbird-78.4.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "f4cb60a537ffba88823c8c8a60f2c164e62fbba13d448f2931c71e7d98d6abe0"; + sha256 = "28beb85fe0ea27a659e5063f7094877e906729602ef2e155f0e55e9e9f6d56ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/he/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/he/thunderbird-78.4.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "425a0bd38d231308fa5cac5d362b7818ccfb6b5fc06924ce312433ba4d5bf2b0"; + sha256 = "718f8605fc8d418c645a0485ce86d97ae1eeded8b776a990e137ced78eb91a68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hr/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hr/thunderbird-78.4.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "37d3f14aeed404bad5cab35c256473a5927787f889afee3da112e510999373f9"; + sha256 = "febadac023152dc30e72026f6df203c8051b65ad4da0c4e7059a14ab0b4b5f37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hsb/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hsb/thunderbird-78.4.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3249467db25d25866a4d1e0acd9a18a26bad13e2ca683df04ca5f8ca19affac3"; + sha256 = "faaaf4606fde4baca3216ed5801209f13cd1bbf34c9671cfc7a7648bb0ac7351"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hu/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hu/thunderbird-78.4.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "f3a82c5917757f221ca59c4b6a950991b52b10f2782b1dffe21c7a7ca6a26272"; + sha256 = "353633956336852193510c8e77251834355c92ec503ab827a389a0dbc21c05bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/hy-AM/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hy-AM/thunderbird-78.4.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "cb917c1ff3fa342a8ad3253a03a1dbb4a417c0bc3cdfd1422ef5ff06dcfcca74"; + sha256 = "1b5dba6f05ecc8449522d8a54c1d4e7aa5ec7a2e26fafbaefbd754ee3ea5780f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/id/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/id/thunderbird-78.4.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1599ddf22093c6a99ccd3ec3e1492e65ce0b5ebdc3a69aafb321ec26f22b6a13"; + sha256 = "470151868d745ce829f0f38c6377f4ead87be829d43f4383d2e5c3541b93e8d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/is/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/is/thunderbird-78.4.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "8cb02ca7ce8c28c10aa1f16ed08417342e93da2dd00f15c5a89fd71306f9afb3"; + sha256 = "e9d6b36beb61445c3f96ffe6e11b238a8539b398d5f3911f2ded7ee96ec0766c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/it/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/it/thunderbird-78.4.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "16f3c54980e614b20ef6a8c0a09ebe7707e298d753d373da79bb2d52d1cc43b6"; + sha256 = "95a02afcebb834b14986b8ccd92d5381a8ac64d3ebbba13860ffbd0313a594e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ja/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ja/thunderbird-78.4.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "e4ec88dd86b46d814232662a4d558361043ac97b348a8fbb2076ec856087be6e"; + sha256 = "d1c4e2a551a5266839da96b843372e71616346ea00361dccc8e1a62628e6315f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ka/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ka/thunderbird-78.4.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "9c2a110ed4df58c334b533255c0f3bf46d777960967e46e74f7f376203bf467b"; + sha256 = "9eb37a69a370b2619724c91c6789471b9ef579190c08363f633f320563dc4df1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/kab/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/kab/thunderbird-78.4.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "1f5cf7b8a03fb4273d9ce4d657c3a77ac4a26b7716e3bed700e14f05a398163d"; + sha256 = "bce07886dc5251ef401141d387c926f27f61d13450f35cb9a9cbc8403b43260a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/kk/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/kk/thunderbird-78.4.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "002ac92fee28c3ec9c05587025eddb4065a842df0430ace7f468ed8f3ec2df27"; + sha256 = "222647dd8106134d46bbad6dad8638090e5441a64aa2a6725aa5b1d959a2832a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ko/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ko/thunderbird-78.4.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "277f0fdfbda0d215a03ccd663f0986cf1b0a1c4e68e3ef36e81c8505d6eb7d09"; + sha256 = "be2346d5a48e5323d5cc8c1077adf054927d8aececd2fb45fc2f5c0a9f0b8dc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/lt/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/lt/thunderbird-78.4.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "65b6737b4ff528453bdaf57cc525a74c79899a9563d189123f87db729aa0f529"; + sha256 = "da5cde252d5e167025fb06861a32b67a2d0f7171c767bdd8c5d2ba9fc90d7739"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ms/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ms/thunderbird-78.4.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "cd40e14d4dbcf03ea7e5ab672678abc9b3b46c5b67fdbb961928a860c2f3218b"; + sha256 = "d6ab0652184cbbfe9126a49f61c25fe8852725b88460ad92c37dc1c4d969368f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/nb-NO/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nb-NO/thunderbird-78.4.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "49c9633a0552a704b06df87ea91991017be920684d12f66c72f6795dafd1cd5d"; + sha256 = "2485cc4df1b1dafd0c5fb7d7723e923e7fea10af1dbf9764d5d7447f38825e49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/nl/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nl/thunderbird-78.4.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4514d79caa1e2b44cafdc9ef06aa54c4708763c888a489d6bdf4473597221316"; + sha256 = "0795d2ae4364def43056e77106ea19053c3111e2f95758dbb41875071655ba47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/nn-NO/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nn-NO/thunderbird-78.4.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "f6aab88e4708659658be8cfb457c40533969a261af489a976f4010439a833458"; + sha256 = "b774035d8bff615646d3b3d73228277531d50309fb5dbf3978346e2b988b2491"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pa-IN/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pa-IN/thunderbird-78.4.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "10f5a885550f2cbee158fedc7111b96a0f07764b5d6d60004d17c233153f304b"; + sha256 = "2a38813c8aa0eaef3d2ec0ac379ab5c85d0b8c2df1f6a2d36ae066f7b0445447"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pl/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pl/thunderbird-78.4.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "1a192c0a9b8ac2f9b18445e69024462b8e95b78bff48014b55dd451e260aaf73"; + sha256 = "21cdb977bff1f0c07bf913b4feab2075a429b4594760de52ac358538179d9c66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pt-BR/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pt-BR/thunderbird-78.4.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "b9dc3db4d8cf4fc2b958695f9077c50d48d355e850618320adff179d33a116d0"; + sha256 = "d903ccd23367c39779ac2cdd3abe636a0f9e72f8d133a567bead8a739e651589"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/pt-PT/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pt-PT/thunderbird-78.4.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "0a3887ff46f9ecc1576bda76e1469eed8ef43813ccec25536e2dbae289196bd5"; + sha256 = "f220a8bc90b05dd796c402aa5e79c62a8aa91a4d80dacbdf57abf77ec51d73b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/rm/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/rm/thunderbird-78.4.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "1a13d443c00da4300aaf58d0af0620541de04e02e87218fa0774cad4b2aaa34f"; + sha256 = "805d08f629e9dda7d6db36bd41dbcc128defe59b4610e4b7d5d47408a07e47b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ro/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ro/thunderbird-78.4.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "62bd15566895dc9462b985f2f5e1afcc7057ef4e93f69005b9ebe89821a2a73a"; + sha256 = "3b09b2c59f32a09938a45270e04740616b2a13f8b8a6f40503650d9b0f72fc35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/ru/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ru/thunderbird-78.4.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e0624e745da31cafe1b885393e11622bac6ddd2e3e4c0cd35432eb5e0e57a47c"; + sha256 = "2022473752da127d2ebe4eef7f834ac5feafe38dedbe64ad30defb8ae69c6ebd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/si/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/si/thunderbird-78.4.3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "46e286fd0913b07ede577514b8e64ce279afd7bda3054b7cba4ec1f9981eef03"; + sha256 = "dc5166b0b24bd0a9e98f7dfc483a6bff184a4bfffb0eff8a4007b96fe8205254"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sk/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sk/thunderbird-78.4.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "3ab838c25d5e10d318705bed69e690d287e6b988412a3f9d5d94f2b7c8cd831b"; + sha256 = "d30e4d3218fbf13a5c531d45f55f0f366aac10aa2d180886ced778c7459c0610"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sl/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sl/thunderbird-78.4.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c04e1a339c4fb2ca8748da6bbc0f5a4dc9eb032b565d6f2333c7d1751eaaaa9a"; + sha256 = "f968618f7b13b6dc4441a09882ac5c826017a5b0ca3887b7cdca8ef6a3b3c266"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sq/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sq/thunderbird-78.4.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "ae9052f081baf3f25c43b2b1e109ce50abeacb5b2322ef38f8d42fb070417908"; + sha256 = "f4400c6e55859e07705b353cbf211e863e8c3f373490f3fff6bd3e6d360d5b7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sr/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sr/thunderbird-78.4.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c4eec55d9be21e02158e8266b9b7b424aa1f5d1078d9de2f0dfce4fef5f801d2"; + sha256 = "f6437ffb64b1a98b5c5630f3b386b12866a514467c641fb02c8e86560e4b62d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/sv-SE/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sv-SE/thunderbird-78.4.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "c7c01c580e1201e2948d0bfe3e029b6bd3a98e9845e6ff648d8bd4fbc8189d37"; + sha256 = "f1af8019698347ac94bad5c33b5e094b65e8ebed9181f5fed5e740cf2029bcef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/th/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/th/thunderbird-78.4.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f09079980e41c156e62f8d008d600850ca8a62fc88917f3cc06d10321bb3e500"; + sha256 = "75830b637302032bbc70342b71012f391b333a2645d8fefb8f4232d432c9dde1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/tr/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/tr/thunderbird-78.4.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "2b99f6fcf904c7cdf67de2ed957167b6e1fe7d997c5a422641bba0af8a22b7f4"; + sha256 = "3691e5aca6b9713fab9c8a15952d1ceae50d67cc60e362eacc9513a362875dfd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/uk/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/uk/thunderbird-78.4.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "d502f4447e1e0c02e9384435e1b552c4da6d083225555b03f90d71ed04314324"; + sha256 = "c4aca974c3a541c312029eb66fb8fdb1c5ecd787deb67a10bda3195f0ca06263"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/uz/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/uz/thunderbird-78.4.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7b9548f91dcf0ee6bfaed9d735baf9254842a633e3f06986d00d9d86b0f645d6"; + sha256 = "2052c0a9a41c81a37aa23fbf28775e286b8350594b01aff629604ccbd74ae90d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/vi/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/vi/thunderbird-78.4.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "32f78b425fd56900d1b3319e571af151214edee83a22321a449556e8ddebea69"; + sha256 = "b142f463cd953bfc423be210eb891f66e948308129de74cdfd415409d4b0cb03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/zh-CN/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/zh-CN/thunderbird-78.4.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "a6252fdd66dbfbd33444a3ebdacef38f8b600891af324d31f22f2fcf59b1e7fb"; + sha256 = "0664f379ce4e464e2e6dcc3cfa749bd6ae4a597b008b7fd1c97bb6219727da6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-x86_64/zh-TW/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/zh-TW/thunderbird-78.4.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b97a176fc12f156d8503e07819e9a0536b338850b8527c3896d93a36d64083aa"; + sha256 = "2ba4d49b52e6cd699f7bb1fa8f024c330f67d6b9df543a77fea7c3dc87985cc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/af/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/af/thunderbird-78.4.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "e1f0a03f540da701f9e742cf7a05e21a1216ba5c60c402968799ff494ffb1fcc"; + sha256 = "60f62dc28a8433e571b894d33c0d9670c3aebc6a8c556c65f12d8d574e5edceb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ar/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ar/thunderbird-78.4.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "5bbee34fe9c5cf02f2f3c8160264f3a0ca3ad880bd75fd1ede87f906b886c7fd"; + sha256 = "cf0fc7d7af09b20dbb35364ac0e47615919ae1627a0b729acf2f13dd99198400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ast/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ast/thunderbird-78.4.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "8a5e481e9aa16619513260d532ec6f7e2c6338b41a0a44468950ec26287b2a26"; + sha256 = "cb7ed53eedb55858fa5a5aadab1ed0ae4f2f9e2714406488b211660e56785d21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/be/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/be/thunderbird-78.4.3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "27f600f0d4b977cde9ede5bd39efd97bfa1abc04f3d1c7a3290339e7eedaef47"; + sha256 = "b04239a6caf488d3fcb5be0373ddf83554643897d41bd197edb6dbaee15b9a4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/bg/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/bg/thunderbird-78.4.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a9a6c127461ca7da6b5fca5e2d2ca8b1eecbbe78b42a9e18e16bc7a343c761ec"; + sha256 = "fabd2c79cee02328166954d6b793b70bb94cb41162b904ecb124cdf91e5cff0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/br/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/br/thunderbird-78.4.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "b8f363ca9ada5b2ed80a9526d1f775d9c17bfecd6b84113391fd6a5b1966bd90"; + sha256 = "66584e5c63c58c10cb4f2f8fb81048c4201046adbad03d58faf8f36e405a8e40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ca/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ca/thunderbird-78.4.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e1c5035ab818ce7525c2bd659622b14b3fe544b7f4c8432bca2b018c7ba1bfa5"; + sha256 = "eca54850e9ed41a19bb4cd23de9c11d9d2851ac1573507b32b4fd33431ad7889"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/cak/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cak/thunderbird-78.4.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f42d03442c8ab4bd844b0414e6d6c8ee168230714b55bbff1704117315f26a0d"; + sha256 = "ff8e285bf3198c225c2b5b216678bde7f978443c1f354193e39c0c5d3d7237bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/cs/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cs/thunderbird-78.4.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "c45a3b75c5106377d73f72b905814972a58604b4f2bfe49f05f5177584f2e0d6"; + sha256 = "72a18f3ac0168478c7b9c8d2641922ba7be5d129b63b711b7f7f133ba3cb1d75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/cy/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cy/thunderbird-78.4.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "e8e1f70703c9c22fceb2efe10f55a2f25da4085822ada1a3a3a3736ae41c0503"; + sha256 = "16fecfef3f81870befcadf833db5ecf54b7b83d587f2a211c5eaceeaf7a5796f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/da/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/da/thunderbird-78.4.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d8fb3be7bc41ae6ae0d064bdf9ab9cc569f65dc18f720de960ace84bb2514b68"; + sha256 = "7aac88184c6e2539003905b3a7609116cb2180943a8df219449354297b323455"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/de/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/de/thunderbird-78.4.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "373f50cb99608779e502d76af0e4a301ef0b8b75a6ec235f64da7626188157c6"; + sha256 = "f3f487f8852b7f50ed49b5375ae97376470282a0f5639c8fc4cb7040da30f946"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/dsb/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/dsb/thunderbird-78.4.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "07518d32b488fb805adceea1126ca104f2e86e3a1245f6cc4fe108b70335c995"; + sha256 = "842a084fc74c29d3c7573e473666cfa01f205b75fe6c1ee83acc25cca68d3666"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/el/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/el/thunderbird-78.4.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "97699a80d96422dad4c95658c9c4d472bd1d69e1823f5a5f7dce5fdaddf1211f"; + sha256 = "8df4c2a688b435f60fe0d5646ac5172dad33d254fdd68e35a29a6a83c4bda905"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/en-CA/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-CA/thunderbird-78.4.3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0b2dc377399c4f27acb717c7f0e59e9e735ad3d2ba1e617a93a3fa337b6dd2c0"; + sha256 = "8eab7a0b08e3c65eb5c373eb018d5e1df519b28f8774b06203a5b7743b146cd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/en-GB/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-GB/thunderbird-78.4.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "679fd1138a8795b0e7d64a4b8d8a2821deb8b30d40092e9df98b0a08d6cc6539"; + sha256 = "23c819e15ca0ff1ad366f2d5fb76e934dcea0fae9cec6674b39339e14a3c4254"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/en-US/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-US/thunderbird-78.4.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "a86f2780353dff8a449f323d5f54d83ce70b724db1a2d77dc3cecf6d1e849ada"; + sha256 = "5cdf4b40f337352a8e966046a2eb1a368c0feef4fb069fd4c22d4f986ea1ed3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/es-AR/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/es-AR/thunderbird-78.4.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "1fbd2312a971f658243dd6733067157fe3de509a88b2cce766ee8e45c243d23d"; + sha256 = "e7947542ef45cb432991ac5435523987c79811889e9bd5cb6fe4c698897a241e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/es-ES/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/es-ES/thunderbird-78.4.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e51217ca711a307c67f538d487eb836d49e4ccd6b8ff9b1a1926bd481322d46f"; + sha256 = "95121f74bc1389e62dfe7acb286d2a4cd60a536f28054c8e367cdfd867babde1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/et/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/et/thunderbird-78.4.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "345ccfa0e703893795d226aacf95645cc2cdc7dc99f5f9fba108466f74af19fe"; + sha256 = "87aedd276bc54360887e81bf2e3b07c54a365b78814d7e478f7ad5ec15c1d451"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/eu/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/eu/thunderbird-78.4.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "47e95ce28a229dbd01d8598d3a5b7f00d8e2c1934f8da4ff92052693dbb0c7c9"; + sha256 = "66168f09ed77b7f31faaf21daff48e9a8bf75314fcab585fad67160db52471b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fa/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fa/thunderbird-78.4.3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6c05b6a34a1ae3232b417e37c6c71bb05e46a296019b55192331cd441f212e1b"; + sha256 = "2848f0277f75dc58f371e2025bebdeca1c37d543055fa78258df67d05c67f5bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fi/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fi/thunderbird-78.4.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "fe043a86dd6679dc20ed17920e008894d78562d099861c0cda598c74aff3b176"; + sha256 = "725f0dcd456245e188e32a32401ecd40400b7786da3a39d9f6965c1f674ee954"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fr/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fr/thunderbird-78.4.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "950fa73e6f5fcf2fd66da9af7b79e43420e3ce75c9227fee095ea65ce2769a7f"; + sha256 = "d24ab35a8db7cb32d6098defb9f7b6b007b5c993a070c1a3a5c8991451165e37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/fy-NL/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fy-NL/thunderbird-78.4.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e01f59e5b7abde309421515240229d16cc0ec6ad4ea52ef1a54fb65f0bc49091"; + sha256 = "ea3a88b57166b3b8f04922a5c2f6d8d9f94f1a7bb5f3a9e2d6b5f11a13528c18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ga-IE/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ga-IE/thunderbird-78.4.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "53a7b0b5a2046525701120101fbab5c581b99de56caadf3aed4732f444c35569"; + sha256 = "763bc901967ec61e1f7f543bbf248bb03ea68b01c000677505408ec8e8c3cbb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/gd/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/gd/thunderbird-78.4.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "eaea6b3770d5bc51a00e25fee02110f5614d9ef52049fc092d90dc1e8de4c210"; + sha256 = "7394f43ae2ff5816dcf9b37255fd9770dc48dd7309d685ab378bc2de8a5a39b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/gl/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/gl/thunderbird-78.4.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "b0c5d871785d1efa23bdbe341d8186b96394375ac56bb541d5d9a75bc784b471"; + sha256 = "7daaacf6af75b34d37d440e2c0b252ef03c3b432523f5acb8ef71f83b5d7b6cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/he/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/he/thunderbird-78.4.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "cef410178a3cf310c7bf158eba5c12093385dfda1de334d6d6e0c28ada16c7ca"; + sha256 = "4831ef263de0a08df6494b13a280475642c3eed7f34c7415fd7b59af192398dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hr/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hr/thunderbird-78.4.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "9040e2235a752a50cbe09207684df928b84787629d21c8d53e6b9bfc708b09a3"; + sha256 = "6860b40fc2ba7f9b8ddedcaf50acca8ac01b6451c0895c325b36485f188b5dda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hsb/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hsb/thunderbird-78.4.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "b0bb84d18c588abf2f05abc8ecb1f3a169221fcdf4117e48b3169362cfc69aa6"; + sha256 = "681fc8200f6f9346e911c21d6a1c8206e5ee5ad1adfaa56ddfbc5088225fc561"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hu/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hu/thunderbird-78.4.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "6d5d0ded325cf7852ef638d7f5d8dd4d7ce127ad7f4eace22ce696541f9485a5"; + sha256 = "8909d02e58f5b333fa51b15e4ddb5df162d01e36a8052827482c479949da2cb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/hy-AM/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hy-AM/thunderbird-78.4.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "cbb8de1462385ef9bdb42cec5e8c81664347dc9e7573f602f41ff586c217d8ea"; + sha256 = "12dee2dbe126d2243b674bed4617ffcec7c93f850d266f6253d802c6af5b6d6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/id/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/id/thunderbird-78.4.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "358a95d7d87adc85cd39bf6da1373026de5b8631139ee1ec44e9410b027e00cd"; + sha256 = "5564c24b01f9a952def885a4fb56e3246643ca30bc5066d6ffa4ed6c6982b33b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/is/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/is/thunderbird-78.4.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c7b27e5311737cd5f3d314830aba0ec165669d8c949edb37482fb4df3b460f9e"; + sha256 = "fedea70297479b2c828aa19a9a4aa3090597c5490ee842a0f521d0096615d6db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/it/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/it/thunderbird-78.4.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "a302c50190fb992fcdaa66a8de9c5f5d177a5563fcec55e5f433761646ccfcbd"; + sha256 = "8466f3dc9988270d4a9166b82dba764d8dbfa14e8c26a1931d35abe011c3160a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ja/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ja/thunderbird-78.4.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d2357cc5bb5b5493035a79b504db8db2750f5880705b693554e2170d8d840cb0"; + sha256 = "3ffe4ae508896ac961a27940a93f5955bb8b29640c88e5378a8251827b4e9ab8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ka/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ka/thunderbird-78.4.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "2d150d1160d92499fd9dc4d632e006170a27929f88909715c0d0210005516ff7"; + sha256 = "7c099596fbc4666e053bd1079f6b7c45511b2b44db73cd5c099fd392bec8e3e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/kab/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/kab/thunderbird-78.4.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "4f9879d5a106ec9fc3bd423fdb5df25a3e0d47690cfec652654472addd21a2c2"; + sha256 = "5e64e5a276a6e77250ad7647f9b4ecc2b8c9dc360c486f9504b3b17b8da3e467"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/kk/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/kk/thunderbird-78.4.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f8d7fe1f39af2019bb37e117545e8cb2901feb0d31a92287eb4b30da2e431a6b"; + sha256 = "4562bced5900bc447a79c53d381b250a1e13b9f076979cb9760f9adaa89c54b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ko/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ko/thunderbird-78.4.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "bd9abd627205fe33430717a60eea8b54498325a8fe4d92fb5572a2719ba50341"; + sha256 = "b6cb53893d67bedb077547f1262a833a5487e49395187a49eb977659d019e7f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/lt/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/lt/thunderbird-78.4.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "69ab343eb79c42c4a1a9ea480aa2ac50d95e9140968690fd99b3d13824be17ef"; + sha256 = "6291d36e9347729920f89a28b949c943d8c92863cba1a03624801c7136eff997"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ms/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ms/thunderbird-78.4.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "fb1246094e22ff59f8671a6aa0827c8e51a7fa8dc2bb565a3cb446d35c098f16"; + sha256 = "5dee2e40dbceea93fbe3b35b744d00472b89b88e745025127a1d07afc79d7df8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/nb-NO/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nb-NO/thunderbird-78.4.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "0ffcd2db855686c4b7e8751884aa4a8729b0fc8da597d256d37d6c73a50c7585"; + sha256 = "491115e7ad1c4245da34dc328e179de3916291d4e42a85ee5fd4fadeae1fcdcd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/nl/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nl/thunderbird-78.4.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "615205a37248619a664b4649f808ddce9b019aae60a900fe4d2ca2dfdd717fe2"; + sha256 = "c4631681eb3354a3093acd5a76d5c7ca5ef3e76ac2cef9f1fa4007c40c1e282d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/nn-NO/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nn-NO/thunderbird-78.4.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "8813d2b40da457d5d7c0da88d54b8b0c13d2ea0215b9bee2966215d366d79a81"; + sha256 = "aa4d383b90b7cd48ff18f098c9bba429f09fcfb72a2f2a086a992778718a3b1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pa-IN/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pa-IN/thunderbird-78.4.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "31feb987ff8493d96e15395deb93506b13089db28d91c0bf6ee4da271db8a0d2"; + sha256 = "c5fb66455a59383494890e06559d4529c0762ecf76d17e5ad784eb413277438d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pl/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pl/thunderbird-78.4.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a9c30450e918ec4c0a95da51c071f8c4ec4f870976ac494ae6042aa3fdbc4a56"; + sha256 = "720eea0998d9934960a5dc97466f57c7e68b2048f88125a987569539a8a00579"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pt-BR/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pt-BR/thunderbird-78.4.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "157d64059b2a7a1082f233c05fdc0302f92dfa496c0075761bd54327b439594c"; + sha256 = "d27ab836f5d8753d740e980291a4403656735c206cedbaf7d5c13df26d327150"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/pt-PT/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pt-PT/thunderbird-78.4.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "d8a403996d56e22809e9124fc4c9dec98cda19a5fad7144fa87e452ae75a990e"; + sha256 = "2b996d07174c24df1b066c41bd92c8b24ebab82767c47d8c658f2205eeff9cb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/rm/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/rm/thunderbird-78.4.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "97524948b2f9259d1b08b9bbc6533b79fd5e592b08fb5fc5cc63bdb749d5866c"; + sha256 = "206b2bf82b88ab733bf585e11a3eba49a779c8b8fb7bb249716022fc7ee1a18a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ro/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ro/thunderbird-78.4.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "99e2c94054fd01001555fdcf4e9ee8a04fbae77e5ff9d34ebc42a6415b939bbd"; + sha256 = "2d06d671114d70ba4e39b2c639eab1debe7ad33de11795113f30f27708d13ae4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/ru/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ru/thunderbird-78.4.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f1996c3f3b6b5371f853f6854edd15ee030b6238f396870a2cff39320eac111a"; + sha256 = "08e71802964c340dfbcddf963382d1ccc5b8fd2e262daa1316488cffd04f449f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/si/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/si/thunderbird-78.4.3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "10df360a1d5a94ccd218a265024fb3f3d9d9a72b8c749ab93d797a3879cbad03"; + sha256 = "0f59d187fa15bd08ffe0e08e643bb76954f7eb7730c3768079514385c53df5d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sk/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sk/thunderbird-78.4.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a5f9e0b983961cc4e4ff7cb6f03c197cd8729eead74d6c0b657b441a91635326"; + sha256 = "5109939226907517fac9ae9c4e6ee96d732de9a67b9139e390d32cbdea892ef7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sl/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sl/thunderbird-78.4.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "10526684f3066322066f204a2cf978c779bb895d5c7ba73880ee32caf63d62a7"; + sha256 = "c56fb54ad65dd453b487813b1f0dde8d83ed6a2f7e428af55c40a80d1c9a35ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sq/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sq/thunderbird-78.4.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "d422e42397d2012efaeeb37101a5b1b29feb34e9e9dbaf87a85f9e2f881511ea"; + sha256 = "0b3814c80014108032c9f0376a62c09864704441f36a084accba1c7c0f8156de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sr/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sr/thunderbird-78.4.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "1e9b5637581c2c4973efcc5b0844ca228f66c4fbb0a44e88201973623aad0b83"; + sha256 = "80b01424fae7d18c98a77a0026dd4b50f1913f5f3cce2d3f85d9e56da633a537"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/sv-SE/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sv-SE/thunderbird-78.4.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "592daeeebdb5f56f486a4e6efa1c51e709d834a65c861e76e5b6fd86f8a4bb09"; + sha256 = "ef0154595d85c13d0eac381a907a51da19e9d93d2758c7dc0f052b7b76a7f31f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/th/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/th/thunderbird-78.4.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "00f883ed3d542d0bf3da3e744523cfd1b3405ae0b928dd83c42e55e5f1bab4e1"; + sha256 = "939f56c4951e8dbfdff257efe7f0212e93c1bb55547ce1e934f7d908932d3116"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/tr/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/tr/thunderbird-78.4.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "ab69a35eebbd1cdef80b22a398c4d570c17e13a8a36e5399b892974d7ed29b10"; + sha256 = "66f4f2cb06f20fca47e59b37d52f07a9e1215b03f0bbf9320cd1436e1d1a7c35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/uk/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/uk/thunderbird-78.4.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "efbd5bf9552333d78c68191265b3ecccb2a59ae19f2bfe7a1d8b096a44c9fcdc"; + sha256 = "33f3b9812b442184c075056cbe7da924655729865d849856093bdaa2d7d84660"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/uz/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/uz/thunderbird-78.4.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "db90d47b59efeb5c847ecdf8b7438a4f99d0954283f1deda39a0ee08f54fdfd1"; + sha256 = "5abbc17bb66700093eeef5eb97bcab0a5d040ffe20ecf79d8239123248b1affb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/vi/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/vi/thunderbird-78.4.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "1d616c682f04f7c0ec976d41eb71d3ac929eaa3199b4af749a80c906a3f2a212"; + sha256 = "de5071c3b4a5cf7494f91c69f4a7cf4678bcf57227115e1b6e50cc65a3e716dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/zh-CN/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/zh-CN/thunderbird-78.4.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "490e4e310606846836d93ca9704b7de11bf307b918933fd0187aa5d3795a82bf"; + sha256 = "07afc2b794439475d0d4db82c7b694728aa5b8e6e80ac79789bae662757ae8d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.2/linux-i686/zh-TW/thunderbird-78.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/zh-TW/thunderbird-78.4.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "c62476ac43d302ad9895524f6f66350122edfdf393697111d5868cf25b996c1a"; + sha256 = "70a71d0c26fd2cd18dd599374cc6f1c39d22246f3b3c8e8d17659cb7c33a5a77"; } ]; } From 205652e31afac6eed2e1fc40ceaa0270dd2cc601 Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 12 Nov 2020 03:12:51 +0900 Subject: [PATCH 016/164] thunderbird: 78.4.2 -> 78.4.3 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e92e89c7126c..e4debe7a909b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.4.2"; + version = "78.4.3"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1bd8z6fm2nky4p3qxc5jh9dca7v7g77i6kdn6p5dzzm4gyadqvk00bfa4nzglzi9nwwyld14r3ydjd6ms012yk07q4aqdsrf51b9k4y"; + "0h5ddqp1z2dphyy4mjcb7v9mrrxlnjw8rwklm0yqsbvs9m96pc1yyp4clb3wmgs7kzh3wxdwi450842m3b13wdg5h0ls7rhamd1yi0c"; }; nativeBuildInputs = [ From 008e711861d82fd89bdf27795905045a773330b0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Nov 2020 18:19:52 +0000 Subject: [PATCH 017/164] obsidian: 0.9.6 -> 0.9.11 --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 58ea50c3ed18..ae3d9181a3e8 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.9.6"; + version = "0.9.11"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "1n8qc8ssv93xcal9fgbwvkvahzwyn6367v8gbxgc3036l66mira7"; + sha256 = "11z22pglqsqjms1ykxmj7lfdwpcmkbdsd5r812m5gv94xsv38lnr"; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; From 784028111406b926250b1627588ac7434cb90c4f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Nov 2020 19:12:07 +0000 Subject: [PATCH 018/164] operator-sdk: 1.1.0 -> 1.2.0 --- pkgs/development/tools/operator-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index e22aaf6ed666..f97611c77853 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "11xlay3sk5nr9pfbqifcrfi5h81qnhs3hg5b75zgqysgr4d2m987"; + sha256 = "03iy4a5jlsmmzn8cpyp35sc2kgz6shg18ah0qdzkadqqalqlldy8"; }; - vendorSha256 = "1bbj23rwghqfw9vsgj9i9zrxvl480adsmjg1zb06cdhh5j1hl0vy"; + vendorSha256 = "0dls086lw3sbal4rf0l3xb0sp6g393n9ylkpzppp75myj7v900vv"; doCheck = false; From bcbc529b91aa1ea5171de0834b51556d1935216e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Nov 2020 05:31:41 +0000 Subject: [PATCH 019/164] stella: 6.3 -> 6.4 --- pkgs/misc/emulators/stella/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 33cd1879ce6a..ece734ef4bca 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stella"; - version = "6.3"; + version = "6.4"; src = fetchFromGitHub { owner = "stella-emu"; repo = pname; rev = version; - sha256 = "sha256-5rH2a/Uvi0HuyU/86y87g5FN/dunlP65+K3j0Bo+yCg="; + sha256 = "0gva6pw5c1pplcf2g48zmm24h1134v0vr705rbzj4v6ifp3adrsl"; }; nativeBuildInputs = [ pkg-config ]; From 5efb8b4b5211d0176cc2a225ecaff83184b54405 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Nov 2020 07:54:19 +0000 Subject: [PATCH 020/164] theme-obsidian2: 2.15 -> 2.16 --- pkgs/data/themes/obsidian2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index cb2660ed058c..4e9087995056 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.15"; + version = "2.16"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "1d6h8jsg8r1jbv2izshhpvlwsrwpi2f2dm461kr1zpwcw5glf9jx"; + sha256 = "0a5268w8b413i62ggipgy19k83va1n0ni8bvfwrp17r0n97wbqx2"; }; sourceRoot = "."; From 04b5e932a3896d2ebba4a4604e2bf31339842e5b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Nov 2020 10:41:56 +0000 Subject: [PATCH 021/164] wavemon: 0.9.1 -> 0.9.2 --- pkgs/tools/networking/wavemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index dab52720a029..8549495e8f82 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, libnl, pkgconfig }: stdenv.mkDerivation rec { - version = "0.9.1"; + version = "0.9.2"; baseName = "wavemon"; name = "${baseName}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "uoaerg"; repo = "wavemon"; rev = "v${version}"; - sha256 = "109ycwnjjqc2vpnd8b86njfifczlxglnyv4rh2qmbn2i5nw2wryg"; + sha256 = "0y984wm03lzqf7bk06a07mw7d1fzjsp9x7zxcvlx4xqmv7wlgb29"; }; meta = with stdenv.lib; { From d817bf140be2083a8b3db5ff70c10e095b9c631c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Nov 2020 13:07:55 +0000 Subject: [PATCH 022/164] zef: 0.8.5 -> 0.9.1 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index c82053446933..c72eaedef9d6 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.8.5"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "17a5ns0ph8626q3b4wv9v2n0zqmhqbqyzjzxa387kr19qs933yy6"; + sha256 = "1qw8g809gnr0s6hmj4qsd81g1dhsacml6n1fdgk4q45l1mxjfdmv"; }; buildInputs = [ rakudo makeWrapper ]; From 9f5cba0aaabc176bde6daf2b0079bc870f009615 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 9 Nov 2020 18:33:43 -0500 Subject: [PATCH 023/164] wine: add MinGW-w64 support --- pkgs/misc/emulators/wine/base.nix | 12 +++++++++--- pkgs/misc/emulators/wine/default.nix | 3 ++- pkgs/misc/emulators/wine/packages.nix | 5 ++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 025158b07173..9b228fba095d 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -1,5 +1,5 @@ { stdenv, lib, pkgArches, callPackage, - name, version, src, monos, geckos, platforms, + name, version, src, mingwGccs, monos, geckos, platforms, pkgconfig, fontforge, makeWrapper, flex, bison, supportFlags, buildScript ? null, configureFlags ? [] @@ -15,9 +15,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { }) // rec { inherit name src configureFlags; + # Fixes "Compiler cannot create executables" building wineWow with mingwSupport + strictDeps = true; + nativeBuildInputs = [ pkgconfig fontforge makeWrapper flex bison - ]; + ] + ++ lib.optionals supportFlags.mingwSupport mingwGccs; buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs: [ pkgs.freetype ] @@ -92,6 +96,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # drive_c/windows/system32 will only contain a few files instead of # hundreds, there will be an error about winemenubuilder and MountMgr # on startup of Wine, and the Drives tab in winecfg will show an error. + # TODO: binutils 2.34 contains a fix for this bug, re-enable stripping once available. dontStrip = true; ## FIXME @@ -136,7 +141,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # https://bugs.winehq.org/show_bug.cgi?id=43530 # https://github.com/NixOS/nixpkgs/issues/31989 hardeningDisable = [ "bindnow" ] - ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify"; + ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify" + ++ lib.optional (supportFlags.mingwSupport) "format"; passthru = { inherit pkgArches; }; meta = { diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 368e2845ca40..24f827b25ffe 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -44,6 +44,7 @@ sdlSupport ? false, faudioSupport ? false, vkd3dSupport ? false, + mingwSupport ? false, }: let wine-build = build: release: @@ -56,7 +57,7 @@ let wine-build = build: release: gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport - vkd3dSupport; + vkd3dSupport mingwSupport; }; }); diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix index 3ea60e62c665..31d21058e3aa 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/misc/emulators/wine/packages.nix @@ -1,4 +1,4 @@ -{ stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, +{ stdenv_32bit, lib, pkgs, pkgsi686Linux, pkgsCross, callPackage, wineRelease ? "stable", supportFlags }: @@ -10,6 +10,7 @@ in with src; { inherit src version supportFlags; pkgArches = [ pkgsi686Linux ]; geckos = [ gecko32 ]; + mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ]; monos = [ mono ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; @@ -17,6 +18,7 @@ in with src; { name = "wine64-${version}"; inherit src version supportFlags; pkgArches = [ pkgs ]; + mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ]; geckos = [ gecko64 ]; monos = [ mono ]; configureFlags = [ "--enable-win64" ]; @@ -28,6 +30,7 @@ in with src; { stdenv = stdenv_32bit; pkgArches = [ pkgs pkgsi686Linux ]; geckos = [ gecko32 gecko64 ]; + mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ]; monos = [ mono ]; buildScript = ./builder-wow.sh; platforms = [ "x86_64-linux" ]; From e86b050938a1fb83faa1638f4e1b0dbd2d96dff4 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Fri, 13 Nov 2020 10:16:55 +0800 Subject: [PATCH 024/164] go-ethereum: 1.9.23 -> 1.9.24 --- pkgs/applications/blockchains/go-ethereum.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 8e9321950676..b0f464cbfdc8 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.23"; + version = "1.9.24"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0w65sln5l3sxwzxwjvyaial0m1kxhivhw8xwl5faxxxlk50rs4wm"; + sha256 = "0nrx5fwfij9wajd3lj76hh1yv4zg4q3jc76a76m22djn1njl0n5j"; }; runVend = true; From 4bdd40df0402c3a609e2dc3de318e21f051e3279 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 13 Nov 2020 04:20:00 +0000 Subject: [PATCH 025/164] awsweeper: 0.7.0 -> 0.10.2 --- pkgs/tools/admin/awsweeper/default.nix | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index 2417854fcad9..f148bd088f4b 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -1,29 +1,25 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "awsweeper"; - version = "0.7.0"; - - # Requires go generate to be run with mockgen, but doesn't check in the results. - patches = fetchurl { - url = "https://raw.githubusercontent.com/c00w/patches/master/awskeeper.patch"; - sha256 = "0dz553ffxc37m2iwygrbhxf7pm91hxdriic8a1gjf8q3nyn13npl"; - }; + version = "0.10.2"; src = fetchFromGitHub { - owner = "cloudetc"; + owner = "jckuester"; repo = pname; rev = "v${version}"; - sha256 = "1ybrrpnp6rh7rcwihww43cvhfhzzyy51rdk1hwy9ljpkg37k4y28"; + sha256 = "1ln4s04n1qd1wv88ahhvvvphlxf6c9krqz9lmbcx3n67sb8xngm5"; }; - vendorSha256 = "0hnpb1xp135z2qpn1b6xad59739hffhs8dfpr3n5drmrvajpn4xp"; + vendorSha256 = "0zlhb84fmrnwq71d0h83p28aqlfclcydndl0z2j9nx2skjlxax2i"; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/jckuester/awsweeper/internal.version=${version} -X github.com/jckuester/awsweeper/internal.commit=${src.rev} -X github.com/jckuester/awsweeper/internal.date=unknown" ]; doCheck = false; meta = with lib; { description = "A tool to clean out your AWS account"; - homepage = "https://github.com/cloudetc/awsweeper/"; + homepage = "https://github.com/jckuester/awsweeper"; license = licenses.mpl20; maintainers = [ maintainers.marsam ]; }; From dce3b4517fbe502eb04a56d7eea073f08778841d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 13 Nov 2020 04:20:00 +0000 Subject: [PATCH 026/164] wal-g: 0.2.17 -> 0.2.18 --- pkgs/tools/backup/wal-g/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index 85a6b169f745..278ee3ad25ed 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wal-g"; - version = "0.2.17"; + version = "0.2.18"; src = fetchFromGitHub { owner = "wal-g"; repo = "wal-g"; rev = "v${version}"; - sha256 = "0r6vy2b3xqwa22286srwngk63sq4aza6aj7brwc130vypcps7svp"; + sha256 = "1clsh42sgfrzyg3vr215wrpi93cb8y8ky3cb1v2l6cs4psh3py1q"; }; - vendorSha256 = "0r73l4kxzldca1vg5mshq6iqsxcrndcbmbp3d7i9pxyb2kig8gv5"; + vendorSha256 = "1ax8niw4zfwvh5ikxnkbsjc9fdz1lziqlwig9nwrhzfp45ysbakh"; buildInputs = [ brotli ]; From e4ac103c7df82ac2cda0aad42125fb923c82c739 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 06:08:30 +0000 Subject: [PATCH 027/164] dar: 2.6.12 -> 2.6.13 --- pkgs/tools/backup/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 8689bc9cd86f..593e9b34da9f 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -8,12 +8,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.12"; + version = "2.6.13"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "0jwgaim2p93skdpjwiz5qgibd3j9965ycqn47wrrjlcvzk93mvyk"; + sha256 = "15yhpzyzw7h7d74xxh104cnbh19639yxx0502xz85fazwpwrzsiz"; }; outputs = [ "out" "dev" ]; From 027bcf83c759f4a1f27eaec0ea638246605ccb8f Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 12 Nov 2020 23:17:47 -0800 Subject: [PATCH 028/164] tailscale: 1.2.1 -> 1.2.6 Signed-off-by: David Anderson --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 4c36d865da96..353ac4d5d882 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tailscale"; - version = "1.2.1"; - tagHash = "614f6730fe7f46bc6e2128b9efd33bee92f3ff93"; # from `git rev-parse v1.2.1` + version = "1.2.6"; + tagHash = "0423683af6500dacbbc0194cb97eedaa312a34f2"; # from `git rev-parse v1.2.6` src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "1xkzh9b67fgp7flfvjja6328254j8gmlzmpnmb69klj3km5v6qmy"; + sha256 = "0p2ygv2vwpjq6yhhaxis8j9gxkv0qcx0byxlf0vbmy9xqb03cs87"; }; nativeBuildInputs = [ makeWrapper ]; From d2a55a7fc53e60c6268b73ada88804083f9dbaaf Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 13 Nov 2020 10:02:17 +0200 Subject: [PATCH 029/164] gnomeExtensions.gsconnect: 43 -> 44 --- pkgs/desktops/gnome-3/extensions/gsconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 5e51b995a54b..3d969f5c0bfd 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "gnome-shell-gsconnect"; - version = "43"; + version = "44"; outputs = [ "out" "installedTests" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "0hm14hg4nhv9hrmjcf9dgm7dsvzpjfifihjmb6yc78y9yjw0i3v7"; + sha256 = "C+8mhK4UOs2iZplDyY45bCX0mMGgwVV/ZfaPpYUlWxA="; }; patches = [ From 897ce96ba7569df678419a00289b7618e6fc4248 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Fri, 13 Nov 2020 09:23:42 +0100 Subject: [PATCH 030/164] kustomize: 3.8.1 -> 3.8.7 Signed-off-by: Sascha Grunert --- pkgs/development/tools/kustomize/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 63a3c7746688..79c484586111 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "kustomize"; - version = "3.8.1"; - # rev is the 3.8.1 commit, mainly for kustomize version command output - rev = "6a50372dd5686df22750b0c729adaf369fbf193c"; + version = "3.8.7"; + # rev is the 3.8.7 commit, mainly for kustomize version command output + rev = "ad092cc7a91c07fdf63a2e4b7f13fa588a39af4f"; buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in '' @@ -17,13 +17,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "07zdp6xv8viwnaz1qacwhg82dlzcrgb8dls6yz9qk4qcnsk6badx"; + sha256 = "1942cyaj6knf8mc3q2vcz6rqqc6lxdd6nikry9m0idk5l1b09x1m"; }; # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "01ff3w4hwp4ynqhg8cplv0i2ixs811d2x2j6xbh1lslyyh3z3wc5"; + vendorSha256 = "0y77ykfcbn4l0x85c3hb1lgjpy64kimx3s1qkn38gpmi4lphvkkl"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; From e5d4ce724a45dfd85c2d01efc2cce736e38fe879 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 08:36:54 +0000 Subject: [PATCH 031/164] discord-canary: 0.0.114 -> 0.0.115 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 8672f64be386..bb37380a6822 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.114"; + version = "0.0.115"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0j3w4jf4jisrpz03462sqjsrvjw50kqqq3psyympw0jb1wjccc41"; + sha256 = "0w9i3plbiiy2kp4yahsdvz0f4wpszsgqdnlgzbnx7wj0xk4qrkcx"; }; }; }.${branch} From 568d95e11e1f4507e6f123b9c9af2d1ab6f35a2a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 10:12:04 +0000 Subject: [PATCH 032/164] forkstat: 0.02.15 -> 0.02.16 --- pkgs/os-specific/linux/forkstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index d42091085baf..09c9c660285e 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "forkstat"; - version = "0.02.15"; + version = "0.02.16"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz"; - sha256 = "11dvg7bbklpfywx6i6vb29vvc28pbfk3mff0g18n5imxvzsd7jxs"; + sha256 = "1rrzvlws9725dy2jq5k4zfv669ngrb2klhla6wvir8nwh53jms4w"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' From e9267c8890f920f7b600596d51b0e83faedf829b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 13 Nov 2020 13:56:57 +0100 Subject: [PATCH 033/164] abcl: update source archive hash Seems like the source archive for abcl 1.8.0 was replaced on 2020-10-30 on both common-lisp.net and abcl.org. Now using the new hash and abcl.org for src. --- pkgs/development/compilers/abcl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index f27abda03d18..22f6ca7a0dd2 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "0wpfj7q9vq2k2mkp2wx2yvrcq0v8229ddyk8viiaizs7msn588ac"; + sha256 = "0zr5mmqyj484vza089l8vc88d07g0m8ymxzglvar3ydwyvi1x1qx"; }; configurePhase = '' mkdir nix-tools From c68e9c54606b95d421ae228aa91f09039607d53a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 12:57:12 +0000 Subject: [PATCH 034/164] flyway: 7.1.1 -> 7.2.0 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 2d8814dd2f72..e6338d3e3f29 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "7.1.1"; + version = "7.2.0"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "0ssspvgikn5avb49aldljx9avplhj33isbmwijk3548dg6dvh2da"; + sha256 = "1rqj2aq1cwh9rsnnlwvg0b5jpyqsij9jamd873i18rf87q6cdsk4"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From 08ca1ee82715eeb2006d112fee7aea76974a506e Mon Sep 17 00:00:00 2001 From: David Terry Date: Thu, 12 Nov 2020 13:48:45 +0100 Subject: [PATCH 035/164] turbo-geth: 2020.11.01 -> 2020.11.02 --- pkgs/applications/blockchains/turbo-geth.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix index 163d87ee8881..eae1b812a3d9 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "turbo-geth"; - version = "2020.11.01"; + version = "2020.11.02"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "0hm8kqd0w231mlclsmsghf15r8pbrs5g064mkpx59qpqzk37lgss"; + sha256 = "1bfywbg6mm3q4wd0mslcv5sj779277izzlqawqvqy3yxnpb6cwj5"; }; - vendorSha256 = "0b7ldrnwkz3r1d4fw95hvvpi3bz56d9v8p2mjzdvlpk5zhl2a37p"; + vendorSha256 = "16vawkky612zf45d8dhipjmhrprmi28z9wdcnjy07x3bxdyfbhfr"; runVend = true; subPackages = [ From 325d97780d713c04d06736621d781015168c1dac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 13:08:06 +0000 Subject: [PATCH 036/164] geany: 1.37 -> 1.37.1 --- pkgs/applications/editors/geany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index d56e5acc71bf..124d4ee0417a 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "geany"; - version = "1.37"; + version = "1.37.1"; outputs = [ "out" "dev" "doc" "man" ]; src = fetchurl { url = "https://download.geany.org/${pname}-${version}.tar.bz2"; - sha256 = "dde52584823b769c56704c27dbedddb7a6bbaf4eacb9587d10bbc387816e3d51"; + sha256 = "060sachn33xpx3a609f09y97qq5ky17gvv686zbvrn618ij7bi8q"; }; nativeBuildInputs = [ From bca0c78dc493e310616582a77c97d55c7c87d745 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Fri, 13 Nov 2020 14:10:26 +0100 Subject: [PATCH 037/164] vscodium: 1.51.0 -> 1.51.1 --- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 6cfcb491afe4..b8ca7e3f262e 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0qims8qypx6aackw1b47pb7hkf0lffh94c69bm5rld2swzczcfnj"; - x86_64-darwin = "1i96qhynjl1ihycq25xjakqlyvszindg5g8kgyhd6ab0q0zhmxqy"; + x86_64-linux = "0hn4pqmabz3qf3bbqnn1fz7fcgzdkp2lwr2yzgmx8hhh3cff8bnb"; + x86_64-darwin = "1x3wx0d99ihyya0n89qclc3jlhh0m72hs8hj7l0h3z6zmh6q2vzv"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.51.0"; + version = "1.51.1"; pname = "vscodium"; executableName = "codium"; From aa9a29c4ce2c53d9f287bb552834c9c242cabf11 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Fri, 13 Nov 2020 14:11:54 +0100 Subject: [PATCH 038/164] vscode: 1.51.0 -> 1.51.1 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index ce6122bddc41..70f621177105 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "18fx2nsgn09l2gzgr1abi0cp4g8z2v9177sdl2rqr0yvmwk5i3p0"; - x86_64-darwin = "14qdfz8q1dz0skkcgpamksgdvgsid2mcm9h09cvkh4z3v458100r"; + x86_64-linux = "0yv6584y4idkl9vvmpxj5ix5brshm1vadiwf7ima84snm0fipb0n"; + x86_64-darwin = "0igndxkwkxyjc9rkf9hbj8903hvfv7ab41q0s3gw8w5qh4b8s48x"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.51.0"; + version = "1.51.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 09eabf6afdcfaa4b75ff17b2d8b8d2e0a1c5f18d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 13 Nov 2020 13:31:29 +0100 Subject: [PATCH 039/164] kitty: use installShellCompletion to install the shell completions --- pkgs/applications/terminal-emulators/kitty/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index e2eda846d60f..4813f5890f8f 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -53,10 +53,10 @@ buildPythonApplication rec { nativeBuildInputs = [ pkgconfig sphinx ncurses + installShellFiles ] ++ stdenv.lib.optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. - installShellFiles ]; propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux libGL; @@ -113,10 +113,10 @@ buildPythonApplication rec { wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" runHook postInstall - mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} - "$out/bin/kitty" + complete setup fish > "$out/share/fish/vendor_completions.d/kitty.fish" - "$out/bin/kitty" + complete setup bash > "$out/share/bash-completion/completions/kitty.bash" - "$out/bin/kitty" + complete setup zsh > "$out/share/zsh/site-functions/_kitty" + installShellCompletion --cmd kitty \ + --bash <("$out/bin/kitty" + complete setup bash) \ + --fish <("$out/bin/kitty" + complete setup fish) \ + --zsh <("$out/bin/kitty" + complete setup zsh) ''; postInstall = '' From 182b7cfb71f794aea8320cee547ff941c98e1607 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 13 Nov 2020 13:31:41 +0100 Subject: [PATCH 040/164] kitty: 0.19.1 -> 0.19.2 https://github.com/kovidgoyal/kitty/releases/tag/v0.19.2 --- pkgs/applications/terminal-emulators/kitty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 4813f5890f8f..b6a93aefb594 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.19.1"; + version = "0.19.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "145fx4nnn0gszawllfwqf1h65ak0ij6ffargs7y0cgaxsc991s6m"; + sha256 = "06mlrc283k5f75y36fmmaxnj29jfc1s8vaykjph6a86m1gcl5wgi"; }; buildInputs = [ From 67394b5efdc8d5e554a668681fab029b1eb3ad70 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Fri, 13 Nov 2020 09:18:31 -0500 Subject: [PATCH 041/164] gnomeExtensions.dash-to-panel: 39 -> 40 --- pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 8a0314cd8b4e..923faa00a149 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-dash-to-panel"; - version = "39"; + version = "40"; src = fetchFromGitHub { owner = "home-sweet-gnome"; repo = "dash-to-panel"; rev = "v${version}"; - sha256 = "0r7kbmrizl9ilqy7gzzvjwxcv8xpp13n5n0a8s84blg97cih0hw2"; + sha256 = "07jq8d16nn62ikis896nyfn3q02f5srj754fmiblhz472q4ljc3p"; }; buildInputs = [ From 3457f85820802837d412c948479ab47c79ca82a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 14:37:53 +0000 Subject: [PATCH 042/164] gp2c: 0.0.11pl4 -> 0.0.12 --- pkgs/applications/science/math/pari/gp2c.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix index 7726a0d789e9..082ff60c3e8d 100644 --- a/pkgs/applications/science/math/pari/gp2c.nix +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gp2c"; - version = "0.0.11pl4"; + version = "0.0.12"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz"; - sha256 = "sha256-QGocEXxTahB5fHhlWtHXgMEl6brQ34LNwScxHNuB1rI="; + sha256 = "039ip7qkwwv46wrcdrz7y12m30kazzkjr44kqbc0h137g4wzd7zf"; }; buildInputs = [ pari perl ]; From 7fb1069a13462abb5dd83cb0f9ff461a43b6dbb9 Mon Sep 17 00:00:00 2001 From: cmacrae Date: Fri, 13 Nov 2020 11:23:05 +0000 Subject: [PATCH 043/164] yabai: 3.3.0 -> 3.3.3 --- pkgs/os-specific/darwin/yabai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 742a3948707e..3c3378b323ad 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yabai"; - version = "3.3.0"; + version = "3.3.3"; src = fetchFromGitHub { owner = "koekeishiya"; repo = pname; rev = "v${version}"; - sha256 = "0y4idivqkmi3xsc8yjdzh1b15qzgyqlw7ifs26v3dc91lkjhfc4x"; + sha256 = "0rxl0in3rhmrgg3v3l91amr497x37i2w1jqm52k0jb9my1sk67rs"; }; buildInputs = [ Carbon Cocoa ScriptingBridge xxd ]; From 4fb71e299d94f3813df6f24a448cf9f2fa16b046 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 15:19:20 +0000 Subject: [PATCH 044/164] haproxy: 2.2.4 -> 2.3.0 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 16670ea175f8..41dd747315ba 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.2.4"; + version = "2.3.0"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "1qhvaixns0xgxgd095kvqid0pi6jxsld9ghvnr60khwdzzadk947"; + sha256 = "1z3qzwm2brpi36kxhvw2xvm1ld9yz9c373rcixw3z21pw1cxrfh8"; }; buildInputs = [ openssl zlib ] From 9ebf4409d2302d859f0dfa1c52ec23f0f4730078 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 13 Nov 2020 16:25:01 +0100 Subject: [PATCH 045/164] pastebinit: fix basic usage --- pkgs/tools/misc/pastebinit/default.nix | 29 +++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index a3134f57397c..9b4202504a0f 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, python3 }: +{ stdenv +, fetchurl +, fetchpatch +, python3 +}: stdenv.mkDerivation rec { version = "1.5"; @@ -9,7 +13,26 @@ stdenv.mkDerivation rec { sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2"; }; - buildInputs = [ python3 ]; + buildInputs = [ + (python3.withPackages (p: [ p.distro ])) + ]; + + patchFlags = [ "-p0" ]; + + patches = [ + # Required to allow pastebinit 1.5 to run on Python 3.8 + (fetchpatch { + name = "use-distro-module.patch"; + url = "https://bazaar.launchpad.net/~arnouten/pastebinit/python38/diff/264?context=3"; + sha256 = "1gp5inp4xald65xbb7fc5aqq5s2fhw464niwjjja9anqyp3zhawj"; + }) + # Required because pastebin.com now redirects http requests to https + (fetchpatch { + name = "pastebin-com-https.patch"; + url = "https://bazaar.launchpad.net/~arnouten/pastebinit/pastebin-com-https/diff/264?context=3"; + sha256 = "0hxhhfcai0mll8qfyhdl3slmbf34ynb759b648x63274m9nd2kji"; + }) + ]; installPhase = '' mkdir -p $out/bin @@ -22,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://launchpad.net/pastebinit"; description = "A software that lets you send anything you want directly to a pastebin from the command line"; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ lethalman raboof ]; license = licenses.gpl2; platforms = platforms.linux; }; From 65ac9e26af258a8cf82b138a906799415af34e23 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 16:17:17 +0000 Subject: [PATCH 046/164] k6: 0.28.0 -> 0.29.0 --- pkgs/development/tools/k6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 4dbd890df180..35972f9cce53 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "k6"; - version = "0.28.0"; + version = "0.29.0"; goPackagePath = "github.com/loadimpact/k6"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "loadimpact"; repo = pname; rev = "v${version}"; - sha256 = "0zpkavl6sg6kcb7wc92lzi4svvv3284xs20zbmgq4i9i5z1njdkx"; + sha256 = "1zkw7jga8nsqycvrwnqxifbb5la2z4bmxg3l5638i4xlpn58g711"; }; subPackages = [ "./" ]; From 04d5b2f80c857654cb0eddd52695f65786f06ace Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 16:53:31 +0000 Subject: [PATCH 047/164] icewm: 1.9.0 -> 1.9.2 --- pkgs/applications/window-managers/icewm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 3e3065301d98..b86e598a4d08 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -9,13 +9,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "icewm"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "bbidulock"; repo = pname; rev = version; - sha256 = "08prc9ip96bxbmkkab0ymma9yisgs5yzymg4gjcvr945bj4q7crb"; + sha256 = "16a9ikknjmhrrlc5r6z2ilkjj5vzyfk4ypwab39mg7vcmd7jzc41"; }; nativeBuildInputs = [ cmake pkgconfig perl asciidoc ]; From 0428243fb3dd2412d121cd53dfeb38246874ce36 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 17:05:07 +0000 Subject: [PATCH 048/164] jotta-cli: 0.7.33634 -> 0.7.35160 --- pkgs/applications/misc/jotta-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index a924bd181c0e..069d98111cc4 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.7.33634"; + version = "0.7.35160"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "0apbdk4fvmn52w9qyh6hvpk3k0sa810jvvndpsbysnlmi7gv5w62"; + sha256 = "00fzycy199l9y738cj71s88qz96ppczb5sqsk3x9w4jj4m6ks239"; stripRoot = false; }; From d4da5f9d3daab3db3ae37287e35bb19223b0ecee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 18:09:23 +0000 Subject: [PATCH 049/164] jetty: 9.4.31.v20200723 -> 9.4.34.v20201102 --- pkgs/servers/http/jetty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 20370fd37c70..b8374d62ddfc 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.31.v20200723"; + version = "9.4.34.v20201102"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "1j1dhlrlj7xnijp55c1hd9r47m6bq37vpjkaf8f9fg7q9m2z9x6x"; + sha256 = "0c5zsnzcg2bz6z1s6hdzwzn813cgs26h1hwjjfhh1msfzyig30ma"; }; phases = [ "unpackPhase" "installPhase" ]; From 82d11130137924a9207aacdf859d0277d366fae7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 18:25:51 +0000 Subject: [PATCH 050/164] igv: 2.8.11 -> 2.8.12 --- pkgs/applications/science/biology/igv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 0b990dc541b5..86a16c4f0474 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.8.11"; + version = "2.8.12"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip"; - sha256 = "1hiwnrrh42qzc7kdc7bypgcgn488pz8g462xzchbhgx7jjdbbwhm"; + sha256 = "0zxmk417j9s5nms0np1fsip7r0jhwkj1d1x424ljr9krcb2zwcyq"; }; installPhase = '' From ea12d880e0fd9b2f08f4f974c8af849bfd59a230 Mon Sep 17 00:00:00 2001 From: Jonas Meurer Date: Fri, 13 Nov 2020 19:49:40 +0100 Subject: [PATCH 051/164] libreoffice-qt: wrap application Libreoffice-qt is not wrapped, thus does not launch. Notice that wrapQtQAppsHook is used manually since all executables are shell scripts which are not wrapped automatically. --- pkgs/applications/office/libreoffice/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 2f961f43da0a..1023af9234c9 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -17,6 +17,7 @@ , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null , ki18n ? null, kconfig ? null, kcoreaddons ? null, kio ? null, kwindowsystem ? null +, wrapQtAppsHook ? null , variant ? "fresh" } @ args: @@ -303,8 +304,15 @@ in (mkDrv rec { mkdir -p $dev cp -r include $dev + '' + lib.optionalString kdeIntegration '' + for prog in $out/bin/* + do + wrapQtApp $prog + done ''; + dontWrapQtApps = true; + configureFlags = [ (if withHelp then "" else "--without-help") "--with-boost=${boost.dev}" @@ -382,7 +390,8 @@ in (mkDrv rec { nativeBuildInputs = [ gdb fontforge autoconf automake bison pkgconfig libtool - ] ++ lib.optional (!kdeIntegration) wrapGAppsHook; + ] ++ lib.optional (!kdeIntegration) wrapGAppsHook + ++ lib.optional kdeIntegration wrapQtAppsHook; buildInputs = with xorg; [ ant ArchiveZip boost cairo clucene_core From 73ca6f3e306af4cdf925cf130e45fd1b3a99b8ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 19:03:00 +0000 Subject: [PATCH 052/164] intel-media-sdk: 20.3.1 -> 20.4.1 --- pkgs/development/libraries/intel-media-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index e59015832314..71e6d3d700ab 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "20.3.1"; + version = "20.4.1"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "13b698zp9b228x81yly0qx3zvj821niz3yad74b229i3z7rf8wzd"; + sha256 = "0qnq43qjcmzkn6v2aymzi3kycndk9xw6m5f5g5sz5x53nz556bp0"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 3bf200de7d9ad1396b85d06e727824636e6cdef3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 13 Nov 2020 20:01:01 +0100 Subject: [PATCH 053/164] hackage2nix: disable broken builds to fix evaluation errors on Hydra --- .../haskell-modules/configuration-hackage2nix.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2c7af6097cc6..c232eb7162ad 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3324,6 +3324,7 @@ broken-packages: - bdd - bdo - beam + - beam-automigrate - beam-core - beam-migrate - beam-mysql @@ -3932,7 +3933,6 @@ broken-packages: - cmt - cmv - cnc-spec-compiler - - co-log - co-log-polysemy-formatting - co-log-sys - Coadjute @@ -3990,7 +3990,6 @@ broken-packages: - commsec - commsec-keyexchange - ComonadSheet - - compact - compact-map - compact-mutable - compact-mutable-vector @@ -7287,6 +7286,7 @@ broken-packages: - language-lua-qq - language-lua2 - language-mixal + - language-Modula2 - language-ninja - language-oberon - language-objc @@ -8774,14 +8774,14 @@ broken-packages: - polysemy-http - polysemy-kvstore-jsonfile - polysemy-methodology - - polysemy-optics + - polysemy-methodology-composite - polysemy-path - polysemy-RandomFu - polysemy-resume - polysemy-test - polysemy-time + - polysemy-vinyl - polysemy-webserver - - polysemy-zoo - polyseq - polytypeable - polytypeable-utils @@ -10777,7 +10777,6 @@ broken-packages: - typelevel-tensor - TypeNat - typeparams - - typerep-map - types-compat - typesafe-precure - typescript-docs @@ -11517,4 +11516,4 @@ broken-packages: - zuramaru - Zwaluw - zxcvbn-dvorak - - zxcvbn-hs + - zxcvbn-h From 1f021c26570f347260a6001e168780fc890d8498 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Nov 2020 02:30:26 +0100 Subject: [PATCH 054/164] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-27-g11a103b from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/cb01aa6d8923bf74fadca03373572c16ba77013c. --- .../haskell-modules/hackage-packages.nix | 1353 +++++++++++++---- 1 file changed, 1041 insertions(+), 312 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6ad8267d4483..8262fdb54c68 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -13180,6 +13180,8 @@ self: { pname = "MIP"; version = "0.1.0.0"; sha256 = "0790jcwqjd33i8sqhzxarda8ihhv5iapj0apjmlqjppbipwa6awa"; + revision = "1"; + editedCabalFile = "16nxbkmkyb9n0jbyrmpazg40gf6aadnm1rk4sqwxkcx7qa99wrnd"; libraryHaskellDepends = [ base bytestring bytestring-encoding case-insensitive containers data-default-class extended-reals filepath intern lattices @@ -20767,8 +20769,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.7.1"; - sha256 = "18al9vr5zy8smn090dd7fwnm4pqcsxld97azrxni7xsqdb22kja8"; + version = "0.3.8"; + sha256 = "1fm2y3v9dcd2yaca212vk2awj90nzamgbsxf39d3s8h3yhjf95ll"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -24458,17 +24460,16 @@ self: { }) {}; "aeson-commit" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, containers, hspec, mtl - , some, tasty, tasty-hspec, text, transformers + ({ mkDerivation, aeson, aeson-qq, base, mtl, tasty, tasty-hspec + , text }: mkDerivation { pname = "aeson-commit"; - version = "1.2"; - sha256 = "09h0gjq9kg1krfsxsy1x697ndi6rajsyqk6j4kkcrq48ynq9vfxr"; + version = "1.3"; + sha256 = "1w185p6s91pxd0kmgxxv62v81q7f77q4bgs8iv02xv34wp1jm9jv"; libraryHaskellDepends = [ aeson base mtl text ]; testHaskellDepends = [ - aeson aeson-qq base containers hspec mtl some tasty tasty-hspec - text transformers + aeson aeson-qq base tasty tasty-hspec text ]; description = "Parse Aeson data with commitment"; license = stdenv.lib.licenses.bsd3; @@ -24780,8 +24781,8 @@ self: { }: mkDerivation { pname = "aeson-iproute"; - version = "0.2"; - sha256 = "13r6vyyw1pbk5sz32ari5kig23vsg57a5pir037adi7xicrm6kgf"; + version = "0.2.1"; + sha256 = "1130mr5fqwi4d74xg6nkvpqycc0vvd6rsiahm1pdhbrx3wvra8p2"; libraryHaskellDepends = [ aeson base iproute text unordered-containers ]; @@ -30126,6 +30127,8 @@ self: { pname = "ansi-pretty"; version = "0.1.2.2"; sha256 = "0q72y2pnx5qx7jk1waq3qdry1azq07wygb9hcgjqz78lbszg19cm"; + revision = "1"; + editedCabalFile = "1y5bdvaafhfs4plrbs5iqvwh86xcxjcz5gas0fb3fkfyjhj87pck"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -30908,8 +30911,8 @@ self: { }: mkDerivation { pname = "apecs-stm"; - version = "0.1.3"; - sha256 = "0wp5mydn1cmf4p70jsnfxqzy48p6d3x01xxpvdbnvkkqrpyrwgxg"; + version = "0.1.4"; + sha256 = "1x9bc3b0x7s7sphr4wzz4mnzz97n2rz3kn48rs889cvqa825dgr9"; libraryHaskellDepends = [ apecs base containers list-t stm stm-containers template-haskell vector @@ -31880,6 +31883,32 @@ self: { broken = true; }) {}; + "approx" = callPackage + ({ mkDerivation, base, containers, hashable, QuickCheck, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "approx"; + version = "0.1.0.0"; + sha256 = "1vc6k0w4zr355gfvprb5syh5jpmkdvp6wjibi4l95q9zwwdwhjn2"; + revision = "1"; + editedCabalFile = "0k34bjsazp4wbv7zzmvh5vnqv7yzyq20h99q30mcrn4g2bvpc0q1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers hashable text time unordered-containers vector + ]; + executableHaskellDepends = [ + base containers hashable text time unordered-containers vector + ]; + testHaskellDepends = [ + base containers hashable QuickCheck text time unordered-containers + vector + ]; + description = "Easy-to-use reasonable way of emulating approximate in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "approx-rand-test" = callPackage ({ mkDerivation, base, Chart, Chart-diagrams, colour, conduit , containers, data-default, data-default-class, filepath, HUnit @@ -32233,8 +32262,8 @@ self: { }: mkDerivation { pname = "arch-hs"; - version = "0.3.0.0"; - sha256 = "068si2cq7557rp86ni5psaig7z89vq38p56743l8yk92i1x1xz9j"; + version = "0.4.0.0"; + sha256 = "022vvznfqkia0w6s6wc586cbzj3l6yabkf73bx2biy8axsls2g4p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37985,8 +38014,8 @@ self: { pname = "base16"; version = "0.3.0.1"; sha256 = "10id9h9mas4kb4kfiz7hhp2hhwnb9mh92pr327c53jqxi4hazgnd"; - revision = "2"; - editedCabalFile = "1ryc4228j4v9mcfjkgallfmww7g19y4awkqyq4j4734rgvkvgslw"; + revision = "3"; + editedCabalFile = "15r912hb0l92f2cajpq2b6ky4g5qwfmb502nfv1vrg02a1h25xb6"; libraryHaskellDepends = [ base bytestring deepseq primitive text text-short ]; @@ -39098,6 +39127,45 @@ self: { broken = true; }) {}; + "beam-automigrate" = callPackage + ({ mkDerivation, aeson, base, beam-core, beam-postgres, bytestring + , containers, criterion, deepseq, dlist + , gargoyle-postgresql-connect, microlens, mtl, postgresql-simple + , pretty-simple, QuickCheck, quickcheck-instances, resource-pool + , scientific, splitmix, string-conv, tasty, tasty-quickcheck, text + , time, transformers, uuid, vector + }: + mkDerivation { + pname = "beam-automigrate"; + version = "0.1.0.0"; + sha256 = "1a9pjmzzyibp6fgrn0p9scczzc2afx5n1947qn5ifcz23hnwnj55"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base beam-core beam-postgres bytestring containers deepseq + dlist microlens mtl postgresql-simple pretty-simple QuickCheck + quickcheck-instances scientific splitmix string-conv text time + transformers uuid vector + ]; + executableHaskellDepends = [ + aeson base beam-core beam-postgres bytestring containers + gargoyle-postgresql-connect postgresql-simple resource-pool text + time + ]; + testHaskellDepends = [ + base containers pretty-simple QuickCheck tasty tasty-quickcheck + text + ]; + benchmarkHaskellDepends = [ + base beam-postgres bytestring containers criterion deepseq + postgresql-simple QuickCheck splitmix + ]; + description = "DB migration library for beam, targeting Postgres"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "beam-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, dlist, free , ghc-prim, hashable, microlens, mtl, network-uri, scientific @@ -45879,8 +45947,8 @@ self: { pname = "broadcast-chan-tests"; version = "0.2.1.1"; sha256 = "0qx8j9sfky5qvrxrn4is9sja4qh6jh7jahq3zkyyq3a54jkwc8d3"; - revision = "3"; - editedCabalFile = "1x34m1wk5m9ryfhp86wm4bmvwdghrknsmir356nnb3y3xm8558b4"; + revision = "4"; + editedCabalFile = "04hgr1ik1z9v317x8rw6amxqrmc94g6cghzxghddszqismz44gaq"; libraryHaskellDepends = [ async base broadcast-chan clock containers optparse-applicative paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis @@ -46420,8 +46488,8 @@ self: { }: mkDerivation { pname = "buffet"; - version = "0.5.0"; - sha256 = "0xi5hr51fwksc9983qzgji6p9lhxqfkhnczs6hamddj9glanf183"; + version = "1.0.1"; + sha256 = "0y8qinbsnc3dm3yl5ik65lgnn9xq54087mqi7p1qfql9nfcx3g6r"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -48623,8 +48691,8 @@ self: { }: mkDerivation { pname = "cabal-file"; - version = "0.1.0"; - sha256 = "1khf39awvpnqxs0rlqa6n5810x9kkn31975v6kbmwwdrjjp2qlqw"; + version = "0.1.1"; + sha256 = "05sah1w0nbvirnvj520ijyz2jrdbp5cciryhziyrgaimfvi9kbnb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48685,8 +48753,8 @@ self: { }: mkDerivation { pname = "cabal-fmt"; - version = "0.1.5"; - sha256 = "1fsnjipd3j4vx77pmslkrdkf2wzqalqhwpcp5drxksl68nnxy8ad"; + version = "0.1.5.1"; + sha256 = "0z8zc48lb6nnf12477j3x5dq7nkfk877q8q1kcrdsvdkz07nzz57"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -49713,8 +49781,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "0.5.0"; - sha256 = "05z5gnj5fkl0pqhinlvnq9zf51v5xhc6lhgnm061aj89rclhm6bg"; + version = "0.5.1"; + sha256 = "13xl87jgpa1swgppr86dylp8ndisasdr8zcmk1l2jjb7vgyly8mb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49732,7 +49800,8 @@ self: { executableHaskellDepends = [ base cachix-api ]; executableToolDepends = [ hspec-discover ]; testHaskellDepends = [ - base cachix-api directory here hspec protolude temporary + base cachix-api directory here hspec protolude servant-auth-client + temporary ]; description = "Command line client for Nix binary cache hosting https://cachix.org"; license = stdenv.lib.licenses.asl20; @@ -51066,6 +51135,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "casa-types_0_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, hashable, path-pieces, persistent, text + }: + mkDerivation { + pname = "casa-types"; + version = "0.0.2"; + sha256 = "1c3qvph690pgnqmj132sn1zh878n3ljvmp913vvhwynfhyixs1v7"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring hashable + path-pieces persistent text + ]; + description = "Types for Casa"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "casadi-bindings" = callPackage ({ mkDerivation, base, binary, casadi, casadi-bindings-core , casadi-bindings-internal, cereal, containers, doctest, HUnit @@ -55127,6 +55213,35 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-ghc_1_2_5" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, Cabal + , clash-lib, clash-prelude, concurrent-supply, containers, deepseq + , directory, filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, ghci, hashable + , haskeline, integer-gmp, lens, mtl, primitive, process, reflection + , split, template-haskell, text, time, transformers, uniplate, unix + , unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "clash-ghc"; + version = "1.2.5"; + sha256 = "1wxlhcpwq0m7k4f12x16ybvp4s5m45p9qk27wjkgk133fw35y3pz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bifunctors bytestring Cabal clash-lib clash-prelude + concurrent-supply containers deepseq directory filepath ghc + ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens + mtl primitive process reflection split template-haskell text time + transformers uniplate unix unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ base ]; + description = "CAES Language for Synchronous Hardware"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-lib" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary , bytestring, clash-prelude, concurrent-supply, containers @@ -55164,6 +55279,44 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-lib_1_2_5" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary + , bytestring, clash-prelude, concurrent-supply, containers + , data-binary-ieee754, data-default, deepseq, directory, dlist + , errors, exceptions, extra, filepath, ghc, ghc-boot-th + , ghc-typelits-knownnat, hashable, haskell-src-exts + , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl + , ordered-containers, parsers, prettyprinter, primitive, process + , reducers, tasty, tasty-hunit, template-haskell, temporary + , terminal-size, text, text-show, time, transformers, trifecta + , unordered-containers, utf8-string, vector + , vector-binary-instances + }: + mkDerivation { + pname = "clash-lib"; + version = "1.2.5"; + sha256 = "14xi0llzm6f3ymlcfwq67d16ggdkqxrxkvr6rwmykxrca3j1b6r3"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base binary bytestring clash-prelude + concurrent-supply containers data-binary-ieee754 data-default + deepseq directory dlist errors exceptions extra filepath ghc + ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate + lens mtl ordered-containers parsers prettyprinter primitive process + reducers template-haskell temporary terminal-size text text-show + time transformers trifecta unordered-containers utf8-string vector + vector-binary-instances + ]; + testHaskellDepends = [ + base clash-prelude concurrent-supply containers data-default + deepseq ghc ghc-typelits-knownnat haskell-src-exts lens tasty + tasty-hunit template-haskell text transformers unordered-containers + ]; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-multisignal" = callPackage ({ mkDerivation, base, clash-prelude, deepseq , ghc-typelits-knownnat, QuickCheck @@ -55217,6 +55370,45 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-prelude_1_2_5" = callPackage + ({ mkDerivation, array, base, bifunctors, binary, bytestring, Cabal + , cabal-doctest, constraints, containers, criterion + , data-binary-ieee754, data-default-class, deepseq, doctest + , ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, half, hashable, hedgehog, hint + , integer-gmp, interpolate, lens, QuickCheck + , quickcheck-classes-base, recursion-schemes, reflection + , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck + , template-haskell, text, text-show, th-abstraction, th-lift + , th-orphans, time, transformers, type-errors, uniplate, vector + }: + mkDerivation { + pname = "clash-prelude"; + version = "1.2.5"; + sha256 = "0q97ap4a6cbf6s06934639pws9z1yyzmmaw6gj05p8jv7r4is239"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base bifunctors binary bytestring constraints containers + data-binary-ieee754 data-default-class deepseq ghc-prim + ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise + half hashable integer-gmp interpolate lens QuickCheck + recursion-schemes reflection singletons template-haskell text + text-show th-abstraction th-lift th-orphans time transformers + type-errors uniplate vector + ]; + testHaskellDepends = [ + base doctest ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base + tasty tasty-hedgehog tasty-hunit tasty-quickcheck template-haskell + ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "CAES Language for Synchronous Hardware - Prelude library"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-prelude-quickcheck" = callPackage ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { @@ -55494,8 +55686,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.26.2.3"; - sha256 = "1bark213l3kx5gbr5nxnlhnrif5sg9z5v3igpcl47yisy99695p4"; + version = "0.26.3"; + sha256 = "119hybfny3sriscgk8zjf56yfc36jxnzydkhb04wxfip9r84mn03"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring @@ -57155,8 +57347,6 @@ self: { testHaskellDepends = [ base co-log-core hedgehog ]; description = "Composable Contravariant Comonadic Logging Library"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "co-log-concurrent" = callPackage @@ -57184,6 +57374,21 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "co-log-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, co-log-core, containers + , string-conv, text + }: + mkDerivation { + pname = "co-log-json"; + version = "0.0.1.0"; + sha256 = "1ap62gq3s08fif96jwssp7aj6kldsiwf2qx0f5yffl3zna4h6j2p"; + libraryHaskellDepends = [ + aeson base bytestring co-log-core containers string-conv text + ]; + description = "Structured messages support in co-log ecosystem"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "co-log-polysemy" = callPackage ({ mkDerivation, base, co-log-core, polysemy }: mkDerivation { @@ -57298,8 +57503,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.10"; - sha256 = "0fdx96f9kn09nwpcdqpys3rvxlwrvynba5ipb509vriny96p7vrr"; + version = "0.1.3.12"; + sha256 = "1jj9ip12zmy8qh080skm9fawasxprfbwiyzywilga7lr573wxb88"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -58970,8 +59175,6 @@ self: { testHaskellDepends = [ base directory ]; description = "Non-GC'd, contiguous storage for immutable data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "compact-list" = callPackage @@ -59774,8 +59977,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "3.0.0.0"; - sha256 = "14dpxpcbpchlppx64k3i7rwq94f1x4vvnd0d6bnwfcpw46hbjlsl"; + version = "3.0.0.2"; + sha256 = "151inlk43m96pnasc6llsjh8vxyc9b1i7xdgf1sp5p5072bzq305"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; @@ -64954,8 +65157,8 @@ self: { }: mkDerivation { pname = "crdt-event-fold"; - version = "1.1.0.0"; - sha256 = "084vbx98b8ca5q2p6icbz0hv0hh4djk8iain7vv60w18453pz8fc"; + version = "1.2.0.0"; + sha256 = "0ald9rjynck8a0x2vicq4kq6hji2jyh0n78ghf49gh70swik5hsc"; libraryHaskellDepends = [ base binary containers data-default-class data-dword ]; @@ -66657,6 +66860,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "csv-conduit_0_7_2_0" = callPackage + ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring + , conduit, conduit-extra, containers, data-default, directory + , exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl + , primitive, resourcet, semigroups, test-framework + , test-framework-hunit, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "csv-conduit"; + version = "0.7.2.0"; + sha256 = "1bclavsan00mv0n0dy0ap6byk4w5fwnhpvxhdhx94r7bxfqi2r0q"; + libraryHaskellDepends = [ + array attoparsec base blaze-builder bytestring conduit + conduit-extra containers data-default exceptions ghc-prim mmorph + monad-control mtl primitive resourcet semigroups text transformers + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers directory HUnit mtl primitive + test-framework test-framework-hunit text transformers vector + ]; + description = "A flexible, fast, conduit-based CSV parser library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "csv-enumerator" = callPackage ({ mkDerivation, attoparsec, attoparsec-enumerator, base , bytestring, containers, directory, enumerator, safe, transformers @@ -70021,13 +70251,18 @@ self: { }) {}; "data-validation" = callPackage - ({ mkDerivation, base, containers, hspec, template-haskell }: + ({ mkDerivation, base, containers, hspec, regex-tdfa + , template-haskell + }: mkDerivation { pname = "data-validation"; - version = "0.1.0.2"; - sha256 = "15mc3m48jnn5fjr3bm02j9raxclqwd8qnb0bx0w2jz5y3asnfx5f"; - libraryHaskellDepends = [ base containers template-haskell ]; + version = "0.1.2.0"; + sha256 = "1qka2f0gl48yi2hfiqphk94srh5lq7i14vx0qmj09fgv8xn65n15"; + libraryHaskellDepends = [ + base containers regex-tdfa template-haskell + ]; testHaskellDepends = [ base containers hspec template-haskell ]; + doHaddock = false; description = "A library for creating type safe validations"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -71642,6 +71877,24 @@ self: { broken = true; }) {}; + "deep-transformations" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, generic-lens + , markdown-unlit, rank2classes, template-haskell + }: + mkDerivation { + pname = "deep-transformations"; + version = "0.1"; + sha256 = "007j67gx2nq77d5zcikywjjc5hs14x95hn94sbzrjh708azbb7gc"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base generic-lens rank2classes template-haskell + ]; + testHaskellDepends = [ base doctest rank2classes ]; + testToolDepends = [ markdown-unlit ]; + description = "Deep natural and unnatural tree transformations, including attribute grammars"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "deepcontrol" = callPackage ({ mkDerivation, base, containers, doctest, HUnit, mmorph, mtl , QuickCheck, safe, transformers @@ -82872,8 +83125,8 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.4.1"; - sha256 = "0pz4s53mn1511hda16qi7l28whq05fcyrf1s8ywq42a3mbayw964"; + version = "0.5.0"; + sha256 = "0paxrh39ags55jg7pxb29dwb6cn7sakxdpkdf1fffrqsr3inpr9n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -82893,8 +83146,8 @@ self: { }: mkDerivation { pname = "elynx-markov"; - version = "0.4.1"; - sha256 = "1qzyfxzg6qq7ajm7b3v62qqychhzh4ms2677acvzjgvc51syk1fq"; + version = "0.5.0"; + sha256 = "0l66zaf4mj117pz16apdr4fi47xv9slay459lzjpdawmm6ppwlgc"; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-seq hmatrix integration math-functions mwc-random parallel primitive statistics @@ -82913,8 +83166,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.4.1"; - sha256 = "0p2kww6fqmfv3bmd5z0c3n8s0rhfbm480jqh16s794xndbbxd15i"; + version = "0.5.0"; + sha256 = "03rhhbyhd1z95kl0ds204z4zywgy9anvhashpw2p311dq1g4axrs"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; @@ -82930,8 +83183,8 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.4.1"; - sha256 = "1mdl7fzzax4dn68paxivms96jfxriladbkwkbq6hff1z5xdwvj2h"; + version = "0.5.0"; + sha256 = "0bqlv3i7qhnkal8yiwvkp7175jdb9bcg7szkx0b352zfr4qhhmpa"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers matrices mwc-random parallel primitive vector vector-th-unbox word8 @@ -82954,8 +83207,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.4.1"; - sha256 = "0dxhwmpaf9r8kr67sa2kn1i7w06skcl1hvxkcranw0xvijwm8g5r"; + version = "0.5.0"; + sha256 = "0lhkgi6wa90wniszkhmnnzmxa3cx1bvzbsy7cwrslmg8iqcxyin0"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptohash-sha256 deepseq directory fast-logger hmatrix @@ -82972,13 +83225,13 @@ self: { "elynx-tree" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, deepseq, double-conversion, elynx-nexus - , elynx-tools, hspec, math-functions, mwc-random, parallel - , primitive, QuickCheck, statistics + , elynx-tools, hspec, math-functions, microlens, mwc-random + , parallel, primitive, QuickCheck, statistics }: mkDerivation { pname = "elynx-tree"; - version = "0.4.1"; - sha256 = "1yd2gk0y55vjaw6b2m6cm25qidmznmvhrb3ypr4rb3bg4yck5ydh"; + version = "0.5.0"; + sha256 = "0b3dmz6hlbawwpnn84qx0w1g5jymgs7b05jxvx83q365vw8pw6aj"; libraryHaskellDepends = [ aeson attoparsec base bytestring comonad containers deepseq double-conversion elynx-nexus math-functions mwc-random parallel @@ -82988,7 +83241,8 @@ self: { attoparsec base bytestring containers elynx-tools hspec QuickCheck ]; benchmarkHaskellDepends = [ - base bytestring criterion deepseq elynx-tools mwc-random parallel + base bytestring criterion deepseq elynx-tools microlens mwc-random + parallel ]; description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3Plus; @@ -96852,10 +97106,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.18.1"; - sha256 = "12nbksr3qywqg88cj4yy5z9qnn24cdxjg8ym70bxym8a8m52928c"; - revision = "1"; - editedCabalFile = "0598rwva6svavwka9m6vr1raz1x8wvn9bfvcc7j8kvdh6m6y9w4m"; + version = "0.18.3"; + sha256 = "15x528wskfl158909y0qapq72084kq4rjbpp2yd96gh2ycgawz7b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98362,8 +98614,8 @@ self: { }: mkDerivation { pname = "generic-aeson"; - version = "0.2.0.10"; - sha256 = "0dz7kib81234xmp7lzwww4vfnbpkq1pdalzvxxxqcjj31l0i803c"; + version = "0.2.0.11"; + sha256 = "0pwmfkw0ydbb9422ic4cpnj8lv0l80mj7y1par0s3qk4vz6vvg97"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -100201,6 +100453,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-check_0_5_0_3" = callPackage + ({ mkDerivation, base, containers, directory, filepath, ghc + , ghc-paths, process, safe-exceptions, template-haskell + , transformers + }: + mkDerivation { + pname = "ghc-check"; + version = "0.5.0.3"; + sha256 = "0crhlqs296zsz7bhy3zqaqhglxg45i6z7d1iqj9v7nr9crimxyjn"; + libraryHaskellDepends = [ + base containers directory filepath ghc ghc-paths process + safe-exceptions template-haskell transformers + ]; + description = "detect mismatches between compile-time and run-time versions of the ghc api"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-clippy-plugin" = callPackage ({ mkDerivation, base, dhall, ghc, text, text-icu , text-regex-replace @@ -100467,15 +100737,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-exactprint_0_6_3_2" = callPackage + "ghc-exactprint_0_6_3_3" = callPackage ({ mkDerivation, base, bytestring, containers, Diff, directory , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl , silently, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.6.3.2"; - sha256 = "1bzf8mafz20pn7cq2483b9w3hjrwfbb0ahbcb3y7xy5yy52qvmln"; + version = "0.6.3.3"; + sha256 = "1psrr6iaa7k5f3zz7j82crg052n3x1h2dljyb16qzbv98bqny6nb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101254,6 +101524,30 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-extra_0_4_1" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-prim + , ghc-tcplugins-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit + , transformers + }: + mkDerivation { + pname = "ghc-typelits-extra"; + version = "0.4.1"; + sha256 = "0wfv0cympdrz999qml8j1cqrqppb22xm4gcn4k8i2hd31j748zb6"; + libraryHaskellDepends = [ + base containers ghc ghc-prim ghc-tcplugins-extra + ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp + transformers + ]; + testHaskellDepends = [ + base ghc-typelits-knownnat ghc-typelits-natnormalise tasty + tasty-hunit + ]; + description = "Additional type-level operations on GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-knownnat" = callPackage ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck @@ -101554,11 +101848,11 @@ self: { ({ mkDerivation, aeson, array, async, base, base16-bytestring , binary, bytestring, Chart, Chart-diagrams, containers , cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg - , directory, extra, filepath, fuzzy, ghc, ghc-boot, ghc-boot-th - , ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev - , haddock-library, hashable, haskell-lsp, haskell-lsp-types - , hie-bios, hslogger, implicit-hie-cradle, lens, lsp-test, mtl - , network-uri, optparse-applicative, prettyprinter + , directory, extra, filepath, fingertree, fuzzy, ghc, ghc-boot + , ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev + , Glob, haddock-library, hashable, haskell-lsp, haskell-lsp-types + , hie-bios, hie-compat, hslogger, implicit-hie-cradle, lens + , lsp-test, mtl, network-uri, optparse-applicative, prettyprinter , prettyprinter-ansi-terminal, process, QuickCheck , quickcheck-instances, record-dot-preprocessor, record-hasfield , regex-tdfa, rope-utf16-splay, safe, safe-exceptions, shake @@ -101568,25 +101862,26 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "0.4.0"; - sha256 = "0h714pfdjkb4rbq9kz3ilj52nxdvr3c0w5nms5znxjlaysgaqp5l"; + version = "0.5.0"; + sha256 = "1l3h12jksxh1ds68zkslwmssfsdspxvyp0gqr5n8hgkymr4p896a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array async base base16-bytestring binary bytestring containers cryptohash-sha1 data-default deepseq directory extra - filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths - haddock-library hashable haskell-lsp haskell-lsp-types hie-bios - hslogger implicit-hie-cradle mtl network-uri prettyprinter - prettyprinter-ansi-terminal regex-tdfa rope-utf16-splay safe - safe-exceptions shake sorted-list stm syb text time transformers - unix unordered-containers utf8-string + filepath fingertree fuzzy ghc ghc-boot ghc-boot-th ghc-check + ghc-paths Glob haddock-library hashable haskell-lsp + haskell-lsp-types hie-bios hie-compat hslogger implicit-hie-cradle + mtl network-uri prettyprinter prettyprinter-ansi-terminal + regex-tdfa rope-utf16-splay safe safe-exceptions shake sorted-list + stm syb text time transformers unix unordered-containers + utf8-string ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios - lens lsp-test optparse-applicative process safe-exceptions text - unordered-containers + lens lsp-test optparse-applicative process safe-exceptions shake + text unordered-containers ]; testHaskellDepends = [ aeson base binary bytestring containers directory extra filepath @@ -103738,8 +104033,8 @@ self: { }: mkDerivation { pname = "git-brunch"; - version = "1.4.2.0"; - sha256 = "0zbbd3hga2qh043xw6igsjk14wh0d3hq5naxich88wg1ig4w28j5"; + version = "1.4.4.0"; + sha256 = "0kj22hx2ibidrnx19wb8kh6vyv4v0b5im616bywwhjqzspjqppmi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104486,19 +104781,19 @@ self: { "githud" = callPackage ({ mkDerivation, base, bytestring, daemons, data-default, directory - , mtl, network, parsec, process, tasty, tasty-hunit + , filelock, mtl, network, parsec, process, tasty, tasty-hunit , tasty-quickcheck, tasty-smallcheck, temporary, text, unix , utf8-string }: mkDerivation { pname = "githud"; - version = "3.2.1"; - sha256 = "1vvqn7wvalywnimv5kxz44pv4szm5csmvk54jbmsls2x0qginmqb"; + version = "3.2.2"; + sha256 = "19z21w6qxfndh381gcyi1ap14map886pkkc3nax8s417mv744ag3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring daemons data-default directory mtl network parsec - process temporary text unix utf8-string + base bytestring daemons data-default directory filelock mtl network + parsec process temporary text unix utf8-string ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -104911,8 +105206,8 @@ self: { ({ mkDerivation, base, linear }: mkDerivation { pname = "gjk2d"; - version = "0.1.0.2"; - sha256 = "163av54lmkqbayx9vkvviv3mdqq60zwkk9kjn75j7mk13d0iwpp3"; + version = "0.1.0.3"; + sha256 = "1wpaiaki61a7wl56qv6ycz9hgc9f8wvqdcqxpxaqvndxmri4njsv"; libraryHaskellDepends = [ base linear ]; testHaskellDepends = [ base linear ]; license = stdenv.lib.licenses.bsd3; @@ -105446,6 +105741,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss_1_13_2_1" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim + , gloss-rendering, GLUT, OpenGL + }: + mkDerivation { + pname = "gloss"; + version = "1.13.2.1"; + sha256 = "0ladpnk2zw27bz895b9gphhrmawb0gwvzrmnisk56msjdxwqq5pn"; + libraryHaskellDepends = [ + base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL + ]; + description = "Painless 2D vector graphics, animations and simulations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-accelerate" = callPackage ({ mkDerivation, accelerate, base, gloss, gloss-rendering , linear-accelerate @@ -109429,20 +109740,22 @@ self: { }) {}; "grammatical-parsers" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, checkers, containers - , criterion, deepseq, doctest, markdown-unlit, monoid-subclasses - , parsers, QuickCheck, rank2classes, size-based, tasty - , tasty-quickcheck, testing-feat, text, transformers + ({ mkDerivation, attoparsec, base, bytestring, Cabal, cabal-doctest + , checkers, containers, criterion, deepseq, doctest, input-parsers + , markdown-unlit, monoid-subclasses, parsers, QuickCheck + , rank2classes, size-based, tasty, tasty-quickcheck, testing-feat + , text, transformers }: mkDerivation { pname = "grammatical-parsers"; - version = "0.4.1.2"; - sha256 = "0aa7lqny3627f4d3z7xjmr9ywh94h5akhg89jabh05mvaykr34kf"; + version = "0.5"; + sha256 = "1kf3wwbk1skp6cm78h6fs2494597sdz82gaq5zx3cwfzgn4swmgx"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base containers monoid-subclasses parsers rank2classes transformers + attoparsec base bytestring containers input-parsers + monoid-subclasses parsers rank2classes transformers ]; executableHaskellDepends = [ base containers monoid-subclasses parsers rank2classes @@ -110037,8 +110350,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "0.10.0.0"; - sha256 = "0j0l8jmfnn3aw9vmk5z571ly9vk711hsz7cdklc243539vfnsywn"; + version = "0.11.0.0"; + sha256 = "1jg0cdyq0z1r752cx9mnbxj2rxd5s723zfvpk3mwcsvx5ygkhm0p"; libraryHaskellDepends = [ aeson base conduit containers exceptions hspec-expectations megaparsec parser-combinators scientific text transformers @@ -110050,7 +110363,7 @@ self: { raw-strings-qq scientific text transformers unordered-containers ]; description = "Haskell GraphQL implementation"; - license = stdenv.lib.licenses.bsd3; + license = "MPL-2.0 AND BSD-3-Clause"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -114145,8 +114458,6 @@ self: { ]; description = "A service for pull-based continuous deployment based on hydra"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hailgun" = callPackage @@ -116505,10 +116816,8 @@ self: { ({ mkDerivation, base, Chart, Chart-diagrams }: mkDerivation { pname = "happy-hour"; - version = "0.0.0.1"; - sha256 = "1dhqgv7q2qw9fc19mpsnfkc4y3h0d68433p2mrpx5fz81slfy4cf"; - revision = "1"; - editedCabalFile = "1yvz6nbqwxjyw7ffs95na7x75xc9ap8hp6m5jdvfqlgqcwlzmd6j"; + version = "0.0.0.2"; + sha256 = "1pj61x1ynspk3avfsy9735blzggz78r4b35gin1bza619gp9yzsb"; libraryHaskellDepends = [ base Chart Chart-diagrams ]; description = "Generate simple okay-looking bar plots without much effort"; license = stdenv.lib.licenses.mit; @@ -118194,8 +118503,8 @@ self: { }: mkDerivation { pname = "haskell-formatter"; - version = "2.0.2"; - sha256 = "0rnx34nkgw4zsyagl38vqd322fzp3kfi16p60dhffadga8v4gajd"; + version = "2.0.3"; + sha256 = "16r5pq9sk5ra4ba29w6i88pcfwasffrfd85yhran68b6d8d7s2aj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129465,8 +129774,8 @@ self: { pname = "hlrdb"; version = "0.3.1.0"; sha256 = "19sxpyv331sjldanf40gw598gcj98n9xwc985cz9k2m38ck3vwhr"; - revision = "1"; - editedCabalFile = "0ikina8r7b3n7gywj0fclarj8g4m20wd23vxwlswikbx4f9mpwgf"; + revision = "2"; + editedCabalFile = "11f2vv95kmk4k07yzvzma7714p148sfyn9k3zx94h5y0zihgn49g"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptonite hashable hedis hlrdb-core memory random store time unordered-containers @@ -129485,6 +129794,8 @@ self: { pname = "hlrdb-core"; version = "0.1.6.0"; sha256 = "13hb0657y5cqhbl2m27v28b6zl9mgcq17r983rds3l3bccn67ayv"; + revision = "1"; + editedCabalFile = "163scamdjq98zk039qv3r4xqz7hmixa136gfkifx757fy4nigdiy"; libraryHaskellDepends = [ base bytestring hashable hedis lens mtl profunctors random time unordered-containers @@ -129509,18 +129820,16 @@ self: { "hls-plugin-api" = callPackage ({ mkDerivation, aeson, base, containers, data-default, Diff, ghc - , ghc-boot-th, ghcide, haskell-lsp, hslogger, lens, process - , regex-tdfa, shake, text, unordered-containers + , ghc-boot-th, ghcide, hashable, haskell-lsp, hslogger, lens + , process, regex-tdfa, shake, text, unordered-containers }: mkDerivation { pname = "hls-plugin-api"; - version = "0.4.1.0"; - sha256 = "00ms2m9sn7a935fh6l3grzvbfq67acjymqmy9rjpn30d0slr1672"; - revision = "1"; - editedCabalFile = "09fd4br6s8lddl98nmwybayqr0z58k8h8fdw5r3jxw00cr13vw31"; + version = "0.5.0.0"; + sha256 = "18bahpndgic8g259v4blckybc5mlp7snaqh1gmnd7kh39p8kf1v4"; libraryHaskellDepends = [ aeson base containers data-default Diff ghc ghc-boot-th ghcide - haskell-lsp hslogger lens process regex-tdfa shake text + hashable haskell-lsp hslogger lens process regex-tdfa shake text unordered-containers ]; description = "Haskell Language Server API for plugin communication"; @@ -134418,23 +134727,23 @@ self: { , bytestring, cryptonite, data-default, http-types, HUnit, hxt , hxt-charproperties, hxt-http, hxt-unicode, invertible , invertible-hxt, lens, libxml2, memory, mtl, network-uri, process - , semigroups, template-haskell, time, x509, zlib + , semigroups, string-conversions, template-haskell, time + , utf8-string, x509, zlib }: mkDerivation { pname = "hsaml2"; - version = "0.1"; - sha256 = "0mpw13cicx16zhsk7km2qsndah9cdmyylz4r5ank5cxj0rzmkjck"; - revision = "1"; - editedCabalFile = "0xvyzq2y94za0ggrlcxvpz4g29jxdcjp3ga8f77hr0f4hfz4z10l"; + version = "0.1.1"; + sha256 = "1jlsmsnrr3ya7az4mpb6f2spwcw3m45yzix2p3lkajbz8a6kfzac"; libraryHaskellDepends = [ asn1-encoding asn1-types base base64-bytestring bytestring cryptonite data-default http-types hxt hxt-charproperties hxt-unicode invertible invertible-hxt lens memory mtl network-uri - process semigroups template-haskell time x509 zlib + process semigroups template-haskell time utf8-string x509 zlib ]; libraryPkgconfigDepends = [ libxml2 ]; testHaskellDepends = [ - base bytestring HUnit hxt hxt-http network-uri semigroups time x509 + base base64-bytestring bytestring cryptonite HUnit hxt hxt-http + network-uri semigroups string-conversions time x509 ]; description = "OASIS Security Assertion Markup Language (SAML) V2.0"; license = stdenv.lib.licenses.asl20; @@ -141037,14 +141346,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hvega_0_10_0_0" = callPackage + "hvega_0_11_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , filepath, tasty, tasty-golden, text, unordered-containers }: mkDerivation { pname = "hvega"; - version = "0.10.0.0"; - sha256 = "0jp9sfmyvscxn415z3mv5i2kjrwwabwy4v4qc709qkrfgzd9mmwn"; + version = "0.11.0.0"; + sha256 = "1lz5f04yi97wkqhyxvav262ayyvvl96xrgvgzyk1ca1g299dw866"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base text unordered-containers ]; @@ -144585,8 +144894,8 @@ self: { ({ mkDerivation, aeson, base, hvega, ihaskell, text }: mkDerivation { pname = "ihaskell-hvega"; - version = "0.3.1.0"; - sha256 = "1zfk58f10r8mkj9wwi4mgqm6hyf2x6zkrxm7rdi8yfvfya38m7fy"; + version = "0.3.2.0"; + sha256 = "0k7h33cqj58dv4hrsdjgnbykh036mrvbw6cbr98xlkdq5062pnzp"; libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = stdenv.lib.licenses.bsd3; @@ -145300,8 +145609,8 @@ self: { }: mkDerivation { pname = "implicit-hie"; - version = "0.1.2.0"; - sha256 = "0scg27iz2yhkfrsj5hw11qi1gdivgnskmcl4v4111zlvyy14lhc9"; + version = "0.1.2.3"; + sha256 = "0gz2rrzlj6031w837whpsh932jjihf49yk7rh05dw13zxvn19fl8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145328,8 +145637,8 @@ self: { }: mkDerivation { pname = "implicit-hie-cradle"; - version = "0.2.0.1"; - sha256 = "1l2i05w547sdgh7dhvwvc8x6i100lb2l3zwr6bhjmapdj5sjnqd1"; + version = "0.3.0.0"; + sha256 = "0zbgqx7dzkpsf6pnxvfrkgl2v70vvm5h4by65m7yi73qjxrcghd1"; libraryHaskellDepends = [ base base16-bytestring bytestring containers directory extra filepath hie-bios hslogger implicit-hie process temporary text time @@ -150096,8 +150405,8 @@ self: { }: mkDerivation { pname = "j"; - version = "0.1.2.0"; - sha256 = "053n10j75mv2iwrra51nv4vf48ki8q5aksqjbrlnzbhbm125jhf3"; + version = "0.2.0.0"; + sha256 = "0ggs57f07na6m3r6m65cdxh48qxwhl3hfvarhsbhv16l92x1rpap"; libraryHaskellDepends = [ base bytestring repa unix ]; testHaskellDepends = [ base bytestring repa tasty tasty-hunit ]; description = "J in Haskell"; @@ -151225,6 +151534,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "js-chart" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "js-chart"; + version = "2.9.4.1"; + sha256 = "03mxr6xr9z20m2hy7hvl9cq3a67k0n9zaqwi7wlqy6xx6pfyy20a"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Obtain minified chart.js code"; + license = stdenv.lib.licenses.mit; + }) {}; + "js-dgtable" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -152169,6 +152491,37 @@ self: { broken = true; }) {}; + "json-to-haskell" = callPackage + ({ mkDerivation, aeson, aeson-extra, ansi-wl-pprint, base, bimap + , bytestring, casing, containers, hspec, microlens-platform, mtl + , nonempty-containers, optparse-applicative, raw-strings-qq + , recursion-schemes, text, unordered-containers, vector + }: + mkDerivation { + pname = "json-to-haskell"; + version = "0.1.1.2"; + sha256 = "0l4i613xd00vrfihh7yrkj1vp99vyvxgbb4902yla9bl80qb3khz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-extra base bimap casing containers microlens-platform + mtl nonempty-containers recursion-schemes text unordered-containers + vector + ]; + executableHaskellDepends = [ + aeson aeson-extra ansi-wl-pprint base bimap bytestring casing + containers microlens-platform mtl nonempty-containers + optparse-applicative raw-strings-qq recursion-schemes text + unordered-containers vector + ]; + testHaskellDepends = [ + aeson aeson-extra base bimap bytestring casing containers hspec + microlens-platform mtl nonempty-containers raw-strings-qq + recursion-schemes text unordered-containers vector + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "json-togo" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-trans, base , bytestring, scientific, text, transformers, unordered-containers @@ -154662,6 +155015,20 @@ self: { broken = true; }) {}; + "ki" = callPackage + ({ mkDerivation, atomic-primops, base, concurrency, containers + , dejafu, stm + }: + mkDerivation { + pname = "ki"; + version = "0.1.0"; + sha256 = "0lzr9i3zrg3qw9pvkp4scy7p5qi2g2x8kvz6h7sph4k61f78kfxg"; + libraryHaskellDepends = [ atomic-primops base containers stm ]; + testHaskellDepends = [ base concurrency dejafu stm ]; + description = "A lightweight, structured concurrency library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "kibro" = callPackage ({ mkDerivation }: mkDerivation { @@ -156631,6 +156998,40 @@ self: { broken = true; }) {}; + "language-Modula2" = callPackage + ({ mkDerivation, base, containers, deep-transformations, directory + , either, filepath, grammatical-parsers, input-parsers + , language-oberon, optparse-applicative, parsers, prettyprinter + , rank2classes, repr-tree-syb, tasty, tasty-hunit, template-haskell + , text + }: + mkDerivation { + pname = "language-Modula2"; + version = "0.1"; + sha256 = "0bwgvag1y5ik3rn9c45y7lldqpsg62yc9cr8ahvijpfz0f4hlq1m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers deep-transformations directory filepath + grammatical-parsers input-parsers language-oberon parsers + prettyprinter rank2classes template-haskell text + ]; + executableHaskellDepends = [ + base containers deep-transformations either filepath + grammatical-parsers language-oberon optparse-applicative + prettyprinter rank2classes repr-tree-syb text + ]; + testHaskellDepends = [ + base deep-transformations directory either filepath + grammatical-parsers language-oberon prettyprinter tasty tasty-hunit + text + ]; + description = "Parser, pretty-printer, and more for the Modula-2 programming language"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "language-asn" = callPackage ({ mkDerivation, aeson, base, bytestring, contravariant, hashable , pretty, primitive, text, vector @@ -157516,31 +157917,33 @@ self: { }) {}; "language-oberon" = callPackage - ({ mkDerivation, base, containers, directory, either, filepath - , grammatical-parsers, optparse-applicative, parsers, prettyprinter - , rank2classes, repr-tree-syb, tasty, tasty-hunit, template-haskell - , text, transformers + ({ mkDerivation, base, base-orphans, containers + , deep-transformations, directory, either, filepath + , grammatical-parsers, input-parsers, optparse-applicative, parsers + , prettyprinter, rank2classes, repr-tree-syb, tasty, tasty-hunit + , template-haskell, text, transformers }: mkDerivation { pname = "language-oberon"; - version = "0.2.1"; - sha256 = "1ia0m9bgrz1jksw349a0pgmkfvy5ykc29n55w7w457c60y37bs02"; + version = "0.3"; + sha256 = "0rpx80zyq4g71sjarjdyx6z919k3140d00ffmv4g14njnd6xb9fw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory either filepath grammatical-parsers - parsers prettyprinter rank2classes template-haskell text - transformers + base base-orphans containers deep-transformations directory either + filepath grammatical-parsers input-parsers parsers prettyprinter + rank2classes template-haskell text transformers ]; executableHaskellDepends = [ - base containers either filepath grammatical-parsers - optparse-applicative prettyprinter rank2classes repr-tree-syb text + base containers deep-transformations either filepath + grammatical-parsers input-parsers optparse-applicative + prettyprinter rank2classes repr-tree-syb text ]; testHaskellDepends = [ - base directory either filepath grammatical-parsers prettyprinter - tasty tasty-hunit text + base deep-transformations directory either filepath + grammatical-parsers prettyprinter tasty tasty-hunit text ]; - description = "Parser, pretty-printer, and type checker for the Oberon programming language"; + description = "Parser, pretty-printer, and more for the Oberon programming language"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -160046,8 +160449,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.4.0.0"; - sha256 = "1f5jcprb2l65nyysxgdkhd9vsg1ixn8qfpjgmgvi8cqm0zp28zw7"; + version = "1.4.1.0"; + sha256 = "07zlmds8450sa54axx91ppxil6jfafx78ba3lxrr6jpdvzc73w55"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160490,8 +160893,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "3.0.0.0"; - sha256 = "0qwnp5jzmlvi7bpbh1dhz3lp91qf5phr8hb7m3h5q0a50d72dqpp"; + version = "3.0.1.1"; + sha256 = "1i5801prr06vachxrpcc31bsxhsb6f8ik91mx7a9hmqkwhpr986b"; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -160613,13 +161016,13 @@ self: { }) {ffi = null;}; "libfuse3" = callPackage - ({ mkDerivation, base, bytestring, clock, directory, filepath - , fuse3, hspec, process, resourcet, temporary, time, unix + ({ mkDerivation, base, bytestring, clock, criterion, directory + , filepath, fuse3, hspec, process, resourcet, temporary, time, unix }: mkDerivation { pname = "libfuse3"; - version = "0.1.1.1"; - sha256 = "0fvkyfdl342zi436n1xqvsvazflkm60wdcq0qzspg6q5pr7s094f"; + version = "0.1.2.0"; + sha256 = "0a59b4xag5vzisrnvf4v1zkdsdzky96h8w2mdj6cip3vgr196frb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160629,6 +161032,7 @@ self: { testHaskellDepends = [ base bytestring directory filepath hspec process temporary unix ]; + benchmarkHaskellDepends = [ base bytestring criterion unix ]; description = "A Haskell binding for libfuse-3.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -165928,8 +166332,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.7.0"; - sha256 = "1nwz7cdjy0s1fa64q4ymyds2m6yhqx8vxjp0p9qn7b4l7civhk9c"; + version = "0.7.1"; + sha256 = "0qqlbpvifh4n6w8b4brc9fybvaxx8aahj9da6y16zlxlf3n6jbv5"; libraryHaskellDepends = [ aeson-pretty base bimap bytestring constraints containers data-default first-class-families fmt interpolate lens morley @@ -167785,8 +168189,8 @@ self: { }: mkDerivation { pname = "magicbane"; - version = "0.4.0"; - sha256 = "0n2yn3jbklibb21pm2ifiy9035d3xmrh8cgywnpawm51p5q3klwl"; + version = "0.5.1"; + sha256 = "18kxixk0cj32pjpwp96mpnppy21xn4gy4xksb97m31j30kmlas91"; libraryHaskellDepends = [ aeson aeson-qq attoparsec base bytestring conduit conduit-combinators data-has ekg-core ekg-wai envy errors @@ -170505,18 +170909,19 @@ self: { "mcmc" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion - , data-default, directory, double-conversion, hspec, hspec-discover - , log-domain, microlens, mwc-random, QuickCheck, statistics, time - , transformers, vector, zlib + , data-default, directory, dirichlet, double-conversion, hspec + , hspec-discover, log-domain, math-functions, microlens, mwc-random + , primitive, QuickCheck, statistics, time, transformers, vector + , zlib }: mkDerivation { pname = "mcmc"; - version = "0.2.4"; - sha256 = "17ahxp7p1klg1j416gvs76a3x1hii5j0fv80rxfrw0w076gn3yy1"; + version = "0.3.0"; + sha256 = "1xkg16gmhqh60z69gz6d51c9yb7q9j2w8aylhpxgh18yz35mw4j1"; libraryHaskellDepends = [ - aeson base bytestring containers data-default directory - double-conversion log-domain microlens mwc-random statistics time - transformers vector zlib + aeson base bytestring containers data-default directory dirichlet + double-conversion log-domain math-functions microlens mwc-random + primitive statistics time transformers vector zlib ]; testHaskellDepends = [ base directory hspec hspec-discover log-domain mwc-random @@ -173738,16 +174143,20 @@ self: { }) {}; "minizinc-process" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , hashable, process-extras, stringsearch, text + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , directory, hashable, hedgehog, hspec, hspec-hedgehog, process + , process-extras, template-haskell, text }: mkDerivation { pname = "minizinc-process"; - version = "0.1.0.0"; - sha256 = "0p2jb69k2n3dy47vx56pwh6pafccsm9r0nzqd60zss5fdrnxddf8"; + version = "0.1.4.1"; + sha256 = "0sihpmjzda7kph8mds4p4fn4pgbiay6v680pcqv2d116a5di2c5g"; libraryHaskellDepends = [ - aeson base bytestring containers directory hashable process-extras - stringsearch text + aeson attoparsec base bytestring containers directory hashable + process process-extras template-haskell text + ]; + testHaskellDepends = [ + aeson base hashable hedgehog hspec hspec-hedgehog ]; description = "A set of helpers to call minizinc models"; license = stdenv.lib.licenses.asl20; @@ -174136,8 +174545,8 @@ self: { }: mkDerivation { pname = "miv"; - version = "0.4.4"; - sha256 = "0is2ckkglh9wnhwnvyhhjy7as67mk7bs4az98q32nk3hx0yj9nq8"; + version = "0.4.6"; + sha256 = "1xf4frjvccjvkzgx9ha9q2i6ig5bx3z37igjb3s7a9zvqnvig06g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -174485,20 +174894,22 @@ self: { "mmsyn6ukr" = callPackage ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3 - , mmsyn5, process, vector + , mmsyn5, process, ukrainian-phonetics-basic, vector }: mkDerivation { pname = "mmsyn6ukr"; - version = "0.8.3.0"; - sha256 = "017q1jf9490sddb0f6wjizcsv423izjqirgq7ymzpxcd4sbcdhyn"; + version = "0.9.0.0"; + sha256 = "1knq7yqgsk3hjvpfb1f3igq7flrmsjafp669d24ww7ijcxs7rpda"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring directory mmsyn2 mmsyn3 mmsyn5 process vector + base bytestring directory mmsyn2 mmsyn3 mmsyn5 process + ukrainian-phonetics-basic vector ]; executableHaskellDepends = [ - base bytestring directory mmsyn2 mmsyn3 mmsyn5 process vector + base bytestring directory mmsyn2 mmsyn3 mmsyn5 process + ukrainian-phonetics-basic vector ]; description = "A musical instrument synthesizer or a tool for Ukrainian language listening"; license = stdenv.lib.licenses.mit; @@ -177405,8 +177816,8 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.8.1"; - sha256 = "1lchr282394vjwgi5l0innc7szxkp7pibrbma0yza37l3q295xz2"; + version = "1.9"; + sha256 = "17fkh2dbi79lgc61nj9v0fyj26n7lzsj824nvi94q0f9qi6ifk5j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177793,8 +178204,8 @@ self: { }: mkDerivation { pname = "moss"; - version = "0.1.0.0"; - sha256 = "19gy0x191gk6wa85vp5nhh0xgmr3mj2daiqx8bap452fm1y85qcr"; + version = "0.2.0.0"; + sha256 = "17ac31r26c8zddp3qdk573lyry2bz7c0y49q0adln3psd39czzw0"; libraryHaskellDepends = [ base bytestring conduit-extra mtl network network-simple unix-compat @@ -192738,7 +193149,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_11_1" = callPackage + "pandoc_2_11_1_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -192757,8 +193168,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.11.1"; - sha256 = "0gvpal4v92x8vscmm5h3jjlx9q03a4qbz0zwcbw24y02xmaz09d8"; + version = "2.11.1.1"; + sha256 = "0i16klsffqqbiann3p3rqcpbiwmbffg8ycmm35yrc9g705hi2r38"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -193698,7 +194109,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pantry_0_5_1_3" = callPackage + "pantry_0_5_1_4" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -193712,8 +194123,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.1.3"; - sha256 = "0yx30zhyq0wbda6z8a9lvp8c83b3nj4l2s8lcxnvwgnzkanvlkss"; + version = "0.5.1.4"; + sha256 = "1q66pxacjxc43gbmjjrvs99wcrzp8yya4gx35qhbb6hgkzwssqhb"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -196226,6 +196637,35 @@ self: { broken = true; }) {}; + "pcapng" = callPackage + ({ mkDerivation, base, bytestring, bytestring-arbitrary, cereal + , cereal-conduit, conduit, conduit-extra, directory, filepath + , genvalidity-hspec, genvalidity-property, hspec, hspec-core, lens + , QuickCheck, resourcet, text, unliftio-core, validity + }: + mkDerivation { + pname = "pcapng"; + version = "0.1.0.0"; + sha256 = "1mvxl8fjsfs8xvm8v9nrqjidv52sgxqydgfnxh0bckhbzcc7gqaq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cereal cereal-conduit conduit conduit-extra lens + resourcet text unliftio-core + ]; + executableHaskellDepends = [ + base bytestring cereal cereal-conduit conduit conduit-extra lens + resourcet text unliftio-core + ]; + testHaskellDepends = [ + base bytestring bytestring-arbitrary cereal cereal-conduit conduit + conduit-extra directory filepath genvalidity-hspec + genvalidity-property hspec hspec-core lens QuickCheck resourcet + text unliftio-core validity + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pcd-loader" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, deepseq , directory, HUnit, lens, linear, mtl, string-qq, test-framework @@ -197774,8 +198214,8 @@ self: { }: mkDerivation { pname = "persistent-documentation"; - version = "0.1.0.1"; - sha256 = "027fxb3ggzyxg2ykml7sdk2hycacd237161yr3w5cwi320b9ghyg"; + version = "0.1.0.2"; + sha256 = "0ys864vjzl97c9qv0gg5q9zviammrfvm0schvh7ckr9pdg062z17"; libraryHaskellDepends = [ base containers mtl persistent template-haskell text ]; @@ -197849,8 +198289,8 @@ self: { }: mkDerivation { pname = "persistent-iproute"; - version = "0.2.4"; - sha256 = "1lsprnlgcnj8v38cnbgf2vpj9ivgsvgi3yy3nh1gmvyj7maznkq5"; + version = "0.2.5"; + sha256 = "0x5vsincd2gll20agkrsgl8f092x7pc7b22fn5ardcm2fnyl2x8i"; libraryHaskellDepends = [ aeson aeson-iproute base bytestring http-api-data iproute path-pieces persistent text @@ -199131,30 +199571,56 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-constaints" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "phonetic-languages-constaints"; + version = "0.3.0.0"; + sha256 = "17n4m9zbl1h6g76wxrqxc3wwcd0m5qjmbiakvmvbcdv7nffc8xyh"; + libraryHaskellDepends = [ base vector ]; + description = "Constraints to filter the needed permutations"; + license = stdenv.lib.licenses.mit; + }) {}; + + "phonetic-languages-constraints" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "phonetic-languages-constraints"; + version = "0.3.2.0"; + sha256 = "16gq0vr20bk3mg8b1w7gdlv32wr5vf9q0dj4f6x42x476fd4dcj3"; + libraryHaskellDepends = [ base vector ]; + description = "Constraints to filter the needed permutations"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-examples" = callPackage - ({ mkDerivation, base, parallel, phonetic-languages-common - , phonetic-languages-general, phonetic-languages-plus - , phonetic-languages-properties, phonetic-languages-ukrainian + ({ mkDerivation, base, mmsyn2, parallel, phonetic-languages-common + , phonetic-languages-constraints, phonetic-languages-general + , phonetic-languages-plus, phonetic-languages-properties + , phonetic-languages-rhythmicity, phonetic-languages-ukrainian , phonetic-languages-vector, print-info, subG , ukrainian-phonetics-basic, uniqueness-periods-vector-filters , uniqueness-periods-vector-stats, vector }: mkDerivation { pname = "phonetic-languages-examples"; - version = "0.1.1.0"; - sha256 = "1i95kglsif5zd5k7yri69mwh8n3a63cqwh3kvn91qpyxqf8zgdzz"; + version = "0.5.0.0"; + sha256 = "1ypv9x2jsz20dmky8mzmni0pmwq8vslyhi2s0s2ji99qsg7y5rwi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base phonetic-languages-common phonetic-languages-properties + base mmsyn2 phonetic-languages-common + phonetic-languages-constraints phonetic-languages-properties phonetic-languages-vector vector ]; executableHaskellDepends = [ - base parallel phonetic-languages-common phonetic-languages-general + base mmsyn2 parallel phonetic-languages-common + phonetic-languages-constraints phonetic-languages-general phonetic-languages-plus phonetic-languages-properties - phonetic-languages-ukrainian phonetic-languages-vector print-info - subG ukrainian-phonetics-basic uniqueness-periods-vector-filters - uniqueness-periods-vector-stats vector + phonetic-languages-rhythmicity phonetic-languages-ukrainian + phonetic-languages-vector print-info subG ukrainian-phonetics-basic + uniqueness-periods-vector-filters uniqueness-periods-vector-stats + vector ]; description = "A generalization of the uniqueness-periods-vector-examples functionality"; license = stdenv.lib.licenses.mit; @@ -199166,8 +199632,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-general"; - version = "0.1.0.0"; - sha256 = "1vv1n58npgwy1shp7xhm48fdqm9a8kqb3lbqkl0sn7qwkph5x53k"; + version = "0.2.0.0"; + sha256 = "1sfaqg3v31188zk70c290ww5k80ph30h2kcgpc8pxj8v3baj5p8x"; libraryHaskellDepends = [ base phonetic-languages-common phonetic-languages-plus print-info subG vector @@ -199202,8 +199668,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-properties"; - version = "0.1.1.0"; - sha256 = "1c312i66rpwxfk34rpzh8ai3m4lbxwj4ayqh1vzbj17mciachaqf"; + version = "0.3.0.0"; + sha256 = "1bf0k2wlypaiff84alnf94c5adbkbz1d3bkdbmd04bq937yc3rfq"; libraryHaskellDepends = [ base phonetic-languages-common phonetic-languages-rhythmicity phonetic-languages-vector ukrainian-phonetics-basic vector @@ -202970,12 +203436,10 @@ self: { ({ mkDerivation, base, containers, polysemy, polysemy-zoo }: mkDerivation { pname = "polysemy-extra"; - version = "0.1.0.0"; - sha256 = "1y5k935jh6dfs87kdih1ibb61ljkp39wyrkg1n2zss020cdhbi7g"; - revision = "1"; - editedCabalFile = "0nh9laqwr40dhkh0806v748zqg61agmv3ih4fyidzr9h30lcl0q8"; + version = "0.1.4.0"; + sha256 = "1lv5zw3wwgyxnsa3c1cfgpqaqj1w4ybph5r8hqr2h7xxaa6wajsx"; libraryHaskellDepends = [ base containers polysemy polysemy-zoo ]; - description = "Extra transformations functions for polysemy"; + description = "Extra Input and Output functions for polysemy.."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -203071,8 +203535,8 @@ self: { }: mkDerivation { pname = "polysemy-methodology"; - version = "0.1.5.0"; - sha256 = "1gi2rjf1vgcamjyqqi4wnasv9i5yaazlh14hbjspvsyv8h2zyl4i"; + version = "0.1.6.0"; + sha256 = "0wsl39hznf6wpq4yd4n0sz9d5yw36xclyg9mrhifzc04mzn3dbi3"; libraryHaskellDepends = [ base co-log-polysemy polysemy polysemy-plugin polysemy-zoo ]; @@ -203082,6 +203546,24 @@ self: { broken = true; }) {}; + "polysemy-methodology-composite" = callPackage + ({ mkDerivation, base, composite-base, polysemy, polysemy-extra + , polysemy-methodology, polysemy-vinyl, vinyl + }: + mkDerivation { + pname = "polysemy-methodology-composite"; + version = "0.1.2.0"; + sha256 = "1gp3jwhhkrbxdmwvcd08x7vphqd99y2zyj81s3ni3249yb3mjcpm"; + libraryHaskellDepends = [ + base composite-base polysemy polysemy-extra polysemy-methodology + polysemy-vinyl vinyl + ]; + description = "Functions for using polysemy-methodology with composite"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "polysemy-optics" = callPackage ({ mkDerivation, base, optics, polysemy, polysemy-zoo }: mkDerivation { @@ -203091,8 +203573,6 @@ self: { libraryHaskellDepends = [ base optics polysemy polysemy-zoo ]; description = "Optics for Polysemy"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "polysemy-path" = callPackage @@ -203220,6 +203700,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "polysemy-vinyl" = callPackage + ({ mkDerivation, base, polysemy, polysemy-extra, vinyl }: + mkDerivation { + pname = "polysemy-vinyl"; + version = "0.1.2.0"; + sha256 = "0cg170avw16cdssirjz5di466z2i5fh3y7whq5cpwc7dqqffxdak"; + libraryHaskellDepends = [ base polysemy polysemy-extra vinyl ]; + description = "Functions for mapping vinyl records in polysemy"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "polysemy-webserver" = callPackage ({ mkDerivation, base, bytestring, hspec, http-conduit, http-types , polysemy, polysemy-plugin, text, wai, wai-websockets, warp @@ -203265,8 +203758,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Experimental, user-contributed effects and interpreters for polysemy"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "polyseq" = callPackage @@ -205871,8 +206362,8 @@ self: { }: mkDerivation { pname = "predicate-typed"; - version = "0.7.4.2"; - sha256 = "0n1r8ysjyc61pr107y5kkarc30crjzps865kx9k25kjcmk5ynlgz"; + version = "0.7.4.3"; + sha256 = "122v0c8zkpv3fdk8wqk4b6q2hicdj7hn1kaavcsf0z266w089ryg"; libraryHaskellDepends = [ aeson aeson-pretty base binary bytestring comonad constraints containers deepseq directory hashable lens lens-action pcre-heavy @@ -208576,8 +209067,8 @@ self: { }: mkDerivation { pname = "prolude"; - version = "0.0.0.6"; - sha256 = "1f3apqs82lv7fq69mjqycs8ynj3hhprg1rrclvs3yix2lc3465vf"; + version = "0.0.0.7"; + sha256 = "0wcjb7svvp5q3lzsddkxp2c0jvr765pva9hwnmmc5ak91yj6lgpw"; libraryHaskellDepends = [ aeson base bytestring cassava containers mongoDB safe-exceptions scientific text time vector @@ -210422,17 +210913,18 @@ self: { }) {}; "purescheme-wai-routing-core" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-media, http-types - , interpolate, text, wai, warp + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , http-media, http-types, interpolate, text, wai, warp }: mkDerivation { pname = "purescheme-wai-routing-core"; - version = "0.1.0.0"; - sha256 = "18ngmq6yb3l1ywigl38jm2x6wi097wjdym5z3hh5qkjndcygkjji"; + version = "0.1.3.0"; + sha256 = "0fwgxvn0vblyma3fpbyj9rvbwsrgsqzyd27mripa3yyvm6ygh4s6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring http-media http-types interpolate text wai + aeson base bytestring case-insensitive http-media http-types + interpolate text wai ]; executableHaskellDepends = [ aeson base bytestring http-types text wai warp @@ -213160,6 +213652,26 @@ self: { broken = true; }) {}; + "r-glpk-phonetic-languages-ukrainian-durations" = callPackage + ({ mkDerivation, base, lists-flines, mmsyn2 + , ukrainian-phonetics-basic, vector + }: + mkDerivation { + pname = "r-glpk-phonetic-languages-ukrainian-durations"; + version = "0.2.1.0"; + sha256 = "0g3xw2a9id28wpvs868xjjmx2hh17876fiwpzjzngcjijr5351b4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base lists-flines mmsyn2 ukrainian-phonetics-basic vector + ]; + executableHaskellDepends = [ + base lists-flines mmsyn2 ukrainian-phonetics-basic vector + ]; + description = "Can be used to calculate the durations of the approximations of the Ukrainian phonemes"; + license = stdenv.lib.licenses.mit; + }) {}; + "r3x-haskell-sdk" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring , case-insensitive, containers, cookie, http-types, mtl, regex-pcre @@ -214302,15 +214814,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rank2classes_1_4_0_1" = callPackage + "rank2classes_1_4_1" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest , markdown-unlit, tasty, tasty-hunit, template-haskell , transformers }: mkDerivation { pname = "rank2classes"; - version = "1.4.0.1"; - sha256 = "1r72z98jvnih16x074izb0wp9gwbsjs2ihvj8a72xxyakdad71r9"; + version = "1.4.1"; + sha256 = "1cmc7xqnvjdvzgfyz7i3nmnhdm92rwfc9bqlpjcirmnkn47va4kb"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base distributive template-haskell transformers @@ -217393,18 +217905,18 @@ self: { "reflex-gadt-api" = callPackage ({ mkDerivation, aeson, aeson-gadt-th, base, bytestring , constraints, constraints-extras, containers, data-default - , dependent-sum, jsaddle, reflex, reflex-dom-core, text, time + , jsaddle, reflex, reflex-dom-core, some, text, time }: mkDerivation { pname = "reflex-gadt-api"; - version = "0.2.0.1"; - sha256 = "0lyzabjyx1fyxrkxpmzhwhkpph9358hw7bpnmsppvwsdaq3m1yqq"; + version = "0.2.1.0"; + sha256 = "1mcxa87z6cldbc9p2mkdif5a8qa8sa0nhmawwm1gjqgvhzp7kmdp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-gadt-th base bytestring constraints constraints-extras - containers data-default dependent-sum jsaddle reflex - reflex-dom-core text time + containers data-default jsaddle reflex reflex-dom-core some text + time ]; executableHaskellDepends = [ aeson aeson-gadt-th base constraints-extras reflex-dom-core text @@ -219558,8 +220070,8 @@ self: { pname = "repa"; version = "3.4.1.4"; sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23"; - revision = "4"; - editedCabalFile = "0bay8j0fm7l2nhrbdvy9fvrb6hgkrk5qx9y03az2kakvjdc4gvvh"; + revision = "6"; + editedCabalFile = "09b2b98pqbjxp4xign29b67yn6za8lfxxqlv1j52sbvh5bbmbd7s"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -220977,6 +221489,17 @@ self: { broken = true; }) {}; + "restartable" = callPackage + ({ mkDerivation, aeson, base, bytestring, unix }: + mkDerivation { + pname = "restartable"; + version = "0.3.0.0"; + sha256 = "0bar7sy53pylq13wkbb4j3i7y81g6y203njkh9vlid7nh109j409"; + libraryHaskellDepends = [ aeson base bytestring unix ]; + description = "Minimal live coding library for model-view-event-update applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "restful-snap" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , data-default, digestive-functors, errors, heist, lens, map-syntax @@ -228621,8 +229144,8 @@ self: { ({ mkDerivation, base, containers, lattices }: mkDerivation { pname = "semibounded-lattices"; - version = "0.1.0.1"; - sha256 = "0xqxmh0chq4vgga5lx2d5pcz4rq000kgpkglj8jgdv2nx6rf8pka"; + version = "0.1.1.0"; + sha256 = "0nlmh84bmizs5dllf3292svs4a5d9yj0l78mcryqmblf1bzp74f4"; libraryHaskellDepends = [ base containers lattices ]; testHaskellDepends = [ base ]; description = "A Haskell implementation of semibounded lattices"; @@ -233282,20 +233805,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sexp-grammar_2_2_1" = callPackage + "sexp-grammar_2_3_0" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers - , criterion, deepseq, happy, invertible-grammar, prettyprinter - , QuickCheck, recursion-schemes, scientific, semigroups, tasty - , tasty-hunit, tasty-quickcheck, text, utf8-string + , criterion, data-fix, deepseq, happy, invertible-grammar + , prettyprinter, QuickCheck, recursion-schemes, scientific + , semigroups, tasty, tasty-hunit, tasty-quickcheck, text + , utf8-string }: mkDerivation { pname = "sexp-grammar"; - version = "2.2.1"; - sha256 = "0nf3b3cibqi2jv9jg742jknqpfgwvc7iwjw7a2jgpf55nrgs6lvz"; + version = "2.3.0"; + sha256 = "1ky0jj47xp6g8shk5znrhncj71sg0p653csj1ds2yl36s7fiwgdk"; libraryHaskellDepends = [ - array base bytestring containers deepseq invertible-grammar - prettyprinter recursion-schemes scientific semigroups text - utf8-string + array base bytestring containers data-fix deepseq + invertible-grammar prettyprinter recursion-schemes scientific + semigroups text utf8-string ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -234808,6 +235332,8 @@ self: { pname = "shh"; version = "0.7.1.0"; sha256 = "03b8h6sjnrlksvpr9f451469j5xngqpb6g3hyxmxp7h7h4xrsvq2"; + revision = "1"; + editedCabalFile = "1sv4rxkwvsb1j42k6bhbvig8215xzmgmqaxacljq03aqqv3x3jf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -234833,8 +235359,8 @@ self: { pname = "shh-extras"; version = "0.1.0.1"; sha256 = "0w4ddjszs0lrpr4zcggcwb80bg3yd8lr628jngmh4a05ypv3hxkk"; - revision = "1"; - editedCabalFile = "0kcnk1f1jgaxaqsrnhv2s17firjsms9xvx8d7jvv6ys5iq4nynya"; + revision = "2"; + editedCabalFile = "1sfj2li0p0bq1dmk85i74jmgcz28vb2q151d16rcjzx8x07kyrq4"; libraryHaskellDepends = [ base hostname shh time ]; testHaskellDepends = [ base tasty ]; description = "Utility functions for using shh"; @@ -238164,8 +238690,8 @@ self: { }: mkDerivation { pname = "slynx"; - version = "0.4.1"; - sha256 = "1cmbk2ynyd5il0jlci5jbc2mn4vhwgrbr7041vgivnqg3p5mb1lx"; + version = "0.5.0"; + sha256 = "0n1d90bmqbiw3w5abncqlk39vca59hd5zkk02q5ickf97zfqik00"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -243805,6 +244331,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stack-all" = callPackage + ({ mkDerivation, base, config-ini, directory, extra, filepath + , process, simple-cmd, simple-cmd-args, text + }: + mkDerivation { + pname = "stack-all"; + version = "0.1"; + sha256 = "0gn20y7lyfpzzxg296rb4fd6nn1v0p3al6x1q78bdyhixjgk2plc"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base config-ini directory extra filepath process simple-cmd + simple-cmd-args text + ]; + description = "CLI tool for building across Stackage major versions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stack-bump" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, filepath , Glob, hspec, lens, lens-aeson, optparse-applicative, process @@ -247690,6 +248234,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "strict-tuple_0_1_4" = callPackage + ({ mkDerivation, base, bifunctors, deepseq, hashable }: + mkDerivation { + pname = "strict-tuple"; + version = "0.1.4"; + sha256 = "06fyf58kl3c5xpfdd5h7368ggbfadm5n67h3kqajrsgh3yl84hrq"; + libraryHaskellDepends = [ base bifunctors deepseq hashable ]; + testHaskellDepends = [ base ]; + description = "Strict tuples"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "strict-tuple-lens" = callPackage ({ mkDerivation, base, lens, strict-tuple }: mkDerivation { @@ -253528,6 +254085,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-hspec_1_1_6" = callPackage + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-hspec"; + version = "1.1.6"; + sha256 = "02s82ijs2ringqxsqbm7m3vcy5brmwxa617azxv0v2phi3rdkjvl"; + libraryHaskellDepends = [ + base hspec hspec-core QuickCheck tasty tasty-quickcheck + tasty-smallcheck + ]; + description = "Hspec support for the Tasty test framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-html" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, filepath , generic-deriving, mtl, semigroups, stm, tagged, tasty, text @@ -254420,6 +254994,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "technique" = callPackage + ({ mkDerivation, async, base, containers, core-data, core-program + , core-text, dlist, free, hashable, hspec, ivar-simple, megaparsec + , mtl, parser-combinators, prettyprinter, text, transformers + , uuid-types + }: + mkDerivation { + pname = "technique"; + version = "0.2.5"; + sha256 = "03z8m5hmchrpc2bvs9r2dkbjfdx05y92wwc5vl04rc9895k74g3l"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + async base containers core-data core-program core-text dlist free + hashable ivar-simple megaparsec mtl parser-combinators + prettyprinter text transformers uuid-types + ]; + executableHaskellDepends = [ + base containers core-data core-program core-text dlist free + ivar-simple megaparsec parser-combinators prettyprinter text + ]; + testHaskellDepends = [ + async base containers core-data core-program core-text dlist free + hashable hspec ivar-simple megaparsec mtl parser-combinators + prettyprinter text transformers uuid-types + ]; + doHaddock = false; + description = "Procedures and Sequences"; + license = stdenv.lib.licenses.mit; + }) {}; + "teeth" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -254525,8 +255130,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.3.3"; - sha256 = "0lbk7j6y2hzkd5hhd1wsdvsixgnim1xzy1nram2msm5jin9wy9rb"; + version = "0.3.4"; + sha256 = "1a007ldp20lcmv55zjca5hc0pszvp2n5yprl4lri9dn49xa8mf6k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -254537,10 +255142,11 @@ self: { unordered-containers ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring cron hashable http-api-data - http-client http-client-tls monad-control mtl pretty-show - profunctors servant servant-client split stm template-haskell text - time transformers unordered-containers + aeson aeson-pretty base bytestring cron filepath hashable + http-api-data http-client http-client-tls monad-control mtl + pretty-show profunctors servant servant-client servant-multipart + split stm template-haskell text time transformers + unordered-containers ]; description = "Easy to use library for building Telegram bots"; license = stdenv.lib.licenses.bsd3; @@ -255683,8 +256289,8 @@ self: { }: mkDerivation { pname = "tesla"; - version = "0.2.0.0"; - sha256 = "0gpzkrh5238n42h158np1k14a28y11kgicwbv6w4br6h0rnbr9d3"; + version = "0.3.0.1"; + sha256 = "0idn4pgzkg1n1xq5z3qihrb7nrpaxba3y98vcx52nl35c4flps4p"; libraryHaskellDepends = [ aeson base bytestring casing containers exceptions generic-deriving lens lens-aeson monad-logger mtl template-haskell text time @@ -260668,20 +261274,20 @@ self: { broken = true; }) {}; - "tldr_0_8_0" = callPackage + "tldr_0_9_0" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cmark, containers - , directory, filepath, optparse-applicative, semigroups, tasty - , tasty-golden, text, typed-process + , directory, filepath, http-conduit, optparse-applicative + , semigroups, tasty, tasty-golden, text, time, zip-archive }: mkDerivation { pname = "tldr"; - version = "0.8.0"; - sha256 = "02by0mj2mk2k8xwcn92zd0cns8fj6fibi0wx5h2zlnm5aj53nffv"; + version = "0.9.0"; + sha256 = "0dixx8i6ka3ksfcr6bjybs1i3ry0wpiffsmskh56cxxcys0jgm5h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base bytestring cmark containers directory filepath - optparse-applicative semigroups text typed-process + http-conduit optparse-applicative semigroups text time zip-archive ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-golden ]; @@ -260781,8 +261387,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.4.1"; - sha256 = "07fql189rm0xc7vx3ch86n5xrhd57zn2h80gxwmr9qaqc5p9b2qp"; + version = "0.5.0"; + sha256 = "1q7mca9gg9fshj5d2yhbvv3ll33z7h7ga3lbli3fax6dk2ncw6pm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262173,6 +262779,28 @@ self: { broken = true; }) {}; + "tracing_0_0_5_2" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, hspec, http-client, mtl, network + , random, stm, text, time, transformers, unliftio + }: + mkDerivation { + pname = "tracing"; + version = "0.0.5.2"; + sha256 = "0h0ga56pikym7igqzbb4lm1qnjnfzn533z0mx7jz3hjpgflk8xxs"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive containers + http-client mtl network random stm text time transformers unliftio + ]; + testHaskellDepends = [ + base containers hspec mtl stm text unliftio + ]; + description = "Distributed tracing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tracing-control" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, hspec, http-client, lifted-base @@ -262291,8 +262919,8 @@ self: { }: mkDerivation { pname = "trade-journal"; - version = "0.0.1"; - sha256 = "1zmpqwrgwf26l9gwcavhgq8d9w0bc9c5sjqkr0i7d1rbiqiqf94j"; + version = "0.0.2"; + sha256 = "0832dn76mfsm0a6hgw9dxzjzvn8rxkrycw5rf439gq7piqcjbbbp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -265986,15 +266614,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "type-of-html_1_6_0_0" = callPackage + "type-of-html_1_6_1_2" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim , hspec, QuickCheck, random, text, weigh }: mkDerivation { pname = "type-of-html"; - version = "1.6.0.0"; - sha256 = "1blwdwr0ryq3as7dc1wh9ixxy81q600hmm5d4bw768a5kbjc1sj6"; + version = "1.6.1.2"; + sha256 = "0dgfj4jk9bs6fjmmvsjxjpnvrd4nxmrnhdgvmawlfs5nib4r4al6"; libraryHaskellDepends = [ base bytestring containers double-conversion ghc-prim text ]; @@ -266665,8 +267293,6 @@ self: { doHaddock = false; description = "Efficient implementation of a dependent map with types as keys"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "types-compat" = callPackage @@ -267311,8 +267937,8 @@ self: { ({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }: mkDerivation { pname = "ukrainian-phonetics-basic"; - version = "0.1.10.0"; - sha256 = "14rc2jx621brka5sgxa8m5s38bqyzqdc1jw808zw6mll4hg6scvx"; + version = "0.2.0.2"; + sha256 = "016q1wq4wbwxjd3a4fbj68h525q8gc2v1gn211mq3divhzc3rhwz"; libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = stdenv.lib.licenses.mit; @@ -268225,6 +268851,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uniplate_1_6_13" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hashable, syb + , unordered-containers + }: + mkDerivation { + pname = "uniplate"; + version = "1.6.13"; + sha256 = "1lis5qcb5j7yzd1cqjaqpb6bmkyjfb7l4nhk3ykmcma4513cjxz7"; + libraryHaskellDepends = [ + base containers ghc-prim hashable syb unordered-containers + ]; + description = "Help writing simple, concise and fast generic operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uniprot-kb" = callPackage ({ mkDerivation, attoparsec, base, hspec, neat-interpolation , QuickCheck, text @@ -268393,8 +269035,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-examples"; - version = "0.14.1.0"; - sha256 = "191ihc62lzgdnzr0z0skgrxb5zg1jbnv2g6faafy9krla3j4rn4s"; + version = "0.14.5.0"; + sha256 = "0c30dd5x1bgk40gzfa5wdrnlam0j41z0cpd1dhmcj6fzwd1l2nra"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -268430,8 +269072,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-general"; - version = "0.5.2.0"; - sha256 = "08jprdi4rlq6i923q9lg6mjbiyphh26ray6kbi1pk84im3y0s6bm"; + version = "0.5.3.0"; + sha256 = "080s606ckbm34d5r4lr1dyvnd0zjs5mc8nn2g04xyw6ym9fsxjaa"; libraryHaskellDepends = [ base print-info uniqueness-periods-vector-common vector ]; @@ -269704,8 +270346,8 @@ self: { }: mkDerivation { pname = "update-nix-fetchgit"; - version = "0.2.3"; - sha256 = "1fmpmwg31gnablwp22a90l7q5hj6xxd57cxf3zbp3mv1xabd341k"; + version = "0.2.4"; + sha256 = "0ginchdkd4ihcji8m0350fam4js5z5pnbmammvnv4abgvqq05mqy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -271125,19 +271767,14 @@ self: { }) {}; "uusi" = callPackage - ({ mkDerivation, base, Cabal, colourista, directory, microlens - , optparse-applicative, process, text - }: + ({ mkDerivation, base, Cabal, text }: mkDerivation { pname = "uusi"; - version = "0.0.1.0"; - sha256 = "1kxhrkfsw6n2ic5f41bw2cjpix1k9ij5s3fhvsxgfiiwn7h5g7x2"; + version = "0.1.0.0"; + sha256 = "1b56rasvypkp8scyxmc090jxk431lbjn72kj4md06cl9z0dg3w2r"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ - base Cabal colourista directory microlens optparse-applicative - process text - ]; + executableHaskellDepends = [ base Cabal text ]; description = "Remove all version constraints of dependencies in .cabal file"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -274048,7 +274685,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vty_5_31" = callPackage + "vty_5_32" = callPackage ({ mkDerivation, ansi-terminal, base, binary, blaze-builder , bytestring, Cabal, containers, deepseq, directory, filepath , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl @@ -274059,8 +274696,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.31"; - sha256 = "0w71qnp1plqpib0b9c5kqyhybfmlw50hnlckw9jwr7m0mfssbqdb"; + version = "5.32"; + sha256 = "0ydbifik7xilb33phglpjkgf6r8vifipyyq0wb6111azzj7dmszs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -274161,8 +274798,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.12"; - sha256 = "1ysqa9vps8jkrcapbrans3k4aljw3wysqlq5z9qds29zrhki4dd0"; + version = "3.6.13"; + sha256 = "1js5wgjr5mcqmhaqvhyln2xq4008rk8kdhjiwh8lwsc3qjqxyibp"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -274182,17 +274819,20 @@ self: { }) {}; "vulkan-utils" = callPackage - ({ mkDerivation, base, bytestring, extra, file-embed, filepath - , template-haskell, temporary, typed-process, vulkan + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest + , extra, file-embed, filepath, template-haskell, temporary + , typed-process, vulkan }: mkDerivation { pname = "vulkan-utils"; - version = "0.1.2.1"; - sha256 = "1ixjw397aqw04p2gy1d1pg9c3rdww2czakqg21ihg7ldi894n8pa"; + version = "0.1.3"; + sha256 = "0f7bpck2g9bv1jgfj1paz305yfrhcsad3g70ybazddzh138qhgny"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring extra file-embed filepath template-haskell temporary typed-process vulkan ]; + testHaskellDepends = [ base doctest ]; description = "Utils for the vulkan package"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -275733,6 +276373,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-rate-limit" = callPackage + ({ mkDerivation, base, http-types, wai }: + mkDerivation { + pname = "wai-rate-limit"; + version = "0.1.0.0"; + sha256 = "1z7npcf0smzyfjvkmpa6dw08sg3ywx4cc4kafgxk95dh8yqnmidw"; + libraryHaskellDepends = [ base http-types wai ]; + description = "Rate limiting as WAI middleware"; + license = stdenv.lib.licenses.mit; + }) {}; + + "wai-rate-limit-redis" = callPackage + ({ mkDerivation, base, bytestring, hedis, http-types, tasty + , tasty-hedgehog, tasty-hunit, wai, wai-extra, wai-rate-limit, warp + }: + mkDerivation { + pname = "wai-rate-limit-redis"; + version = "0.1.0.0"; + sha256 = "1lwlx6krxq1pf5a2r2n4pc5crk4ia8r50xzdhrg3fjf9ydpcbv2n"; + libraryHaskellDepends = [ base bytestring hedis wai-rate-limit ]; + testHaskellDepends = [ + base bytestring hedis http-types tasty tasty-hedgehog tasty-hunit + wai wai-extra wai-rate-limit warp + ]; + description = "Redis backend for rate limiting as WAI middleware"; + license = stdenv.lib.licenses.mit; + }) {}; + "wai-request-spec" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, http-types, text, wai @@ -284747,6 +285415,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth-hashdb_1_7_1_5" = callPackage + ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers + , hspec, http-conduit, http-types, monad-logger, network-uri + , persistent, persistent-sqlite, resourcet, text + , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core + , yesod-form, yesod-persistent, yesod-test + }: + mkDerivation { + pname = "yesod-auth-hashdb"; + version = "1.7.1.5"; + sha256 = "14isl9mwxarba14aqhidi82yci36jdws6af2jirv7z8mfnrwysbi"; + libraryHaskellDepends = [ + aeson base bytestring persistent text yesod-auth yesod-core + yesod-form yesod-persistent + ]; + testHaskellDepends = [ + aeson base basic-prelude bytestring containers hspec http-conduit + http-types monad-logger network-uri persistent-sqlite resourcet + text unordered-containers wai-extra yesod yesod-auth yesod-core + yesod-test + ]; + description = "Authentication plugin for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-hmac-keccak" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, mtl , persistent, random, shakespeare, text, yesod-auth, yesod-core @@ -285187,6 +285881,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_18_6" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, bytestring, case-insensitive, cereal, clientsession + , conduit, conduit-extra, containers, cookie, deepseq, fast-logger + , gauge, hspec, hspec-expectations, http-types, HUnit, memory + , monad-logger, mtl, network, parsec, path-pieces, primitive + , random, resourcet, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.18.6"; + sha256 = "1iay7lrc52krhnlkvr6bxchnwk9lj316fv2d47bh3bfay69wqc69"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq fast-logger http-types memory + monad-logger mtl parsec path-pieces primitive random resourcet + shakespeare template-haskell text time transformers unix-compat + unliftio unordered-containers vector wai wai-extra wai-logger warp + word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -285331,15 +286063,14 @@ self: { "yesod-eventsource" = callPackage ({ mkDerivation, base, blaze-builder, conduit, transformers, wai - , wai-eventsource, wai-extra, yesod-core + , wai-extra, yesod-core }: mkDerivation { pname = "yesod-eventsource"; - version = "1.6.0"; - sha256 = "12s11q6zga37xyynll7b30gpv02k7jmmzfassshci02y9niyrkkg"; + version = "1.6.0.1"; + sha256 = "0h8gyvlqvp6zm6kfmiwa0z7ic2377f0vi43fgcn5mlssv890z8gh"; libraryHaskellDepends = [ - base blaze-builder conduit transformers wai wai-eventsource - wai-extra yesod-core + base blaze-builder conduit transformers wai wai-extra yesod-core ]; description = "Server-sent events support for Yesod apps"; license = stdenv.lib.licenses.mit; @@ -289269,8 +290000,6 @@ self: { ]; description = "Password strength estimation based on zxcvbn"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; } From 9028b8f341a4fb6d1a86da37755403afa892364f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Nov 2020 22:00:45 +0100 Subject: [PATCH 055/164] haskell-time-compat: update to latest version so that binary-instances compiles --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 02cb1d10aaa0..4ede06883ce8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1442,6 +1442,9 @@ self: super: { autoapply = super.autoapply.override { th-desugar = self.th-desugar_1_11; }; + # binary-instances needs the latest version. + time-compat = self.time-compat_1_9_4; + # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let inherit (self) hls-ghcide hls-brittany; From a3d8c1284f573486267f5387fef354f92eb20a67 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 7 Nov 2020 12:36:06 +0800 Subject: [PATCH 056/164] haskell: add addTestToolDepends --- pkgs/development/haskell-modules/lib.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 58d50592ac42..192a531e5d14 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -156,6 +156,9 @@ rec { addBuildDepend = drv: x: addBuildDepends drv [x]; addBuildDepends = drv: xs: overrideCabal drv (drv: { buildDepends = (drv.buildDepends or []) ++ xs; }); + addTestToolDepend = drv: x: addTestToolDepends drv [x]; + addTestToolDepends = drv: xs: overrideCabal drv (drv: { testToolDepends = (drv.testToolDepends or []) ++ xs; }); + addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x]; addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkgconfigDepends = (drv.pkgconfigDepends or []) ++ xs; }); From 4f0af81b01bf3c4640b2318159b51dd49f757dfe Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 6 Nov 2020 14:53:08 +0800 Subject: [PATCH 057/164] haskellPackages.optparse-applicative_0_16_0_0: Fix for compgen error --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4ede06883ce8..02bf9fa2cea9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -85,6 +85,11 @@ self: super: { url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff"; sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql"; }); + optparse-applicative_0_16_0_0 = appendPatch super.optparse-applicative_0_16_0_0 (pkgs.fetchpatch { + name = "optparse-applicative-0.15.1-hercules-ci-compgen.diff"; + url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff"; + sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql"; + }); # Fix test trying to access /home directory shell-conduit = overrideCabal super.shell-conduit (drv: { From 738d4fef65684233ab7e603b324d0aaa0151d1db Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 6 Nov 2020 14:29:46 +0800 Subject: [PATCH 058/164] haskellPackages.optparse-generic_1_4_4: Correct version of dependency --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 02bf9fa2cea9..96686d990bf6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1450,6 +1450,10 @@ self: super: { # binary-instances needs the latest version. time-compat = self.time-compat_1_9_4; + optparse-generic_1_4_4 = super.optparse-generic_1_4_4.override { + optparse-applicative = self.optparse-applicative_0_16_0_0; + }; + # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let inherit (self) hls-ghcide hls-brittany; From b95bea03858c050fcd8cd2673a253aed45a0307a Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 6 Nov 2020 14:31:00 +0800 Subject: [PATCH 059/164] haskellPackages.update-nix-fetchgit: Several fixes Fix versions of dependencies Generate shell completions Wrap executable so that required executables are in PATH Make sure necessary executables for tests are present during build --- .../haskell-modules/configuration-common.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 96686d990bf6..32a539c65735 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1450,6 +1450,23 @@ self: super: { # binary-instances needs the latest version. time-compat = self.time-compat_1_9_4; + # - Deps are required during the build for testing and also during execution, + # so add them to build input and also wrap the resulting binary so they're in + # PATH. + update-nix-fetchgit = let deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ]; + in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal + (addTestToolDepends (super.update-nix-fetchgit.overrideScope (self: super: { + optparse-generic = self.optparse-generic_1_4_4; + optparse-applicative = self.optparse-applicative_0_16_0_0; + })) deps) (drv: { + buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ]; + postInstall = drv.postInstall or "" + '' + wrapProgram "$out/bin/update-nix-fetchgit" --prefix 'PATH' ':' "${ + pkgs.lib.makeBinPath deps + }" + ''; + })); + optparse-generic_1_4_4 = super.optparse-generic_1_4_4.override { optparse-applicative = self.optparse-applicative_0_16_0_0; }; From e5570d9f8bb9500cbddc24923ca8291d58ed2a2e Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 6 Nov 2020 14:32:06 +0800 Subject: [PATCH 060/164] update-nix-fetchgit: standalone small closure --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3667a63a03e6..392504146027 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6209,6 +6209,8 @@ in update-dotdee = with python3Packages; toPythonApplication update-dotdee; + update-nix-fetchgit = haskell.lib.justStaticExecutables haskellPackages.update-nix-fetchgit; + update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { }; From 407bb3ba3fa6a0e4313007e3d3eac768ff550c02 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 7 Nov 2020 13:03:29 +0800 Subject: [PATCH 061/164] haskell: whitespace fixes --- pkgs/development/haskell-modules/lib.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 192a531e5d14..4d0954a5d7af 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -86,11 +86,11 @@ rec { future. Instead of jailbreaking, you can patch the cabal file. - + Note that jailbreaking at this time, doesn't lift bounds on - conditional branches. + conditional branches. https://github.com/peti/jailbreak-cabal/issues/7 has further details. - + */ doJailbreak = drv: overrideCabal drv (drv: { jailbreak = true; }); From 01a403fb717f55ff3db000d02f4b555a2da6a696 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 7 Nov 2020 13:28:53 +0900 Subject: [PATCH 062/164] haskellPackages.quickcheck-instances: no longer needs doJailbreak in ghc-8.8. --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 220a8e5c207a..d0a070a72e15 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -69,7 +69,6 @@ self: super: { integer-logarithms = doJailbreak super.integer-logarithms; lucid = doJailbreak super.lucid; parallel = doJailbreak super.parallel; - quickcheck-instances = doJailbreak super.quickcheck-instances; setlocale = doJailbreak super.setlocale; split = doJailbreak super.split; system-fileio = doJailbreak super.system-fileio; From bbb5016daa17b8a55d1cd77074e75787f956e88f Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 7 Nov 2020 14:11:41 +0900 Subject: [PATCH 063/164] haskellPackages.binary-instances: get building again --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 32a539c65735..cea7980be395 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1471,6 +1471,10 @@ self: super: { optparse-applicative = self.optparse-applicative_0_16_0_0; }; + # Our quickcheck-instances is too old for the newer binary-instances, but + # quickcheck-instances is only used in the tests of binary-instances. + binary-instances = dontCheck super.binary-instances; + # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let inherit (self) hls-ghcide hls-brittany; From 7673eda11d59309e1b9051252e44caffc98c8052 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 7 Nov 2020 17:50:17 +0800 Subject: [PATCH 064/164] haskell: Add documentationTarball to lib --- pkgs/development/haskell-modules/lib.nix | 25 +++++++++++++++++++ pkgs/test/default.nix | 1 + .../haskell-documentationTarball/default.nix | 17 +++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 pkgs/test/haskell-documentationTarball/default.nix diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 4d0954a5d7af..6bcc563164eb 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -235,6 +235,31 @@ rec { fixupPhase = ":"; }); + /* Create a documentation tarball suitable for uploading to Hackage instead + of building the package. + */ + documentationTarball = pkg: + pkgs.lib.overrideDerivation pkg (drv: { + name = "${drv.name}-docs"; + # Like sdistTarball, disable the "doc" output here. + outputs = [ "out" ]; + buildPhase = '' + runHook preHaddock + ./Setup haddock --for-hackage + runHook postHaddock + ''; + haddockPhase = ":"; + checkPhase = ":"; + installPhase = '' + runHook preInstall + mkdir -p "$out" + tar --format=ustar \ + -czf "$out/${drv.name}-docs.tar.gz" \ + -C dist/doc/html "${drv.name}-docs" + runHook postInstall + ''; + }); + /* Use the gold linker. It is a linker for ELF that is designed "to run as fast as possible on modern systems" */ diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index d9befb9350ad..7ee7d21fd56e 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -23,6 +23,7 @@ with pkgs; stdenv-inputs = callPackage ./stdenv-inputs { }; haskell-shellFor = callPackage ./haskell-shellFor { }; + haskell-documentationTarball = callPackage ./haskell-documentationTarball { }; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; diff --git a/pkgs/test/haskell-documentationTarball/default.nix b/pkgs/test/haskell-documentationTarball/default.nix new file mode 100644 index 000000000000..aec3dc41f268 --- /dev/null +++ b/pkgs/test/haskell-documentationTarball/default.nix @@ -0,0 +1,17 @@ +{ pkgs, haskellPackages }: + +let + drv = haskellPackages.vector; + docs = pkgs.haskell.lib.documentationTarball drv; + +in pkgs.runCommand "test haskell.lib.documentationTarball" { } '' + tar xvzf "${docs}/${drv.name}-docs.tar.gz" + + # Check for Haddock html + find "${drv.name}-docs" | grep -q "Data-Vector.html" + + # Check for source html + find "${drv.name}-docs" | grep -q "src/Data.Vector.html" + + touch "$out" +'' From bc1ffa457e87513096e3c01e8689524b5a5f3e47 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 9 Nov 2020 23:24:10 +0100 Subject: [PATCH 065/164] haskellPackages.pandoc: 2.11.1 -> 2.11.1.1 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cea7980be395..8280b225dcb6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1430,7 +1430,7 @@ self: super: { skylighting-core = doDistribute super.skylighting-core_0_10_0_3; hslua = doDistribute self.hslua_1_1_2; jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; - pandoc = doDistribute self.pandoc_2_11_1; + pandoc = doDistribute self.pandoc_2_11_1_1; # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2); pandoc-types = doDistribute self.pandoc-types_1_22; From 798e23c74fccbf4f4582aff3b3f24f5846412e0b Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 9 Nov 2020 23:25:18 +0100 Subject: [PATCH 066/164] haskellPackages.reflex-dom-core: Remove obsolete patches --- .../haskell-modules/configuration-common.nix | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8280b225dcb6..e6a70c0e27cc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1261,25 +1261,7 @@ self: super: { patch = doJailbreak super.patch; # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 - # Tests disabled because of very old dep: https://github.com/reflex-frp/reflex-dom/issues/393 - reflex-dom-core = doDistribute (unmarkBroken (dontCheck (appendPatches super.reflex-dom-core [ - # Upstream PR: https://github.com/reflex-frp/reflex-dom/pull/388 - # Fix upper bounds - (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex-dom/commit/5ef04d8e478f410d2c63603b84af052c9273a533.patch"; - sha256 ="0d0b819yh8mqw8ih5asdi9qcca2kmggfsi8gf22akfw1n7xvmavi"; - stripLen = 2; - extraPrefix = ""; - }) - # Upstream PR: https://github.com/reflex-frp/reflex-dom/pull/394 - # Bump dependent-map - (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex-dom/commit/695bd17d5dcdb1bf321ee8858670731637f651db.patch"; - sha256 ="0llky3i37rakgsw9vqaqmwryv7s91w8ph8xjkh83nxjs14p5zfyk"; - stripLen = 2; - extraPrefix = ""; - }) - ]))); + reflex-dom-core = doDistribute (unmarkBroken (dontCheck super.reflex-dom-core)); # add unreleased commit fixing version constraint as a patch # Can be removed if https://github.com/lpeterse/haskell-utc/issues/8 is resolved From becd5f5bc3c040b6220f1c8f1299ea5ff05c3a6a Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 11 Nov 2020 00:30:20 +0100 Subject: [PATCH 067/164] haskellPackages.matterhorn: Fix eval --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e6a70c0e27cc..364f6370e0f4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -340,7 +340,7 @@ self: super: { # Needs the latest version of vty and brick. matterhorn = super.matterhorn.overrideScope (self: super: { brick = self.brick_0_57; - vty = self.vty_5_31; + vty = self.vty_5_32; }); memcache = dontCheck super.memcache; From bf29c147c3fc616267868da67b28c3253e78b0c8 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 10 Nov 2020 22:07:19 +0100 Subject: [PATCH 068/164] haskellPackages.haskell-language-server: Fix build In preparation of the upcoming 0.6.0 release I wanted to fix hls. It introduces two new plugin packages, which are not on hackage yet. I remove apply-refact overrides, because current apply-refact versions are compatible with all ghcs we support, according to their changelog. I override more of the hls dependencies globally on the whole package set, to avoid a lot of duplicate compilations. And because @peti changed my mind about this being a good practice. hls now uses a released version of ghcide --- .../haskell-modules/configuration-common.nix | 44 ++++++-------- .../configuration-ghc-8.10.x.nix | 3 - .../configuration-ghc-8.6.x.nix | 3 - .../configuration-ghc-8.8.x.nix | 3 - .../configuration-hackage2nix.yaml | 4 -- .../haskell-modules/non-hackage-packages.nix | 3 +- .../haskell-language-server/default.nix | 28 ++++----- .../haskell-language-server/hls-ghcide.nix | 60 ------------------- .../hls-hlint-plugin.nix | 26 ++++++++ .../hls-tactics-plugin.nix | 32 ++++++++++ .../haskell/haskell-language-server/update.sh | 20 +------ 11 files changed, 95 insertions(+), 131 deletions(-) delete mode 100644 pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix create mode 100644 pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix create mode 100644 pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 364f6370e0f4..c4b10e436ace 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1229,14 +1229,6 @@ self: super: { sha256 = "0xbfhzhzg94b4r5qy5dg1c40liswwpqarrc2chcwgfbfnrmwkfc2"; }); - # this will probably need to get updated with every ghcide update, - # we need an override because ghcide is tracking haskell-lsp closely. - ghcide = dontCheck (super.ghcide.overrideScope (self: super: { - hie-bios = dontCheck super.hie-bios_0_7_1; - lsp-test = dontCheck self.lsp-test_0_11_0_7; - })); - implicit-hie-cradle = super.implicit-hie-cradle.override { hie-bios = dontCheck super.hie-bios_0_7_1; }; - # hasn‘t bumped upper bounds # upstream: https://github.com/obsidiansystems/which/pull/6 which = doJailbreak super.which; @@ -1459,25 +1451,27 @@ self: super: { # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let - inherit (self) hls-ghcide hls-brittany; - hlsScopeOverride = self: super: { - # haskell-language-server uses its own fork of ghcide - # Test disabled: it seems to freeze (is it just that it takes a long time ?) - ghcide = dontCheck hls-ghcide; - # we are faster than stack here - hie-bios = dontCheck super.hie-bios_0_7_1; - lsp-test = dontCheck super.lsp-test_0_11_0_7; - # fourmolu can‘t compile with an older aeson + # fourmolu can‘t compile with an older aeson + overrideAeson = name: value: value.overrideScope (self: super: { aeson = dontCheck super.aeson_1_5_2_0; - # brittany has an aeson upper bound of 1.5 - brittany = hls-brittany; + }); + in pkgs.lib.mapAttrs overrideAeson { + # tons of overrides for bleeding edge versions for ghcide and hls + # overriding aeson on all of them to prevent double compilations + # this shouldn‘t break anything because nearly all their reverse deps are + # in this list or marked as broken anyways + haskell-language-server = dontCheck super.haskell-language-server; + fourmolu = dontCheck super.fourmolu; + stylish-haskell = super.stylish-haskell_0_12_2_0; + ghcide = dontCheck super.ghcide; + refinery = super.refinery_0_3_0_0; data-tree-print = doJailbreak super.data-tree-print; ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_2; - }; - in { - haskell-language-server = dontCheck (super.haskell-language-server.overrideScope hlsScopeOverride); - hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride); - hls-brittany = dontCheck (super.hls-brittany.overrideScope hlsScopeOverride); - fourmolu = dontCheck (super.fourmolu.overrideScope hlsScopeOverride); + hie-bios = dontCheck super.hie-bios_0_7_1; + lsp-test = dontCheck super.lsp-test_0_11_0_7; + # the hls brittany is objectively better, because there hasn‘t been a + # brittany release in a while and this version works with 8.10. + # And we need to build it anyways. + brittany = dontCheck super.hls-brittany; } ) // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 047c5ba481fb..b801a08a9eab 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -111,9 +111,6 @@ self: super: { sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; }); - # Only 0.8 is compatible with ghc 8.10 https://hackage.haskell.org/package/apply-refact/changelog - apply-refact = super.apply-refact_0_8_0_0; - # https://github.com/commercialhaskell/pantry/issues/21 pantry = appendPatch super.pantry (pkgs.fetchpatch { name = "add-cabal-3.2.x-support.patch"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index f2da20426ace..0a64c20ea7a5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -91,7 +91,4 @@ self: super: { # ghc versions prior to 8.8.x needs additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; - - # Only 0.6 is compatible with ghc 8.6 https://hackage.haskell.org/package/apply-refact/changelog - apply-refact = super.apply-refact_0_6_0_0; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index d0a070a72e15..718186c9f38f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -104,9 +104,6 @@ self: super: { # of issues with Cabal 3.x. darcs = dontDistribute super.darcs; - # Only 0.7 is compatible with ghc 8.7 https://hackage.haskell.org/package/apply-refact/changelog - apply-refact = super.apply-refact_0_7_0_0; - # The package needs the latest Cabal version. cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c232eb7162ad..9ff253a42326 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2546,10 +2546,6 @@ extra-packages: - aeson-pretty < 0.8 # required by elm compiler - Agda == 2.6.1 # allows the agdaPackage set to be fixed to this version so that it won't break when another agda version is released. - ansi-terminal == 0.10.3 # required by cabal-plan, and policeman in ghc-8.8.x - - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x - - apply-refact == 0.6.0.0 # works with GHC 8.6.x https://hackage.haskell.org/package/apply-refact/changelog - - apply-refact == 0.7.0.0 # works with GHC 8.8.x https://hackage.haskell.org/package/apply-refact/changelog - - apply-refact == 0.8.0.0 # works with GHC 8.10.x https://hackage.haskell.org/package/apply-refact/changelog - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - Cabal == 2.2.* # required for jailbreak-cabal etc. diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 52a2737ebb74..c79673a28646 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -22,8 +22,9 @@ self: super: { # HLS and its fork of ghcide that it uses # both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { }; - hls-ghcide = self.callPackage ../tools/haskell/haskell-language-server/hls-ghcide.nix { }; hls-brittany = self.callPackage ../tools/haskell/haskell-language-server/hls-brittany.nix { }; + hls-hlint-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-hlint-plugin.nix { }; + hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { }; nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { }; diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix index 0c1b6d0dbcca..530ed7c28391 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -1,22 +1,22 @@ { mkDerivation, aeson, base, binary, blaze-markup, brittany , bytestring, containers, data-default, deepseq, directory, extra -, fetchgit, filepath, fingertree, floskell, fourmolu, ghc -, ghc-boot-th, ghc-exactprint, ghc-paths, ghc-source-gen, ghcide -, gitrev, hashable, haskell-lsp, hie-bios, hls-plugin-api, hslogger +, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th +, ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios +, hls-hlint-plugin, hls-plugin-api, hls-tactics-plugin, hslogger , hspec, hspec-core, lens, lsp-test, mtl, optparse-applicative -, optparse-simple, ormolu, process, refinery, regex-tdfa, retrie -, safe-exceptions, shake, stdenv, stm, stylish-haskell, syb, tasty +, optparse-simple, ormolu, process, regex-tdfa, retrie +, safe-exceptions, shake, stdenv, stm, stylish-haskell, tasty , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit , tasty-rerun, temporary, text, time, transformers , unordered-containers, yaml }: mkDerivation { pname = "haskell-language-server"; - version = "0.5.0.0"; + version = "0.5.1.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "1qi762fa72487i8fspxmr8xizm9n2s1shxsvnvsl67vj9if573r9"; - rev = "3ca2a6cd267f373aae19f59e1cf9e04b6524eff3"; + sha256 = "1w15p988a5h11fcp25lllaj7j78f35gzg5bixy1vs7ld0p6jj7n9"; + rev = "8682517e9ff92caa35e727e28445896f97c61e8d"; fetchSubmodules = true; }; isLibrary = true; @@ -29,12 +29,12 @@ mkDerivation { ]; executableHaskellDepends = [ aeson base binary brittany bytestring containers deepseq directory - extra filepath fingertree floskell fourmolu ghc ghc-boot-th - ghc-exactprint ghc-paths ghc-source-gen ghcide gitrev hashable - haskell-lsp hie-bios hls-plugin-api hslogger lens mtl - optparse-applicative optparse-simple ormolu process refinery - regex-tdfa retrie safe-exceptions shake stylish-haskell syb - temporary text time transformers unordered-containers + extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide + gitrev hashable haskell-lsp hie-bios hls-hlint-plugin + hls-plugin-api hls-tactics-plugin hslogger lens mtl + optparse-applicative optparse-simple ormolu process regex-tdfa + retrie safe-exceptions shake stylish-haskell temporary text time + transformers unordered-containers ]; testHaskellDepends = [ aeson base blaze-markup bytestring containers data-default diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix deleted file mode 100644 index 450c665bef85..000000000000 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ mkDerivation, aeson, array, async, base, base16-bytestring -, binary, bytestring, Chart, Chart-diagrams, containers -, cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg -, directory, extra, fetchgit, filepath, fingertree, fuzzy, ghc -, ghc-boot, ghc-boot-th, ghc-check, ghc-paths -, ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable -, haskell-lsp, haskell-lsp-types, hie-bios, hslogger -, implicit-hie-cradle, lens, lsp-test, mtl, network-uri -, optparse-applicative, prettyprinter, prettyprinter-ansi-terminal -, process, QuickCheck, quickcheck-instances -, record-dot-preprocessor, record-hasfield, regex-tdfa -, rope-utf16-splay, safe, safe-exceptions, shake, sorted-list -, stdenv, stm, syb, tasty, tasty-expected-failure, tasty-hunit -, tasty-quickcheck, tasty-rerun, text, time, transformers, unix -, unordered-containers, utf8-string, yaml -}: -mkDerivation { - pname = "ghcide"; - version = "0.4.0"; - src = fetchgit { - url = "https://github.com/haskell/ghcide"; - sha256 = "0zv14mvfhmwwkhyzkr38qpvyffa8ywzp41lr1k55pbrc5b10fjr6"; - rev = "0bfce3114c28bd00f7bf5729c32ec0f23a8d8854"; - fetchSubmodules = true; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array async base base16-bytestring binary bytestring - containers cryptohash-sha1 data-default deepseq directory extra - filepath fingertree fuzzy ghc ghc-boot ghc-boot-th ghc-check - ghc-paths Glob haddock-library hashable haskell-lsp - haskell-lsp-types hie-bios hslogger implicit-hie-cradle mtl - network-uri prettyprinter prettyprinter-ansi-terminal regex-tdfa - rope-utf16-splay safe safe-exceptions shake sorted-list stm syb - text time transformers unix unordered-containers utf8-string - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory extra - filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios - lens lsp-test optparse-applicative process safe-exceptions text - unordered-containers - ]; - testHaskellDepends = [ - aeson base binary bytestring containers directory extra filepath - ghc ghc-typelits-knownnat haddock-library haskell-lsp - haskell-lsp-types lens lsp-test network-uri optparse-applicative - process QuickCheck quickcheck-instances record-dot-preprocessor - record-hasfield rope-utf16-splay safe safe-exceptions shake tasty - tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun - text - ]; - benchmarkHaskellDepends = [ - aeson base Chart Chart-diagrams diagrams diagrams-svg directory - extra filepath shake text yaml - ]; - homepage = "https://github.com/haskell/ghcide#readme"; - description = "The core of an IDE"; - license = stdenv.lib.licenses.asl20; -} diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix new file mode 100644 index 000000000000..8fd3cdb2a32b --- /dev/null +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix @@ -0,0 +1,26 @@ +{ mkDerivation, aeson, apply-refact, base, binary, bytestring +, containers, data-default, deepseq, Diff, directory, extra +, fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide +, hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens +, regex-tdfa, shake, stdenv, temporary, text, transformers +, unordered-containers +}: +mkDerivation { + pname = "hls-hlint-plugin"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/haskell/haskell-language-server.git"; + sha256 = "1w15p988a5h11fcp25lllaj7j78f35gzg5bixy1vs7ld0p6jj7n9"; + rev = "8682517e9ff92caa35e727e28445896f97c61e8d"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + aeson apply-refact base binary bytestring containers data-default + deepseq Diff directory extra filepath ghc ghc-lib ghc-lib-parser-ex + ghcide hashable haskell-lsp hlint hls-plugin-api hslogger lens + regex-tdfa shake temporary text transformers unordered-containers + ]; + description = "Hlint integration plugin with Haskell Language Server"; + license = stdenv.lib.licenses.asl20; +} diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix new file mode 100644 index 000000000000..5fa0f6ed0cf9 --- /dev/null +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix @@ -0,0 +1,32 @@ +{ mkDerivation, aeson, base, checkers, containers, deepseq +, directory, extra, fetchgit, filepath, fingertree, generic-lens +, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide +, haskell-lsp, hie-bios, hls-plugin-api, hspec, lens, mtl +, QuickCheck, refinery, retrie, shake, stdenv, syb, text +, transformers +}: +mkDerivation { + pname = "hls-tactics-plugin"; + version = "0.5.1.0"; + src = fetchgit { + url = "https://github.com/haskell/haskell-language-server.git"; + sha256 = "1w15p988a5h11fcp25lllaj7j78f35gzg5bixy1vs7ld0p6jj7n9"; + rev = "8682517e9ff92caa35e727e28445896f97c61e8d"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + aeson base containers deepseq directory extra filepath fingertree + generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide + haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text + transformers + ]; + testHaskellDepends = [ + base checkers containers ghc hie-bios hls-plugin-api hspec mtl + QuickCheck + ]; + homepage = "https://github.com/isovector/hls-tactics-plugin#readme"; + description = "LSP server for GHC"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; +} diff --git a/pkgs/development/tools/haskell/haskell-language-server/update.sh b/pkgs/development/tools/haskell/haskell-language-server/update.sh index fd22a80126d9..fbd97b5488a8 100755 --- a/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ b/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -15,24 +15,6 @@ set -eo pipefail # This is the directory of this update.sh script. script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -# =========================== -# ghcide fork on https://github.com/wz1000/ghcide -# =========================== - -# ghcide derivation created with cabal2nix. -ghcide_derivation_file="${script_dir}/hls-ghcide.nix" - -# This is the current revision of hls in Nixpkgs. -ghcide_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$ghcide_derivation_file")" - -# This is the revision of ghcide used by hls on GitHub. -ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/contents/ghcide" | jq '.sha' --raw-output) - -echo "Updating haskell-language-server's ghcide from old version $ghcide_old_version to new version $ghcide_new_version." -echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..." - -cabal2nix --revision "$ghcide_new_version" "https://github.com/haskell/ghcide" > "$ghcide_derivation_file" - # =========================== # HLS maintainer's Brittany fork # =========================== @@ -67,5 +49,7 @@ echo "Updating haskell-language-server from old version $hls_old_version to new echo "Running cabal2nix and outputting to ${hls_derivation_file}..." cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file" +cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix" +cabal2nix --revision "$hls_new_version" --subpath plugins/hls-hlint-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-hlint-plugin.nix" echo "Finished." From 13f96d5d655b2dfa02490d181e3784978deede69 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 11 Nov 2020 10:55:29 +0100 Subject: [PATCH 069/164] haskell-language-server: 0.6.0rc -> 0.6.0 --- .../tools/haskell/haskell-language-server/default.nix | 6 +++--- .../haskell/haskell-language-server/hls-hlint-plugin.nix | 4 ++-- .../haskell/haskell-language-server/hls-tactics-plugin.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix index 530ed7c28391..a19e05759136 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -12,11 +12,11 @@ }: mkDerivation { pname = "haskell-language-server"; - version = "0.5.1.0"; + version = "0.6.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "1w15p988a5h11fcp25lllaj7j78f35gzg5bixy1vs7ld0p6jj7n9"; - rev = "8682517e9ff92caa35e727e28445896f97c61e8d"; + sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj"; + rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix index 8fd3cdb2a32b..3a730dc71642 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix @@ -10,8 +10,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "1w15p988a5h11fcp25lllaj7j78f35gzg5bixy1vs7ld0p6jj7n9"; - rev = "8682517e9ff92caa35e727e28445896f97c61e8d"; + sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj"; + rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot"; diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix index 5fa0f6ed0cf9..3d168622fb7d 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix @@ -10,8 +10,8 @@ mkDerivation { version = "0.5.1.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "1w15p988a5h11fcp25lllaj7j78f35gzg5bixy1vs7ld0p6jj7n9"; - rev = "8682517e9ff92caa35e727e28445896f97c61e8d"; + sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj"; + rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot"; From 425d22e6cfb81c7c4a65407524c1134e2a910391 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 11 Nov 2020 11:42:14 +0100 Subject: [PATCH 070/164] haskellPackages: Fix eval errors --- .../haskell-modules/configuration-hackage2nix.yaml | 2 ++ pkgs/development/haskell-modules/hackage-packages.nix | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9ff253a42326..89a6f825ff89 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7727,6 +7727,7 @@ broken-packages: - mcl - mcm - mcmaster-gloss-examples + - mcmc - mcmc-samplers - mcmc-synthesis - mcpi @@ -8559,6 +8560,7 @@ broken-packages: - pbc4hs - PBKDF2 - pcap-enumerator + - pcapng - pcd-loader - pcf - pcf-font diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8262fdb54c68..5115cbcee680 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -170933,6 +170933,8 @@ self: { ]; description = "Sample from a posterior using Markov chain Monte Carlo"; license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mcmc-samplers" = callPackage @@ -196664,6 +196666,8 @@ self: { text unliftio-core validity ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pcd-loader" = callPackage From ed26917b674b1b42f0c970ec906e5f7e7f88f46a Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 11 Nov 2020 11:42:32 +0100 Subject: [PATCH 071/164] haskellPackages: Cleanup unneeded builds --- .../configuration-hackage2nix.yaml | 2 - .../haskell-modules/hackage-packages.nix | 182 ------------------ 2 files changed, 184 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 89a6f825ff89..11bf99d4516c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2586,8 +2586,6 @@ extra-packages: - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below - network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30) - - ormolu == 0.0.5.0 # required by haskell-language-server - - pandoc-types == 1.21 # required by for pandoc_2_10_1 - pantry == 0.2.0.0 # required by stack-2.1.3.1 - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 - patience ^>= 0.1 # required by chell-0.4.x diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5115cbcee680..5ee222dcdfce 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -31683,136 +31683,6 @@ self: { broken = true; }) {}; - "apply-refact_0_3_0_1" = callPackage - ({ mkDerivation, base, containers, directory, filemanip, filepath - , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact - , silently, syb, tasty, tasty-expected-failure, tasty-golden - , temporary, transformers, unix-compat - }: - mkDerivation { - pname = "apply-refact"; - version = "0.3.0.1"; - sha256 = "0578ql80fzkbjiw589v4498qd9jd7l2sz626imkdybxr1lqbsm0p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filemanip ghc ghc-exactprint mtl process - refact syb temporary transformers unix-compat - ]; - executableHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact syb temporary transformers - unix-compat - ]; - testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact silently syb tasty - tasty-expected-failure tasty-golden temporary transformers - unix-compat - ]; - description = "Perform refactorings specified by the refact library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "apply-refact_0_6_0_0" = callPackage - ({ mkDerivation, base, containers, directory, filemanip, filepath - , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact - , silently, syb, tasty, tasty-expected-failure, tasty-golden - , temporary, transformers, unix-compat - }: - mkDerivation { - pname = "apply-refact"; - version = "0.6.0.0"; - sha256 = "0p2mqgjcqr1zcmk8zgr0yq7g8z1agsa6l493lkj6g3ya9lyhxgig"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filemanip ghc ghc-exactprint mtl process - refact syb temporary transformers unix-compat - ]; - executableHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact syb temporary transformers - unix-compat - ]; - testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact silently syb tasty - tasty-expected-failure tasty-golden temporary transformers - unix-compat - ]; - description = "Perform refactorings specified by the refact library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "apply-refact_0_7_0_0" = callPackage - ({ mkDerivation, base, containers, directory, filemanip, filepath - , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact - , silently, syb, tasty, tasty-expected-failure, tasty-golden - , temporary, transformers, unix-compat - }: - mkDerivation { - pname = "apply-refact"; - version = "0.7.0.0"; - sha256 = "1facic5lbc9xih6w1kfr3inwvada6y98n9xgc6iv6r057zr8jfp0"; - revision = "1"; - editedCabalFile = "0ilyhm6nz1mkjdq13pgzgplmmfqrv6b5ailyhvbds362pqjqw72q"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filemanip ghc ghc-exactprint mtl process - refact syb temporary transformers unix-compat - ]; - executableHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact syb temporary transformers - unix-compat - ]; - testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact silently syb tasty - tasty-expected-failure tasty-golden temporary transformers - unix-compat - ]; - description = "Perform refactorings specified by the refact library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "apply-refact_0_8_0_0" = callPackage - ({ mkDerivation, base, containers, directory, filemanip, filepath - , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact - , silently, syb, tasty, tasty-expected-failure, tasty-golden - , temporary, transformers, unix-compat - }: - mkDerivation { - pname = "apply-refact"; - version = "0.8.0.0"; - sha256 = "0hh7flildjfbigs0knhd3bfd4r3wnhg4ji4cpkx1qagnp5cs4pk0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filemanip ghc ghc-exactprint mtl process - refact syb temporary transformers unix-compat - ]; - executableHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact syb temporary transformers - unix-compat - ]; - testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact silently syb tasty - tasty-expected-failure tasty-golden temporary transformers - unix-compat - ]; - description = "Perform refactorings specified by the refact library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, extra, filemanip , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative @@ -192063,34 +191933,6 @@ self: { broken = true; }) {}; - "ormolu_0_0_5_0" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, exceptions - , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl - , optparse-applicative, path, path-io, syb, text - }: - mkDerivation { - pname = "ormolu"; - version = "0.0.5.0"; - sha256 = "1sf22silpj89sldd7wanlr34nsv77bq0cf4i0q1x2r20pz7s4w4m"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers dlist exceptions ghc-lib-parser mtl syb - text - ]; - executableHaskellDepends = [ - base ghc-lib-parser gitrev optparse-applicative text - ]; - testHaskellDepends = [ - base containers filepath hspec path path-io text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ormolu" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, exceptions , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl @@ -193761,30 +193603,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-types_1_21" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, transformers - }: - mkDerivation { - pname = "pandoc-types"; - version = "1.21"; - sha256 = "1wbb0hhjiw0b66kj1ck3qipwgdac5v7qvjaqszsz5fll3cqp4sna"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq ghc-prim QuickCheck syb - text transformers - ]; - testHaskellDepends = [ - aeson base bytestring containers HUnit QuickCheck string-qq syb - test-framework test-framework-hunit test-framework-quickcheck2 text - ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Types for representing a structured document"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pandoc-types_1_22" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb From 3cbe2b5bc3da7ba3fe685c31ac80d36877c070b1 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 11 Nov 2020 15:48:19 +0100 Subject: [PATCH 072/164] haskell-language-server: Fix hydra config for deps --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c4b10e436ace..d1e05f502aa9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1452,10 +1452,10 @@ self: super: { # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let # fourmolu can‘t compile with an older aeson - overrideAeson = name: value: value.overrideScope (self: super: { + localOverride = name: value: doDistribute (value.overrideScope (self: super: { aeson = dontCheck super.aeson_1_5_2_0; - }); - in pkgs.lib.mapAttrs overrideAeson { + })); + in pkgs.lib.mapAttrs localOverride { # tons of overrides for bleeding edge versions for ghcide and hls # overriding aeson on all of them to prevent double compilations # this shouldn‘t break anything because nearly all their reverse deps are @@ -1469,6 +1469,8 @@ self: super: { ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_2; hie-bios = dontCheck super.hie-bios_0_7_1; lsp-test = dontCheck super.lsp-test_0_11_0_7; + hls-plugin-api = super.hls-plugin-api; + implicit-hie-cradle = super.implicit-hie-cradle; # the hls brittany is objectively better, because there hasn‘t been a # brittany release in a while and this version works with 8.10. # And we need to build it anyways. From bacdeffd804c1da6700d2ab424cf2b74ca7e5355 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 11 Nov 2020 22:17:28 +0100 Subject: [PATCH 073/164] haskellPackages.hls-hlint-plugin: Fix build on hydra --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d1e05f502aa9..20f5357f78a8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1470,6 +1470,7 @@ self: super: { hie-bios = dontCheck super.hie-bios_0_7_1; lsp-test = dontCheck super.lsp-test_0_11_0_7; hls-plugin-api = super.hls-plugin-api; + hls-hlint-plugin = super.hls-hlint-plugin; implicit-hie-cradle = super.implicit-hie-cradle; # the hls brittany is objectively better, because there hasn‘t been a # brittany release in a while and this version works with 8.10. From c3b35f21f78a3d23aaf40b70fe8865598ddc6729 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 11 Nov 2020 10:36:19 +0800 Subject: [PATCH 074/164] lib: Add composeManyExtensions --- lib/default.nix | 4 ++-- lib/fixed-points.nix | 11 ++++++++++- lib/tests/misc.nix | 20 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index d2239d26eadf..e3c1ed713463 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -5,7 +5,7 @@ */ let - inherit (import ./fixed-points.nix {}) makeExtensible; + inherit (import ./fixed-points.nix { inherit lib; }) makeExtensible; lib = makeExtensible (self: let callLibs = file: import file { lib = self; }; @@ -69,7 +69,7 @@ let importJSON importTOML warn info showWarnings nixpkgsVersion version mod compare splitByAndCompare functionArgs setFunctionArgs isFunction toHexString toBaseDigits; inherit (self.fixedPoints) fix fix' converge extends composeExtensions - makeExtensible makeExtensibleWithCustomName; + composeManyExtensions makeExtensible makeExtensibleWithCustomName; inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 968930526a63..f998bc74e1db 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -1,4 +1,4 @@ -{ ... }: +{ lib, ... }: rec { # Compute the fixed point of the given function `f`, which is usually an # attribute set that expects its final, non-recursive representation as an @@ -77,6 +77,15 @@ rec { super' = super // fApplied; in fApplied // g self super'; + # Compose several extending functions of the type expected by 'extends' into + # one where changes made in preceding functions are made available to + # subsequent ones. + # + # composeManyExtensions : [packageSet -> packageSet -> packageSet] -> packageSet -> packageSet -> packageSet + # ^final ^prev ^overrides ^final ^prev ^overrides + composeManyExtensions = + lib.foldr (x: y: composeExtensions x y) (self: super: {}); + # Create an overridable, recursive attribute set. For example: # # nix-repl> obj = makeExtensible (self: { }) diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 6175f15819a7..35a5801c724f 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -87,6 +87,26 @@ runTests { expected = true; }; + testComposeManyExtensions0 = { + expr = let obj = makeExtensible (self: { foo = true; }); + emptyComposition = composeManyExtensions []; + composed = obj.extend emptyComposition; + in composed.foo; + expected = true; + }; + + testComposeManyExtensions = + let f = self: super: { bar = false; baz = true; }; + g = self: super: { bar = super.baz or false; }; + h = self: super: { qux = super.bar or false; }; + obj = makeExtensible (self: { foo = self.qux; }); + in { + expr = let composition = composeManyExtensions [f g h]; + composed = obj.extend composition; + in composed.foo; + expected = (obj.extend (composeExtensions f (composeExtensions g h))).foo; + }; + testBitAnd = { expr = (bitAnd 3 10); expected = 2; From 07e697d22d91a4f1ae75da32c457a432f46d7bd1 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 11 Nov 2020 11:01:53 +0800 Subject: [PATCH 075/164] haskell: improve documentation on ghcWithHoogle and developPackage --- pkgs/development/haskell-modules/make-package-set.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index ac65fad35270..77060c8d8641 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -228,6 +228,9 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # optional set of arbitrary overrides, and an optional haskell package # modifier, return a derivation appropriate for nix-build or nix-shell to # build that package. + # If 'returnShellEnv' is true this returns a derivation which will give you + # an environment suitable for developing the listed packages with an + # incremental tool like cabal-install. developPackage = { root , name ? builtins.baseNameOf root @@ -245,6 +248,13 @@ in package-set { inherit pkgs stdenv callPackage; } self // { ghcWithPackages = selectFrom: withPackages (selectFrom self); + # Put 'hoogle' into the derivation's PATH with a database containing all + # the package's dependencies; run 'hoogle server --local' in a shell to + # host a search engine for the dependencies. + # + # To reload the Hoogle server automatically on .cabal file changes try + # this: + # echo *.cabal | entr -r -- nix-shell --run 'hoogle server --local' ghcWithHoogle = selectFrom: let packages = selectFrom self; From a32c231007afc4a934bcca47a9ac7edb44a5f784 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 11 Nov 2020 11:02:05 +0800 Subject: [PATCH 076/164] haskell: add withHoogle option to developPackage --- pkgs/development/haskell-modules/make-package-set.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 77060c8d8641..2ce8ad989f8d 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -221,6 +221,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # , overrides : Defaulted (HaskellPackageOverrideSet) # , modifier : Defaulted # , returnShellEnv : Defaulted + # , withHoogle : Defaulted # } -> NixShellAwareDerivation # Given a path to a haskell package directory, an optional package name # which defaults to the base name of the path, an optional set of source @@ -231,20 +232,26 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # If 'returnShellEnv' is true this returns a derivation which will give you # an environment suitable for developing the listed packages with an # incremental tool like cabal-install. + # If 'withHoogle' is true (the default if a shell environment is requested) + # then 'ghcWithHoogle' is used to generate the derivation (instead of + # 'ghcWithPackages'), see the documentation there for more information. developPackage = { root , name ? builtins.baseNameOf root , source-overrides ? {} , overrides ? self: super: {} , modifier ? drv: drv - , returnShellEnv ? pkgs.lib.inNixShell }: + , returnShellEnv ? pkgs.lib.inNixShell + , withHoogle ? returnShellEnv }: let drv = (extensible-self.extend (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)) .callCabal2nix name root {}; - in if returnShellEnv then (modifier drv).env else modifier drv; + in if returnShellEnv + then (modifier drv).envFunc {inherit withHoogle;} + else modifier drv; ghcWithPackages = selectFrom: withPackages (selectFrom self); From 49e9758ef335d7266d755556d12e55c6df4feb31 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 13 Nov 2020 13:37:40 +0800 Subject: [PATCH 077/164] haskell: Add cabal2nixOptions to developPackage Also neaten documentation slightly --- .../haskell-modules/make-package-set.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 2ce8ad989f8d..4ae3f0b2427f 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -222,19 +222,27 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # , modifier : Defaulted # , returnShellEnv : Defaulted # , withHoogle : Defaulted + # , cabal2nixOptions : Defaulted # } -> NixShellAwareDerivation + # # Given a path to a haskell package directory, an optional package name # which defaults to the base name of the path, an optional set of source # overrides as appropriate for the 'packageSourceOverrides' function, an # optional set of arbitrary overrides, and an optional haskell package # modifier, return a derivation appropriate for nix-build or nix-shell to # build that package. + # # If 'returnShellEnv' is true this returns a derivation which will give you # an environment suitable for developing the listed packages with an # incremental tool like cabal-install. + # # If 'withHoogle' is true (the default if a shell environment is requested) # then 'ghcWithHoogle' is used to generate the derivation (instead of # 'ghcWithPackages'), see the documentation there for more information. + # + # 'cabal2nixOptions' can contain extra command line arguments to pass to + # 'cabal2nix' when generating the package derivation, for example setting + # a cabal flag with '--flag=myflag'. developPackage = { root , name ? builtins.baseNameOf root @@ -242,13 +250,14 @@ in package-set { inherit pkgs stdenv callPackage; } self // { , overrides ? self: super: {} , modifier ? drv: drv , returnShellEnv ? pkgs.lib.inNixShell - , withHoogle ? returnShellEnv }: + , withHoogle ? returnShellEnv + , cabal2nixOptions ? "" }: let drv = (extensible-self.extend (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)) - .callCabal2nix name root {}; + .callCabal2nixWithOptions name root cabal2nixOptions {}; in if returnShellEnv then (modifier drv).envFunc {inherit withHoogle;} else modifier drv; From 0f1709ad236ca23fb2d935a7564e0fa891a56259 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 13 Nov 2020 11:20:42 +0100 Subject: [PATCH 078/164] haskell-language-server: Fix build Fixing a bound problem in ghcide and bumping ghc-exactprint --- .../haskell-modules/configuration-common.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 20f5357f78a8..0a7070a34e66 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1463,10 +1463,16 @@ self: super: { haskell-language-server = dontCheck super.haskell-language-server; fourmolu = dontCheck super.fourmolu; stylish-haskell = super.stylish-haskell_0_12_2_0; - ghcide = dontCheck super.ghcide; + ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch { + # 2020-11-13: Bumping bounds via an already upstream merged change + # https://github.com/haskell/ghcide/pull/905 + url = https://github.com/haskell/ghcide/commit/9b8aaf9b06846571cc0b5d46680e686e4f9153a3.patch; + sha256 = "0j8980dmvwjcs72ahq2zc14hwkyd5ybgzyy1az3zq5flp383fai6"; + includes = [ "ghcide.cabal" ]; + })); refinery = super.refinery_0_3_0_0; data-tree-print = doJailbreak super.data-tree-print; - ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_2; + ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_3; hie-bios = dontCheck super.hie-bios_0_7_1; lsp-test = dontCheck super.lsp-test_0_11_0_7; hls-plugin-api = super.hls-plugin-api; From bf2b91cfc0571cc077299c5bc37cec8f63d01bd7 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 13 Nov 2020 11:24:08 +0100 Subject: [PATCH 079/164] haskellPackages.stack: Fix eval error --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0a7070a34e66..9a084b2311a4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1414,7 +1414,7 @@ self: super: { domain-auth = dontCheck super.domain-auth; # stack-2.5.1 needs a more current version of pantry to compile - pantry = self.pantry_0_5_1_3; + pantry = self.pantry_0_5_1_4; # Too tight version bounds, see https://github.com/haskell-hvr/microaeson/pull/4 microaeson = doJailbreak super.microaeson; From 9ea5a41df060f5ca990a71fe6c7ef52b69d7447d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 13 Nov 2020 20:51:00 +0100 Subject: [PATCH 080/164] haskell-pantry: update overrides for the new version --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 7c233ade7427..f8c7689c57a0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -654,7 +654,7 @@ self: super: builtins.intersectAttrs super { # Tests require internet http-download = dontCheck super.http-download; pantry = dontCheck super.pantry; - pantry_0_5_1_3 = dontCheck super.pantry_0_5_1_3; + pantry_0_5_1_4 = dontCheck super.pantry_0_5_1_4; # gtk2hs-buildtools is listed in setupHaskellDepends, but we # need it during the build itself, too. From 986d973ff42a9dd0ba25b0c47a4a70d1bf5eaf9f Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 13 Nov 2020 01:14:58 +0300 Subject: [PATCH 081/164] qvge: init at 0.6.1 --- pkgs/applications/graphics/qvge/default.nix | 39 +++++++++++++++++++ .../graphics/qvge/set-graphviz-path.patch | 13 +++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 54 insertions(+) create mode 100644 pkgs/applications/graphics/qvge/default.nix create mode 100644 pkgs/applications/graphics/qvge/set-graphviz-path.patch diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix new file mode 100644 index 000000000000..d8080e6fbb44 --- /dev/null +++ b/pkgs/applications/graphics/qvge/default.nix @@ -0,0 +1,39 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, substituteAll +, qmake +, qtx11extras +, graphviz +}: + +mkDerivation rec { + pname = "qvge"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "ArsMasiuk"; + repo = pname; + rev = "v${version}"; + sha256 = "0j4ih03nl6iihhnxrfldkarg9hvxb62lpr58xspn417d3gj6xjll"; + }; + + prePatch = "cd src"; + + patches = (substituteAll { + src = ./set-graphviz-path.patch; + inherit graphviz; + }); + + nativeBuildInputs = [ qmake ]; + + buildInputs = [ qtx11extras ]; + + meta = with lib; { + description = "Qt Visual Graph Editor"; + homepage = "https://github.com/ArsMasiuk/qvge"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/graphics/qvge/set-graphviz-path.patch b/pkgs/applications/graphics/qvge/set-graphviz-path.patch new file mode 100644 index 000000000000..d18eb81c5d04 --- /dev/null +++ b/pkgs/applications/graphics/qvge/set-graphviz-path.patch @@ -0,0 +1,13 @@ +diff --git i/commonui/CNodeEditorUIController.cpp w/commonui/CNodeEditorUIController.cpp +index 7dacd48..64983e4 100644 +--- i/commonui/CNodeEditorUIController.cpp ++++ w/commonui/CNodeEditorUIController.cpp +@@ -123,7 +123,7 @@ CNodeEditorUIController::CNodeEditorUIController(CMainWindow *parent) : + QString pathToGraphviz = QCoreApplication::applicationDirPath() + "/../tools/graphviz"; + m_optionsData.graphvizPath = QFileInfo(pathToGraphviz).absoluteFilePath(); + #else +- m_optionsData.graphvizPath = ""; ++ m_optionsData.graphvizPath = "@graphviz@/bin"; + #endif + m_gvController->setPathToGraphviz(m_optionsData.graphvizPath); + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 551b285d419a..5b99a286d1c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6723,6 +6723,8 @@ in quota = if stdenv.isLinux then linuxquota else unixtools.quota; + qvge = libsForQt5.callPackage ../applications/graphics/qvge { }; + qview = libsForQt5.callPackage ../applications/graphics/qview {}; wayback_machine_downloader = callPackage ../applications/networking/wayback_machine_downloader { }; From 5a5cb550dd75263ee7f2f6b4fc428989aa8b5934 Mon Sep 17 00:00:00 2001 From: Christoph Stich Date: Fri, 13 Nov 2020 21:43:50 +0000 Subject: [PATCH 082/164] julia: init at 1.5 (#101933) --- pkgs/development/compilers/julia/1.5.nix | 160 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 + 2 files changed, 166 insertions(+) create mode 100644 pkgs/development/compilers/julia/1.5.nix diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix new file mode 100644 index 000000000000..151cf83cecef --- /dev/null +++ b/pkgs/development/compilers/julia/1.5.nix @@ -0,0 +1,160 @@ +{ stdenv, fetchurl, fetchzip, fetchFromGitHub +# build tools +, gfortran, m4, makeWrapper, patchelf, perl, which, python2 +, cmake +# libjulia dependencies +, libunwind, readline, utf8proc, zlib +# standard library dependencies +, curl, fftwSinglePrec, fftw, libgit2, mpfr, openlibm, openspecfun, pcre2 +# linear algebra +, blas, lapack, arpack +# Darwin frameworks +, CoreServices, ApplicationServices +}: + +assert (!blas.isILP64) && (!lapack.isILP64); + +with stdenv.lib; + +let + majorVersion = "1"; + minorVersion = "5"; + maintenanceVersion = "3"; + src_sha256 = "sha256:0jds8lrhk4hfdv7dg5p2ibzin9ivga7wrx7zwcmz6dqp3x792n1i"; + version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; +in + +stdenv.mkDerivation rec { + pname = "julia"; + inherit version; + + src = fetchzip { + url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; + sha256 = src_sha256; + }; + + patches = [ + ./use-system-utf8proc-julia-1.3.patch + + # Julia recompiles a precompiled file if the mtime stored *in* the + # .ji file differs from the mtime of the .ji file. This + # doesn't work in Nix because Nix changes the mtime of files in + # the Nix store to 1. So patch Julia to accept mtimes of 1. + ./allow_nix_mtime.patch + ]; + + postPatch = '' + patchShebangs . contrib + for i in backtrace cmdlineargs; do + mv test/$i.jl{,.off} + touch test/$i.jl + done + rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl + rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl + # LibGit2 fails with a weird error, so we skip it as well now + rm stdlib/LibGit2/test/runtests.jl && touch stdlib/LibGit2/test/runtests.jl + sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl + sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl + ''; + + dontUseCmakeConfigure = true; + + buildInputs = [ + arpack fftw fftwSinglePrec libgit2 libunwind mpfr + pcre2.dev blas lapack openlibm openspecfun readline utf8proc + zlib + ] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]; + + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which cmake ]; + + makeFlags = + let + arch = head (splitString "-" stdenv.system); + march = { + x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; + i686 = "pentium4"; + aarch64 = "armv8-a"; + }.${arch} + or (throw "unsupported architecture: ${arch}"); + # Julia requires Pentium 4 (SSE2) or better + cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch} + or (throw "unsupported architecture: ${arch}"); + # Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM + # https://github.com/JuliaLang/julia/tree/master/deps/patches + in [ + "ARCH=${arch}" + "MARCH=${march}" + "JULIA_CPU_TARGET=${cpuTarget}" + "PREFIX=$(out)" + "prefix=$(out)" + "SHELL=${stdenv.shell}" + + "USE_SYSTEM_BLAS=1" + "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" + + "USE_SYSTEM_LAPACK=1" + + "USE_SYSTEM_ARPACK=1" + "USE_SYSTEM_FFTW=1" + "USE_SYSTEM_GMP=0" + "USE_SYSTEM_LIBGIT2=1" + "USE_SYSTEM_LIBUNWIND=1" + + "USE_SYSTEM_MPFR=1" + "USE_SYSTEM_OPENLIBM=1" + "USE_SYSTEM_OPENSPECFUN=1" + "USE_SYSTEM_PATCHELF=1" + "USE_SYSTEM_PCRE=1" + "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" + "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" + "USE_SYSTEM_READLINE=1" + "USE_SYSTEM_UTF8PROC=1" + "USE_SYSTEM_ZLIB=1" + + "USE_BINARYBUILDER=0" + ]; + + LD_LIBRARY_PATH = makeLibraryPath [ + arpack fftw fftwSinglePrec libgit2 mpfr blas openlibm + openspecfun pcre2 lapack + ]; + + enableParallelBuilding = true; + + # Julia's tests require read/write access to $HOME + preCheck = '' + export HOME="$NIX_BUILD_TOP" + ''; + + preBuild = '' + sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile + sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} + ''; + + postInstall = '' + # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, + # as using a wrapper with LD_LIBRARY_PATH causes segmentation + # faults when program returns an error: + # $ julia -e 'throw(Error())' + find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do + if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then + ln -sv $lib $out/lib/julia/$(basename $lib) + fi + done + ''; + + passthru = { + inherit majorVersion minorVersion maintenanceVersion; + site = "share/julia/site/v${majorVersion}.${minorVersion}"; + }; + + meta = { + description = "High-level performance-oriented dynamical language for technical computing"; + homepage = "https://julialang.org/"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + broken = stdenv.isi686; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 392504146027..74b21e526bae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9525,6 +9525,12 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; +julia_15 = callPackage ../development/compilers/julia/1.5.nix { + inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + }; + + + julia_1 = julia_10; julia = julia_1; From dd8591d752f8210c2c0f8eaa2facaea79f9daee6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 22:05:46 +0000 Subject: [PATCH 083/164] jmol: 14.31.14 -> 14.31.17 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index cba3f1d09463..3035a69dc193 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.14"; + version = "14.31.17"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "1qmy4iqn5xgd4m9hs4w9cn9rzkwmpgdb5azd93cypp05s4nmjsnm"; + sha256 = "1cg3a56bbvlq5wfjgwclg9vsj61kmj6fnqvgf7fdvklhdvnijla2"; }; patchPhase = '' From c1dfbaa8ade7df9cabc2615664f052c593f04cab Mon Sep 17 00:00:00 2001 From: scalavision Date: Sat, 14 Nov 2020 00:15:01 +0100 Subject: [PATCH 084/164] mill: removing MILL_VERSION variable (#103736) --- pkgs/development/tools/build-managers/mill/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 3fc893fd07cf..384385356d04 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -21,8 +21,7 @@ stdenv.mkDerivation rec { # can't use wrapProgram because it sets --argv0 makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" \ --prefix PATH : "${jre}/bin" \ - --set JAVA_HOME "${jre}" \ - --set MILL_VERSION "${version}" + --set JAVA_HOME "${jre}" runHook postInstall ''; From a698dfa0a25d974cb0b9a4826bef3c2e92c96649 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 23:30:53 +0000 Subject: [PATCH 085/164] last: 1133 -> 1145 --- pkgs/applications/science/biology/last/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 775852931163..0976e5a10802 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1133"; + version = "1145"; src = fetchurl { url = "http://last.cbrc.jp/last-${version}.zip"; - sha256 = "0a600p1fymm1ylaxzjwg46zdwz6ilaaak1f4n8xr3hp3ir9rgfjq"; + sha256 = "0g54nmxxrirgid1i1k5i6rf7vnjpk9548sy06yqb4fj7vdzqgq99"; }; nativeBuildInputs = [ unzip ]; From d4a4860e31a346cf174c789b9a5375e909609cb6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Nov 2020 23:41:23 +0000 Subject: [PATCH 086/164] kpt: 0.36.1 -> 0.37.0 --- pkgs/applications/networking/cluster/kpt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index e50f6e3462c1..712761eeef29 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.36.1"; + version = "0.37.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "0j9a7lxspgw63xzz1f8r5fb67jxm5isdvfi5450v20virxch9afi"; + sha256 = "1b1sgwax67pazcs1lly3h3bb7ww91lcd3nr0w3r3f46d1c6iy8mn"; }; - vendorSha256 = "06kx85bf8mjmyhz5gp0la4fr8psnfz6i2rchc22sz2pgmsng1dfr"; + vendorSha256 = "0dn6nryf3vn7r0xna02va4wbgkq0z6x8sj6g2mskfywrk0mfhadv"; subPackages = [ "." ]; From 001a975b752011a2a84413817d1c43a2200e6c74 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 13 Nov 2020 18:46:13 -0500 Subject: [PATCH 087/164] python3Packages.dipy: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/dipy/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix index a1360ada2257..51d689f98596 100644 --- a/pkgs/development/python-modules/dipy/default.nix +++ b/pkgs/development/python-modules/dipy/default.nix @@ -9,11 +9,12 @@ , scipy , h5py , nibabel +, tqdm }: buildPythonPackage rec { pname = "dipy"; - version = "1.2.0"; + version = "1.3.0"; disabled = isPy27; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "dipy"; repo = pname; rev = version; - sha256 = "0x49lph400ndlvk419nd2g9ss4jg75xr7xh88ggv5d2ama19v7py"; + sha256 = "0555abx0fwqmk6dc3im7r45d9j7r9xh6gm9mbwfwvlf7laf8h098"; }; nativeBuildInputs = [ cython packaging ]; @@ -30,6 +31,7 @@ buildPythonPackage rec { scipy h5py nibabel + tqdm ]; checkInputs = [ pytest ]; From 698c471340111744db6c7dc55288cf4a8aab098d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 13 Nov 2020 16:18:19 -0800 Subject: [PATCH 088/164] PULL_REQUEST_TEMPLATE.md: use rendered docs --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 48b84f8c36ce..ce630e77e940 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,7 +5,7 @@ comment describing what you have tested in the relevant package/service. Reviewing helps to reduce the average time-to-merge for everyone. Thanks a lot if you do! List of open PRs: https://github.com/NixOS/nixpkgs/pulls -Reviewing guidelines: https://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download/1/nixpkgs/manual.html#chap-reviewing-contributions +Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions --> ###### Motivation for this change From c881ca60ede6524fee8e2c0d6efb66e828d3ee5e Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 20 Aug 2020 15:32:06 -0400 Subject: [PATCH 089/164] python3Packages.pytorch-metric-learning: 0.9.81 -> 0.9.94 --- .../pytorch-metric-learning/default.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index daf6accb8935..64564a4dca55 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -4,6 +4,7 @@ , isPy27 , numpy , scikitlearn +, pytestCheckHook , pytorch , torchvision , tqdm @@ -11,15 +12,15 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "0.9.81"; + version = "0.9.94"; disabled = isPy27; src = fetchFromGitHub { owner = "KevinMusgrave"; repo = pname; - rev = "cb23328aba64f7f4658374cc2920ef5d56cda5c8"; # no version tag - sha256 = "0c2dyi4qi7clln43481xq66f6r4fadrz84jphjc5phz97bp33ds8"; + rev = "v${version}"; + sha256 = "1i2m651isa6xk3zj8dhzdbmd1bdzl51bh6rxifx6gg22hfa5dj9a"; }; propagatedBuildInputs = [ @@ -30,6 +31,22 @@ buildPythonPackage rec { tqdm ]; + preCheck = '' + export HOME=$TMP + export TEST_DEVICE=cpu + export TEST_DTYPES=float32,float64 # half-precision tests fail on CPU + ''; + # package only requires `unittest`, but use `pytest` to exclude tests + checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # requires FAISS (not in Nixpkgs) + "test_accuracy_calculator_and_faiss" + # require network access: + "test_get_nearest_neighbors" + "test_tuplestoweights_sampler" + "test_untrained_indexer" + ]; + meta = { description = "Metric learning library for PyTorch"; homepage = "https://github.com/KevinMusgrave/pytorch-metric-learning"; From d1a603b5c38c0023606e90064acadaa8e052e44b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 01:21:43 +0000 Subject: [PATCH 090/164] kubernetes-helm: 3.4.0 -> 3.4.1 --- pkgs/applications/networking/cluster/helm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index a0daba8d8f28..86d1fd1383c3 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "helm"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "1z5s8c6yrc1v2y54lx2mbyz31schzpaz2r304m0wwxhn06p43sl0"; + sha256 = "13w0s11319qg9mmmxc24mlj0hrp0r529p3ny4gfzsl0vn3qzd6i2"; }; - vendorSha256 = "0vcvmbvfmj0bi5msjhy9qcqabiscjpfqpnb1lxy49mshs902qc14"; + vendorSha256 = "0x3dcvnrl7cs8faaiq9ybfgg0lkac5ppf61i724cja270nmpmazl"; doCheck = false; From 7a5047bede8f7851eac2fcc4d257d07cc5f6eda7 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 10 Nov 2020 12:54:24 +0100 Subject: [PATCH 091/164] ubootRockPi4: init This adds support for the Radxa Rock Pi 4 board which is based on RK3399. The u-boot outputs from the introduced build are suitable to build a generic image for the Rock Pi 4 by setting the following in a custom build of $nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix: ``` sdImage.postBuildCommands = '' dd if=${pkgs.ubootRockPi4}/idbloader.img of=$img seek=64 conv=notrunc dd if=${pkgs.ubootROckPi4}/u-boot.itb of=$img seek=16384 conv=notrunc ''; ``` --- pkgs/misc/uboot/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index d3ce3e598761..0a178b398006 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -394,4 +394,11 @@ in { extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.img" "SPL"]; }; + + ubootRockPi4 = buildUBoot { + defconfig = "rock-pi-4-rk3399_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareRK3399}/bl31.elf"; + filesToInstall = [ "u-boot.itb" "idbloader.img"]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3667a63a03e6..4dfc8d937ff0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18988,6 +18988,7 @@ in ubootRaspberryPi3_64bit ubootRaspberryPiZero ubootRock64 + ubootRockPi4 ubootRockPro64 ubootROCPCRK3399 ubootSheevaplug From 2f4bd22364e139d5f3ddadc493793a2930650645 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 02:41:51 +0000 Subject: [PATCH 092/164] libthreadar: 1.3.0 -> 1.3.1 --- pkgs/development/libraries/libthreadar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix index 96c0418f74c8..587ef2e208a3 100644 --- a/pkgs/development/libraries/libthreadar/default.nix +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.3.0"; + version = "1.3.1"; pname = "libthreadar"; src = fetchurl { url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; - sha256 = "0g2wxykawlsj6ma9slbbk0bxynqvmkwhaln2fiwc21x7nhjvpn9z"; + sha256 = "0x1kkccy81rcqbhlw88sw7lykp7398vmrvp6f9yy42k9bl4yxn2q"; }; outputs = [ "out" "dev" ]; From f61b91cec4654ce730141c1f58a9ec521ab70888 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 Nov 2020 00:24:57 -0300 Subject: [PATCH 093/164] antiprism: init at 0.26 --- .../science/geometry/antiprism/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/science/geometry/antiprism/default.nix diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/applications/science/geometry/antiprism/default.nix new file mode 100644 index 000000000000..4691291a4257 --- /dev/null +++ b/pkgs/applications/science/geometry/antiprism/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, libX11 +, libGL +, libGLU +, freeglut }: + +stdenv.mkDerivation rec { + pname = "antiprism"; + version = "0.26"; + + src = fetchFromGitHub { + owner = "antiprism"; + repo = pname; + rev = version; + sha256 = "sha256-5FE6IbYKk7eMT985R9NCX3GDXE8SrdVHFcCpKeJvKtQ="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libX11 libGLU libGL.dev freeglut.dev ]; + + meta = with stdenv.lib; { + homepage = "https://www.antiprism.com"; + description = "A collection of programs for generating, manipulating, transforming and viewing polyhedra"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74b21e526bae..b30e42e100d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1163,6 +1163,8 @@ in gaia = callPackage ../development/libraries/gaia { }; + antiprism = callPackage ../applications/science/geometry/antiprism { }; + gama = callPackage ../applications/science/geometry/gama { }; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; From fb1c3a2e1d9af4419af34651e8e0a300b4e69479 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 Nov 2020 00:48:32 -0300 Subject: [PATCH 094/164] all-packages.nix: a small reorganization Now the science/geometry expressions are in a same block of the all-packages file. --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b30e42e100d8..017ac9c7a13e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1163,10 +1163,6 @@ in gaia = callPackage ../development/libraries/gaia { }; - antiprism = callPackage ../applications/science/geometry/antiprism { }; - - gama = callPackage ../applications/science/geometry/gama { }; - gamecube-tools = callPackage ../development/tools/gamecube-tools { }; gammy = qt5.callPackage ../tools/misc/gammy { }; @@ -26163,6 +26159,10 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix { ### SCIENCE/GEOMETRY + antiprism = callPackage ../applications/science/geometry/antiprism { }; + + gama = callPackage ../applications/science/geometry/gama { }; + drgeo = callPackage ../applications/science/geometry/drgeo { inherit (gnome2) libglade; guile = guile_1_8; From 7225ae36c3b02056449d0b6d567d02d1ab6dab3f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 14 Nov 2020 04:20:00 +0000 Subject: [PATCH 095/164] haproxy: add passthru.tests --- pkgs/tools/networking/haproxy/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 41dd747315ba..80b135e524bf 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,7 +1,7 @@ { useLua ? !stdenv.isDarwin , usePcre ? true , withPrometheusExporter ? true -, stdenv, lib, fetchurl +, stdenv, lib, fetchurl, nixosTests , openssl, zlib , lua5_3 ? null, pcre ? null, systemd ? null }: @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests.haproxy = nixosTests.haproxy; + meta = with lib; { description = "Reliable, high performance TCP/HTTP load balancer"; longDescription = '' From ac676f133242cb1d341a68082d0742354291672f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 14 Nov 2020 04:20:00 +0000 Subject: [PATCH 096/164] cloud-nuke: 0.1.18 -> 0.1.23 --- pkgs/development/tools/cloud-nuke/default.nix | 14 +- pkgs/development/tools/cloud-nuke/deps.nix | 219 ------------------ 2 files changed, 8 insertions(+), 225 deletions(-) delete mode 100644 pkgs/development/tools/cloud-nuke/deps.nix diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 6e070f3cc5f2..e124f6c7ca54 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -1,19 +1,21 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "cloud-nuke"; - version = "0.1.18"; + version = "0.1.23"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "1amk9bjrc9svvgllif2vr6xx7kc3xmwjbyb8prnm5zp82hymk5f1"; + sha256 = "0qqvjw6lqdrfg1mjfxljslcv9714cpxcnkf65wkf46r5g8fwzr1f"; }; - goPackagePath = "github.com/gruntwork-io/cloud-nuke"; + vendorSha256 = "0bw0xcbyns94vy1abr962876zr7aq6q9qq7y9vr1yqw4hqmi3ndi"; - goDeps = ./deps.nix; + buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + + doCheck = false; meta = with lib; { homepage = "https://github.com/gruntwork-io/cloud-nuke"; diff --git a/pkgs/development/tools/cloud-nuke/deps.nix b/pkgs/development/tools/cloud-nuke/deps.nix deleted file mode 100644 index c354bd985fd3..000000000000 --- a/pkgs/development/tools/cloud-nuke/deps.nix +++ /dev/null @@ -1,219 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "1f4898f67806740d2a91c9dfe9a8be8a61523eb4"; - sha256 = "1znjv4irzqxwizdp3dxgb5w9x06xjs79a3s68afzrblz97kf94kc"; - }; - } - { - goPackagePath = "github.com/bgentry/speakeasy"; - fetch = { - type = "git"; - url = "https://github.com/bgentry/speakeasy"; - rev = "4aabc24848ce5fd31929f7d1e4ea74d3709c14cd"; - sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; - }; - } - { - goPackagePath = "github.com/boombuler/barcode"; - fetch = { - type = "git"; - url = "https://github.com/boombuler/barcode"; - rev = "3cfea5ab600ae37946be2b763b8ec2c1cf2d272d"; - sha256 = "1fzb8wz1ny2sc78g9rm0bcm80pgwvkm2k6lmim2sb4jgm1j3sajd"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260"; - sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh"; - }; - } - { - goPackagePath = "github.com/go-errors/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-errors/errors"; - rev = "d98b870cc4e05f1545532a80e9909be8216095b6"; - sha256 = "1skj4vh9h7c5lk1pw8y6740w2k99z398jl0aasn63x83viqjf1zw"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "72cd26f257d44c1114970e19afddcd812016007e"; - sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "b48cb6623c04dae64c28537143aca42d16561daf"; - sha256 = "1zb4n285mv85dh3y2f8fqbs30h2dhzw7vbczr6z0zg2gqr6vzg0q"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "064e2069ce9c359c118179501254f67d7d37ba24"; - sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; - }; - } - { - goPackagePath = "github.com/gruntwork-io/gruntwork-cli"; - fetch = { - type = "git"; - url = "https://github.com/gruntwork-io/gruntwork-cli"; - rev = "94044eeeb0a48b5e8dd52190fa0d0daba53e157f"; - sha256 = "1x6g2s4f66c4pb8dwvjnj4i70ik43ak2x189v2ys218nz4zkjs74"; - }; - } - { - goPackagePath = "github.com/gruntwork-io/terratest"; - fetch = { - type = "git"; - url = "https://github.com/gruntwork-io/terratest"; - rev = "bd5fdfc1564ec40a149a6e579d6ca20ebf2eaca4"; - sha256 = "1vbipykcwhmzs2qxfxdnq3gdi3i5ds6pykjjxqw3f1llad2dihby"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e84"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/pquerna/otp"; - fetch = { - type = "git"; - url = "https://github.com/pquerna/otp"; - rev = "43bebefda392017900e7a7b237b4c914c6a55b50"; - sha256 = "088njs8i7b0syyz20hzd3lcjxy61chc518d71lvykw2g9c9wsc7l"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "d682213848ed68c0a260ca37d6dd5ace8423f5ba"; - sha256 = "0nzyqwzx3k7nqfq8q7yv32gaf3ymq3bpwhkmw1hj2zakq5a93d8x"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "13931e22f9e72ea58bb73048bc752b48c6d4d4ac"; - sha256 = "1621j82c1hiw4pxjdvaf5qyirwv5c0bqwlrhhna9pnjsgr5pkw33"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "ca1201d0de80cfde86cb01aea620983605dfe99b"; - sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "2c42eef0765b9837fbdab12011af7830f55f88f0"; - sha256 = "0gj9nwryyzf9rn33gl3zm6rxvg1zhrhwi36akipqj37x4g86h3gz"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880"; - sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "53403b58ad1b561927d19068c655246f2db79d48"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; - }; - } -] \ No newline at end of file From a398eb859ce94b6538e74c02ff64e6e6c43eedb3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 14 Nov 2020 04:20:00 +0000 Subject: [PATCH 097/164] lxd: 4.7 -> 4.8 https://discuss.linuxcontainers.org/t/lxd-4-8-has-been-released/9458 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 331960e6857f..9bff8332c34b 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.7"; + version = "4.8"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1v95cnbs54gzyhzflwb8x0ykja202nll5p48l2nra7cpdsk4a5q1"; + sha256 = "0zrk6l2wwc2hmzwd9fayq54qxshp9pin638dihsyp324f5n0jkyy"; }; postPatch = '' From 06d328c3460bc07db4271bc3e63481c5ec1b45cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 05:05:51 +0000 Subject: [PATCH 098/164] liblinear: 2.41 -> 2.42 --- pkgs/development/libraries/liblinear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index 86d306d0a07f..67eb8748f16c 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -4,13 +4,13 @@ let soVersion = "4"; in stdenv.mkDerivation rec { pname = "liblinear"; - version = "2.41"; + version = "2.42"; src = fetchFromGitHub { owner = "cjlin1"; repo = "liblinear"; rev = "v${builtins.replaceStrings ["."] [""] version}"; - sha256 = "1mykrzka2wxnvvjh21hisabs5fsxqzdhkxw9m08h24c58vfiwsd8"; + sha256 = "0p0hpjajfkskhd7jiv5zwhfa8hi49q3mgifjlkqvy99xspv98ijj"; }; outputs = [ "bin" "dev" "out" ]; From df7db2b3ed9db2a3c2d3950b4b84e8e937fb2f7a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 06:25:20 +0000 Subject: [PATCH 099/164] mavproxy: 1.8.22 -> 1.8.23 --- pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 9c7166afc2a9..dcc2114a4886 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.22"; + version = "1.8.23"; src = fetchPypi { inherit pname version; - sha256 = "87d7f9c0b8f4f1db3ce3521f67cd244fe3b89ffead797e92f35a7f71bbe8b958"; + sha256 = "46c70e013d3e465daae5523f6a1aad553e6ee0f4db137bb935a3273f7ffcc22e"; }; propagatedBuildInputs = [ From 5e76b77ff60a7b5acf8f3ac9468ab4884a6113d1 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 13 Nov 2020 22:44:07 +0100 Subject: [PATCH 100/164] openocd: unstable-2020-09-02 -> unstable-2020-11-11 fix build failure with hidapi 0.10.0 --- .../tools/misc/openocd/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 47212e9967d0..5c8e95f7fd4b 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,18 +1,27 @@ -{ stdenv, lib, fetchgit, libftdi1, libusb1, pkgconfig, hidapi, autoreconfHook }: +{ stdenv +, lib +, fetchgit +, autoreconfHook +, pkg-config +, hidapi +, libftdi1 +, libusb1 +}: stdenv.mkDerivation rec { pname = "openocd"; - version = "2020-09-02"; + version = "unstable-2020-11-11"; src = fetchgit { url = "https://git.code.sf.net/p/openocd/code"; - rev = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3"; - sha256 = "1256qqhn3pxmijfk1x0y5b5kc5ar88ivykkvx0h1m7pdwqfs6zm9"; + rev = "06c7a53f1fff20bcc4be9e63f83ae98664777f34"; + sha256 = "0g0w7g94r88ylfpwswnhh8czlf5iqvd991ssn4gfcfd725lpdb01"; fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ libftdi1 libusb1 hidapi ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ hidapi libftdi1 libusb1 ]; configureFlags = [ "--enable-jtag_vpi" @@ -29,6 +38,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=cpp" + "-Wno-error=strict-prototypes" # fixes build failure with hidapi 0.10.0 ]; postInstall = lib.optionalString stdenv.isLinux '' From 1f9b39678550d9e2c55fe5c26ef8314c75552e6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 07:45:33 +0000 Subject: [PATCH 101/164] python37Packages.vowpalwabbit: 8.8.1 -> 8.9.0 --- pkgs/development/python-modules/vowpalwabbit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index ddd36a98cb6d..da13ad21026d 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "8.8.1"; + version = "8.9.0"; src = fetchPypi{ inherit pname version; - sha256 = "17fw1g4ka9jppd41srw39zbp2b8h81izc71bbggxgf2r0xbdpga6"; + sha256 = "37fb7a400f3a7923a04df9921b3eef1bbe96117424ef083dcfed0e4eea77fa08"; }; nativeBuildInputs = [ From 0e6f020463b738e4e2a113c23c7bb0ac91d81d00 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 6 Nov 2020 21:55:11 +0100 Subject: [PATCH 102/164] ocamlPackages.mirage-unix: use Dune 2 --- pkgs/development/ocaml-modules/mirage-unix/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/mirage-unix/default.nix b/pkgs/development/ocaml-modules/mirage-unix/default.nix index 696181f7f602..1e6dc0ef144f 100644 --- a/pkgs/development/ocaml-modules/mirage-unix/default.nix +++ b/pkgs/development/ocaml-modules/mirage-unix/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "mirage-unix"; version = "4.0.0"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; sha256 = "0kyd83bkpjhn382b4mw3a4325xr8vms78znxqvifpcyfvfnlx7hj"; From 7fb0a750f7b4b99d19b86dc1a9e0b7ac1b121381 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 6 Nov 2020 21:55:17 +0100 Subject: [PATCH 103/164] ocamlPackages.mirage-runtime: use Dune 2 --- pkgs/development/ocaml-modules/mirage/runtime.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix index b3f308979f46..9c9a479d5295 100644 --- a/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -5,6 +5,8 @@ buildDunePackage rec { pname = "mirage-runtime"; version = "3.9.0"; + useDune2 = true; + minimumOCamlVersion = "4.08"; src = fetchurl { From 9ca92f0a5b627f0189b6b6adcd4185ab16aa02f6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 6 Nov 2020 21:55:22 +0100 Subject: [PATCH 104/164] ocamlPackages.mirage: init at 3.9.0 --- .../ocaml-modules/mirage/default.nix | 25 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/mirage/default.nix diff --git a/pkgs/development/ocaml-modules/mirage/default.nix b/pkgs/development/ocaml-modules/mirage/default.nix new file mode 100644 index 000000000000..9a4d3f21cb87 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, ocaml +, functoria, mirage-runtime +}: + +buildDunePackage rec { + pname = "mirage"; + inherit (mirage-runtime) version src; + + useDune2 = true; + + outputs = [ "out" "dev" ]; + + propagatedBuildInputs = [ functoria mirage-runtime ]; + + installPhase = '' + runHook preInstall + dune install --prefix=$out --libdir=$dev/lib/ocaml/${ocaml.version}/site-lib/ ${pname} + runHook postInstall + ''; + + meta = mirage-runtime.meta // { + description = "The MirageOS library operating system"; + }; + +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2947b369ed8c..7fd321425082 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -539,6 +539,8 @@ let minisat = callPackage ../development/ocaml-modules/minisat { }; + mirage = callPackage ../development/ocaml-modules/mirage { }; + mirage-block = callPackage ../development/ocaml-modules/mirage-block { }; mirage-bootvar-unix = callPackage ../development/ocaml-modules/mirage-bootvar-unix { }; From 302cbf171c9e1de1b4d65d5aff6131a3badd6456 Mon Sep 17 00:00:00 2001 From: midchildan Date: Fri, 4 Sep 2020 01:14:26 +0900 Subject: [PATCH 105/164] arc_unpacker: init at unstable-2019-01-28 --- pkgs/tools/archivers/arc_unpacker/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/tools/archivers/arc_unpacker/default.nix diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix new file mode 100644 index 000000000000..76eb9a7fccbc --- /dev/null +++ b/pkgs/tools/archivers/arc_unpacker/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, cmake, makeWrapper, boost, libpng, libjpeg, zlib +, openssl, libwebp, catch }: + +stdenv.mkDerivation rec { + pname = "arc_unpacker-unstable"; + version = "2019-01-28"; + + src = fetchFromGitHub { + owner = "vn-tools"; + repo = "arc_unpacker"; + # Since the latest release (0.11) doesn't build, we've opened an upstream + # issue in https://github.com/vn-tools/arc_unpacker/issues/187 to ask if a + # a new release is upcoming + rev = "b9843a13e2b67a618020fc12918aa8d7697ddfd5"; + sha256 = "0wpl30569cip3im40p3n22s11x0172a3axnzwmax62aqlf8kdy14"; + }; + + nativeBuildInputs = [ cmake makeWrapper catch ]; + buildInputs = [ boost libpng libjpeg zlib openssl libwebp ]; + + postPatch = '' + cp ${catch}/include/catch/catch.hpp tests/test_support/catch.h + ''; + + checkPhase = '' + pushd .. + ./build/run_tests + popd + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/doc/arc_unpacker $out/libexec/arc_unpacker + cp arc_unpacker $out/libexec/arc_unpacker/arc_unpacker + cp ../GAMELIST.{htm,js} $out/share/doc/arc_unpacker + cp -r ../etc $out/libexec/arc_unpacker + makeWrapper $out/libexec/arc_unpacker/arc_unpacker $out/bin/arc_unpacker + ''; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A tool to extract files from visual novel archives"; + homepage = "https://github.com/vn-tools/arc_unpacker"; + license = licenses.gpl3; + maintainers = with maintainers; [ midchildan ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e0efbb8d70a..d3a43d0632da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -603,6 +603,8 @@ in adlplug = callPackage ../applications/audio/adlplug { }; + arc_unpacker = callPackage ../tools/archivers/arc_unpacker { }; + tuijam = callPackage ../applications/audio/tuijam { inherit (python3Packages) buildPythonApplication; }; opnplug = callPackage ../applications/audio/adlplug { From 91a41b057f77587cd705be9f727c211e4211ba06 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 10:14:45 +0000 Subject: [PATCH 106/164] python37Packages.sshtunnel: 0.2.1 -> 0.2.2 --- pkgs/development/python-modules/sshtunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index f37ba1545748..b8f2ab998266 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.2.1"; + version = "0.2.2"; pname = "sshtunnel"; src = fetchPypi { inherit pname version; - sha256 = "ce28bf9abe6c6b00c5d10343a68c1325f8409ebfb9bf1c1d863a31afa3983cd7"; + sha256 = "1801b144b42b9bdb2f931923e85837f9193b877f3d490cd5776e1d4062c62fb4"; }; propagatedBuildInputs = [ paramiko ]; From 3098d5045a5b785bdf991d262c3170ad556ec71a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 11:20:48 +0000 Subject: [PATCH 107/164] python37Packages.gtts: 2.1.1 -> 2.1.2 --- pkgs/development/python-modules/gtts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index 934f3bd58202..a8b6d7199bcd 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "v${version}"; - sha256 = "1d0r6dnb8xvgyvxz7nfj4q4xqmpmvcwcsjghxrh76m6p364lh1hj"; + sha256 = "1vcsxzqzl61h50lm934hd7q5nl7l10wwymgq1mcynmqxbm1s4rnl"; }; propagatedBuildInputs = [ From c07706efde310616b703976656b40ca0d14553ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 12:34:23 +0000 Subject: [PATCH 108/164] python37Packages.internetarchive: 1.9.5 -> 1.9.6 --- pkgs/development/python-modules/internetarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 2683f0f1afcf..879c90c40a42 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "1.9.5"; + version = "1.9.6"; src = fetchPypi { inherit pname version; - sha256 = "759053685c75e6e969d690043b82643c4016500abcbbc44e4daf52ec097a9a15"; + sha256 = "0e9b24577086283280a5089b3e65086640b4e42d61ca4af913639f45b02b9e4c"; }; propagatedBuildInputs = [ From e4b6e569f16df3546ef00ad2a888eec5359d2def Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 12:51:36 +0000 Subject: [PATCH 109/164] python37Packages.sphinxcontrib-katex: 0.6.1 -> 0.7.1 --- .../python-modules/sphinxcontrib-katex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 95bd4b592010..6fcafd438ba0 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-katex"; - version = "0.6.1"; + version = "0.7.1"; # pkgutil namespaces are broken in nixpkgs (because they can't scan multiple # directories). But python2 is EOL, so not supporting it should be ok. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "88320b2780f350d67f84a5424973ce24aee65701e8e163a7f5856c5df3353188"; + sha256 = "fa80aba8af9d78f70a0a255815d44e33e8aca8e806ca6101e0eb18b2b7243246"; }; propagatedBuildInputs = [ sphinx ]; From 2ac6d50e1696250eabee99e50fb830e741692c33 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Sat, 14 Nov 2020 03:25:59 +1300 Subject: [PATCH 110/164] vte-ng: update patches to apply on vte 0.62 --- .../terminal-emulators/termite/default.nix | 23 +++---- ...function-for-setting-cursor-position.patch | 61 +++++++++++++++++++ ...tion-for-setting-the-text-selections.patch | 56 +++++++++++++++++ ...nction-for-getting-the-selected-text.patch | 29 +++++++++ 4 files changed, 154 insertions(+), 15 deletions(-) create mode 100644 pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch create mode 100644 pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch create mode 100644 pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix index 63565e207f77..2f991ca1c7e6 100644 --- a/pkgs/applications/terminal-emulators/termite/default.nix +++ b/pkgs/applications/terminal-emulators/termite/default.nix @@ -4,6 +4,8 @@ let # termite requires VTE with some internals exposed # https://github.com/thestinger/vte-ng + # + # three of the patches have been locally modified to cleanly apply on 0.62 vte-ng = vte.overrideAttrs (attrs: { patches = attrs.patches or [] ++ [ (fetchpatch { @@ -11,26 +13,17 @@ let url = "https://github.com/thestinger/vte-ng/commit/342e26574f50dcd40bbeaad9e839c2a6144d0c1c.patch"; sha256 = "1b0k9ys545q85vfki417p21kis9f36yd0hyp12phayynss6fn715"; }) - (fetchpatch { - name = "0002-expose-function-for-setting-cursor-position.patch"; - url = "https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch"; - sha256 = "091sb44g2pl0zbxnxidpfmsqqc65dmkakhjb0wvlnsjckqalhs89"; - }) - (fetchpatch { - name = "0003-add-function-for-setting-the-text-selections.patch"; - url = "https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch"; - sha256 = "12rq3svbj1nzridbssxsvmmb8njky3w8qdnkymz7850b3kqg277x"; - }) + # Derived from https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch + ./vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch + # Derived from https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch + ./vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch (fetchpatch { name = "0004-add-functions-to-get-set-block-selection-mode.patch"; url = "https://github.com/thestinger/vte-ng/commit/08748fd9cb82bd191e5c476b1682ca71f7732572.patch"; sha256 = "1cnhd8f7ywdgcyd6xmcd2nn39jjxzkxp4d0zsj2k7m5v74nhcs1g"; }) - (fetchpatch { - name = "0005-expose-function-for-getting-the-selected-text.patch"; - url = "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch"; - sha256 = "0pbnbkwqxm4p9xsgvqwayvh8srk5z1kyjnigmahf9mlqn7hi6v27"; - }) + # Derived from "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch"; + ./vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch ]; }); diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch new file mode 100644 index 000000000000..8f5c0dab39ad --- /dev/null +++ b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch @@ -0,0 +1,61 @@ +From 5ae3acb69474fe5bc43767a4a3625e9ed23607a1 Mon Sep 17 00:00:00 2001 +From: Jelle van der Waa +Date: Sat, 13 Feb 2016 22:18:01 +0100 +Subject: [PATCH] expose function for setting cursor position + +--- + src/vte/vteterminal.h | 5 +++++ + src/vtegtk.cc | 24 ++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index a607e5da..9701320d 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -378,6 +378,11 @@ _VTE_PUBLIC + void vte_terminal_get_cursor_position(VteTerminal *terminal, + glong *column, + glong *row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); ++_VTE_PUBLIC ++void vte_terminal_set_cursor_position(VteTerminal *terminal, ++ glong column, ++ glong row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); ++ + + _VTE_PUBLIC + char *vte_terminal_hyperlink_check_event(VteTerminal *terminal, +diff --git a/src/vtegtk.cc b/src/vtegtk.cc +index b11b780b..bdf36eac 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -2415,6 +2415,30 @@ vte_terminal_get_cursor_position(VteTerminal *terminal, + } + } + ++/** ++ * vte_terminal_set_cursor_position ++ * @terminal: a #VteTerminal ++ * @column: the new cursor column ++ * @row: the new cursor row ++ * ++ * Set the location of the cursor. ++ */ ++void ++vte_terminal_set_cursor_position(VteTerminal *terminal, ++ long column, long row) noexcept ++{ ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); ++ ++ auto impl = IMPL(terminal); ++ impl->invalidate_cursor_once(FALSE); ++ impl->m_screen->cursor.col = column; ++ impl->m_screen->cursor.row = row; ++ impl->invalidate_cursor_once(FALSE); ++ impl->check_cursor_blink(); ++ impl->queue_cursor_moved(); ++ ++} ++ + /** + * vte_terminal_pty_new_sync: + * @terminal: a #VteTerminal diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch new file mode 100644 index 000000000000..203228dae34d --- /dev/null +++ b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch @@ -0,0 +1,56 @@ +From 742d57ecf15e24f6a5f2133a81b6c70acc8ff03c Mon Sep 17 00:00:00 2001 +From: Jelle van der Waa +Date: Sat, 13 Feb 2016 22:25:19 +0100 +Subject: [PATCH] add function for setting the text selections + +--- + src/vte/vteterminal.h | 4 ++++ + src/vtegtk.cc | 20 ++++++++++++++++++++ + 2 files changed, 24 insertions(+) + +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index 9701320d..a11b4cb7 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -196,6 +196,10 @@ _VTE_PUBLIC + void vte_terminal_select_all(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); + _VTE_PUBLIC + void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); ++_VTE_PUBLIC ++void vte_terminal_select_text(VteTerminal *terminal, long start_col, long start_row, ++ long end_col, long end_row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); ++ + + /* By-word selection */ + _VTE_PUBLIC +diff --git a/src/vtegtk.cc b/src/vtegtk.cc +index bdf36eac..d9e9f2ed 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -2390,6 +2390,26 @@ vte_terminal_unselect_all(VteTerminal *terminal) + IMPL(terminal)->deselect_all(); + } + ++/** ++ * vte_terminal_select_text: ++ * @terminal: a #VteTerminal ++ * @start_col: the starting column for the selection ++ * @start_row: the starting row for the selection ++ * @end_col: the end column for the selection ++ * @end_row: the end row for the selection ++ * ++ * Sets the current selection region. ++ */ ++void ++vte_terminal_select_text(VteTerminal *terminal, ++ long start_col, long start_row, ++ long end_col, long end_row) noexcept ++{ ++ g_return_if_fail (VTE_IS_TERMINAL (terminal)); ++ ++ IMPL(terminal)->select_text(start_col, start_row, end_col, end_row); ++} ++ + /** + * vte_terminal_get_cursor_position: + * @terminal: a #VteTerminal diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch new file mode 100644 index 000000000000..0a2c52722268 --- /dev/null +++ b/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch @@ -0,0 +1,29 @@ +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -204,7 +204,9 @@ + _VTE_PUBLIC + void vte_terminal_select_text(VteTerminal *terminal, long start_col, long start_row, + long end_col, long end_row) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); +- ++_VTE_PUBLIC ++char * ++vte_terminal_get_selection(VteTerminal *terminal) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1); + + /* By-word selection */ + _VTE_PUBLIC +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -2435,6 +2435,13 @@ + IMPL(terminal)->select_text(start_col, start_row, end_col, end_row); + } + ++char * ++vte_terminal_get_selection(VteTerminal *terminal) noexcept ++{ ++ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); ++ return g_strdup (IMPL(terminal)->m_selection[VTE_SELECTION_PRIMARY]->str); ++} ++ + /** + * vte_terminal_get_cursor_position: + * @terminal: a #VteTerminal From 99d3a69d5b97020cefd25f876ca5a2c505cc5548 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sat, 14 Nov 2020 23:06:33 +0900 Subject: [PATCH 111/164] musescore: fix unpack on darwin (#103651) --- pkgs/applications/audio/musescore/darwin.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index 8870a144c9f5..4a2ae29f36ad 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { pname = "musescore-darwin"; version = concatStringsSep "." versionComponents; + # The disk image contains the .app and a symlink to /Applications. + sourceRoot = "${appName}.app"; + src = fetchurl { url = "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg"; sha256 = "19xkaxlkbrhvfip6n3iw6q7463ngr6y5gfisrpjqg2xl2igyl795"; From f89b4dc45057343af8c625bd78738b0433a7f2b0 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sat, 4 Jan 2020 00:44:27 +0100 Subject: [PATCH 112/164] utsushi: 3.59.2 -> unstable-2020-11-10 + master should be roughly equivalent to 3.62.0 + moving to the community repo because they are way better at fixing things, while upstream epson almost never merges fixes + great thanks to @mwilsoncoding for debugging the problem: + `autoconf-archive` was missing --- pkgs/misc/drivers/utsushi/default.nix | 46 +++++++++++++++++---------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index 294bb8a0203e..10b5e570d0fa 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -1,20 +1,32 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, boost, gtkmm2 -, imagemagick, sane-backends, tesseract4, udev, libusb1}: +{ stdenv, writeScriptBin, fetchFromGitLab, autoreconfHook, pkg-config +, autoconf-archive, libxslt, boost , gtkmm2 , imagemagick, sane-backends +, tesseract4, udev, libusb1, gnum4 }: -stdenv.mkDerivation rec { + +let + fakegit = writeScriptBin "git" '' + #! ${stdenv.shell} -e + if [ "$1" = "describe" ]; then + [ -r .rev ] && cat .rev || true + fi + ''; +in stdenv.mkDerivation rec { pname = "utsushi"; - version = "3.59.2"; + version = "unstable-2020-11-10"; - src = fetchFromGitLab{ + src = fetchFromGitLab { owner = pname; - repo = "imagescan"; - rev = version; - sha256 = "06gp97dfnf43l6kb988scmm66q9n5rc7ndwv3rykrdpyhy8rbi05"; + repo = pname; + rev = "04700043e2d16062eb8bd27f4efff3024f387d32"; + sha256 = "0rxv5n0985d414i6hwichsn7hybwgwsimpy5s4hmcsvxqcpks4li"; }; nativeBuildInputs = [ autoreconfHook pkg-config + autoconf-archive + fakegit + libxslt ]; buildInputs = [ @@ -26,19 +38,21 @@ stdenv.mkDerivation rec { libusb1.dev ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=parentheses -Wno-error=unused-variable"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=deprecated-declarations" + "-Wno-error=parentheses" + "-Wno-error=unused-variable" + ]; + postPatch = '' - # remove vendored dependencies - rm -r upstream/boost - # create fake udev and sane config mkdir -p $out/etc/{sane.d,udev/rules.d} touch $out/etc/sane.d/dll.conf - - # absolute paths to conver & tesseract + # absolute paths to convert & tesseract + sed -i '/\[AC_DEFINE(\[HAVE_IMAGE_MAGICK\], \[1\])/a \ MAGICK_CONVERT="${imagemagick}/bin/convert"' configure.ac substituteInPlace filters/magick.cpp \ - --replace '"convert' '"${imagemagick}/bin/convert' + --replace 'convert ' '${imagemagick}/bin/convert ' substituteInPlace filters/reorient.cpp \ --replace '"tesseract' '"${tesseract4}/bin/tesseract' substituteInPlace filters/get-text-orientation \ @@ -61,7 +75,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doInstallCheck = true; + doInstallCheck = false; meta = with stdenv.lib; { description = "SANE utsushi backend for some Epson scanners"; From 5d08fb8fd6a9eab20d2480b93687655c5ff81728 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 15:02:54 +0000 Subject: [PATCH 113/164] python37Packages.hyperopt: 0.1.2 -> 0.2.5 --- pkgs/development/python-modules/hyperopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hyperopt/default.nix b/pkgs/development/python-modules/hyperopt/default.nix index 7a907224993e..16599214ede7 100644 --- a/pkgs/development/python-modules/hyperopt/default.nix +++ b/pkgs/development/python-modules/hyperopt/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "hyperopt"; - version = "0.1.2"; + version = "0.2.5"; src = fetchPypi { inherit pname version; - sha256 = "34xIpivBYUvcN/XMVwBkqTpLgaFlWWIduazuP2U2tlg="; + sha256 = "bc6047d50f956ae64eebcb34b1fd40f186a93e214957f20e87af2f10195295cc"; }; propagatedBuildInputs = [ future cloudpickle numpy networkx six tqdm scipy pymongo ]; From 9750813b89bfa38d2c319a28d8537d8754047d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 22 Aug 2020 08:17:40 +0100 Subject: [PATCH 114/164] nixos/telegraf: add support for native ping --- nixos/modules/services/monitoring/telegraf.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index 5d131557e8be..c6b0b8906fd6 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -60,6 +60,8 @@ in { ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = "telegraf"; Restart = "on-failure"; + # for ping probes + AmbientCapabilities = [ "CAP_NET_RAW" ]; }; }; From 157d7354d6e66153352e5ef2c054ef4398c67187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 22 Aug 2020 11:31:34 +0100 Subject: [PATCH 115/164] nixos/telegraf: add environmentFile option --- .../modules/services/monitoring/telegraf.nix | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index c6b0b8906fd6..c0733f6b89cf 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -26,6 +26,19 @@ in { type = types.package; }; + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/telegraf.env"; + description = '' + File to load as environment file. Environment variables + from this file will be interpolated into the config file + using envsubst with this syntax: + $ENVIRONMENT ''${VARIABLE} + This is useful to avoid putting secrets into the nix store. + ''; + }; + extraConfig = mkOption { default = {}; description = "Extra configuration options for telegraf"; @@ -51,15 +64,23 @@ in { ###### implementation config = mkIf config.services.telegraf.enable { - systemd.services.telegraf = { + systemd.services.telegraf = let + finalConfigFile = if config.services.telegraf.environmentFile == null + then configFile + else "/tmp/config.toml"; + in { description = "Telegraf Agent"; wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; serviceConfig = { - ExecStart=''${cfg.package}/bin/telegraf -config "${configFile}"''; + EnvironmentFile = config.services.telegraf.environmentFile; + ExecStartPre = lib.optional (config.services.telegraf.environmentFile != null) + ''${pkgs.envsubst}/bin/envsubst -o /tmp/config.toml -i "${configFile}"''; + ExecStart=''${cfg.package}/bin/telegraf -config ${finalConfigFile}''; ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = "telegraf"; Restart = "on-failure"; + PrivateTmp = true; # for ping probes AmbientCapabilities = [ "CAP_NET_RAW" ]; }; From 8edc4619abc884d97583c1ec714c9f7c795fbbac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 8 Sep 2020 07:59:50 +0200 Subject: [PATCH 116/164] nixos/telegraf: switch to setting types This allows to split up configuration into multiple modules --- .../modules/services/monitoring/telegraf.nix | 21 ++++++++----------- nixos/tests/telegraf.nix | 5 ++++- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index c0733f6b89cf..12a360e7229a 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -5,14 +5,8 @@ with lib; let cfg = config.services.telegraf; - configFile = pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.remarshal ]; - preferLocalBuild = true; - } '' - remarshal -if json -of toml \ - < ${pkgs.writeText "config.json" (builtins.toJSON cfg.extraConfig)} \ - > $out - ''; + settingsFormat = pkgs.formats.toml {}; + configFile = settingsFormat.generate "config.toml" cfg.extraConfig; in { ###### interface options = { @@ -42,7 +36,7 @@ in { extraConfig = mkOption { default = {}; description = "Extra configuration options for telegraf"; - type = types.attrs; + type = settingsFormat.type; example = { outputs = { influxdb = { @@ -67,7 +61,7 @@ in { systemd.services.telegraf = let finalConfigFile = if config.services.telegraf.environmentFile == null then configFile - else "/tmp/config.toml"; + else "/var/run/telegraf/config.toml"; in { description = "Telegraf Agent"; wantedBy = [ "multi-user.target" ]; @@ -75,12 +69,15 @@ in { serviceConfig = { EnvironmentFile = config.services.telegraf.environmentFile; ExecStartPre = lib.optional (config.services.telegraf.environmentFile != null) - ''${pkgs.envsubst}/bin/envsubst -o /tmp/config.toml -i "${configFile}"''; + (pkgs.writeShellScript "pre-start" '' + umask 077 + ${pkgs.envsubst}/bin/envsubst -i "${configFile}" > /var/run/telegraf/config.toml + ''); ExecStart=''${cfg.package}/bin/telegraf -config ${finalConfigFile}''; ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + RuntimeDirectory = "telegraf"; User = "telegraf"; Restart = "on-failure"; - PrivateTmp = true; # for ping probes AmbientCapabilities = [ "CAP_NET_RAW" ]; }; diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix index 73f741b11357..483a5ae7e540 100644 --- a/nixos/tests/telegraf.nix +++ b/nixos/tests/telegraf.nix @@ -6,12 +6,15 @@ import ./make-test-python.nix ({ pkgs, ...} : { machine = { ... }: { services.telegraf.enable = true; + services.telegraf.environmentFile = pkgs.writeText "secrets" '' + SECRET=example + ''; services.telegraf.extraConfig = { agent.interval = "1s"; agent.flush_interval = "1s"; inputs.exec = { commands = [ - "${pkgs.runtimeShell} -c 'echo example,tag=a i=42i'" + "${pkgs.runtimeShell} -c 'echo $SECRET,tag=a i=42i'" ]; timeout = "5s"; data_format = "influx"; From 7534d92648cc4a7c708718e72c21b9483aca385d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 12 Nov 2020 13:49:00 +0100 Subject: [PATCH 117/164] nixos/telegraf: allow multiple env files --- nixos/modules/services/monitoring/telegraf.nix | 12 ++++++------ nixos/tests/telegraf.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index 12a360e7229a..1fc17ec72daf 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -20,9 +20,9 @@ in { type = types.package; }; - environmentFile = mkOption { - type = types.nullOr types.path; - default = null; + environmentFiles = mkOption { + type = types.nullOr (types.listOf types.path); + default = []; example = "/run/keys/telegraf.env"; description = '' File to load as environment file. Environment variables @@ -59,7 +59,7 @@ in { ###### implementation config = mkIf config.services.telegraf.enable { systemd.services.telegraf = let - finalConfigFile = if config.services.telegraf.environmentFile == null + finalConfigFile = if config.services.telegraf.environmentFiles == [] then configFile else "/var/run/telegraf/config.toml"; in { @@ -67,8 +67,8 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; serviceConfig = { - EnvironmentFile = config.services.telegraf.environmentFile; - ExecStartPre = lib.optional (config.services.telegraf.environmentFile != null) + EnvironmentFile = config.services.telegraf.environmentFiles; + ExecStartPre = lib.optional (config.services.telegraf.environmentFiles != []) (pkgs.writeShellScript "pre-start" '' umask 077 ${pkgs.envsubst}/bin/envsubst -i "${configFile}" > /var/run/telegraf/config.toml diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix index 483a5ae7e540..938bbd518b5a 100644 --- a/nixos/tests/telegraf.nix +++ b/nixos/tests/telegraf.nix @@ -6,9 +6,9 @@ import ./make-test-python.nix ({ pkgs, ...} : { machine = { ... }: { services.telegraf.enable = true; - services.telegraf.environmentFile = pkgs.writeText "secrets" '' + services.telegraf.environmentFiles = [pkgs.writeText "secrets" '' SECRET=example - ''; + '']; services.telegraf.extraConfig = { agent.interval = "1s"; agent.flush_interval = "1s"; From b696d7962f4f2724918622fd086a781220fcfade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 Nov 2020 09:26:41 +0100 Subject: [PATCH 118/164] telegraf: 1.15.2 -> 1.16.2 --- pkgs/servers/monitoring/telegraf/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index a12b9e50adb5..fa94a3332a82 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.15.2"; + version = "1.16.2"; excludedPackages = "test"; @@ -12,19 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "045wjpq29dr0s48ns3a4p8pw1j0ssfcw6m91iim4pkrppj7bm2di"; + sha256 = "sha256-XdlXUwGn2isGn7SqCGaAjntposBEd6WbbdfN6dEycDI="; }; - patches = [ - # https://github.com/influxdata/telegraf/pull/7988 - # fix broken cgo vendoring - (fetchpatch { - url = "https://github.com/influxdata/telegraf/commit/63e1f41d8ff246d191d008ff7f69d69cc34b4fae.patch"; - sha256 = "0ikifc4414bid3g6hhxz18cw71z63s5g805klx98vrndjlpbqkzw"; - }) - ]; - - vendorSha256 = "0f95xigpkindd7dmci8kqpqq5dlirimbqh8ai73142asbrd5h4yr"; + vendorSha256 = "02fqx817w6f9grfc69ri06a6qygbr5chan6w9waq2y0mxvmypz28"; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} From 68f44d990df3b2d33773a05921a4ff19b41329bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 08:39:20 -0800 Subject: [PATCH 119/164] fahviewer: 7.6.13 -> 7.6.21 (#103688) --- pkgs/applications/science/misc/foldingathome/viewer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index cdeed6536efa..a383de621f29 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -11,7 +11,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.6.13"; + version = "7.6.21"; in stdenv.mkDerivation rec { inherit version; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb"; - sha256 = "09yfvk16j1iwx8h1xg678ks3bc8760gfdn7n32j8r893kd32cwyk"; + sha256 = "00fd00pf6fcpplcaahvy9ir60mk69d9rcmwsyq3jrv9mxqm9aq7p"; }; nativeBuildInputs = [ From e3cf6e12bc39401e26b4e45ed121e71c828d8d3a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 08:39:37 -0800 Subject: [PATCH 120/164] fahcontrol: 7.6.13 -> 7.6.21 (#103677) --- pkgs/applications/science/misc/foldingathome/control.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix index 91c3b8c779cd..85be61f6686d 100644 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ b/pkgs/applications/science/misc/foldingathome/control.nix @@ -8,7 +8,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.6.13"; + version = "7.6.21"; python = python2.withPackages ( @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb"; - sha256 = "0qfvhwc29cgqkwf2bkhq4gr2d1c4jgccfs58916ss03n4rwz9gng"; + sha256 = "1vfrdqkrvdlyxaw3f6z92w5dllrv6810lmf8yhcmjcwmphipvf71"; }; nativeBuildInputs = [ From 8578fb314495b24e1bb3b533d18542459f6031c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 8 Jun 2020 16:27:01 +0200 Subject: [PATCH 121/164] phonemizer: init at 2.2.1 --- .../phonemizer/backend-paths.patch | 29 ++++++++ .../python-modules/phonemizer/default.nix | 73 +++++++++++++++++++ .../drop-readme-festival-test.patch | 12 +++ .../remove-intertwined-festival-test.patch | 22 ++++++ pkgs/top-level/python-packages.nix | 2 + 5 files changed, 138 insertions(+) create mode 100644 pkgs/development/python-modules/phonemizer/backend-paths.patch create mode 100644 pkgs/development/python-modules/phonemizer/default.nix create mode 100644 pkgs/development/python-modules/phonemizer/drop-readme-festival-test.patch create mode 100644 pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch diff --git a/pkgs/development/python-modules/phonemizer/backend-paths.patch b/pkgs/development/python-modules/phonemizer/backend-paths.patch new file mode 100644 index 000000000000..1734addb0ef1 --- /dev/null +++ b/pkgs/development/python-modules/phonemizer/backend-paths.patch @@ -0,0 +1,29 @@ +diff --git a/phonemizer/backend/espeak.py b/phonemizer/backend/espeak.py +index 387c11c..ceb5e7e 100644 +--- a/phonemizer/backend/espeak.py ++++ b/phonemizer/backend/espeak.py +@@ -81,10 +81,7 @@ class BaseEspeakBackend(BaseBackend): + if _ESPEAK_DEFAULT_PATH: + return _ESPEAK_DEFAULT_PATH + +- espeak = distutils.spawn.find_executable('espeak-ng') +- if not espeak: # pragma: nocover +- espeak = distutils.spawn.find_executable('espeak') +- return espeak ++ return "@espeak@" + + @classmethod + def is_available(cls): +diff --git a/phonemizer/backend/festival.py b/phonemizer/backend/festival.py +index b5bc56d..0833160 100644 +--- a/phonemizer/backend/festival.py ++++ b/phonemizer/backend/festival.py +@@ -78,7 +78,7 @@ class FestivalBackend(BaseBackend): + if _FESTIVAL_DEFAULT_PATH: + return _FESTIVAL_DEFAULT_PATH + +- return distutils.spawn.find_executable('festival') ++ return "@festival@" + + @classmethod + def is_available(cls): diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix new file mode 100644 index 000000000000..2d6531794313 --- /dev/null +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -0,0 +1,73 @@ +{ lib +, substituteAll +, buildPythonApplication +, fetchPypi +, python3Packages +, pkgs +, joblib +, segments +, attrs +, espeak-ng +, pytestCheckHook +, pytestrunner +, pytestcov +}: + +buildPythonApplication rec { + pname = "phonemizer"; + version = "2.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "127n4f10zxq60qd8xvlc1amji4wbghqb90rfp25rzdk716kvgwab"; + }; + + postPatch = '' + sed -i -e '/\'pytest-runner\'/d setup.py + ''; + + patches = [ + (substituteAll { + src = ./backend-paths.patch; + espeak = "${lib.getBin espeak-ng}/bin/espeak"; + # override festival path should you try to integrate it + festival = ""; + }) + ./remove-intertwined-festival-test.patch + ]; + + propagatedBuildInputs = [ + joblib + segments + attrs + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + checkInputs = [ + pytestCheckHook + pytestcov + ]; + + # We tried to package festvial, but were unable to get the backend running, + # so let's disable related tests. + pytestFlagsArray = [ + "--ignore=test/test_festival.py" + ]; + + disabledTests = [ + "test_festival" + "test_relative" + "test_absolute" + "test_readme_festival_syll" + ]; + + meta = with lib; { + homepage = "https://github.com/bootphon/phonemizer"; + description = "Simple text to phones converter for multiple languages"; + license = licenses.gpl3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/phonemizer/drop-readme-festival-test.patch b/pkgs/development/python-modules/phonemizer/drop-readme-festival-test.patch new file mode 100644 index 000000000000..a60cdf2645a5 --- /dev/null +++ b/pkgs/development/python-modules/phonemizer/drop-readme-festival-test.patch @@ -0,0 +1,12 @@ +diff --git a/test/test_main.py b/test/test_main.py +index 71d605a..d137cd7 100644 +--- a/test/test_main.py ++++ b/test/test_main.py +@@ -63,7 +63,6 @@ def test_readme(): + _test(u'hello world', u'həloʊ wɜːld ') + _test(u'hello world', u'həloʊ wɜːld ', '--verbose') + _test(u'hello world', u'həloʊ wɜːld ', '--quiet') +- _test(u'hello world', u'hhaxlow werld', '-b festival --strip') + _test(u'hello world', u'həloʊ wɜːld ', '-l en-us') + _test(u'bonjour le monde', u'bɔ̃ʒuʁ lə mɔ̃d ', '-l fr-fr') + _test(u'bonjour le monde', u'b ɔ̃ ʒ u ʁ ;eword l ə ;eword m ɔ̃ d ;eword ', diff --git a/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch b/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch new file mode 100644 index 000000000000..d7d605df7f98 --- /dev/null +++ b/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch @@ -0,0 +1,22 @@ +diff --git a/test/test_main.py b/test/test_main.py +index 71d605a..0ea3c74 100644 +--- a/test/test_main.py ++++ b/test/test_main.py +@@ -63,17 +63,12 @@ def test_readme(): + _test(u'hello world', u'həloʊ wɜːld ') + _test(u'hello world', u'həloʊ wɜːld ', '--verbose') + _test(u'hello world', u'həloʊ wɜːld ', '--quiet') +- _test(u'hello world', u'hhaxlow werld', '-b festival --strip') + _test(u'hello world', u'həloʊ wɜːld ', '-l en-us') + _test(u'bonjour le monde', u'bɔ̃ʒuʁ lə mɔ̃d ', '-l fr-fr') + _test(u'bonjour le monde', u'b ɔ̃ ʒ u ʁ ;eword l ə ;eword m ɔ̃ d ;eword ', + '-l fr-fr -p " " -w ";eword "') + + +-@pytest.mark.skipif( +- '2.1' in backend.FestivalBackend.version(), +- reason='festival-2.1 gives different results than further versions ' +- 'for syllable boundaries') + def test_readme_festival_syll(): + _test(u'hello world', + u'hh ax ;esyll l ow ;esyll ;eword w er l d ;esyll ;eword ', diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d84b4c366243..51ae93b0eb18 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5290,6 +5290,8 @@ in { pyomo = callPackage ../development/python-modules/pyomo { }; + phonemizer = callPackage ../development/python-modules/phonemizer { }; + pyopencl = callPackage ../development/python-modules/pyopencl { }; pyopengl = callPackage ../development/python-modules/pyopengl { }; From 00251c0689046f194551ba509ef4249f8e1f50d3 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 26 Sep 2020 13:49:39 +0200 Subject: [PATCH 122/164] =?UTF-8?q?sacc:=201.01=20=E2=86=92=201.02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/networking/gopher/sacc/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/applications/networking/gopher/sacc/default.nix index 71726056a554..e10d97aeb42b 100644 --- a/pkgs/applications/networking/gopher/sacc/default.nix +++ b/pkgs/applications/networking/gopher/sacc/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchgit, ncurses +{ stdenv, fetchurl, ncurses , patches ? [] # allow users to easily override config.def.h }: stdenv.mkDerivation rec { pname = "sacc"; - version = "1.01"; + version = "1.02"; - src = fetchgit { - url = "git://bitreich.org/sacc"; - rev = version; - sha256 = "0n6ghbi715m7hrxzqggx1bpqj8h7569s72b9bzk6m4gd29jaq9hz"; + src = fetchurl { + url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tgz"; + sha512 = "18ja95cscgjaj1xqn70dj0482f76d0561bdcc47flqfsjh4mqckjqr65qv7awnw6rzm03i5cp45j1qx12y0y83skgsar4pplmy8q014"; }; inherit patches; From 960b4816a54ce683392ffb6225c982675467087d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 5 Nov 2020 17:27:58 +0100 Subject: [PATCH 123/164] verilog: unstable-2020-10-24 -> 11.0 --- .../science/electronics/verilog/default.nix | 37 +++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index abe80378024d..6217df2db8f8 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -1,40 +1,47 @@ -{ stdenv, fetchFromGitHub, autoconf, gperf, flex, bison, readline, ncurses -, bzip2, zlib -# Test inputs +{ stdenv +, fetchFromGitHub +, autoconf +, bison +, bzip2 +, flex +, gperf +, ncurses , perl +, readline +, zlib }: let iverilog-test = fetchFromGitHub { owner = "steveicarus"; repo = "ivtest"; - rev = "d4c80beb845cad92136c05074b3910b822a9315f"; - sha256 = "13cpnkki3xmhsh2v4bp2s35mhwknapcikdh85g4q6925ka940r45"; + rev = "253609b89576355b3bef2f91e90db62223ecf2be"; + sha256 = "18i7jlr2csp7mplcrwjhllwvb6w3v7x7mnx7vdw48nd3g5scrydx"; }; in stdenv.mkDerivation rec { pname = "iverilog"; - version = "unstable-2020-10-24"; + version = "11.0"; src = fetchFromGitHub { owner = "steveicarus"; repo = pname; - rev = "d6e01d0c557253414109a4dde46b2966a5a3fb08"; - sha256 = "1bl75mbycj9zpjbpay8z12384yk9ih5q9agsrjh9pva0vv3h4y4y"; + rev = "v${stdenv.lib.replaceStrings ["."] ["_"] version}"; + sha256 = "0nzcyi6l2zv9wxzsv9i963p3igyjds0n55x0ph561mc3pfbc7aqp"; }; - nativeBuildInputs = [ autoconf gperf flex bison ]; - buildInputs = [ readline ncurses bzip2 zlib ]; + nativeBuildInputs = [ autoconf bison flex gperf ]; - preConfigure = "bash $PWD/autoconf.sh"; + buildInputs = [ bzip2 ncurses readline zlib ]; + + preConfigure = "sh autoconf.sh"; enableParallelBuilding = true; + doCheck = true; - # most tests pass, but some that rely on exact text of floating-point numbers - # fail on aarch64. - doInstallCheck = !stdenv.isAarch64; installCheckInputs = [ perl ]; + installCheckPhase = '' # copy tests to allow writing results export TESTDIR=$(mktemp -d) @@ -53,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Icarus Verilog compiler"; - homepage = "http://iverilog.icarus.com/"; + homepage = "http://iverilog.icarus.com/"; # https does not work license = with licenses; [ gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ winden thoughtpolice ]; platforms = platforms.all; From 610d3377646c1882773b4155bb4aedcaacfc3b01 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 14 Nov 2020 19:53:42 +0100 Subject: [PATCH 124/164] vhd2vl: fix compatibility with verilog 11.0 --- .../science/electronics/vhd2vl/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix index 43dfdcabd02f..be9e890fc8d5 100644 --- a/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , bison , flex , verilog @@ -16,6 +17,15 @@ stdenv.mkDerivation rec { sha256 = "17va2pil4938j8c93anhy45zzgnvq3k71a7glj02synfrsv6fs8n"; }; + patches = stdenv.lib.optionals (!stdenv.isAarch64) [ + # fix build with verilog 11.0 - https://github.com/ldoolitt/vhd2vl/pull/15 + # for some strange reason, this is not needed for aarch64 + (fetchpatch { + url = "https://github.com/ldoolitt/vhd2vl/commit/ce9b8343ffd004dfe8779a309f4b5a594dbec45e.patch"; + sha256 = "1qaqhm2mk66spb2dir9n91b385rarglc067js1g6pcg8mg5v3hhf"; + }) + ]; + nativeBuildInputs = [ bison flex From 65bd03c8d3eb21a3dd849e0b4b38a39529ead058 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Wed, 11 Nov 2020 17:23:02 +0100 Subject: [PATCH 125/164] hsetroot: 1.0.2 -> 1.0.5 --- pkgs/tools/X11/hsetroot/default.nix | 46 ++++++++++++++++------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 3bfe98a7a211..0d42687bf0b0 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -1,36 +1,40 @@ -{ stdenv, fetchurl, autoconf, automake, imlib2, libtool, libX11, pkgconfig, xorgproto }: +{ stdenv +, fetchFromGitHub +, pkg-config +, imlib2 +, libX11 +, libXinerama +}: stdenv.mkDerivation rec { pname = "hsetroot"; - version = "1.0.2"; + version = "1.0.5"; - # The primary download site seems to no longer exist; use Gentoo's mirror for now. - src = fetchurl { - url = "http://mirror.datapipe.net/gentoo/distfiles/hsetroot-${version}.tar.gz"; - sha256 = "d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7"; + src = fetchFromGitHub { + owner = "himdel"; + repo = "hsetroot"; + rev = version; + sha256 = "1jbk5hlxm48zmjzkaq5946s58rqwg1v1ds2sdyd2ba029hmvr722"; }; - # See https://bugs.gentoo.org/show_bug.cgi?id=504056 - underlinkingPatch = fetchurl { - url = "http://www.gtlib.gatech.edu/pub/gentoo/gentoo-x86-portage/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch"; - name = "hsetroot-1.0.2-underlinking.patch"; - sha256 = "1px1p3wz7ji725z9nlwb0x0h6lnnvnpz15sblzzq7zrijl3wz65x"; - }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + imlib2 + libX11 + libXinerama + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake imlib2 libtool libX11 xorgproto ]; + makeFlags = [ "PREFIX=$(out)" ]; - patches = [ underlinkingPatch ]; - - patchFlags = [ "-p0" ]; - - preConfigure = "./autogen.sh"; + preInstall = '' + mkdir -p "$out/bin" + ''; meta = with stdenv.lib; { description = "Allows you to compose wallpapers ('root pixmaps') for X"; - homepage = "https://thegraveyard.org/hsetroot.html"; + homepage = "https://github.com/himdel/hsetroot"; license = licenses.gpl2Plus; - maintainers = [ maintainers.henrytill ]; + maintainers = with maintainers; [ henrytill shamilton ]; platforms = platforms.unix; }; } From fb397ae7d88d1867981148e62a1c15c08c5a3afe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 19:44:09 +0000 Subject: [PATCH 126/164] python37Packages.casbin: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 117b6374f918..bb111bfbbd69 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.9.0"; + version = "0.10.0"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "16bqa2f5l2cns2izc4siy8jw23q9vrqm9wnyp696fj83y77nkp75"; + sha256 = "13r8alja25yd5gk5124y1v6frwphmz6wl5z5gz1fafb5nv2zgqw9"; }; propagatedBuildInputs = [ From 6769ad9f119a41f19e04b1cb755c43b73bb8cf28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 14 Nov 2020 21:06:48 +0100 Subject: [PATCH 127/164] Revert "Merge #102138: thunderbird: set build timeout at eight hours" This reverts commit ef543fb416353320ba2876754e3d3240d338865e, reversing changes made to 0d657b9c61d1b568584805717f640b2bbc5a9b0e. See the parent commit. --- pkgs/applications/networking/mailreaders/thunderbird/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e92e89c7126c..e228258efcf7 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -332,6 +332,5 @@ stdenv.mkDerivation rec { ]; platforms = platforms.linux; license = licenses.mpl20; - timeout = 28800; # eight hours }; } From 0c0b533fa7fb401517d3a7fe6103d6ecde6affeb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 14 Nov 2020 15:21:48 -0500 Subject: [PATCH 128/164] linux-rt_5_4: 5.4.74-rt42 -> 5.4.77-rt43 --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 11a5387cac3d..53020a1ab8dd 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.74-rt42"; # updated by ./update-rt.sh + version = "5.4.77-rt43"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1drs2pngr5w3rmpydljirmibp30qb4hdrhqsi92knshlw6nz817c"; + sha256 = "1xyvml0mps7bsa11bgpa4l0w8x6pasdz9yab2z4ds394f1lkxq53"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "11hk5ps2nsffcjmccp839l55nzbl9irss0ralj2y1xah1ikbs7fh"; + sha256 = "1i0d52iq9n72i3dipskh2hwy2x19wsr9vsx5vvj2hvz21jv6z5m0"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; From a429039a1f936b0df442d5d334fab75dd911769a Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sat, 14 Nov 2020 23:21:01 +0200 Subject: [PATCH 129/164] pijul: 1.0.0-alpha -> 1.0.0-alpha.1 --- pkgs/applications/version-management/pijul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 0eadb51fd1a8..f62d3982b59e 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha"; + version = "1.0.0-alpha.1"; src = fetchCrate { inherit version pname; - sha256 = "0dnw2cxsxb20my81szyqjsmmnkakxawvsk6cnd1fi88k4lr0z2xh"; + sha256 = "113j7f6l9yvgm3x65p268940hk2svspg0n63lg0dpp8hakk3mslq"; }; - cargoSha256 = "130vryqs0g4a0328ivqafdylwqs64g4mp8vgmz6nz4c9l3h9wgcx"; + cargoSha256 = "0lciyhh4yv2z9aii0xph8sird4f9624pk9hynx7441hwjjdmgy59"; cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; LIBCLANG_PATH = "${libclang}/lib"; From c7463be402da29b10396e8fb6b62823b625aa838 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 Nov 2020 17:57:06 -0300 Subject: [PATCH 130/164] simh: init at 3.11-1 --- pkgs/misc/emulators/simh/default.nix | 62 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/misc/emulators/simh/default.nix diff --git a/pkgs/misc/emulators/simh/default.nix b/pkgs/misc/emulators/simh/default.nix new file mode 100644 index 000000000000..50e02a8f2403 --- /dev/null +++ b/pkgs/misc/emulators/simh/default.nix @@ -0,0 +1,62 @@ +{ stdenv +, fetchFromGitHub +, SDL2 +, SDL2_ttf +, libpcap +, vde2 +, pcre +}: + +stdenv.mkDerivation rec { + pname = "simh"; + version = "3.11-1"; + + src = fetchFromGitHub { + owner = "simh"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-65+YfOWpVXPeT64TZcSaWJY+ODQ0q/pwF9jb8xGdpIs="; + }; + + buildInputs = [ SDL2 SDL2_ttf libpcap vde2 pcre ]; + + dontConfigure = true; + + makeFlags = [ "GCC=cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; + + preInstall = '' + install -d ${placeholder "out"}/bin + install -d ${placeholder "out"}/share/simh + ''; + + installPhase = '' + runHook preInstall + for i in BIN/*; do + install -D $i ${placeholder "out"}/bin + done + for i in VAX/*bin; do + install -D $i ${placeholder "out"}/share/simh + done + runHook postInstall + ''; + + postInstall = '' + (cd $out/bin; for i in *; do ln -s $i simh-$i; done) + ''; + + meta = with stdenv.lib; { + homepage = "http://simh.trailing-edge.com/"; + description = "A collection of simulators of historic hardware"; + longDescription = '' + SimH (History Simulator) is a collection of simulators for historically + significant or just plain interesting computer hardware and software from + the past. The goal of the project is to create highly portable system + simulators and to publish them as freeware on the Internet, with freely + available copies of significant or representative software. + ''; + license = with licenses; mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} +# TODO: install documentation diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e0efbb8d70a..22e43fc1ef49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1589,6 +1589,8 @@ in bsod = callPackage ../misc/emulators/bsod { }; + simh = callPackage ../misc/emulators/simh { }; + btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; btrbk = callPackage ../tools/backup/btrbk { From 6bf0226686caf35d8fe5ea2522a12b0de5f11601 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 8 Nov 2020 17:00:17 +0100 Subject: [PATCH 131/164] pythonPackages.notmuch2: init at 0.31 generates bindings via cffi --- pkgs/development/python-modules/notmuch/2.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/notmuch/2.nix diff --git a/pkgs/development/python-modules/notmuch/2.nix b/pkgs/development/python-modules/notmuch/2.nix new file mode 100644 index 000000000000..593eed6c2514 --- /dev/null +++ b/pkgs/development/python-modules/notmuch/2.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, notmuch +, python +, cffi +}: + +buildPythonPackage { + pname = "notmuch2"; + inherit (notmuch) version src; + + sourceRoot = "${notmuch.src.name}/bindings/python-cffi"; + + buildInputs = [ python notmuch cffi ]; + + meta = with stdenv.lib; { + description = "Pythonic bindings for the notmuch mail database using CFFI"; + homepage = "https://notmuchmail.org/"; + license = licenses.gpl3; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51ae93b0eb18..d9862a193e45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4140,6 +4140,7 @@ in { notify-py = callPackage ../development/python-modules/notify-py { }; notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; }; + notmuch2 = callPackage ../development/python-modules/notmuch/2.nix { inherit (pkgs) notmuch; }; nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; From 0e89c426c7e4693bba4d3f70d38bbe920d4af88c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 13 Nov 2020 17:40:36 -0800 Subject: [PATCH 132/164] doc/contributing: remove label instructions ofborg largely does this now --- doc/contributing/reviewing-contributions.xml | 48 -------------------- 1 file changed, 48 deletions(-) diff --git a/doc/contributing/reviewing-contributions.xml b/doc/contributing/reviewing-contributions.xml index 4fe51677f181..96bf44da9723 100644 --- a/doc/contributing/reviewing-contributions.xml +++ b/doc/contributing/reviewing-contributions.xml @@ -47,18 +47,6 @@ - - - Add labels to the pull request. (Requires commit rights) - - - - - 8.has: package (update) and any topic label that fit the updated package. - - - - Ensure that the package versioning fits the guidelines. @@ -186,18 +174,6 @@ - - - Add labels to the pull request. (Requires commit rights) - - - - - 8.has: package (new) and any topic label that fit the new package. - - - - Ensure that the package versioning is fitting the guidelines. @@ -302,18 +278,6 @@ - - - Add labels to the pull request. (Requires commit rights) - - - - - 8.has: module (update) and any topic label that fit the module. - - - - Ensure that the module maintainers are notified. @@ -406,18 +370,6 @@ - - - Add labels to the pull request. (Requires commit rights) - - - - - 8.has: module (new) and any topic label that fit the module. - - - - Ensure that the module tests, if any, are succeeding. From 2fa89880cb8426c744143a698748fa73280d0569 Mon Sep 17 00:00:00 2001 From: Daniel Fox Franke Date: Sat, 14 Nov 2020 20:45:41 -0500 Subject: [PATCH 133/164] nvidia-x11: 455.28 -> 455.38 (#103830) --- 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 75ce13da0d35..5fc60b404d89 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "455.28"; - sha256_64bit = "03ysf61qrb272yqkn7bhn9d65lcfhmqc2c0dbh5prp5f2ndlkqg4"; - settingsSha256 = "0r9vclmh48yhcrnz9yrswfipj5450ga73jywdjg19gaq2s2aaf1f"; - persistencedSha256 = "04v9d2g1r0x5dgyy9hqqyp0p9a3qxy1kzl13vklfqrwswb8jw7z1"; + version = "455.38"; + sha256_64bit = "0x6w2kcjm5q9z9l6rkxqabway4qq4h3ynngn36i8ky2dpxc1wzfq"; + settingsSha256 = "1hk4yvbb7xhfwm8jiwq6fj5m7vg3w7yvgglhfyhq7bbrlklfb4hm"; + persistencedSha256 = "00mmazv8sy93jvp60v7p954n250f4q3kxc13l4f8fmi28lgv0844"; } else legacy_390; From f48ec9844443e5b6218d860535879530c6c79dde Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 01:59:18 +0000 Subject: [PATCH 134/164] cloudflared: 2020.11.3 -> 2020.11.5 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 49abbc7f2cc4..738917f37991 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.11.3"; + version = "2020.11.5"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "1v262wr1z0z3frb9avg6bgsv973cn6gmn4w6wghpcjwsm6jld575"; + sha256 = "09bjqcrz7s40m7afb80dpx7jncp5prn2p6bksspv5wqc84l2nn5d"; }; vendorSha256 = null; From c8f7b02dfe74b0ed11042f43476933221e1e36f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 02:34:21 +0000 Subject: [PATCH 135/164] dasel: 1.2.0 -> 1.5.1 --- pkgs/applications/misc/dasel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 0e5c33c00b5b..49a16b583661 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "1.2.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Un9tqODwiWsaw66t2m8NyaDF0+hq/e0tmRFi3/T4LMI="; + sha256 = "14xh5fjh0ngf8rmhqgfxmz25yz7far3sf8yza9iprs7y7ad61qz9"; }; - vendorSha256 = "sha256:1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; + vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; meta = with stdenv.lib; { description = "Query and update data structures from the command line"; From fbdb0d9953f7d01530fd9d3912ccc68c2e4d8139 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 03:11:48 +0000 Subject: [PATCH 136/164] doctl: 1.51.0 -> 1.52.0 --- pkgs/development/tools/doctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 51dffdbe2bed..53d0f791a35d 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.51.0"; + version = "1.52.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "1pc1nyzjzgnwchxbhgwiq46rysxpvxv7nmshvmphqm7avxfsmdzf"; + sha256 = "0x4ri36ivmhg42bvh62jvgawbwwypl3a4vr8m9gk19nndds9q5zv"; }; meta = with lib; { From e542a2d22e50ed55813a331eaa7246e464aa504d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 04:50:11 +0000 Subject: [PATCH 137/164] flyctl: 0.0.146 -> 0.0.149 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 73450d086777..0ba7784ab2ff 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.146"; + version = "0.0.149"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "0qqrzzgr7r2j5cwhbfwfl1z6k9qgqpsdf8f0n545hg48i52q0p2q"; + sha256 = "0wscyakl415504yzqb93mysi2n4gqrbfzg20mdj316r9krqcbzpg"; }; preBuild = '' From a37ccc733c811c7376fad94f34ba070ff089c7dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 05:00:35 +0000 Subject: [PATCH 138/164] font-manager: 0.7.8 -> 0.7.9 --- pkgs/applications/misc/font-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index b2001c21bf76..defbe7520d7c 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.7.8"; + version = "0.7.9"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "0s1l30y55l45rrqd9lygvp2gzrqw25rmjgnnja6s5rzs79gc668c"; + sha256 = "1nc0i824v2szz0j9a5rwl8gygih15xbxnxpnx9d3wr0yq9057q6q"; }; nativeBuildInputs = [ From 168747920a1fb2c05d462b25fd58693bb6b9c37c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 05:25:31 +0000 Subject: [PATCH 139/164] ft2-clone: 1.39 -> 1.40 --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 5ee7a4d9c744..05f24d84e353 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.39"; + version = "1.40"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0vc7gni24q649b53flz7rlgnc5xl2dqdklgwc2brj380a5s7g6m7"; + sha256 = "0qc3hai6fhn4amk5ixmxx3yswsi25qpax0r9nvvnyhbcb6crqcs1"; }; nativeBuildInputs = [ cmake ]; From 72c798ddcb7da96159686457e256b1d133b4f0b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 06:56:28 +0000 Subject: [PATCH 140/164] hugo: 0.78.1 -> 0.78.2 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 0882b0974497..5372b556ecdb 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.78.1"; + version = "0.78.2"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1rzv6az7fb1xvjxxq31rs42waqpwvks4h03lzjxv0kj8i43z116k"; + sha256 = "1xjxyx520wa6sgvighjp82qqfi0ykfskp0za5j95167c56ss8lm4"; }; - vendorSha256 = "06cw3qj57nhrxrbbxcyrqn53j6g11rd2q7bxw89fdn901mc26s03"; + vendorSha256 = "00jjcw76l12ppx3q1xhly7q10jfi2kx62a8z3r1k7m2593k8c4vq"; doCheck = false; From bc412a012d0837ea1563a1dc7dce1cb7fee76422 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 07:20:00 +0000 Subject: [PATCH 141/164] iconpack-obsidian: 4.13 -> 4.14 --- pkgs/data/icons/iconpack-obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix index 8fe21aabe36f..165801f52eb8 100644 --- a/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/pkgs/data/icons/iconpack-obsidian/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-obsidian"; - version = "4.13"; + version = "4.14"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1hh0hnd2d08l4n5r73fkngv08f8230pp94k9qq8xgmchvjfg6j8y"; + sha256 = "1rhs8k88gh6673flr22cb3gbbw37wyzhd6jyysx6qgjjsnjvl2h8"; }; nativeBuildInputs = [ gtk3 ]; From efe6b12a35e38e4da9d651e4898079c8e7263d99 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 17:34:28 +0000 Subject: [PATCH 142/164] python37Packages.pyvips: 2.1.12 -> 2.1.13 --- pkgs/development/python-modules/pyvips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 0f5f9a4b43ad..5853538610a1 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyvips"; - version = "2.1.12"; + version = "2.1.13"; src = fetchPypi { inherit pname version; - sha256 = "0pg0dxhxgi2m7bb5bi5wpx9hgnbi8ws1bz6w2dldbhi52pizghl4"; + sha256 = "4f1f6fa19893048bf6b950eb7eb2d4cdfeb8b940a9defaca5d4f79e5acd5085f"; }; nativeBuildInputs = [ pytestrunner pkgconfig pkg-config ]; From e038ae53292e8ecbc1b6810e33037d0b7d08779e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 17:09:01 +0000 Subject: [PATCH 143/164] python37Packages.dropbox: 10.8.0 -> 10.10.0 --- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 20576e5e47a4..b58d24e3fecf 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "10.8.0"; + version = "10.10.0"; src = fetchPypi { inherit pname version; - sha256 = "2312a0314d7698f6aa6944bf6d73a756f4ff7d7d90fa26c323a418a84dc3b533"; + sha256 = "df43e9e0bdcae6d610dd754a5ec72f2f91a311bbc2c8a28d076df69695b18398"; }; # Set DROPBOX_TOKEN environment variable to a valid token. From 05d4955a96608ce8309124140360cee4c9a1390c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 21:37:14 +0000 Subject: [PATCH 144/164] python37Packages.versioneer: 0.18 -> 0.19 --- pkgs/development/python-modules/versioneer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 8094a15a32e7..f8ad6b16c81f 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "versioneer"; - version = "0.18"; + version = "0.19"; src = fetchPypi { inherit pname version; - sha256 = "0dgkzg1r7mjg91xp81sv9z4mabyxl39pkd11jlc1200md20zglga"; + sha256 = "a4fed39bbebcbd2d07f8a86084773f303cb442709491955a0e6754858e47afae"; }; # Couldn't get tests to work because, for instance, they used virtualenv and From a0ea37d21d8a13bb4ecb647e9d77d651733695b9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 14 Nov 2020 23:58:07 -0800 Subject: [PATCH 145/164] python2Packages.versioneer: disable python2 --- pkgs/development/python-modules/versioneer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index f8ad6b16c81f..31042c8cc1c4 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { - pname = "versioneer"; version = "0.19"; + disabled = isPy27; src = fetchPypi { inherit pname version; From d2928191c60ad82cc5b3acea8da3535dd843d5fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 11:13:35 +0000 Subject: [PATCH 146/164] python37Packages.cmd2: 1.3.11 -> 1.4.0 --- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 335649c6be92..889ef3fba15c 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.3.11"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "826a288ee6d9c4ec1184e64e9566c09d3b73be8f4283c1898fa4332f1daf8dbf"; + sha256 = "e59fa932418603af4e046a96c8985812b05af8a73bfd9d7a386cd1b02c6ab687"; }; LC_ALL="en_US.UTF-8"; From 7d129704d042894e75f78141a4f59cc04b8bea73 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 11:03:33 +0000 Subject: [PATCH 147/164] python37Packages.azure-mgmt-policyinsights: 0.5.0 -> 0.6.0 --- .../python-modules/azure-mgmt-policyinsights/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix index ad8a2a0fbe23..b60cd66725c1 100644 --- a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-policyinsights"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ed229e3845c477e88dde413825d4fba0d38b3a5ffab4e694c7d0da995f3db0f3"; + sha256 = "2c64533f6eab08dc16450fc5d7c7651557fc0edc8ef1278dda336333d648a7c4"; }; propagatedBuildInputs = [ From 0e77efac27638eea96e7be01f611c132803c8fb1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 20:22:07 +0000 Subject: [PATCH 148/164] python37Packages.bpython: 0.20 -> 0.20.1 --- pkgs/development/python-modules/bpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index bbdca0a00974..7dfe8053ca24 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.20"; + version = "0.20.1"; src = fetchPypi { inherit pname version; - sha256 = "fec7d97be9912a50d8f5b34ca10d70715c99a33f0cd0b9e4977c1b0f617fa913"; + sha256 = "6e7738806013b469be57b0117082b9c4557ed7c92c70ceb79f96d674d89c7503"; }; patches = [ (substituteAll { From fa962c1d243aaed47d4f083bff013d55f85addd0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Nov 2020 14:03:02 +0000 Subject: [PATCH 149/164] python37Packages.distributed: 2.30.0 -> 2.30.1 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 0267e959e5ba..f4be407fade2 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "2.30.0"; + version = "2.30.1"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "3eb8e4173625cea6ebda2f0a079b813eeabbffd1b24584855cf063ed1cca60b3"; + sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e"; }; disabled = pythonOlder "3.6"; From aaa295cf8b0b1a86d604e0cab8ab0bf8b7638b16 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 08:32:55 +0000 Subject: [PATCH 150/164] kube3d: 3.2.0 -> 3.2.1 --- pkgs/applications/networking/cluster/kube3d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index f6306ef9043d..69119673f308 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "3.2.0"; + version = "3.2.1"; k3sVersion = "1.18.9-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "0jy0l8rvmwi0qznnvv97v50lfkpc2bwjmbnq4pxnmf9ih970wjwh"; + sha256 = "1910vir9yc3xvb23260xljnfpznyhnk4gddy752rrndz7rk1b5c3"; }; buildFlagsArray = '' From b94a294363990d58be6b59863cab58c454935127 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 8 Nov 2020 15:34:09 +0100 Subject: [PATCH 151/164] scheherazade-new: init at 3.000 --- pkgs/data/fonts/scheherazade/default.nix | 26 +++++++++++++++--------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix index e7651f22d6a0..8639d29066c3 100644 --- a/pkgs/data/fonts/scheherazade/default.nix +++ b/pkgs/data/fonts/scheherazade/default.nix @@ -1,11 +1,16 @@ -{ lib, fetchzip }: +{ lib, fetchzip, version ? "3.000" }: let - version = "2.100"; -in fetchzip rec { - name = "scheherazade-${version}"; + new = lib.versionAtLeast version "3.000"; + sha256 = { + "2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; + "3.000" = "12sd2mjqb80ijc73y7p0iw6j3wy9i60a3aar3ywrxz4khpya48jw"; + }."${version}"; - url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade-${version}.zip"; +in fetchzip rec { + name = "scheherazade${lib.optionalString new "-new"}-${version}"; + + url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade${lib.optionalString new "New"}-${version}.zip"; postFetch = '' mkdir -p $out/share/{doc,fonts} @@ -15,16 +20,17 @@ in fetchzip rec { unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation ''; - sha256 = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; + inherit sha256; meta = with lib; { homepage = "https://software.sil.org/scheherazade/"; description = "A font designed in a similar style to traditional Naskh typefaces"; longDescription = '' - Scheherazade, named after the heroine of the classic Arabian Nights tale, - is designed in a similar style to traditional typefaces such as Monotype - Naskh, extended to cover the Unicode Arabic repertoire through Unicode - 8.0. + + Scheherazade${lib.optionalString new " New"}, named after the heroine of + the classic Arabian Nights tale, is designed in a similar style to + traditional typefaces such as Monotype Naskh, extended to cover the + Unicode Arabic repertoire through Unicode ${if new then "13.0" else "8.0"}. Scheherazade provides a “simplified” rendering of Arabic script, using basic connecting glyphs but not including a wide variety of additional diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 115b23032375..d1d1b8a84a00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19714,7 +19714,9 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix { shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { }; - scheherazade = callPackage ../data/fonts/scheherazade { }; + scheherazade = callPackage ../data/fonts/scheherazade { version = "2.100"; }; + + scheherazade-new = callPackage ../data/fonts/scheherazade { }; signwriting = callPackage ../data/fonts/signwriting { }; From 1ff209c9884706c60e63ef4c3a4c7e6a49585eca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 08:40:47 +0000 Subject: [PATCH 152/164] lazydocker: 0.9 -> 0.10 --- pkgs/tools/misc/lazydocker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index d0c4d71c58a6..4ab4e40de98d 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "lazydocker"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "08j2qp632fdmswnb92wxa9lhnal4mrmq6gmxaxngnxiqgkfx37zy"; + sha256 = "04j5bcsxm2yf74zkphnjrg8j3w0v6bsny8sg2k4gbisgshl1i3p8"; }; goPackagePath = "github.com/jesseduffield/lazydocker"; From 018696cbf2574806a11273ce713bfc18247361d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 09:59:18 +0000 Subject: [PATCH 153/164] matcha-gtk-theme: 2020-10-23 -> 2020-11-11-0 --- pkgs/data/themes/matcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 7ed6acb2800e..8adaa3b18350 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2020-10-23"; + version = "2020-11-11-0"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "125wcvr457lbs8zxp8r18q7gzagp0wbg518iynzmbax8gsjds8w3"; + sha256 = "00nl887nm1syy23s9y590ycjlrl15h5scp9hp0yvg0n6jd78rsc7"; }; buildInputs = [ gdk-pixbuf librsvg ]; From dbf134a71bf771b37957ce75162dff552dad3df2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 15 Nov 2020 11:56:16 +0100 Subject: [PATCH 154/164] html-proofer: 3.16.0 -> 3.17.0 --- pkgs/tools/misc/html-proofer/Gemfile.lock | 4 ++-- pkgs/tools/misc/html-proofer/gemset.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index 489fa555c5de..c918577fded7 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -6,7 +6,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) ffi (1.13.1) - html-proofer (3.16.0) + html-proofer (3.17.0) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) @@ -20,7 +20,7 @@ GEM mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) - parallel (1.19.2) + parallel (1.20.0) public_suffix (4.0.6) rainbow (3.0.0) typhoeus (1.4.0) diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index bdd0bbc20c9f..b617ebe7b0e5 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18s8l3nys0lvdkqpfg3c1rd84c5j4dmlx503wnksw9skbzn7l93m"; + sha256 = "0vjy9r9lwr0rfxxadj4rfkl94b2rz6avgq4h54g6b7x1jmx6b3sd"; type = "gem"; }; - version = "3.16.0"; + version = "3.17.0"; }; mercenary = { groups = ["default"]; @@ -89,10 +89,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l"; + sha256 = "1wci3dimgrap91nw5vnq4qa2vfmxga27m6sfmn8caskhzwxwv1dg"; type = "gem"; }; - version = "1.19.2"; + version = "1.20.0"; }; public_suffix = { groups = ["default"]; From 2806eb27431abf2ffcff7404783198c4b767e6de Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 14 Nov 2020 09:58:39 +0100 Subject: [PATCH 155/164] =?UTF-8?q?coq=5F8=5F12:=208.12.0=20=E2=86=92=208.?= =?UTF-8?q?12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/coq/default.nix | 1 + pkgs/top-level/coq-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 946cba41b143..dc9e40912d53 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -35,6 +35,7 @@ let "8.11.1" = "0qriy9dy36dajsv5qmli8gd6v55mah02ya334nw49ky19v7518m0"; "8.11.2" = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa"; "8.12.0" = "18dc7k0piv6v064zgdadpw6mkkxk7j663hb3svgj5236fihjr0cz"; + "8.12.1" = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q"; }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index fe6cd81f9ea1..605db554363b 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -119,7 +119,7 @@ in rec { version = "8.11.2"; }; coq_8_12 = callPackage ../applications/science/logic/coq { - version = "8.12.0"; + version = "8.12.1"; }; coqPackages_8_5 = mkCoqPackages coq_8_5; From 3e6fdd843ca6b8d909c71da53d03ed5ff1cd92f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 11:06:51 +0000 Subject: [PATCH 156/164] musikcube: 0.94.0 -> 0.95.0 --- pkgs/applications/audio/musikcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 5f0eb61a5bea..c6d1a264a9c3 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.94.0"; + version = "0.95.0"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "0hifyawsr38vsx12aqw38nms4kzbaghihib1r80x56f1jjsdhww0"; + sha256 = "16ksr4yjkg88bpij1i49dzi07ffhqq8b36r090y4fq5czrc420rc"; }; nativeBuildInputs = [ From 5848e9845b00e4b063431bc020f5903d5d3a95d5 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 15 Nov 2020 12:15:20 +0100 Subject: [PATCH 157/164] mutt: 2.0.0 -> 2.0.1 Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 49a4790f8a83..696fb504c1b8 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1bxf8976mrl3vbn3s5i32i1lf908yag5rsf84n76dllmly61794k"; + sha256 = "1nr1n0lshif6lrn4c5ym473jrg0jaka5wfyy06qmbxhnavmgvx8c"; }; patches = optional smimeSupport (fetchpatch { From 046002f4722b898800ae2c83293f27772ea78939 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 14 Nov 2020 02:55:29 +0100 Subject: [PATCH 158/164] firefox: 82.0.2 -> 82.0.3 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index de0180834d2f..d65ae7037beb 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "82.0.2"; + ffversion = "82.0.3"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "25wkgsqnafmq30m1kd1axkm454dhl2bmz6100i3ccqnn31vw3nyy6k3k1apsn62siqswpm55iclzcb10y4dfyyqcszvflim47c8i37k"; + sha512 = "0j5s5fkph9bm87lv53d4xvfj02qjfqzj5graxcc8air49iqswfmqjdzghna6bj9m8fbn6f5klgm6jbrmavdsycbps0y88x23b6kab5i"; }; patches = [ From d93868a92b849e112559e70c56b725833aa696c7 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 15 Nov 2020 14:35:19 +0100 Subject: [PATCH 159/164] firefox-esr: 78.4.0esr -> 78.4.1esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index d65ae7037beb..5786e4113946 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -35,10 +35,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.4.0esr"; + ffversion = "78.4.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "13640ssp1nq9dsfv8jqfw2paqk3wzwc4r47mvbhb4l9h990gzzb2chhlcjq066b7r3q9s0nq3iyk847vzi7z1yvhrhsnzfgk9g9gpnr"; + sha512 = "3gfhipbihyznnh822lxams6rm0bcslh31b58lzibjx8a9dn99hy3p04h07slygcqazbz1rrs7b2b8q321fknp27aisk0sz8cynrcw18"; }; patches = [ From 95bea3d7831537e0cd0bb3d1e02d2d6f45a83023 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 13:38:25 +0000 Subject: [PATCH 160/164] pmix: 3.2.0 -> 3.2.1 --- pkgs/development/libraries/pmix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index 32e5c5381b64..60215c9531c2 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -3,7 +3,7 @@ } : let - version = "3.2.0"; + version = "3.2.1"; in stdenv.mkDerivation { pname = "pmix"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - sha256 = "171hpz0m6lpyjd1hkxy7fl06fcgymz8cssqgbxzg92b7x595276b"; + sha256 = "0c9q9a18kdilj6ddqlsvalyv4js79qvslnccn79xl2gl3wm3lyzh"; }; postPatch = '' From 79b78663e52de262f662e8a2ee472209e07f0b63 Mon Sep 17 00:00:00 2001 From: Mark Hudnall Date: Sun, 15 Nov 2020 06:11:56 -0800 Subject: [PATCH 161/164] chicken: support darwin platform (#103748) Darwin was not included as a supported platform for chicken. However, it compiled and worked fine after bypassing unsupported platforms. We make two changes to chicken's derivation. First, we add darwin as a supported platform. Second, we set some envvars that force the build to use nix-supplied build tools. Chicken's Makefile for macOS hardcodes paths to gcc and other build tools (see https://code.call-cc.org/cgi-bin/gitweb.cgi?p=chicken-core.git;a=blob;f=Makefile.macosx;h=5d4d9b0aa1bb4c95e1ba7a55f9586fa86ee5034f;hb=317468e4994e6245d787400359726a9fb97d5d60#l31). We override these envvars to use the wrapped $CC and bintools provided by nix to make the build pure. --- .../compilers/chicken/4/chicken.nix | 26 ++++++++++++------- .../compilers/chicken/5/chicken.nix | 19 +++++++++----- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index 11f4eaada604..50126fdac92c 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }: +{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }: let version = "4.13.0"; @@ -21,31 +21,39 @@ stdenv.mkDerivation { sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd"; }; - setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; + setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; - buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ]; - installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ]; + # -fno-strict-overflow is not a supported argument in clang on darwin + hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"]; + + makeFlags = [ + "PLATFORM=${platform}" "PREFIX=$(out)" + "VARDIR=$(out)/var/lib" + ] ++ (lib.optionals stdenv.isDarwin [ + "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" + "C_COMPILER=$(CC)" + ]); # We need a bootstrap-chicken to regenerate the c-files after # applying a patch to add support for CHICKEN_REPOSITORY_EXTRA - patches = lib.ifEnable (bootstrap-chicken != null) [ + patches = lib.optionals (bootstrap-chicken != null) [ ./0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch ]; buildInputs = [ makeWrapper - ] ++ (lib.ifEnable (bootstrap-chicken != null) [ + ] ++ (lib.optionals (bootstrap-chicken != null) [ bootstrap-chicken ]); - preBuild = lib.ifEnable (bootstrap-chicken != null) '' + preBuild = lib.optionalString (bootstrap-chicken != null) '' # Backup the build* files - those are generated from hostname, # git-tag, etc. and we don't need/want that mkdir -p build-backup mv buildid buildbranch buildtag.h build-backup # Regenerate eval.c after the patch - make spotless $buildFlags + make spotless $makeFlags mv build-backup/* . ''; @@ -64,7 +72,7 @@ stdenv.mkDerivation { homepage = "http://www.call-cc.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ corngood ]; - platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' CHICKEN is a compiler for the Scheme programming language. diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index f07b63ea26f4..712012643f33 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }: +{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }: let version = "5.2.0"; @@ -21,14 +21,21 @@ stdenv.mkDerivation { sha256 = "1yl0hxm9cirgcp8jgxp6vv29lpswfvaw3zfkh6rsj0vkrv44k4c1"; }; - setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; + setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; - buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ]; - installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ]; + # -fno-strict-overflow is not a supported argument in clang on darwin + hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"]; + + makeFlags = [ + "PLATFORM=${platform}" "PREFIX=$(out)" + ] ++ (lib.optionals stdenv.isDarwin [ + "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" + "C_COMPILER=$(CC)" + ]); buildInputs = [ makeWrapper - ] ++ (lib.ifEnable (bootstrap-chicken != null) [ + ] ++ (lib.optionals (bootstrap-chicken != null) [ bootstrap-chicken ]); @@ -46,7 +53,7 @@ stdenv.mkDerivation { homepage = "http://www.call-cc.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ corngood ]; - platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' CHICKEN is a compiler for the Scheme programming language. From cda5a96bc8896f8b08226965771bfe606c852f20 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 16:30:05 +0000 Subject: [PATCH 162/164] rtsp-simple-server: 0.12.0 -> 0.12.1 --- pkgs/servers/rtsp-simple-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index 892ac1921a2b..254c24754c2e 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "0mslag208410bvnhnd5hr7zvj8026m291ivkvr9sz3v6rh68cisy"; + sha256 = "0x8di6zkbn7v77awlybp3m722a27kw20vrpjgalifv8p87238x24"; }; - vendorSha256 = "1884lbfsalry68m0kzfvbrk4dz9y19d2xxaivafwb7nc0wp64734"; + vendorSha256 = "0p7d0c6zgbzj7wd2qdz578cgamydl6mp5sc8jmvnwb50h10n45af"; # Tests need docker doCheck = false; From c7b9b3dee5db2af470607c6283107e8ba478c531 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 24 May 2020 11:46:13 -0700 Subject: [PATCH 163/164] cockroachdb: fix license information --- pkgs/servers/sql/cockroachdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 3e7548fea34f..1822cf58a743 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -56,7 +56,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://www.cockroachlabs.com"; description = "A scalable, survivable, strongly-consistent SQL database"; - license = licenses.asl20; + license = licenses.bsl11; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ rushmorem thoughtpolice rvolosatovs ]; }; From a83e5c42451ca7acf3fdaec3c73a0854089598e6 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 15 Nov 2020 21:28:23 -0600 Subject: [PATCH 164/164] firecracker: 0.22.0 -> 0.23.0 Closes #102789. Signed-off-by: Austin Seipp --- .../virtualization/firecracker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 9513457d86d3..98b95fa2bec3 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.22.0"; + version = "0.23.0"; suffix = { x86_64-linux = "x86_64"; @@ -15,13 +15,13 @@ let }; firecracker-bin = fetchbin "firecracker" { - x86_64-linux = "1jl7cmw53fbykcji8a0bkdy82mgpfr8km3ab6iwsrswvahh4srx7"; - aarch64-linux = "15vi6441gr4jy0698ifashgv1ic7iz0kbm7c28m2jd8z08p6bnlz"; + x86_64-linux = "11h6qkq55y1w0mlkfkbnpxxai73rzxkiz07i747m7a9azbrmldp8"; + aarch64-linux = "0zyx7md54w0fhqk1anfyjfdqrkg2mjyy17y9jk17p34yrw8j9y29"; }; jailer-bin = fetchbin "jailer" { - x86_64-linux = "0wir7fi1iqvw02908axfaqzp9q5qyg4yk5jicp8s493iz3vhm9h7"; - aarch64-linux = "1l3yc9j27vxfyn89xmxi1ir635v7l8ikwpw9a30dhh50wa3rm4jy"; + x86_64-linux = "15slr2azqvyqlhvlh7zk1n0rkfq282kj0pllp19r0yl1w8ns1gw5"; + aarch64-linux = "1d92jhd6fb7w7ciz15rcfp8jf74r2503w2fl1b6pznpc8h4qscfd"; }; in