From a62c5f34356fcbbec9b02f54ed655d06cc9634c2 Mon Sep 17 00:00:00 2001 From: Wei Tang Date: Sun, 17 Oct 2021 17:15:12 +0200 Subject: [PATCH 01/62] nixos/mailman: use separate virtualHosts --- nixos/modules/services/mail/mailman.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 0c9b38b44b24..263f3b159d25 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -277,13 +277,12 @@ in { services.nginx = mkIf cfg.serve.enable { enable = mkDefault true; - virtualHosts."${lib.head cfg.webHosts}" = { - serverAliases = cfg.webHosts; + virtualHosts = lib.genAttrs cfg.webHosts (webHost: { locations = { "/".extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;"; "/static/".alias = webSettings.STATIC_ROOT + "/"; }; - }; + }); }; environment.systemPackages = [ (pkgs.buildEnv { From 4b331bea5bcab8c35d3f42ad6fbe5931eaf12dc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Feb 2022 01:40:52 +0000 Subject: [PATCH 02/62] libngspice: 34 -> 36 --- pkgs/development/libraries/libngspice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index 2f8aab830da0..e65ec32e34dd 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -4,11 +4,11 @@ # the ngspice derivation. stdenv.mkDerivation rec { pname = "libngspice"; - version = "34"; + version = "36"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "sha256-ImP//GaUdUlyr3By7wHP5irHkIANrWUbwpC/yueb17U="; + sha256 = "sha256-T4GCh++6JFNBBGY1t1eugfh5VJsyakMWtfbml6pRf4w="; }; nativeBuildInputs = [ flex bison ]; From ce39524a198ab09cf9f953f057248c8785c09ca1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Apr 2022 21:25:14 +0000 Subject: [PATCH 03/62] stripe-cli: 1.8.1 -> 1.8.4 --- pkgs/tools/admin/stripe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index da39ebfac739..e3241aacab69 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.8.1"; + version = "1.8.4"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R1w+dVBIPbmBOhtVWKfB4tS+Jp1/tahRk6rifPM53HA="; + sha256 = "sha256-TP366SozSNfxUGYXIOObfIul0BhQtIGQYZLwH/TPFs0="; }; - vendorSha256 = "sha256-KgoSJcVUtE4ryJLtQXNCdl51sgO94vyb682OdL5CYw8="; + vendorSha256 = "sha256-1c+YtfRy1ey0z117YHHkrCnpb7g+DmM+LR1rjn1YwMQ="; subPackages = [ "cmd/stripe" From 55c7460272151d1135e50490c185b7f2849a1267 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 00:38:36 +0000 Subject: [PATCH 04/62] tracy: 0.7.8 -> 0.8 --- pkgs/development/tools/tracy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 55114c518e57..fa0f472463c3 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -4,13 +4,13 @@ let disableLTO = stdenv.cc.isClang && stdenv.isDarwin; # workaround issue #19098 in stdenv.mkDerivation rec { pname = "tracy"; - version = "0.7.8"; + version = "0.8"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "sha256-hOeanY170vvn5W68cCDRUFApia/PW3ymPIgdWx3gwVw="; + sha256 = "sha256-wsb2pOF8Y+cFHHSkDSJngTyWeLKCtFNK/mm+usyo+0k="; }; nativeBuildInputs = [ pkg-config ]; From b12298c8d7bb25c78f38b3d9317151764a243454 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 01:53:08 +0000 Subject: [PATCH 05/62] vieb: 7.1.2 -> 7.2.0 --- pkgs/applications/networking/browsers/vieb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 7cbf4cad975e..40ae8502c762 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,13 +2,13 @@ mkYarnPackage rec { pname = "vieb"; - version = "7.1.2"; + version = "7.2.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-4LGg3w/rleTyHJd4867dog+/fIXhtKbYgF1bYKwoh/I="; + sha256 = "sha256-4iokmUzs72aVHb95D98ZITRygn4gGAc/K+M5uMnF2NM="; }; packageJSON = ./package.json; From 8dfbf3c0f018774118960335a6e56c8d15dc3502 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 09:08:53 +0000 Subject: [PATCH 06/62] blis: 0.8.1 -> 0.9.0 --- pkgs/development/libraries/science/math/blis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/development/libraries/science/math/blis/default.nix index 847d8429c92f..5b78afc15ed4 100644 --- a/pkgs/development/libraries/science/math/blis/default.nix +++ b/pkgs/development/libraries/science/math/blis/default.nix @@ -17,13 +17,13 @@ let blasIntSize = if blas64 then "64" else "32"; in stdenv.mkDerivation rec { pname = "blis"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "flame"; repo = "blis"; rev = version; - sha256 = "sha256-D5T/itq9zyD5TkeJ4Ae1vS4yEWU51omyJoIkKQ2NLhY="; + sha256 = "sha256-1aHIdt5wCDrT1hBPnaUVThwjwDkJQ0G0+tao2iFXYpM="; }; inherit blas64; From 2d1621012c52e4e6af53903d06a3017a77b3eff3 Mon Sep 17 00:00:00 2001 From: Shadaj Laddad Date: Mon, 4 Apr 2022 20:30:28 +0000 Subject: [PATCH 07/62] symfpu: init at unstable-2019-05-17 --- maintainers/maintainer-list.nix | 6 +++++ .../science/logic/symfpu/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/applications/science/logic/symfpu/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index af379f48cb2b..505eccda603d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11271,6 +11271,12 @@ githubId = 1151264; name = "Sebastian Graf"; }; + shadaj = { + email = "shadaj@users.noreply.github.com"; + github = "shadaj"; + githubId = 543055; + name = "Shadaj Laddad"; + }; shahrukh330 = { email = "shahrukh330@gmail.com"; github = "shahrukh330"; diff --git a/pkgs/applications/science/logic/symfpu/default.nix b/pkgs/applications/science/logic/symfpu/default.nix new file mode 100644 index 000000000000..af61b7c617c7 --- /dev/null +++ b/pkgs/applications/science/logic/symfpu/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "symfpu"; + version = "unstable-2019-05-17"; + + src = fetchFromGitHub { + owner = "martin-cs"; + repo = "symfpu"; + rev = "8fbe139bf0071cbe0758d2f6690a546c69ff0053"; + sha256 = "1jf5lkn67q136ppfacw3lsry369v7mdr1rhidzjpbz18jfy9zl9q"; + }; + + installPhase = '' + mkdir -p $out/symfpu + cp -r * $out/symfpu/ + ''; + + meta = with lib; { + description = "A (concrete or symbolic) implementation of IEEE-754 / SMT-LIB floating-point"; + homepage = "https://github.com/martin-cs/symfpu"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ shadaj ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a88b23b73b5..eadd2c5fd94b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32934,6 +32934,8 @@ with pkgs; symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; + symfpu = callPackage ../applications/science/logic/symfpu {}; + mcy = callPackage ../applications/science/logic/mcy {}; lingeling = callPackage ../applications/science/logic/lingeling {}; From 94de0b156a744753f031ead35f371e49ec505ade Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Apr 2022 06:28:33 +0000 Subject: [PATCH 08/62] mediainfo: 21.09 -> 22.03 --- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 146df27726bb..a6dfa557b2c5 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "21.09"; + version = "22.03"; pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0mqcqm8y2whnbdi2ry7jd755gfl5ccdqhwjh67hsyr7c0ajxk3vv"; + sha256 = "sha256-Yjb5Kh1XqBdLPzDqbd6Kq1ONj2IPcoIk2FE3MWmAK+Q="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From ff746ac2c34d10ff14cb0f1a215c9c10e8a3110b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Apr 2022 10:01:44 +0000 Subject: [PATCH 09/62] openfortivpn: 1.17.1 -> 1.17.2 --- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 15711e8d43b2..c97abcb272b9 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wSbE3vq9/o1r80zRT1rO9zAG6ws1nG18ALXYd9BAbLA="; + sha256 = "sha256-pZcYbm1fWqGWYJzexph7i9nPAHH6HP+B8Y6uUkOCRk8="; }; # we cannot write the config file to /etc and as we don't need the file, so drop it From f4a0bb8334dbfef6e092078a78d78572ad3d6730 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 2 Apr 2022 11:17:46 +0000 Subject: [PATCH 10/62] nixos/mailman: improve empty webHosts error Now this configuration mistake will generate the assertion message, instead of "error: list index 0 is out of bounds". --- nixos/modules/services/mail/mailman.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 0c9b38b44b24..2183f22cbde8 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -225,7 +225,14 @@ in { See . ''; }; - in (lib.optionals cfg.enablePostfix [ + in [ + { assertion = cfg.webHosts != []; + message = '' + services.mailman.serve.enable requires there to be at least one entry + in services.mailman.webHosts. + ''; + } + ] ++ (lib.optionals cfg.enablePostfix [ { assertion = postfix.enable; message = '' Mailman's default NixOS configuration requires Postfix to be enabled. @@ -275,7 +282,7 @@ in { globals().update(json.load(f)) ''; - services.nginx = mkIf cfg.serve.enable { + services.nginx = mkIf (cfg.serve.enable && cfg.webHosts != []) { enable = mkDefault true; virtualHosts."${lib.head cfg.webHosts}" = { serverAliases = cfg.webHosts; From 4b5380f30d4e34bac8d00fa8f607df0c6d5012e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Apr 2022 17:20:50 +0000 Subject: [PATCH 11/62] pianobar: 2020.11.28 -> 2022.04.01 --- pkgs/applications/audio/pianobar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index c5ef0352503f..9949fce8b09c 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pianobar"; - version = "2020.11.28"; + version = "2022.04.01"; src = fetchurl { url = "https://6xq.net/projects/pianobar/${pname}-${version}.tar.bz2"; - sha256 = "1znlwybfpxsjqr1jmr8j0ci8wzmpzmk2yxb0qcx9w9a8nnbgnfv5"; + sha256 = "sha256-FnCyiGWouCpXu23+p/FuL6QUXS81SRC7FzgLMsm5R2M="; }; nativeBuildInputs = [ pkg-config ]; From 4c2a906df5a9657149999038d065417aab39e322 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Apr 2022 17:18:18 +0000 Subject: [PATCH 12/62] thunderbird-unwrapped: 91.7.0 -> 91.8.0 --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index e2d4a76df7d0..91db452356f2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = (common rec { pname = "thunderbird"; - version = "91.7.0"; + version = "91.8.0"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "2afaee16f155edcb0bdb46ebe282a733cf041ec6f562aebd06f8b675e46917f6f500fcc532fc54d74f3f4b0b489a88934a2c6c304f849873de4bc2690b9056a0"; + sha512 = "147c7ad68b0a32cc0fd4405935836af1fa77bbce6a1e367b51ef9871e7fc2a8fe908a1d200be34326f4f339d272e62f619b75680201fe82d301ddd02e23824d5"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. From 74b7319023a3428d2d2acb761c6e4a3489211684 Mon Sep 17 00:00:00 2001 From: Shadaj Laddad Date: Mon, 4 Apr 2022 20:30:47 +0000 Subject: [PATCH 13/62] cvc5: init at 1.0.0 --- .../science/logic/cvc5/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/science/logic/cvc5/default.nix diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix new file mode 100644 index 000000000000..c1bf56b45d5b --- /dev/null +++ b/pkgs/applications/science/logic/cvc5/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, cadical, symfpu, gmp, git, python3, gtest, libantlr3c, antlr3_4, boost, jdk }: + +stdenv.mkDerivation rec { + pname = "cvc5"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "cvc5"; + repo = "cvc5"; + rev = "cvc5-${version}"; + sha256 = "03sxqwmlajffmv7lncqs1bx8gyihkpnikk87q9wjrd4776n13ign"; + }; + + nativeBuildInputs = [ pkg-config cmake ]; + buildInputs = [ cadical.dev symfpu gmp git python3 python3.pkgs.toml gtest libantlr3c antlr3_4 boost jdk ]; + + preConfigure = '' + patchShebangs ./src/ + ''; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Production" + "-DBUILD_SHARED_LIBS=1" + "-DANTLR3_JAR=${antlr3_4}/lib/antlr/antlr-3.4-complete.jar" + ]; + + meta = with lib; { + description = "A high-performance theorem prover and SMT solver"; + homepage = "https://cvc5.github.io"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ shadaj ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eadd2c5fd94b..34bb636eac4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32770,6 +32770,8 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + cvc5 = callPackage ../applications/science/logic/cvc5 { }; + drat-trim = callPackage ../applications/science/logic/drat-trim {}; ekrhyper = callPackage ../applications/science/logic/ekrhyper { From 3da361fa40c8279695ea0a93dda4836a987f160d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Apr 2022 23:30:33 +0000 Subject: [PATCH 14/62] jenkins: 2.332.1 -> 2.332.2 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 9c87c5f08f4c..5c95c99814df 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.332.1"; + version = "2.332.2"; src = fetchurl { url = "http://get.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0xrrqdwfz19mr4wl4sdzk0qnq9rjdh65vd1386qsn6a4axwv652s"; + sha256 = "0z0igaq29nsxbkdzqfgrh10206a7ndsvz79bj8078hq8hqvl3an7"; }; nativeBuildInputs = [ makeWrapper ]; From 493062e5fa31fa46da461f3289c588928382bb05 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Apr 2022 01:54:02 +0200 Subject: [PATCH 15/62] all-cabal-hashes: 2022-04-03T10:13:27Z -> 2022-04-06T22:24:53Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index e729226b71cf..52ca8f4897ab 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "e4f120f36a6e55fc2fe15c5ed774773420d38108", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e4f120f36a6e55fc2fe15c5ed774773420d38108.tar.gz", - "sha256": "16ljr256nrlmmsll2pbnf0xk07mqbcwa9n6d0mc2j44vyb478qwl", - "msg": "Update from Hackage at 2022-04-03T10:13:27Z" + "commit": "6387c3141750050e170d6ac030c063536c39aede", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6387c3141750050e170d6ac030c063536c39aede.tar.gz", + "sha256": "1w9vy5ky3aqqnkldxqdvma21qz3myhc961xmgh1iqn60q03j4d2j", + "msg": "Update from Hackage at 2022-04-06T22:24:53Z" } From 28ca22e7d00171eb3c27e2942573785edaf19836 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Apr 2022 01:54:10 +0200 Subject: [PATCH 16/62] haskellPackages: stackage LTS 19.1 -> LTS 19.2 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 51741597999a..ad02f7f51dec 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.1 +# Stackage LTS 19.2 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -33,7 +33,7 @@ default-package-overrides: - aeson-typescript ==0.3.0.1 - aeson-yak ==0.1.1.3 - aeson-yaml ==1.1.0.1 - - Agda ==2.6.2.1 + - Agda ==2.6.2.2 - agda2lagda ==0.2021.6.1 - al ==0.1.4.2 - alarmclock ==0.7.0.6 @@ -121,15 +121,15 @@ default-package-overrides: - bank-holidays-england ==0.2.0.7 - barbies ==2.0.3.1 - barrier ==0.1.1 - - base16 ==0.3.1.0 + - base16 ==0.3.2.0 - base16-bytestring ==1.0.2.0 - base16-lens ==0.1.3.2 - - base32 ==0.2.1.0 + - base32 ==0.2.2.0 - base32-lens ==0.1.1.1 - base32string ==0.9.1 - base58-bytestring ==0.1.0 - base58string ==0.10.0 - - base64 ==0.4.2.3 + - base64 ==0.4.2.4 - base64-bytestring ==1.2.1.0 - base64-bytestring-type ==1.0.1 - base64-lens ==0.3.1 @@ -224,7 +224,7 @@ default-package-overrides: - BoundedChan ==1.0.3.0 - bounded-queue ==1.0.0 - boxes ==0.1.5 - - brick ==0.68 + - brick ==0.68.1 - brittany ==0.14.0.2 - broadcast-chan ==0.2.1.2 - bsb-http-chunked ==0.0.0.4 @@ -267,7 +267,7 @@ default-package-overrides: - cabal-file-th ==0.2.7 - cabal-flatpak ==0.1.0.3 - cabal-plan ==0.7.2.1 - - cabal-rpm ==2.0.11 + - cabal-rpm ==2.0.11.1 - Cabal-syntax ==3.6.0.0 - cache ==0.1.3.0 - cached-json-file ==0.1.1 @@ -342,7 +342,7 @@ default-package-overrides: - climb ==0.3.3 - Clipboard ==2.3.2.0 - clock ==0.8.3 - - closed ==0.2.0.1 + - closed ==0.2.0.2 - clumpiness ==0.17.0.2 - ClustalParser ==1.3.0 - cmark ==0.6 @@ -366,8 +366,8 @@ default-package-overrides: - comfort-array-shape ==0.0 - comfort-fftw ==0.0 - comfort-graph ==0.0.3.2 - - commonmark ==0.2.1.1 - - commonmark-extensions ==0.2.3 + - commonmark ==0.2.2 + - commonmark-extensions ==0.2.3.1 - commonmark-pandoc ==0.2.1.2 - commutative ==0.0.2 - comonad ==5.0.8 @@ -680,7 +680,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.10 - - esqueleto ==3.5.3.1 + - esqueleto ==3.5.4.0 - essence-of-live-coding ==0.2.6 - essence-of-live-coding-gloss ==0.2.6 - essence-of-live-coding-pulse ==0.2.6 @@ -722,7 +722,7 @@ default-package-overrides: - fakedata-quickcheck ==0.2.0 - fakefs ==0.3.0.2 - fakepull ==0.3.0.2 - - faktory ==1.1.2.1 + - faktory ==1.1.2.2 - fast-builder ==0.1.3.0 - fast-logger ==3.1.1 - fast-math ==1.0.2 @@ -811,7 +811,7 @@ default-package-overrides: - functor-classes-compat ==2.0.0.2 - functor-combinators ==0.4.1.0 - fused-effects ==1.1.1.2 - - fusion-plugin ==0.2.3 + - fusion-plugin ==0.2.4 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.1 @@ -942,10 +942,10 @@ default-package-overrides: - graph-core ==0.3.0.0 - graphite ==0.10.0.1 - graphs ==0.7.1 - - graphula ==2.0.1.0 + - graphula ==2.0.1.1 - graphviz ==2999.20.1.0 - graph-wrapper ==0.2.6.0 - - gravatar ==0.8.0 + - gravatar ==0.8.1 - greskell ==2.0.0.0 - greskell-core ==1.0.0.0 - greskell-websocket ==1.0.0.0 @@ -966,7 +966,7 @@ default-package-overrides: - hadoop-streaming ==0.2.0.3 - hakyll ==4.15.1.1 - hakyll-convert ==0.3.0.4 - - hal ==0.4.10 + - hal ==0.4.10.1 - half ==0.3.1 - hall-symbols ==0.1.0.6 - hamilton ==0.1.0.3 @@ -1050,7 +1050,7 @@ default-package-overrides: - hindent ==5.3.2 - hinfo ==0.0.3.0 - hinotify ==0.4.1 - - hint ==0.9.0.5 + - hint ==0.9.0.6 - histogram-fill ==0.9.1.0 - hjsmin ==0.2.0.4 - hkd-default ==1.1.0.0 @@ -1087,12 +1087,12 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.10 - - hpack ==0.34.6 + - hpack ==0.34.7 - hpack-dhall ==0.5.4 - hpc-codecov ==0.3.0.0 - HPDF ==1.6.0 - hpp ==0.6.4 - - hpqtypes ==1.9.3.0 + - hpqtypes ==1.9.3.1 - hprotoc ==2.4.17 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 @@ -1135,7 +1135,7 @@ default-package-overrides: - hspec-core ==2.8.5 - hspec-discover ==2.8.5 - hspec-expectations ==0.8.2 - - hspec-expectations-json ==1.0.0.5 + - hspec-expectations-json ==1.0.0.6 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.6 - hspec-golden ==0.2.0.0 @@ -1665,7 +1665,7 @@ default-package-overrides: - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.1.0 - - nonempty-zipper ==1.0.0.3 + - nonempty-zipper ==1.0.0.4 - non-negative ==0.1.2 - normalization-insensitive ==2.0.2 - not-gloss ==0.7.7.0 @@ -1746,7 +1746,7 @@ default-package-overrides: - pandoc-lua-marshal ==0.1.5.1 - pandoc-plot ==1.4.1 - pandoc-throw ==0.1.0.0 - - pandoc-types ==1.22.1 + - pandoc-types ==1.22.2 - pantry ==0.5.4 - parallel ==3.2.2.0 - parallel-io ==0.3.5 @@ -2116,7 +2116,7 @@ default-package-overrides: - sandwich-quickcheck ==0.1.0.6 - sandwich-slack ==0.1.0.6 - say ==0.1.0.1 - - sbp ==4.1.1 + - sbp ==4.1.5 - sbv ==8.17 - scalpel ==0.6.2 - scalpel-core ==0.6.2 @@ -2149,7 +2149,7 @@ default-package-overrides: - seqalign ==0.2.0.4 - seqid ==0.6.2 - seqid-streams ==0.7.2 - - sequence-formats ==1.6.3 + - sequence-formats ==1.6.6.1 - sequenceTools ==1.5.2 - serf ==0.1.1.0 - serialise ==0.2.4.0 @@ -2439,7 +2439,7 @@ default-package-overrides: - tcp-streams ==1.0.1.1 - tdigest ==0.2.1.1 - teardown ==0.5.0.1 - - telegram-bot-simple ==0.4.4 + - telegram-bot-simple ==0.4.5 - template-haskell-compat-v0208 ==0.1.7 - temporary ==1.3 - temporary-rc ==1.2.0.3 @@ -2460,8 +2460,8 @@ default-package-overrides: - texmath ==0.12.4 - text-ansi ==0.1.1 - text-binary ==0.2.1.1 - - text-builder ==0.6.6.4 - - text-builder-dev ==0.2 + - text-builder ==0.6.6.5 + - text-builder-dev ==0.2.0.1 - text-conversions ==0.3.1 - text-icu ==0.7.1.0 - text-latin1 ==0.3.1 @@ -2627,7 +2627,7 @@ default-package-overrides: - universe-instances-extended ==1.1.3 - universe-reverse-instances ==1.1.1 - universe-some ==1.2.1 - - universum ==1.7.2 + - universum ==1.7.3 - unix-bytestring ==0.3.7.6 - unix-compat ==0.5.4 - unix-time ==0.4.7 @@ -2841,11 +2841,11 @@ default-package-overrides: - yesod-gitrev ==0.2.2 - yesod-markdown ==0.12.6.12 - yesod-newsfeed ==1.7.0.0 - - yesod-page-cursor ==2.0.0.9 - - yesod-paginator ==1.1.1.0 + - yesod-page-cursor ==2.0.0.10 + - yesod-paginator ==1.1.2.1 - yesod-persistent ==1.6.0.7 - yesod-recaptcha2 ==1.0.2 - - yesod-routes-flow ==3.0.0.1 + - yesod-routes-flow ==3.0.0.2 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - yesod-test ==1.6.12 From d317a29a606c54b47fcc2f23ce07ea29d353a258 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Apr 2022 01:55:35 +0200 Subject: [PATCH 17/62] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 1873 +++++++++-------- 1 file changed, 957 insertions(+), 916 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b4ceaa6556a6..6e19adf80ce3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -804,43 +804,6 @@ self: { }) {}; "Agda" = callPackage - ({ mkDerivation, aeson, alex, array, async, base, binary - , blaze-html, boxes, bytestring, Cabal, case-insensitive - , containers, data-hash, deepseq, directory, edit-distance, emacs - , equivalence, exceptions, filepath, ghc-compact, gitrev, happy - , hashable, hashtables, haskeline, monad-control, mtl, murmur-hash - , parallel, pretty, process, regex-tdfa, split, stm, strict - , template-haskell, text, time, transformers, unordered-containers - , uri-encode, zlib - }: - mkDerivation { - pname = "Agda"; - version = "2.6.2.1"; - sha256 = "03dw7jfqr3ffik6avigm525djqh2gn5c3qwnb2h6298zkr9lch9w"; - revision = "4"; - editedCabalFile = "0spsj8nk28lfvsv6063d1nif5hag8yal47iwicm7yln0626xsxcd"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal directory filepath process ]; - libraryHaskellDepends = [ - aeson array async base binary blaze-html boxes bytestring - case-insensitive containers data-hash deepseq directory - edit-distance equivalence exceptions filepath ghc-compact gitrev - hashable hashtables haskeline monad-control mtl murmur-hash - parallel pretty process regex-tdfa split stm strict - template-haskell text time transformers unordered-containers - uri-encode zlib - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base directory filepath process ]; - executableToolDepends = [ emacs ]; - description = "A dependently typed functional programming language and proof assistant"; - license = "unknown"; - maintainers = with lib.maintainers; [ abbradar turion ]; - }) {inherit (pkgs) emacs;}; - - "Agda_2_6_2_2" = callPackage ({ mkDerivation, aeson, alex, array, async, base, binary , blaze-html, boxes, bytestring, Cabal, case-insensitive , containers, data-hash, deepseq, directory, edit-distance, emacs @@ -872,7 +835,6 @@ self: { executableToolDepends = [ emacs ]; description = "A dependently typed functional programming language and proof assistant"; license = "unknown"; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ abbradar turion ]; }) {inherit (pkgs) emacs;}; @@ -21043,8 +21005,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.9"; - sha256 = "1avq9njgqbvmqn5277q66bqq01jj6syyrnw82qy4477r5yln2wh2"; + version = "0.10"; + sha256 = "1iqfks31wcpdizk6dnja29i5nzxa08h0s6qnar4h4w8xgwp0zj0q"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -25161,16 +25123,16 @@ self: { "aeson-match-qq" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, bytestring - , either, haskell-src-meta, hspec, scientific, template-haskell - , text, unordered-containers, vector + , containers, either, haskell-src-meta, hspec, scientific + , template-haskell, text, unordered-containers, vector }: mkDerivation { pname = "aeson-match-qq"; - version = "1.4.1"; - sha256 = "0l9x20hqx6k6grdmni2smiznsiigzhzxmpks1qdg7850sb6lw5fg"; + version = "1.4.2"; + sha256 = "1dajffzyqcfnrjzmg05gw6kjcfjmn9p9fxfszdgnipx1isr6cn2l"; libraryHaskellDepends = [ - aeson attoparsec base bytestring either haskell-src-meta scientific - template-haskell text unordered-containers vector + aeson attoparsec base bytestring containers either haskell-src-meta + scientific template-haskell text unordered-containers vector ]; testHaskellDepends = [ aeson aeson-qq base hspec unordered-containers @@ -27009,8 +26971,8 @@ self: { ({ mkDerivation, assoc, base, bifunctors, lens, semigroupoids }: mkDerivation { pname = "alignment"; - version = "0.1.0.2"; - sha256 = "1gsnp2rfqcll1hrf1c0c9rkjvv3mbvfsqghlkyfs9jvb0w9sd2i7"; + version = "0.1.0.3"; + sha256 = "09icpp5s8sfygcq423mczmapn0ssc9s9i9v5cr78bf687wqy7yqv"; libraryHaskellDepends = [ assoc base bifunctors lens semigroupoids ]; @@ -36501,15 +36463,16 @@ self: { "autodocodec-openapi3" = callPackage ({ mkDerivation, aeson, autodocodec, base - , insert-ordered-containers, lens, openapi3, scientific, text + , insert-ordered-containers, lens, mtl, openapi3, scientific, text + , unordered-containers }: mkDerivation { pname = "autodocodec-openapi3"; - version = "0.1.0.0"; - sha256 = "02ccbpjy4x2kai6wysqp2hjq97k58psn3739c6j1sqhcrlqwhwy5"; + version = "0.2.0.0"; + sha256 = "1r9csd9v01pwiz1vhydpn3jnp5jk45shkfmizgpnn8p1mfkms55j"; libraryHaskellDepends = [ - aeson autodocodec base insert-ordered-containers lens openapi3 - scientific text + aeson autodocodec base insert-ordered-containers lens mtl openapi3 + scientific text unordered-containers ]; description = "Autodocodec interpreters for openapi3"; license = lib.licenses.mit; @@ -37906,8 +37869,8 @@ self: { }: mkDerivation { pname = "aws-xray-client"; - version = "0.1.0.1"; - sha256 = "1b179i32aw3xi72vnxmgvgczq14ay159cji9mmk345shdiac6crj"; + version = "0.1.0.2"; + sha256 = "0i60ggcrwp2vkyagj8jqb33wh7y0h3anag9l2pb5zh6xl2n043ai"; libraryHaskellDepends = [ aeson base bytestring deepseq http-types lens network random text time @@ -37925,15 +37888,15 @@ self: { "aws-xray-client-persistent" = callPackage ({ mkDerivation, aws-xray-client, base, conduit, containers, lens - , persistent, random, resourcet, text, time + , persistent, random, text, time }: mkDerivation { pname = "aws-xray-client-persistent"; - version = "0.1.0.4"; - sha256 = "1jkc3li196l0hp4x1kbx65idn7dl710c2yagbh573d3l09zzh0l8"; + version = "0.1.0.5"; + sha256 = "0pfmlb5i51sz4aypazw2cpkmgxjbmik1jpi9zbp68jwfaw31j7wk"; libraryHaskellDepends = [ - aws-xray-client base conduit containers lens persistent random - resourcet text time + aws-xray-client base conduit containers lens persistent random text + time ]; description = "A client for AWS X-Ray integration with Persistent"; license = lib.licenses.mit; @@ -37947,8 +37910,8 @@ self: { }: mkDerivation { pname = "aws-xray-client-wai"; - version = "0.1.0.1"; - sha256 = "0b2rnls3qk7qzn9swfqmslxrw466gs6lhh7zi677k5b0dzh237vp"; + version = "0.1.0.2"; + sha256 = "0n6viya3j94nx1sys9lqabmnc72szmslkpibhc1df1gl453633y9"; libraryHaskellDepends = [ aws-xray-client base bytestring containers http-types lens random text time unliftio unliftio-core vault wai @@ -39139,30 +39102,6 @@ self: { }) {}; "base16" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, criterion - , deepseq, primitive, QuickCheck, random-bytestring, tasty - , tasty-hunit, tasty-quickcheck, text, text-short - }: - mkDerivation { - pname = "base16"; - version = "0.3.1.0"; - sha256 = "1k7gp9nxzsd9d22ma7r4wbigck3bv71jycdjgr2n72bv5yzvrrzn"; - libraryHaskellDepends = [ - base bytestring deepseq primitive text text-short - ]; - testHaskellDepends = [ - base base16-bytestring bytestring QuickCheck random-bytestring - tasty tasty-hunit tasty-quickcheck text text-short - ]; - benchmarkHaskellDepends = [ - base base16-bytestring bytestring criterion deepseq - random-bytestring text - ]; - description = "Fast RFC 4648-compliant Base16 encoding"; - license = lib.licenses.bsd3; - }) {}; - - "base16_0_3_2_0" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion , deepseq, primitive, QuickCheck, random-bytestring, tasty , tasty-hunit, tasty-quickcheck, text, text-short @@ -39184,7 +39123,6 @@ self: { ]; description = "Fast RFC 4648-compliant Base16 encoding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "base16-bytestring_0_1_1_7" = callPackage @@ -39236,31 +39174,6 @@ self: { }) {}; "base32" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq - , ghc-byteorder, memory, QuickCheck, random-bytestring, tasty - , tasty-hunit, tasty-quickcheck, text, text-short - }: - mkDerivation { - pname = "base32"; - version = "0.2.1.0"; - sha256 = "1c1qzbri6m8b2m1cr68vrjbny6wlvfyrbfyzd61s83a3y3w39plp"; - revision = "1"; - editedCabalFile = "0apyphnlsnr16s5xb9b9g7d5aw3ny4qx8nz8y71zpglk63sy0cq0"; - libraryHaskellDepends = [ - base bytestring deepseq ghc-byteorder text text-short - ]; - testHaskellDepends = [ - base bytestring memory QuickCheck random-bytestring tasty - tasty-hunit tasty-quickcheck text text-short - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq memory random-bytestring text - ]; - description = "Fast RFC 4648-compliant Base32 encoding"; - license = lib.licenses.bsd3; - }) {}; - - "base32_0_2_2_0" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, memory , QuickCheck, random-bytestring, tasty, tasty-hunit , tasty-quickcheck, text, text-short @@ -39281,7 +39194,6 @@ self: { ]; description = "Fast RFC 4648-compliant Base32 encoding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "base32-bytestring" = callPackage @@ -39424,32 +39336,6 @@ self: { }) {}; "base64" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, criterion - , deepseq, ghc-byteorder, QuickCheck, random-bytestring, tasty - , tasty-hunit, tasty-quickcheck, text, text-short - }: - mkDerivation { - pname = "base64"; - version = "0.4.2.3"; - sha256 = "1hdqswxhgjrg8akl5v99hbm02gkpagsbx4i7fxbzdys1k0bj3gxw"; - revision = "2"; - editedCabalFile = "153csdlayv1zh6xrjrdbdczj6xl5xnipa5pg4l3i3dmaxiynzgcp"; - libraryHaskellDepends = [ - base bytestring deepseq ghc-byteorder text text-short - ]; - testHaskellDepends = [ - base base64-bytestring bytestring QuickCheck random-bytestring - tasty tasty-hunit tasty-quickcheck text text-short - ]; - benchmarkHaskellDepends = [ - base base64-bytestring bytestring criterion deepseq - random-bytestring text - ]; - description = "A modern RFC 4648-compliant Base64 library"; - license = lib.licenses.bsd3; - }) {}; - - "base64_0_4_2_4" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, criterion , deepseq, QuickCheck, random-bytestring, tasty, tasty-hunit , tasty-quickcheck, text, text-short @@ -39471,7 +39357,6 @@ self: { ]; description = "A modern RFC 4648-compliant Base64 library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "base64-bytes" = callPackage @@ -45276,8 +45161,8 @@ self: { }: mkDerivation { pname = "blockfrost-api"; - version = "0.4.0.0"; - sha256 = "01rdg8xl3qal2nl76h56badzfmjpqbn8zrcxqrqbbv611c8ccpqs"; + version = "0.4.0.1"; + sha256 = "0bz3m6zmmwjj4g6d7h33calljmkhqgxb4la4xgrk309qxpk6sbcj"; libraryHaskellDepends = [ aeson base bytestring data-default-class deriving-aeson lens QuickCheck quickcheck-instances safe-money servant servant-docs @@ -45302,8 +45187,8 @@ self: { }: mkDerivation { pname = "blockfrost-client"; - version = "0.4.0.0"; - sha256 = "1xx53zrdi37lvj0mfzwfd3yhyzfm9wp8621yqm4cr091gzwh8a1m"; + version = "0.4.0.1"; + sha256 = "09gk90sic9dnqp2ybvg9vqaha6lblbd3940cdhqri1v8nc6s2i9g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45329,8 +45214,8 @@ self: { }: mkDerivation { pname = "blockfrost-client-core"; - version = "0.4.0.0"; - sha256 = "1g276jinr4nbia63sx5bciwglb3yxzgqli8xsq1g73pd4qxwdw43"; + version = "0.4.0.1"; + sha256 = "0zlcdkvw8qpm0hiy7nyvyxhndbyv6nc5hfd5c7cdv0qighh4s5if"; libraryHaskellDepends = [ aeson base blockfrost-api bytestring case-insensitive containers data-default http-client http-client-tls http-types servant @@ -47087,32 +46972,6 @@ self: { }) {}; "brick" = callPackage - ({ mkDerivation, base, bytestring, config-ini, containers - , contravariant, data-clist, deepseq, directory, dlist, exceptions - , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm - , template-haskell, text, text-zipper, transformers, unix, vector - , vty, word-wrap - }: - mkDerivation { - pname = "brick"; - version = "0.68"; - sha256 = "0fa0vlj9k3ril8mjc0kyxrq87iy40v10yvkgz32r3fcy80j7spk9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring config-ini containers contravariant data-clist - deepseq directory dlist exceptions filepath microlens microlens-mtl - microlens-th stm template-haskell text text-zipper transformers - unix vector vty word-wrap - ]; - testHaskellDepends = [ - base containers microlens QuickCheck vector - ]; - description = "A declarative terminal user interface library"; - license = lib.licenses.bsd3; - }) {}; - - "brick_0_68_1" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -47136,7 +46995,6 @@ self: { ]; description = "A declarative terminal user interface library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "brick-dropdownmenu" = callPackage @@ -50806,27 +50664,6 @@ self: { }) {}; "cabal-rpm" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, extra - , filepath, http-client, http-client-tls, http-conduit - , optparse-applicative, process, simple-cabal, simple-cmd - , simple-cmd-args, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; - version = "2.0.11"; - sha256 = "041sr5fym01cdfi606180iz5zqxnlw44vhr4bbwpxr45qn71kzxb"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal directory extra filepath http-client - http-client-tls http-conduit optparse-applicative process - simple-cabal simple-cmd simple-cmd-args time unix - ]; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = lib.licenses.gpl3Only; - }) {}; - - "cabal-rpm_2_0_11_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, extra , filepath, http-client, http-client-tls, http-conduit , optparse-applicative, process, simple-cabal, simple-cmd @@ -50845,7 +50682,6 @@ self: { ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "cabal-scripts" = callPackage @@ -58712,25 +58548,6 @@ self: { }) {}; "closed" = callPackage - ({ mkDerivation, aeson, base, cassava, deepseq, hashable, hspec - , markdown-unlit, persistent, QuickCheck, text, vector - }: - mkDerivation { - pname = "closed"; - version = "0.2.0.1"; - sha256 = "1d74bdjvn7rapakmv1vvf7wws2r12pydlbfym9nw1z6hqvvk8hsn"; - libraryHaskellDepends = [ - aeson base cassava deepseq hashable persistent QuickCheck text - ]; - testHaskellDepends = [ - aeson base cassava hspec markdown-unlit persistent text vector - ]; - testToolDepends = [ markdown-unlit ]; - description = "Integers bounded by a closed interval"; - license = lib.licenses.mit; - }) {}; - - "closed_0_2_0_2" = callPackage ({ mkDerivation, aeson, base, cassava, deepseq, hashable, hspec , markdown-unlit, persistent, QuickCheck, text, vector }: @@ -58747,7 +58564,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Integers bounded by a closed interval"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "closed-classes" = callPackage @@ -61352,28 +61168,6 @@ self: { }) {}; "commonmark" = callPackage - ({ mkDerivation, base, bytestring, containers, parsec, tasty - , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers - , unicode-transforms - }: - mkDerivation { - pname = "commonmark"; - version = "0.2.1.1"; - sha256 = "105szy7l4ji255fwv0kbfcy3i3a3a4197zgj6s9jb12kwbn6n0c7"; - libraryHaskellDepends = [ - base bytestring containers parsec text transformers - unicode-transforms - ]; - testHaskellDepends = [ - base parsec tasty tasty-hunit tasty-quickcheck text - unicode-transforms - ]; - benchmarkHaskellDepends = [ base tasty-bench text ]; - description = "Pure Haskell commonmark parser"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark_0_2_2" = callPackage ({ mkDerivation, base, bytestring, containers, parsec, tasty , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers , unicode-data, unicode-transforms @@ -61393,7 +61187,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench text ]; description = "Pure Haskell commonmark parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-cli" = callPackage @@ -61417,27 +61210,6 @@ self: { }) {}; "commonmark-extensions" = callPackage - ({ mkDerivation, base, commonmark, containers, emojis, filepath - , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text - , transformers - }: - mkDerivation { - pname = "commonmark-extensions"; - version = "0.2.3"; - sha256 = "02zq9ma58yngabz1rw0alaq9s8lsfmxjn8m3dfjxavvq2pl3748f"; - libraryHaskellDepends = [ - base commonmark containers emojis filepath network-uri parsec text - transformers - ]; - testHaskellDepends = [ - base commonmark parsec tasty tasty-hunit text - ]; - benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; - description = "Pure Haskell commonmark parser"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark-extensions_0_2_3_1" = callPackage ({ mkDerivation, base, commonmark, containers, emojis, filepath , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text , transformers @@ -61456,7 +61228,6 @@ self: { benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; description = "Pure Haskell commonmark parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-pandoc" = callPackage @@ -66558,6 +66329,28 @@ self: { license = lib.licenses.mit; }) {}; + "core-program_0_4_5_0" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-text, directory, exceptions, filepath, fsnotify, hashable + , hourglass, mtl, prettyprinter, safe-exceptions, stm + , template-haskell, terminal-size, text, text-short, transformers + , typed-process, unix + }: + mkDerivation { + pname = "core-program"; + version = "0.4.5.0"; + sha256 = "01p6h6gmw1dqqnqv10skabmilz9rx0ryz7k66da1jyafy4jzw9n1"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-text directory + exceptions filepath fsnotify hashable hourglass mtl prettyprinter + safe-exceptions stm template-haskell terminal-size text text-short + transformers typed-process unix + ]; + description = "Opinionated Haskell Interoperability"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-telemetry" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-program, core-text, exceptions, http-streams, io-streams @@ -70581,6 +70374,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "cybus" = callPackage + ({ mkDerivation, adjunctions, base, checkers, deepseq, distributive + , indexed-traversable, lens, mtl, pos, pretty-simple, primus + , profunctors, QuickCheck, semigroupoids, tasty, tasty-hunit + , tasty-quickcheck, these, transformers, vector + }: + mkDerivation { + pname = "cybus"; + version = "0.1.0.0"; + sha256 = "1zd384agclc75y0nqzmhlxlghgac3g807jqgvsqbk0ddlghqvkmn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + adjunctions base deepseq distributive indexed-traversable mtl pos + primus profunctors semigroupoids these transformers vector + ]; + executableHaskellDepends = [ + adjunctions base deepseq distributive indexed-traversable mtl pos + primus profunctors semigroupoids these transformers vector + ]; + testHaskellDepends = [ + adjunctions base checkers deepseq distributive indexed-traversable + lens mtl pos pretty-simple primus profunctors QuickCheck + semigroupoids tasty tasty-hunit tasty-quickcheck these transformers + vector + ]; + description = "multi-dimensional arrays"; + license = lib.licenses.bsd3; + }) {}; + "cyclotomic" = callPackage ({ mkDerivation, arithmoi, base, containers, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -75455,6 +75278,8 @@ self: { pname = "dep-t"; version = "0.6.1.0"; sha256 = "093zic45a0q3lr0shhc0yjp5gclskyk7ipva0khsqgk2wrqgwqx6"; + revision = "1"; + editedCabalFile = "126h9isb8lzrqvf1rgl7n95snjzj181mkxn6qhbl8jg4rxn2zj3l"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ aeson barbies base bytestring containers doctest mtl rank2classes @@ -75474,6 +75299,8 @@ self: { pname = "dep-t-advice"; version = "0.6.1.0"; sha256 = "1l3zphhyb55da4jrkbhgynwb72s1lm63iyi4p35np1jffwfcc9mg"; + revision = "1"; + editedCabalFile = "09rszbs5l4z8zzhizipiqk8g11h9gr7brn03ylhci716mkzwkzw5"; libraryHaskellDepends = [ base dep-t mtl sop-core transformers unliftio-core ]; @@ -75498,8 +75325,8 @@ self: { }: mkDerivation { pname = "dep-t-dynamic"; - version = "0.1.0.0"; - sha256 = "0z0dhq5s4cn8y2r60d0ws44z7sq104ghfzic5yn1cicy0nlwddhk"; + version = "0.1.0.1"; + sha256 = "1wa68s5mcsgwchdm0xm2qcgpxvcxi6banmjzyfq1dn6wzj8028vn"; libraryHaskellDepends = [ algebraic-graphs base dep-t hashable sop-core transformers unordered-containers @@ -75987,8 +75814,8 @@ self: { }: mkDerivation { pname = "derive-storable-plugin"; - version = "0.2.3.4"; - sha256 = "0yvfmm8wkix8icsfqm9wd81000dlfgmwjzbnhspzd6a9wpd73i6p"; + version = "0.2.3.5"; + sha256 = "16v61sm8vqx7wi02z68qjsvfv76g8kbag9cc8j8i0k8ixya1hddb"; libraryHaskellDepends = [ base derive-storable ghc ghci ]; testHaskellDepends = [ base derive-storable ghc ghci hspec QuickCheck @@ -81315,8 +81142,8 @@ self: { }: mkDerivation { pname = "docker"; - version = "0.6.0.6"; - sha256 = "15qai77a5wqb94lij4l24w516q7d5h6wn6h2g6lmgghwh3hafq8y"; + version = "0.7.0.0"; + sha256 = "1w228qhnl54v3d69ln4y5s64ywvcsd202m1m3ry8j6lsgfj1hawm"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions @@ -81500,6 +81327,8 @@ self: { pname = "docrecords"; version = "0.1.0.0"; sha256 = "1b8lavhm3iiz0w0b581yn88kaydwiimvj5j9sayx5gq04aa20jvj"; + revision = "1"; + editedCabalFile = "1c13ba8plkrrdkm0r71igj3k8vq8bqhpk3i6lr8lhgzylp1bkkin"; libraryHaskellDepends = [ aeson base data-default lens optparse-applicative text unordered-containers vinyl yaml @@ -81553,6 +81382,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "doctemplates_0_10_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific + , tasty, tasty-golden, tasty-hunit, temporary, text + , text-conversions, vector + }: + mkDerivation { + pname = "doctemplates"; + version = "0.10.0.2"; + sha256 = "0as0sc4x4ch5z233dqlb8xqg97xbfbzw2dqsz9rfq8rw10v9yx57"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base containers doclayout filepath HsYAML mtl parsec safe + scientific text text-conversions vector + ]; + testHaskellDepends = [ + aeson base bytestring containers doclayout filepath Glob tasty + tasty-golden tasty-hunit temporary text + ]; + benchmarkHaskellDepends = [ + aeson base containers criterion doclayout filepath mtl text + ]; + description = "Pandoc-style document templates"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "doctest" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core, HUnit @@ -88855,17 +88711,17 @@ self: { , fast-logger, file-embed, foreign-store, hjsmin, hscolour, hspec , html-entities, http-api-data, http-client, http-client-tls , http-conduit, http-types, iso8601-time, microlens, monad-logger - , mtl, optparse-generic, parser-combinators, persistent - , persistent-sqlite, persistent-template, pretty-show, safe - , shakespeare, template-haskell, text, time, transformers + , mtl, optparse-applicative, optparse-generic, parser-combinators + , persistent, persistent-sqlite, persistent-template, pretty-show + , safe, shakespeare, template-haskell, text, time, transformers , unordered-containers, vector, wai, wai-extra, wai-logger, warp , yaml, yesod, yesod-auth, yesod-core, yesod-form, yesod-newsfeed , yesod-static, yesod-test }: mkDerivation { pname = "espial"; - version = "0.0.9"; - sha256 = "128vwdmilvvxwaylslway3d6mx4ad9pcx5y2x74x38hi9mpmrylc"; + version = "0.0.10"; + sha256 = "01xbnif1wwfr6w9mnc6fpsnf8vnfdi3r1gcg8gwdsg7mjxvjc0w1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88886,12 +88742,12 @@ self: { connection containers data-default directory entropy esqueleto fast-logger file-embed foreign-store hjsmin hscolour html-entities http-api-data http-client http-client-tls http-conduit http-types - iso8601-time microlens monad-logger mtl optparse-generic - parser-combinators persistent persistent-sqlite persistent-template - pretty-show safe shakespeare template-haskell text time - transformers unordered-containers vector wai wai-extra wai-logger - warp yaml yesod yesod-auth yesod-core yesod-form yesod-newsfeed - yesod-static + iso8601-time microlens monad-logger mtl optparse-applicative + optparse-generic parser-combinators persistent persistent-sqlite + persistent-template pretty-show safe shakespeare template-haskell + text time transformers unordered-containers vector wai wai-extra + wai-logger warp yaml yesod yesod-auth yesod-core yesod-form + yesod-newsfeed yesod-static ]; testHaskellDepends = [ aeson attoparsec base bcrypt blaze-html bytestring case-insensitive @@ -88911,36 +88767,6 @@ self: { }) {}; "esqueleto" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , conduit, containers, exceptions, hspec, hspec-core, monad-logger - , mtl, mysql, mysql-simple, persistent, persistent-mysql - , persistent-postgresql, persistent-sqlite, postgresql-simple - , QuickCheck, resourcet, tagged, text, time, transformers, unliftio - , unordered-containers - }: - mkDerivation { - pname = "esqueleto"; - version = "3.5.3.1"; - sha256 = "16i0hnn91a77jdzmj8zwr328splaqbk0wzbj3kvrwnbylwjbdccm"; - revision = "1"; - editedCabalFile = "1b5q5nf5b32id5g3gbndsn3c31m3ch57a5w16akfww711dk45lyz"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - monad-logger persistent resourcet tagged text time transformers - unliftio unordered-containers - ]; - testHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - exceptions hspec hspec-core monad-logger mtl mysql mysql-simple - persistent persistent-mysql persistent-postgresql persistent-sqlite - postgresql-simple QuickCheck resourcet tagged text time - transformers unliftio unordered-containers - ]; - description = "Type-safe EDSL for SQL queries on persistent backends"; - license = lib.licenses.bsd3; - }) {}; - - "esqueleto_3_5_4_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql @@ -88966,7 +88792,6 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "esqueleto-pgcrypto" = callPackage @@ -92406,34 +92231,6 @@ self: { }) {}; "faktory" = callPackage - ({ mkDerivation, aeson, aeson-casing, aeson-qq, async, base - , bytestring, connection, cryptonite, errors, hspec, markdown-unlit - , megaparsec, memory, mtl, network, random, safe-exceptions - , scanner, semigroups, text, time, unix, unordered-containers - }: - mkDerivation { - pname = "faktory"; - version = "1.1.2.1"; - sha256 = "0hdwp12qn6m7xd2d7wsj3092jgvx2h6gf4b0gdswy1mkf0c2jql9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-casing base bytestring connection cryptonite errors - megaparsec memory mtl network random safe-exceptions scanner - semigroups text time unix unordered-containers - ]; - executableHaskellDepends = [ aeson base safe-exceptions ]; - testHaskellDepends = [ - aeson aeson-qq async base hspec markdown-unlit mtl time - ]; - testToolDepends = [ markdown-unlit ]; - description = "Faktory Worker for Haskell"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "faktory_1_1_2_2" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-qq, async, base , bytestring, connection, cryptonite, errors, hspec, markdown-unlit , megaparsec, memory, mtl, network, random, safe-exceptions @@ -98700,7 +98497,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "fourmolu_0_5_0_1" = callPackage + "fourmolu_0_6_0_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring , Cabal, containers, Diff, directory, dlist, exceptions, filepath , ghc-lib-parser, gitrev, hspec, hspec-discover, HsYAML @@ -98709,10 +98506,8 @@ self: { }: mkDerivation { pname = "fourmolu"; - version = "0.5.0.1"; - sha256 = "1dal9nl08g4c8pjkn8nbk5rxbdlnl9bbavybv52kzry7qhlg71px"; - revision = "1"; - editedCabalFile = "1jkam52bff82id2bhwmwxi52d3k85pami2530qp6xci1h488gqyh"; + version = "0.6.0.0"; + sha256 = "0yxv3ih2jjnjzdhz31y4a94ly6g3qhddrm3lvflqrb4krk445p67"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101345,22 +101140,6 @@ self: { }) {}; "fusion-plugin" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , fusion-plugin-types, ghc, syb, time, transformers - }: - mkDerivation { - pname = "fusion-plugin"; - version = "0.2.3"; - sha256 = "1lklrd3afvm8fwd14yiavx5h8zxjkn2k2vqnxbqwcakcnljxrfyq"; - libraryHaskellDepends = [ - base containers directory filepath fusion-plugin-types ghc syb time - transformers - ]; - description = "GHC plugin to make stream fusion more predictable"; - license = lib.licenses.asl20; - }) {}; - - "fusion-plugin_0_2_4" = callPackage ({ mkDerivation, base, containers, directory, filepath , fusion-plugin-types, ghc, syb, time, transformers }: @@ -101374,7 +101153,6 @@ self: { ]; description = "GHC plugin to make stream fusion more predictable"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "fusion-plugin-types" = callPackage @@ -103035,6 +102813,18 @@ self: { license = lib.licenses.mit; }) {}; + "generic-arbitrary_0_2_1" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "generic-arbitrary"; + version = "0.2.1"; + sha256 = "0xg00rlzk6gg4sd0fb15rpgdgpfpy08azgiwgkxrdrjcjfi6cyp9"; + libraryHaskellDepends = [ base QuickCheck ]; + description = "Generic implementation for QuickCheck's Arbitrary"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-binary" = callPackage ({ mkDerivation, base, binary, bytestring, ghc-prim }: mkDerivation { @@ -105392,6 +105182,8 @@ self: { pname = "ghc-exactprint"; version = "0.6.4"; sha256 = "0a6baza962d4pz2m02hxmh8234i47zkizmwhsy68namr05dmlgpw"; + revision = "1"; + editedCabalFile = "0qil5rlsvxhwrbciixha8mdaw8wfci797n4wcyxn41mr4a4783f5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105412,6 +105204,8 @@ self: { pname = "ghc-exactprint"; version = "1.4.1"; sha256 = "0q9z43753arxbcs6mz26kz4dsz0c2i5hkxa125gl36vsipxfrq92"; + revision = "1"; + editedCabalFile = "00wvn8j7439r5pp9wjqasv710amrsf34qpa3czxja2khg9jdnngj"; isLibrary = true; isExecutable = true; description = "ExactPrint for GHC"; @@ -105425,6 +105219,8 @@ self: { pname = "ghc-exactprint"; version = "1.5.0"; sha256 = "07m4cg47knrrvpyimnbc0nq9176vkzwwa64b2iqfj6azn6q2hagp"; + revision = "1"; + editedCabalFile = "1v6my8bnhjhw7k3v2q9iwjpz9lj5g6ilvlzdq6svcabxahmzbr2c"; isLibrary = true; isExecutable = true; description = "ExactPrint for GHC"; @@ -113928,8 +113724,8 @@ self: { }: mkDerivation { pname = "google-server-api"; - version = "0.4.0.1"; - sha256 = "064y4rw4dpx3k9h7p8pwzydkrbh5ljnqgzlxdsgis665hh4kp0rr"; + version = "0.4.0.2"; + sha256 = "0wnfn75z5k9lh8h38ya52dc4rjjxzpybj0sayjz6ax1xxiaz3d90"; libraryHaskellDepends = [ aeson aeson-casing base base64-bytestring bytestring HsOpenSSL http-api-data http-client http-client-tls http-media mime-mail @@ -115435,34 +115231,6 @@ self: { }) {}; "graphula" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , generic-arbitrary, generics-eot, hspec, http-api-data, HUnit - , markdown-unlit, monad-logger, mtl, path-pieces, persistent - , persistent-sqlite, persistent-template, QuickCheck, random - , resourcet, semigroups, temporary, text, transformers, unliftio - , unliftio-core - }: - mkDerivation { - pname = "graphula"; - version = "2.0.1.0"; - sha256 = "0h9nckz4mz4xrzwpqs3dclrc7dnqxf5pn3x741bng7cmvcwzzhdd"; - libraryHaskellDepends = [ - base containers directory generics-eot HUnit mtl persistent - QuickCheck random semigroups temporary text transformers unliftio - unliftio-core - ]; - testHaskellDepends = [ - aeson base bytestring containers generic-arbitrary hspec - http-api-data markdown-unlit monad-logger path-pieces persistent - persistent-sqlite persistent-template QuickCheck resourcet text - transformers unliftio-core - ]; - testToolDepends = [ markdown-unlit ]; - description = "A simple interface for generating persistent data and linking its dependencies"; - license = lib.licenses.mit; - }) {}; - - "graphula_2_0_1_1" = callPackage ({ mkDerivation, base, containers, directory, generic-arbitrary , generics-eot, hspec, HUnit, markdown-unlit, monad-logger, mtl , persistent, persistent-sqlite, QuickCheck, random, resourcet @@ -115484,7 +115252,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "A simple interface for generating persistent data and linking its dependencies"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "graphula-core" = callPackage @@ -115590,22 +115357,6 @@ self: { }) {}; "gravatar" = callPackage - ({ mkDerivation, base, bytestring, data-default, hspec, HTTP - , pureMD5, text - }: - mkDerivation { - pname = "gravatar"; - version = "0.8.0"; - sha256 = "1mzl08qzwzzhz6bvkz4qnrdnzsgvsmi2lnhzf743yzx4msn00q3g"; - libraryHaskellDepends = [ - base bytestring data-default HTTP pureMD5 text - ]; - testHaskellDepends = [ base hspec text ]; - description = "Generate Gravatar image URLs"; - license = lib.licenses.mit; - }) {}; - - "gravatar_0_8_1" = callPackage ({ mkDerivation, base, bytestring, data-default, doctest, Glob , hspec, HTTP, pureMD5, text }: @@ -115619,7 +115370,6 @@ self: { testHaskellDepends = [ base doctest Glob hspec ]; description = "Generate Gravatar image URLs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "gray-code" = callPackage @@ -119681,8 +119431,8 @@ self: { pname = "hakyll"; version = "4.15.1.1"; sha256 = "0b3bw275q1xbx8qs9a6gzzs3c9z3qdj7skqhpp09jkchi5kdvhvi"; - revision = "2"; - editedCabalFile = "0rsr61xndj6kxwscbp4zcq2y5x9cg7y0r4iblj3s767yw1ajnpn4"; + revision = "3"; + editedCabalFile = "1h9cy5yp98f2wi0yk6l0qpy3zpg1kb7yizh8dkmss0nzq242nz4s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -120143,33 +119893,6 @@ self: { }) {}; "hal" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, conduit, conduit-extra, containers, envy - , exceptions, hashable, hedgehog, hspec, hspec-hedgehog - , http-client, http-types, mtl, raw-strings-qq, scientific, text - , time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "hal"; - version = "0.4.10"; - sha256 = "10byncg5m23qfzi2avlrh3yq5gdppgiy998a225wa5p95m31xh9b"; - revision = "1"; - editedCabalFile = "01mrqgh8n1kzpclcfqpc02jqdijj9pwks9bia5hs1s6vnasbpfg7"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive conduit - conduit-extra containers envy exceptions hashable http-client - http-types mtl scientific text time unordered-containers - ]; - testHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive containers - hedgehog hspec hspec-hedgehog http-client http-types raw-strings-qq - scientific text time transformers unordered-containers vector - ]; - description = "A runtime environment for Haskell applications running on AWS Lambda"; - license = lib.licenses.bsd3; - }) {}; - - "hal_0_4_10_1" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, conduit, conduit-extra, containers, envy , exceptions, hashable, hedgehog, hspec, hspec-hedgehog @@ -120194,7 +119917,6 @@ self: { ]; description = "A runtime environment for Haskell applications running on AWS Lambda"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "halberd" = callPackage @@ -130278,6 +130000,46 @@ self: { broken = true; }) {}; + "heist-emanote" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder + , blaze-html, bytestring, containers, criterion + , criterion-measurement, directory, directory-tree, dlist, filepath + , hashable, HUnit, lens, lifted-base, map-syntax, monad-control + , mtl, process, QuickCheck, random, statistics, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, time + , transformers, transformers-base, unordered-containers, vector + , xmlhtml + }: + mkDerivation { + pname = "heist-emanote"; + version = "1.2.0.0"; + sha256 = "098gy30vpwwg4hx7nqkic11214y5vrcqazvxk9477ry9rmp7hv85"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + containers directory directory-tree dlist filepath hashable + lifted-base map-syntax monad-control mtl process random text time + transformers transformers-base unordered-containers vector xmlhtml + ]; + testHaskellDepends = [ + aeson attoparsec base bifunctors blaze-builder blaze-html + bytestring containers directory directory-tree dlist filepath + hashable HUnit lens lifted-base map-syntax monad-control mtl + process QuickCheck random test-framework test-framework-hunit + test-framework-quickcheck2 text time transformers transformers-base + unordered-containers vector xmlhtml + ]; + benchmarkHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + containers criterion criterion-measurement directory directory-tree + dlist filepath hashable HUnit lifted-base map-syntax monad-control + mtl process random statistics test-framework test-framework-hunit + text time transformers transformers-base unordered-containers + vector xmlhtml + ]; + description = "An Haskell template system supporting both HTML5 and XML"; + license = lib.licenses.bsd3; + }) {}; + "helf" = callPackage ({ mkDerivation, alex, array, base, containers, happy, mtl, pretty , QuickCheck @@ -131572,20 +131334,20 @@ self: { }) {}; "hexml-lens" = callPackage - ({ mkDerivation, base, bytestring, contravariant, doctest - , foundation, hexml, hspec, lens, profunctors, QuickCheck, text - , wreq + ({ mkDerivation, base, bytestring, contravariant, foundation, hexml + , hspec, lens, profunctors, text, wreq }: mkDerivation { pname = "hexml-lens"; - version = "0.2.1"; - sha256 = "0ss9riq7ppmqav4p38ckk479ggq7iy7xm0wsanr29ybg43vlx8xs"; + version = "0.2.2"; + sha256 = "1z522r600b0jzz0fw612a78k296cmpnfddwd5dfg4d4bcqc1db6n"; libraryHaskellDepends = [ base bytestring contravariant foundation hexml lens profunctors text ]; testHaskellDepends = [ - base bytestring doctest hexml hspec lens QuickCheck wreq + base bytestring contravariant foundation hexml hspec lens + profunctors text wreq ]; description = "Lenses for the hexml package"; license = lib.licenses.bsd3; @@ -133739,26 +133501,6 @@ self: { }) {}; "hint" = callPackage - ({ mkDerivation, base, containers, directory, exceptions, filepath - , ghc, ghc-boot, ghc-paths, HUnit, random, stm, temporary - , transformers, unix - }: - mkDerivation { - pname = "hint"; - version = "0.9.0.5"; - sha256 = "1qjasjbilvrfwk8lxfw0pa0hwpsr7nn0n9yd95lwjgfnqnigzcb8"; - libraryHaskellDepends = [ - base containers directory exceptions filepath ghc ghc-boot - ghc-paths random temporary transformers unix - ]; - testHaskellDepends = [ - base containers directory exceptions filepath HUnit stm unix - ]; - description = "Runtime Haskell interpreter (GHC API wrapper)"; - license = lib.licenses.bsd3; - }) {}; - - "hint_0_9_0_6" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit, random , stm, temporary, text, transformers, typed-process, unix @@ -133777,7 +133519,6 @@ self: { ]; description = "A Haskell interpreter built on top of the GHC API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hint-server" = callPackage @@ -136121,8 +135862,8 @@ self: { ({ mkDerivation, base, doctest, hmatrix, nlopt-haskell, vector }: mkDerivation { pname = "hmatrix-nlopt"; - version = "0.1.3.0"; - sha256 = "17c6s4q5sldr3mqqbyg4yknqxfgd45a0aw6sac33xcv9dvgyjyfc"; + version = "0.2.0.0"; + sha256 = "1akllhmh143j9xcw0kcmvn8pfafha94gkyd9h6cfd48wlvz93wwk"; libraryHaskellDepends = [ base hmatrix nlopt-haskell vector ]; testHaskellDepends = [ base doctest ]; description = "Interface HMatrix with the NLOPT minimizer"; @@ -138665,44 +138406,6 @@ self: { }) {}; "hpack" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal - , containers, cryptonite, deepseq, directory, filepath, Glob, hspec - , hspec-discover, http-client, http-client-tls, http-types, HUnit - , infer-license, interpolate, mockery, pretty, QuickCheck - , scientific, template-haskell, temporary, text, transformers - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "hpack"; - version = "0.34.6"; - sha256 = "0hmaf5j4blyav3a0r1qbdhr5hs8s88c6l7ryxi011xj7hqs4fi8w"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob http-client http-client-tls - http-types infer-license pretty scientific text transformers - unordered-containers vector yaml - ]; - executableHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob http-client http-client-tls - http-types infer-license pretty scientific text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob hspec http-client http-client-tls - http-types HUnit infer-license interpolate mockery pretty - QuickCheck scientific template-haskell temporary text transformers - unordered-containers vector yaml - ]; - testToolDepends = [ hspec-discover ]; - description = "A modern format for Haskell packages"; - license = lib.licenses.mit; - }) {}; - - "hpack_0_34_7" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec , hspec-discover, http-client, http-client-tls, http-types, HUnit @@ -138738,7 +138441,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A modern format for Haskell packages"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hpack-convert" = callPackage @@ -139318,38 +139020,28 @@ self: { license = lib.licenses.bsd3; }) {}; - "hpqtypes" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers - , directory, exceptions, filepath, HUnit, lifted-base - , monad-control, mtl, postgresql, QuickCheck, random, resource-pool - , scientific, semigroups, test-framework, test-framework-hunit - , text, text-show, time, transformers, transformers-base - , unordered-containers, uuid-types, vector + "hpp_0_6_5" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, ghc-prim + , time, transformers, unordered-containers }: mkDerivation { - pname = "hpqtypes"; - version = "1.9.3.0"; - sha256 = "1xvimzwbmb72g7c4c5wi2lr4dn0pyyfzk8y4q4a9ihpw0yapby3n"; - setupHaskellDepends = [ base Cabal directory filepath ]; + pname = "hpp"; + version = "0.6.5"; + sha256 = "0xmnnmw2h4rf0bffncbhy8ja005wfr54cgsnqnc5vsqnl3dmvdlp"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring containers exceptions lifted-base - monad-control mtl resource-pool semigroups text text-show time - transformers transformers-base uuid-types vector + base bytestring directory filepath ghc-prim time transformers + unordered-containers ]; - librarySystemDepends = [ postgresql ]; - testHaskellDepends = [ - aeson base bytestring exceptions HUnit lifted-base monad-control - mtl QuickCheck random scientific test-framework - test-framework-hunit text text-show time transformers-base - unordered-containers uuid-types vector - ]; - description = "Haskell bindings to libpqtypes"; + executableHaskellDepends = [ base directory filepath time ]; + testHaskellDepends = [ base bytestring transformers ]; + description = "A Haskell pre-processor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; - }) {inherit (pkgs) postgresql;}; + }) {}; - "hpqtypes_1_9_3_1" = callPackage + "hpqtypes" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers , directory, exceptions, filepath, HUnit, lifted-base , monad-control, mtl, postgresql, QuickCheck, random, resource-pool @@ -140446,8 +140138,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-api"; - version = "0.0.3.2"; - sha256 = "0rb3hmpwvncrjr9dh7wk7dqair51rmdzw9d138ld66cy6np5cjz0"; + version = "0.0.3.3"; + sha256 = "0hrlz77p5w57ax4jml5c415qb1bfh8zi357xvnb0bin7g5a00fn8"; libraryHaskellDepends = [ async attoparsec base binary bytestring charset clock containers ghc-prim hashable http-types memory mtl template-haskell text @@ -143207,6 +142899,23 @@ self: { license = lib.licenses.mit; }) {}; + "hslua-module-doclayout_1_0_4" = callPackage + ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit + , tasty-lua, text + }: + mkDerivation { + pname = "hslua-module-doclayout"; + version = "1.0.4"; + sha256 = "14sqffgcrhhrv7k4j8b1l41mn5gqlp8yzggd727746kjl0n56hqq"; + libraryHaskellDepends = [ base doclayout hslua text ]; + testHaskellDepends = [ + base doclayout hslua tasty tasty-hunit tasty-lua text + ]; + description = "Lua module wrapping Text.DocLayout."; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hslua-module-path" = callPackage ({ mkDerivation, base, filepath, hslua-core, hslua-marshalling , hslua-packaging, tasty, tasty-hunit, tasty-lua, text @@ -143941,22 +143650,6 @@ self: { }) {}; "hspec-expectations-json" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, Diff, hspec - , HUnit, scientific, text, vector - }: - mkDerivation { - pname = "hspec-expectations-json"; - version = "1.0.0.5"; - sha256 = "12kb0dsw36rwg522lhs31gi2ij8vf8lq36j3983i352yiqrzb586"; - libraryHaskellDepends = [ - aeson aeson-pretty base Diff HUnit scientific text vector - ]; - testHaskellDepends = [ aeson-qq base hspec ]; - description = "Hspec expectations for JSON Values"; - license = lib.licenses.mit; - }) {}; - - "hspec-expectations-json_1_0_0_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, Diff, hspec , HUnit, scientific, text, unordered-containers, vector }: @@ -143971,7 +143664,6 @@ self: { testHaskellDepends = [ aeson-qq base hspec ]; description = "Hspec expectations for JSON Values"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hspec-expectations-lens" = callPackage @@ -146154,6 +145846,23 @@ self: { broken = true; }) {}; + "htoml-parse" = callPackage + ({ mkDerivation, base, comonad, containers, dlist, htoml-megaparsec + , mtl, prettyprinter, prettyprinter-combinators, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "htoml-parse"; + version = "0.1.0.1"; + sha256 = "02zp241wgc7lkywp1wd7qz69k2gkgdhk72vdwqfmvxg3l61z0wb8"; + libraryHaskellDepends = [ + base comonad containers dlist htoml-megaparsec mtl prettyprinter + prettyprinter-combinators text time unordered-containers vector + ]; + description = "Parse TOML values produced by htoml-megaparsec package"; + license = lib.licenses.asl20; + }) {}; + "htrace" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -160139,6 +159848,42 @@ self: { license = lib.licenses.mit; }) {}; + "jsonlogic" = callPackage + ({ mkDerivation, base, containers, hedgehog, mtl, tasty + , tasty-hedgehog, tasty-hunit + }: + mkDerivation { + pname = "jsonlogic"; + version = "0.1.0.0"; + sha256 = "10mibw6nakpdbb2ilf16zm4fydjg1arsy95frjziiah3vilqngdg"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ + base containers hedgehog tasty tasty-hedgehog tasty-hunit + ]; + description = "JsonLogic Evaluation"; + license = lib.licenses.mit; + }) {}; + + "jsonlogic-aeson" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , hedgehog, jsonlogic, scientific, tasty, tasty-hedgehog + , tasty-hunit, text, utf8-string, vector + }: + mkDerivation { + pname = "jsonlogic-aeson"; + version = "0.1.0.0"; + sha256 = "1kljmxrr96lsg8d59pq4jphip8ymd5j3jdd5ckjjlri9hqrmqks1"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers jsonlogic scientific + text utf8-string vector + ]; + testHaskellDepends = [ + base containers hedgehog jsonlogic tasty tasty-hedgehog tasty-hunit + ]; + description = "JsonLogic Aeson Support"; + license = lib.licenses.mit; + }) {}; + "jsonnet" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring , containers, data-fix, deriving-compat, directory, exceptions @@ -161835,8 +161580,8 @@ self: { }: mkDerivation { pname = "keera-hails-i18n"; - version = "0.7.0"; - sha256 = "0k5cvnkc5r99r4361hn5jrmslvb21y3k2pj0dryiwbs21jwyv213"; + version = "0.8.0"; + sha256 = "0bl5szf7npifbmay7shj2lbbwcm71n4p4rxw1cy2mpy71c53gzpl"; libraryHaskellDepends = [ base directory filepath glib hgettext MissingK setlocale utf8-string @@ -161850,8 +161595,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "keera-hails-mvc-controller"; - version = "0.7.0"; - sha256 = "1j7vhkghdh4hrap7g2xshpd2fw3acgwvi68f2c01mqmfi5dl4z2n"; + version = "0.8.0"; + sha256 = "1fky7z6zc2xs56hn4bbxjc9clinw5anzndqbb59qwb7pf1h1bxjb"; libraryHaskellDepends = [ base ]; description = "Haskell on Gtk rails - Gtk-based controller for MVC applications"; license = lib.licenses.bsd3; @@ -161863,8 +161608,8 @@ self: { }: mkDerivation { pname = "keera-hails-mvc-environment-gtk"; - version = "0.7.0"; - sha256 = "0px1f9jpdgkd253bhgalxk5rxx971s0s2a845h81x6hy9wi7n6mf"; + version = "0.8.0"; + sha256 = "0s3ax8ysz3g2fbi10sjz4xx10hf8cvhy01kqiy6sa3y7c79fbmis"; libraryHaskellDepends = [ base keera-hails-mvc-model-protectedmodel keera-hails-mvc-view keera-hails-mvc-view-gtk @@ -161880,8 +161625,8 @@ self: { }: mkDerivation { pname = "keera-hails-mvc-model-lightmodel"; - version = "0.7.0"; - sha256 = "0nklcgsadm2h62jwp8i419dwrsfs885cmglr5n39b7r1zy7dsa0f"; + version = "0.8.0"; + sha256 = "0m3n7l5am935pvicmajxdzs1s7h2y8jw8iw6m4lpij2cv03w0ik5"; libraryHaskellDepends = [ base containers keera-hails-reactivevalues MissingK stm template-haskell @@ -161897,8 +161642,8 @@ self: { }: mkDerivation { pname = "keera-hails-mvc-model-protectedmodel"; - version = "0.7.0"; - sha256 = "0vz4bcnm2p03c3x6qspii9kylcv4d0qlmzawm6x1f148srrwidi7"; + version = "0.8.0"; + sha256 = "0s6ac518mr1y9300dyifxryx8ba71ca08630a81ag7glhpr8s81y"; libraryHaskellDepends = [ base containers keera-hails-reactivevalues MissingK stm template-haskell @@ -161912,8 +161657,8 @@ self: { ({ mkDerivation, base, directory, filepath, MissingK }: mkDerivation { pname = "keera-hails-mvc-solutions-config"; - version = "0.0.3.3"; - sha256 = "16c6nh5fqw2r42nxs3x27rqbpscypjzgqnprl99241giwcvy98x1"; + version = "0.8.0"; + sha256 = "0qv77hvw4cvpl6dk4vgcvcc9gybijld5r1ixjxhqqiw70w18qr9a"; libraryHaskellDepends = [ base directory filepath MissingK ]; description = "Haskell on Gtk rails - Easy handling of configuration files"; license = lib.licenses.bsd3; @@ -161928,15 +161673,15 @@ self: { }: mkDerivation { pname = "keera-hails-mvc-solutions-gtk"; - version = "0.0.3.4"; - sha256 = "01sksznn8rxv4ww3p99qm8dhjlpy03ygavp512zmyrpvydhp86mm"; + version = "0.8.0"; + sha256 = "1k7iaz7klm3sc84bhyzrni9sa0b8g1m6c6wacx3w87ca233yx2b4"; libraryHaskellDepends = [ base gtk hslogger HTTP keera-hails-mvc-environment-gtk keera-hails-mvc-model-protectedmodel keera-hails-mvc-view keera-hails-mvc-view-gtk keera-hails-reactivevalues MissingK mtl network network-uri template-haskell ]; - description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications"; + description = "Haskell on Gtk rails - Solutions to recurrent problems in Gtk applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -161945,8 +161690,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "keera-hails-mvc-view"; - version = "0.0.3.3"; - sha256 = "0jkwbpw23ba5z83nfk51hp8wsfkrbbiwr0f6bvx39wzz1v81n58p"; + version = "0.8.0"; + sha256 = "1by0xr31c22b3xcimnx7l2hddf0qhv9fmz6cs60ya0dkd7bgc8gw"; libraryHaskellDepends = [ base ]; description = "Haskell on Gtk rails - Generic View for MVC applications"; license = lib.licenses.bsd3; @@ -161956,8 +161701,8 @@ self: { ({ mkDerivation, base, gtk, gtk-helpers, keera-hails-mvc-view }: mkDerivation { pname = "keera-hails-mvc-view-gtk"; - version = "0.0.3.3"; - sha256 = "1yz4drm0r1831acg9y8glg7hgiqwgc5nqkz4hfgqgfngqs94jx4z"; + version = "0.8.0"; + sha256 = "0hf4wjnvbnljm732q826qjmnkvgzvy716d1fc5v31imx7flsi1hl"; libraryHaskellDepends = [ base gtk gtk-helpers keera-hails-mvc-view ]; @@ -161972,8 +161717,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactive-cbmvar"; - version = "0.7.0"; - sha256 = "085zli0s7p8f2ib2882q4qpqlh6czw62626fnrjiks4sff3f31c7"; + version = "0.8.0"; + sha256 = "1b9agmlxpg6x6p8bysgb7ir9rrssjnhpx0m28v6wwy06kgwg0j9d"; libraryHaskellDepends = [ base keera-callbacks keera-hails-reactivevalues lens ]; @@ -161991,8 +161736,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactive-fs"; - version = "0.0.3.4"; - sha256 = "1yinlhp08xxdlbnm90gnwbr1h9sp8r741ihd8kihy1yfqzkp85cy"; + version = "0.8.0"; + sha256 = "01yr0lc6s4d6ihlrzlrxbdf7vsa81c099whxsr2hyqw9brkc0ycb"; libraryHaskellDepends = [ base directory fsnotify keera-hails-reactivevalues system-filepath ]; @@ -162007,8 +161752,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactive-gtk"; - version = "0.7.0"; - sha256 = "1xn5ar20x8kpiv1z6i5gcvm09xjgrdppjyxd2si8nyv7gw173scr"; + version = "0.8.0"; + sha256 = "15zjpj533zm3kjr5j1m8xh25y0cyz6wp224lkdy3b7x321yrd1c2"; libraryHaskellDepends = [ base bytestring cairo glib gtk gtk-helpers keera-hails-reactivevalues mtl transformers @@ -162025,8 +161770,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactive-htmldom"; - version = "0.7.0"; - sha256 = "05lz38pffm6k3kbw3g6gkslixq4nc764n1i4dxz9p6zwj27f6svc"; + version = "0.8.0"; + sha256 = "0mf22b0qvg9xmsz8nijld7qccp12nhwn3gznrcdb56k6p2yk6daf"; libraryHaskellDepends = [ base ghcjs-dom keera-callbacks keera-hails-reactive-cbmvar keera-hails-reactivevalues mtl transformers @@ -162042,8 +161787,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactive-network"; - version = "0.7.0"; - sha256 = "0qn1vz55fpvrx4l3lak0lkx0ggli8smf3r4za3zypgfv3a1q3rxm"; + version = "0.8.0"; + sha256 = "0m1xgfl8cisi67hv6k5gjdr0l2mla8f88vqisicw39dr6nqdrfmf"; libraryHaskellDepends = [ base bytestring keera-hails-reactivevalues network network-bsd ]; @@ -162057,8 +161802,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactive-polling"; - version = "0.0.3.3"; - sha256 = "1khkbhj94y6y5s2d56h718c8kh3y698wdryi2369mrw755dy6qh8"; + version = "0.8.0"; + sha256 = "1v88bz16zx73lwk62f5nyr2kizbjazvh5k0f5vfjgd8mlx3hrhg0"; libraryHaskellDepends = [ base keera-callbacks keera-hails-reactivevalues ]; @@ -162071,8 +161816,8 @@ self: { ({ mkDerivation, base, keera-hails-reactivevalues, wx, wxcore }: mkDerivation { pname = "keera-hails-reactive-wx"; - version = "0.7.0"; - sha256 = "1cpwyqqcdnxc30qmny0rq0ww51vv8g241jwjis1sbs47hvwgvi27"; + version = "0.8.0"; + sha256 = "0p8zygfbmw0lh88pkfn7rpnxl5ikdfbasdnyafi90nn24dnfii84"; libraryHaskellDepends = [ base keera-hails-reactivevalues wx wxcore ]; @@ -162087,8 +161832,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactive-yampa"; - version = "0.7.0"; - sha256 = "178r5igwnvkbpz1hypiy4l61s3amr4j8bk1yvqc7jvs40cldiw1x"; + version = "0.8.0"; + sha256 = "0ayazs0lmjjs2ilr56zdbmvzcx6091fk72dcz0kqg5jx2xlj3h9j"; libraryHaskellDepends = [ base keera-callbacks keera-hails-reactivevalues time Yampa ]; @@ -162098,12 +161843,19 @@ self: { }) {}; "keera-hails-reactivelenses" = callPackage - ({ mkDerivation, base, keera-hails-reactivevalues, lens }: + ({ mkDerivation, base, directory, filepath, hlint, HUnit + , keera-hails-reactivevalues, lens, mtl, process, QuickCheck + , regex-posix, tasty, tasty-hunit, tasty-quickcheck + }: mkDerivation { pname = "keera-hails-reactivelenses"; - version = "0.0.1"; - sha256 = "1c72sc68wqvsxhjr7y16k7iw784swk8wfp2j7xw0y0ggdjlamn0x"; + version = "0.8.0"; + sha256 = "093dpcy076inas2v0zh1p2k8a0dpd7g9gfbsk7shrqv1qjh6rjam"; libraryHaskellDepends = [ base keera-hails-reactivevalues lens ]; + testHaskellDepends = [ + base directory filepath hlint HUnit keera-hails-reactivevalues mtl + process QuickCheck regex-posix tasty tasty-hunit tasty-quickcheck + ]; description = "Reactive Haskell on Rails - Lenses applied to Reactive Values"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -162116,8 +161868,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactivevalues"; - version = "0.7.0"; - sha256 = "1dmsjyvrzh8rdp9kcc8ysar0zw9gaxqh231xaqy17ndfhlmp2nzq"; + version = "0.8.0"; + sha256 = "00h5kakpwfif82dhvcbxc5s8m5ypkd5cyk4v7wjcwrj0m1nikqk4"; libraryHaskellDepends = [ base contravariant ]; testHaskellDepends = [ base directory filepath hlint HUnit mtl process QuickCheck @@ -165010,6 +164762,26 @@ self: { maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; + "language-c_0_9_1" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers, deepseq + , directory, filepath, happy, mtl, pretty, process + }: + mkDerivation { + pname = "language-c"; + version = "0.9.1"; + sha256 = "0g5djsnzzmi1d1ndcmmrmwz4xnv1m3w009d6kx9jz9jxxdk9adcl"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath mtl + pretty process + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ base directory filepath process ]; + description = "Analysis and generation of C code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ expipiplus1 ]; + }) {}; + "language-c-comments" = callPackage ({ mkDerivation, alex, array, base, language-c }: mkDerivation { @@ -165193,8 +164965,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.4.1.2"; - sha256 = "0z6bri73gprs485pjhwvwd37p9lfqvy15k9ws5p4178m538bxmmq"; + version = "1.4.2.0"; + sha256 = "0745idh2qf2xpql360mk66pjfpjw8acj0p3q3hhnkdx7l3dkakl4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -165244,6 +165016,29 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "language-docker_11_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , data-default-class, hspec, hspec-megaparsec, HUnit, megaparsec + , prettyprinter, QuickCheck, split, text, time + }: + mkDerivation { + pname = "language-docker"; + version = "11.0.0"; + sha256 = "1j8aib6pq7ghmsi3l2p554l8gnapi0jd3qsi8vhdn2mgvw2n1948"; + libraryHaskellDepends = [ + base bytestring containers data-default data-default-class + megaparsec prettyprinter split text time + ]; + testHaskellDepends = [ + base bytestring containers data-default data-default-class hspec + hspec-megaparsec HUnit megaparsec prettyprinter QuickCheck split + text time + ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -166354,17 +166149,43 @@ self: { license = lib.licenses.bsd3; }) {}; + "large-anon" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , ghc, ghc-tcplugin-api, hashable, large-generics, mtl, optics-core + , parsec, primitive, QuickCheck, record-dot-preprocessor + , record-hasfield, sop-core, syb, tagged, tasty, tasty-hunit + , tasty-quickcheck, text, typelet, validation-selective + }: + mkDerivation { + pname = "large-anon"; + version = "0.1.0.0"; + sha256 = "15rrqpfd7jmm391lxhz2ag1sa17nw8x3wjqm0f9naidgmyv9x1z2"; + libraryHaskellDepends = [ + aeson base containers ghc ghc-tcplugin-api hashable large-generics + mtl optics-core primitive record-hasfield sop-core syb tagged + typelet + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring large-generics mtl optics-core + parsec QuickCheck record-dot-preprocessor record-hasfield sop-core + tasty tasty-hunit tasty-quickcheck text typelet + validation-selective + ]; + description = "Scalable anonymous records"; + license = lib.licenses.bsd3; + }) {}; + "large-generics" = callPackage ({ mkDerivation, aeson, base, generic-deriving, generics-sop - , microlens, mtl, QuickCheck, sop-core, tasty, tasty-hunit - , tasty-quickcheck, vector + , microlens, mtl, primitive, QuickCheck, sop-core, tasty + , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "large-generics"; - version = "0.1.0.0"; - sha256 = "0i80pzxi7nrk5m0lxhqavw9glhrr5l69g958zyc998rskqyi0mjw"; + version = "0.2.0.0"; + sha256 = "0pyydzwybccwaliajzaddgirrffv0sskkyf5zp84rs8kp2yqz9z1"; libraryHaskellDepends = [ - aeson base generics-sop sop-core vector + aeson base generics-sop primitive sop-core ]; testHaskellDepends = [ aeson base generic-deriving generics-sop microlens mtl QuickCheck @@ -166411,17 +166232,17 @@ self: { "large-records" = callPackage ({ mkDerivation, base, containers, generic-deriving, ghc - , large-generics, mtl, newtype, record-dot-preprocessor + , large-generics, mtl, newtype, primitive, record-dot-preprocessor , record-hasfield, syb, tasty, tasty-hunit, template-haskell - , transformers, vector + , transformers }: mkDerivation { pname = "large-records"; - version = "0.2.0.0"; - sha256 = "0vgdrs12xg2d917z24x7i61xv41m1bdkb7vj136l0vf03av65ffm"; + version = "0.2.1.0"; + sha256 = "0gmgrkh9fsyy6ww64l4warsilxkxwfzfl43d36d8a5dcgvn49ip2"; libraryHaskellDepends = [ - base containers ghc large-generics mtl record-hasfield syb - template-haskell transformers vector + base containers ghc large-generics mtl primitive record-hasfield + syb template-haskell transformers ]; testHaskellDepends = [ base generic-deriving large-generics mtl newtype @@ -170222,17 +170043,17 @@ self: { }) {}; "lifx-lan" = callPackage - ({ mkDerivation, base, binary, bytestring, composition, containers - , extra, monad-loops, mtl, network, random, safe, text, time - , transformers + ({ mkDerivation, ansi-terminal, base, binary, bytestring, colour + , composition, containers, extra, monad-loops, mtl, network, random + , safe, text, time, transformers }: mkDerivation { pname = "lifx-lan"; - version = "0.6.2"; - sha256 = "1lshzfgx0cgjqpxlknbsqwvhkmn2jc30zgyzj7lsr3jqqr41zssn"; + version = "0.7"; + sha256 = "00lci0mj75pyrimzcbyq088pg7k6xx1p9pps09l7m3y4dhbnsyyf"; libraryHaskellDepends = [ - base binary bytestring composition containers extra monad-loops mtl - network random safe text time transformers + ansi-terminal base binary bytestring colour composition containers + extra monad-loops mtl network random safe text time transformers ]; description = "LIFX LAN API"; license = lib.licenses.bsd3; @@ -170686,6 +170507,36 @@ self: { license = lib.licenses.mit; }) {}; + "linear-base_0_2_0" = callPackage + ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim + , hashable, hashtables, hedgehog, inspection-testing + , linear-generics, mmorph, MonadRandom, primitive, random + , random-shuffle, storable-tuple, tasty, tasty-hedgehog + , tasty-inspection-testing, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "linear-base"; + version = "0.2.0"; + sha256 = "0s6z21b71pbqjmbz1r2d6xk90a9wbpa4f1dhlia209avhr1wsv26"; + libraryHaskellDepends = [ + base containers ghc-prim hashable linear-generics primitive + storable-tuple text transformers vector + ]; + testHaskellDepends = [ + base containers hedgehog inspection-testing linear-generics mmorph + storable-tuple tasty tasty-hedgehog tasty-inspection-testing text + vector + ]; + benchmarkHaskellDepends = [ + base deepseq gauge hashable hashtables MonadRandom random + random-shuffle unordered-containers vector + ]; + description = "Standard library for linear types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "linear-circuit" = callPackage ({ mkDerivation, base, comfort-array, comfort-graph, containers , lapack, netlib-ffi, non-empty, QuickCheck, transformers @@ -173488,8 +173339,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.11.0.0"; - sha256 = "155lzi9x33rhiymfy1271k0dz7c4qm1r48cz6kc7gcwxvrfh8dxi"; + version = "0.11.1.0"; + sha256 = "0gq92n2xbvrsaqyf2mjfcdpxrgvv2ls299mijjmm6b0m9qzh3r2y"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control mtl semigroups stm text time transformers-base @@ -173563,8 +173414,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.12.1.1"; - sha256 = "0jrfrqydbg549d7gh38mq852kzd0nsaaaq6l5bi4ldfpj443kz8a"; + version = "0.12.2.0"; + sha256 = "1laj93wiy092ha7w1dmaggpqkyq6y8zc3l1s56h2dv7jrxhfpc7n"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq http-client http-client-tls http-types log-base network-uri @@ -173584,8 +173435,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.8.0.2"; - sha256 = "167asvp7a5v8621sbr6r4j25byg18d125gqd2i4jrq57g5f2mivf"; + version = "0.8.1.0"; + sha256 = "01j6x59cahsajymzcqjp7miy46azjnarsgs8ymc5blak2wbws2i5"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -175939,6 +175790,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "lzma-conduit_1_2_3" = callPackage + ({ mkDerivation, base, base-compat, bytestring, conduit, HUnit + , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "lzma-conduit"; + version = "1.2.3"; + sha256 = "1pmvmchrg429b2yk485x0066lxcr37cbyczlyp3ala2iaq8hm61z"; + libraryHaskellDepends = [ + base bytestring conduit lzma resourcet transformers + ]; + testHaskellDepends = [ + base base-compat bytestring conduit HUnit QuickCheck resourcet + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "Conduit interface for lzma/xz compression"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lzma-enumerator" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, enumerator, HUnit , mtl, QuickCheck, test-framework, test-framework-hunit @@ -183272,6 +183144,8 @@ self: { pname = "mmark"; version = "0.0.7.5"; sha256 = "0jh5pbd2f6bqi8rg4q73k7cgbkdc888hjqf99kzcm6k9xllg5770"; + revision = "1"; + editedCabalFile = "1agra1nqsb6d7lcj2j42hd3cb899bnh00y8br7czlmw0jv5fjr55"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -183288,6 +183162,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "mmark_0_0_7_6" = callPackage + ({ mkDerivation, aeson, base, case-insensitive, containers + , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec + , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens + , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck + , text, text-metrics, unordered-containers, weigh, yaml + }: + mkDerivation { + pname = "mmark"; + version = "0.0.7.6"; + sha256 = "1zahgky724s0x89c9jp4fa6m0kzh461sc2lcpwaw61hqgamaay4c"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base case-insensitive containers deepseq dlist email-validate + foldl hashable html-entity-map lucid megaparsec microlens + microlens-th modern-uri mtl parser-combinators text text-metrics + unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri + QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion text weigh ]; + description = "Strict markdown processor for writers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mmark-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark @@ -183319,6 +183221,30 @@ self: { pname = "mmark-ext"; version = "0.2.1.4"; sha256 = "02ygx0kkp69gd2n4bnqjzbwzhs9ksqm148jf6zfgn3z8w1p9glzh"; + revision = "1"; + editedCabalFile = "1n1f0ijnll2pkmm25gy9yn7vycm8y1p14c0d9dq7kwbaa6bhr09d"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri + skylighting text + ]; + testHaskellDepends = [ base hspec lucid mmark skylighting text ]; + testToolDepends = [ hspec-discover ]; + description = "Commonly useful extensions for the MMark markdown processor"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "mmark-ext_0_2_1_5" = callPackage + ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec + , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting + , text + }: + mkDerivation { + pname = "mmark-ext"; + version = "0.2.1.5"; + sha256 = "1dy3xnzpbbnp03k3r04q8y10pcj2r708dk8bff0pxzkvypm75g88"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri @@ -183888,6 +183814,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "modern-uri_0_3_4_4" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant + , criterion, deepseq, exceptions, hspec, hspec-discover + , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck + , reflection, tagged, template-haskell, text, weigh + }: + mkDerivation { + pname = "modern-uri"; + version = "0.3.4.4"; + sha256 = "19fffy7kb7ibajagdryjy872x56045zi6c1div8wvr8aisd55qsz"; + libraryHaskellDepends = [ + base bytestring containers contravariant deepseq exceptions + megaparsec mtl profunctors QuickCheck reflection tagged + template-haskell text + ]; + testHaskellDepends = [ + base bytestring hspec hspec-megaparsec megaparsec QuickCheck text + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq megaparsec text weigh + ]; + description = "Modern library for working with URIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "modify-fasta" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split @@ -194901,8 +194854,8 @@ self: { }: mkDerivation { pname = "niv"; - version = "0.2.19"; - sha256 = "15smcgr81ryxb3a57b88azz2xsvcq92n0cmjam8v1x8r6j0w0p39"; + version = "0.2.20"; + sha256 = "1bspaz1a1vy50336d264b6wv7wrfb4a758ghcv6j437lhinjjbf9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -195964,18 +195917,6 @@ self: { }) {}; "nonempty-zipper" = callPackage - ({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }: - mkDerivation { - pname = "nonempty-zipper"; - version = "1.0.0.3"; - sha256 = "1cifrld76j43spf265arwp2sdpkbhrb4ca2fmj4g9mw0nxj4dbqq"; - libraryHaskellDepends = [ base comonad deepseq safe ]; - testHaskellDepends = [ base comonad deepseq doctest Glob safe ]; - description = "A non-empty comonadic list zipper"; - license = lib.licenses.mit; - }) {}; - - "nonempty-zipper_1_0_0_4" = callPackage ({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }: mkDerivation { pname = "nonempty-zipper"; @@ -195985,7 +195926,6 @@ self: { testHaskellDepends = [ base comonad deepseq doctest Glob safe ]; description = "A non-empty comonadic list zipper"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "nonemptymap" = callPackage @@ -202862,6 +202802,66 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "pandoc_2_18" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, citeproc, commonmark, commonmark-extensions + , commonmark-pandoc, connection, containers, data-default, deepseq + , Diff, directory, doclayout, doctemplates, emojis, exceptions + , file-embed, filepath, Glob, haddock-library, hslua + , hslua-module-doclayout, hslua-module-path, hslua-module-system + , hslua-module-text, hslua-module-version, http-client + , http-client-tls, http-types, ipynb, jira-wiki-markup, JuicyPixels + , lpeg, mtl, network, network-uri, pandoc-lua-marshal, pandoc-types + , parsec, pretty, pretty-show, process, random, safe, scientific + , SHA, skylighting, skylighting-core, split, syb, tagsoup, tasty + , tasty-bench, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-collation, unicode-transforms, unix, xml + , xml-conduit, xml-types, yaml, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.18"; + sha256 = "02g6da49g60b5v7aj8w82n9yfks37bcaa6ni75hcbvbn3mw59lyl"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty array attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive citeproc + commonmark commonmark-extensions commonmark-pandoc connection + containers data-default deepseq directory doclayout doctemplates + emojis exceptions file-embed filepath Glob haddock-library hslua + hslua-module-doclayout hslua-module-path hslua-module-system + hslua-module-text hslua-module-version http-client http-client-tls + http-types ipynb jira-wiki-markup JuicyPixels lpeg mtl network + network-uri pandoc-lua-marshal pandoc-types parsec pretty + pretty-show process random safe scientific SHA skylighting + skylighting-core split syb tagsoup temporary texmath text + text-conversions time unicode-collation unicode-transforms unix xml + xml-conduit xml-types yaml zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring containers Diff directory doctemplates exceptions + filepath Glob hslua mtl pandoc-types process tasty tasty-golden + tasty-hunit tasty-lua tasty-quickcheck text time xml zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq mtl tasty-bench text + ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -203409,29 +203409,6 @@ self: { }) {}; "pandoc-types" = 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.22.1"; - sha256 = "0z2j306jsiriwhib0201hsllwyck7qcvqci5c25frwsmknr3mls2"; - 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 = lib.licenses.bsd3; - }) {}; - - "pandoc-types_1_22_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -203452,7 +203429,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Types for representing a structured document"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pandoc-unlit" = callPackage @@ -203737,6 +203713,8 @@ self: { pname = "pantry"; version = "0.5.4"; sha256 = "080j0pw8fmyb05klbi8vy3dpahiw3zxmykvqamvziwrznl1p4b2m"; + revision = "1"; + editedCabalFile = "0y1faym7qqcjn2f23sqhxaq83ih3h6nr7ql665k1pw93hi3jdv05"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -206021,6 +205999,17 @@ self: { license = lib.licenses.asl20; }) {}; + "path-tree" = callPackage + ({ mkDerivation, base, containers, relude }: + mkDerivation { + pname = "path-tree"; + version = "0.2.0.0"; + sha256 = "13dknkl5lyvy1hyfgvgav611788bkc5w2hzsvsfg40z7ga87v10q"; + libraryHaskellDepends = [ base containers relude ]; + description = "`Data.Tree` for file paths"; + license = lib.licenses.mit; + }) {}; + "path-utils" = callPackage ({ mkDerivation, base, exceptions, path, split, text }: mkDerivation { @@ -207927,6 +207916,43 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; + "persistent_2_13_3_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, bytestring, conduit, containers, criterion, deepseq + , fast-logger, file-embed, hspec, http-api-data, lift-type + , monad-logger, mtl, path-pieces, QuickCheck, quickcheck-instances + , resource-pool, resourcet, scientific, shakespeare, silently + , template-haskell, text, th-lift-instances, time, transformers + , unliftio, unliftio-core, unordered-containers, vault, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.13.3.4"; + sha256 = "1hl11iicgvvd8wxs6zgm2lbv593rqywjiay3f45pfzwr7kmd7r3z"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger http-api-data lift-type monad-logger + mtl path-pieces resource-pool resourcet scientific silently + template-haskell text th-lift-instances time transformers unliftio + unliftio-core unordered-containers vault vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger hspec http-api-data monad-logger mtl + path-pieces QuickCheck quickcheck-instances resource-pool resourcet + scientific shakespeare silently template-haskell text + th-lift-instances time transformers unliftio unliftio-core + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq file-embed template-haskell text + ]; + description = "Type-safe, multi-backend data serialization"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ psibi ]; + }) {}; + "persistent-audit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , getopt-generics, hashable, hspec, mongoDB, persistent @@ -215098,6 +215124,18 @@ self: { license = "unknown"; }) {}; + "pos" = callPackage + ({ mkDerivation, base, deepseq, tasty, tasty-hunit }: + mkDerivation { + pname = "pos"; + version = "0.1.0.0"; + sha256 = "0xzzwpxjkb03ynml59irk5j4q98ggw6pwx1fvldqza0hfn7n5l90"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq tasty tasty-hunit ]; + description = "positive numbers"; + license = lib.licenses.bsd3; + }) {}; + "poseidon" = callPackage ({ mkDerivation, aeson, async, base, binary, binary-bits , bytestring, generics-eot, hspec, postgresql-libpq, QuickCheck @@ -217887,6 +217925,23 @@ self: { license = lib.licenses.bsd2; }) {}; + "prettyprinter-combinators" = callPackage + ({ mkDerivation, base, bimap, bytestring, containers, dlist + , pretty-show, prettyprinter, syb, template-haskell, text + , unordered-containers, vector + }: + mkDerivation { + pname = "prettyprinter-combinators"; + version = "0.1.0.1"; + sha256 = "0plnan8dvxl1y9h5vazszhdrf47862jqbhyx1ibldak19bibp367"; + libraryHaskellDepends = [ + base bimap bytestring containers dlist pretty-show prettyprinter + syb template-haskell text unordered-containers vector + ]; + description = "Some useful combinators for the prettyprinter package"; + license = lib.licenses.asl20; + }) {}; + "prettyprinter-compat-annotated-wl-pprint" = callPackage ({ mkDerivation, base, prettyprinter, text }: mkDerivation { @@ -218507,6 +218562,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "primus" = callPackage + ({ mkDerivation, adjunctions, base, checkers, deepseq, distributive + , lens, pos, profunctors, QuickCheck, semigroupoids, tasty + , tasty-hunit, tasty-quickcheck, these + }: + mkDerivation { + pname = "primus"; + version = "0.1.0.0"; + sha256 = "1z4byp374nkdwsz99bh9v2w2sm3899li8rfbj7q8d4x0mlmcmafy"; + libraryHaskellDepends = [ + adjunctions base deepseq distributive pos profunctors semigroupoids + these + ]; + testHaskellDepends = [ + adjunctions base checkers deepseq distributive lens pos profunctors + QuickCheck semigroupoids tasty tasty-hunit tasty-quickcheck these + ]; + description = "NonEmpty and positive functions"; + license = lib.licenses.bsd3; + }) {}; + "pringletons" = callPackage ({ mkDerivation, aeson, base, hashable, singletons , template-haskell, text, unordered-containers, vector, vinyl @@ -220263,6 +220339,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "proto-lens_0_7_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , lens-family, parsec, pretty, primitive, profunctors, QuickCheck + , tagged, tasty, tasty-quickcheck, text, transformers, vector + }: + mkDerivation { + pname = "proto-lens"; + version = "0.7.1.1"; + sha256 = "1a2w8bpi18djcfklgkvsla5zbfsncww260kw8a87jdd3l0v6gq7q"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim lens-family parsec + pretty primitive profunctors tagged text transformers vector + ]; + testHaskellDepends = [ + base bytestring QuickCheck tasty tasty-quickcheck vector + ]; + description = "A lens-based implementation of protocol buffers in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "proto-lens-arbitrary" = callPackage ({ mkDerivation, base, bytestring, containers, lens-family , proto-lens, QuickCheck, text @@ -220278,6 +220376,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "proto-lens-arbitrary_0_1_2_11" = callPackage + ({ mkDerivation, base, bytestring, containers, lens-family + , proto-lens, QuickCheck, text + }: + mkDerivation { + pname = "proto-lens-arbitrary"; + version = "0.1.2.11"; + sha256 = "1gapsvn72hn8dbfdnrj9xdy7n1ip55sxx1679lpzgyjgq80sgslv"; + libraryHaskellDepends = [ + base bytestring containers lens-family proto-lens QuickCheck text + ]; + description = "Arbitrary instances for proto-lens"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "proto-lens-combinators" = callPackage ({ mkDerivation, base, Cabal, HUnit, lens-family, lens-family-core , proto-lens, proto-lens-runtime, proto-lens-setup, test-framework @@ -220349,6 +220463,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "proto-lens-optparse_0_1_1_9" = callPackage + ({ mkDerivation, base, optparse-applicative, proto-lens, text }: + mkDerivation { + pname = "proto-lens-optparse"; + version = "0.1.1.9"; + sha256 = "1xg72lnx0r03gg41j8mgd61bil33kxpqd1jdpmgh6jx25km6rw9l"; + libraryHaskellDepends = [ + base optparse-applicative proto-lens text + ]; + description = "Adapting proto-lens to optparse-applicative ReadMs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "proto-lens-protobuf-types" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens , proto-lens-protoc, proto-lens-runtime, proto-lens-setup, protobuf @@ -220367,6 +220495,25 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) protobuf;}; + "proto-lens-protobuf-types_0_7_1_1" = callPackage + ({ mkDerivation, base, Cabal, lens-family, proto-lens + , proto-lens-protoc, proto-lens-runtime, proto-lens-setup, protobuf + , text + }: + mkDerivation { + pname = "proto-lens-protobuf-types"; + version = "0.7.1.1"; + sha256 = "17m7aysj1mdx74r7mk9c1jy3q3nn7cfksdmadaxr0lmdq7iawk2g"; + setupHaskellDepends = [ base Cabal proto-lens-setup ]; + libraryHaskellDepends = [ + base lens-family proto-lens proto-lens-runtime text + ]; + libraryToolDepends = [ proto-lens-protoc protobuf ]; + description = "Basic protocol buffer message types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) protobuf;}; + "proto-lens-protoc" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, ghc , ghc-paths, ghc-source-gen, lens-family, pretty, proto-lens @@ -220388,6 +220535,28 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) protobuf;}; + "proto-lens-protoc_0_7_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath, ghc + , ghc-paths, ghc-source-gen, lens-family, pretty, proto-lens + , proto-lens-runtime, protobuf, text + }: + mkDerivation { + pname = "proto-lens-protoc"; + version = "0.7.1.1"; + sha256 = "1wl081xckv0pg2h25gb4fyafw03fq5hrm6shc658k8z8pi3jnh8c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base filepath ]; + libraryToolDepends = [ protobuf ]; + executableHaskellDepends = [ + base bytestring containers filepath ghc ghc-paths ghc-source-gen + lens-family pretty proto-lens proto-lens-runtime text + ]; + description = "Protocol buffer compiler for the proto-lens library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) protobuf;}; + "proto-lens-runtime" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, filepath , lens-family, proto-lens, text, vector @@ -220404,6 +220573,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "proto-lens-runtime_0_7_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, filepath + , lens-family, proto-lens, text, vector + }: + mkDerivation { + pname = "proto-lens-runtime"; + version = "0.7.0.2"; + sha256 = "1akspkc1vswdk2z8ilqdnpf01a851mrr820j516xxnlwmhql7y3k"; + libraryHaskellDepends = [ + base bytestring containers deepseq filepath lens-family proto-lens + text vector + ]; + doHaddock = false; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "proto-lens-setup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, deepseq , directory, filepath, process, proto-lens-protoc, temporary, text @@ -220420,6 +220606,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "proto-lens-setup_0_4_0_6" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, deepseq + , directory, filepath, process, proto-lens-protoc, temporary, text + }: + mkDerivation { + pname = "proto-lens-setup"; + version = "0.4.0.6"; + sha256 = "1jz1d83cbvr7k6igjmjg6z6yl49aci05v8g944whl1j3vkgh4sya"; + libraryHaskellDepends = [ + base bytestring Cabal containers deepseq directory filepath process + proto-lens-protoc temporary text + ]; + description = "Cabal support for codegen with proto-lens"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "proto3-suite" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, bytestring, cereal, containers @@ -221067,8 +221270,8 @@ self: { }: mkDerivation { pname = "ptera"; - version = "0.2.0.0"; - sha256 = "0lf9d2mcigrmn4asr6cjh5hbp1yl048v57a7az8aszhpsz4k8vkp"; + version = "0.3.0.0"; + sha256 = "1zbs7h8lvq9m8qw4267kpp3lr5q2yd3v4jsw4ghrgpa6xwhji7z4"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers enummapset-th membership ptera-core @@ -221116,8 +221319,8 @@ self: { }: mkDerivation { pname = "ptera-th"; - version = "0.2.0.0"; - sha256 = "15djvwgivi2gxqhq65j3qkfh2w9z07yjh4nrg42ydv6n3ps4s9i8"; + version = "0.3.0.0"; + sha256 = "0w5kr7cp0kcxh1cmqb38waxci81i9ccqn42kvhkrkzf35pnkn0m4"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base containers enummapset-th ghc-prim membership ptera @@ -238034,33 +238237,6 @@ self: { }) {}; "sbp" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base - , base64-bytestring, basic-prelude, binary, binary-conduit - , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 - , lens, lens-aeson, monad-loops, resourcet, tasty, tasty-hunit - , template-haskell, text, time, yaml - }: - mkDerivation { - pname = "sbp"; - version = "4.1.1"; - sha256 = "18nhbxq2d07a0hnrb3acm1yi8hlyi84wnia2fc6p1lw9nmlrkzbv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array base base64-bytestring basic-prelude binary bytestring - data-binary-ieee754 lens lens-aeson monad-loops template-haskell - text - ]; - executableHaskellDepends = [ - aeson aeson-pretty base basic-prelude binary-conduit bytestring - cmdargs conduit conduit-extra lens resourcet time yaml - ]; - testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; - description = "SwiftNav's SBP Library"; - license = lib.licenses.mit; - }) {}; - - "sbp_4_1_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -238085,7 +238261,6 @@ self: { testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; description = "SwiftNav's SBP Library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "sbp2udp" = callPackage @@ -241689,29 +241864,6 @@ self: { }) {}; "sequence-formats" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, errors - , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec - , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers - , vector - }: - mkDerivation { - pname = "sequence-formats"; - version = "1.6.3"; - sha256 = "0ilirvbi5jzqzrpqg2b8v2w0c3pwvgcshvvp821rvcqkfl9wfvj3"; - libraryHaskellDepends = [ - attoparsec base bytestring containers errors exceptions foldl - lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe - transformers vector - ]; - testHaskellDepends = [ - base bytestring containers foldl hspec pipes pipes-safe tasty - tasty-hunit transformers vector - ]; - description = "A package with basic parsing utilities for several Bioinformatic data formats"; - license = lib.licenses.gpl3Only; - }) {}; - - "sequence-formats_1_6_6_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, errors , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers @@ -241732,7 +241884,6 @@ self: { ]; description = "A package with basic parsing utilities for several Bioinformatic data formats"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "sequenceTools" = callPackage @@ -251548,6 +251699,22 @@ self: { broken = true; }) {}; + "snack" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-lexing + , criterion, string-conversions, text + }: + mkDerivation { + pname = "snack"; + version = "0.1.0.0"; + sha256 = "01h49r64mg55ii32gnd7bab4rmgp73r3gks9g35z2qgdacwijwac"; + libraryHaskellDepends = [ base bytestring bytestring-lexing text ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion string-conversions text + ]; + description = "Strict ByteString Parser Combinator"; + license = lib.licenses.mit; + }) {}; + "snake" = callPackage ({ mkDerivation, base, random, split, terminal-size }: mkDerivation { @@ -266087,25 +266254,26 @@ self: { "tailwind" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, deriving-aeson, directory, filepath, filepattern - , lens, monad-logger, mtl, neat-interpolation, optparse-applicative - , parser-combinators, profunctors, relude, safe-exceptions - , temporary, text, time, unliftio, which, with-utf8 + , monad-logger, mtl, neat-interpolation, optics-core, optics-th + , optparse-applicative, parser-combinators, profunctors, relude + , safe-exceptions, temporary, text, time, unliftio, which + , with-utf8 }: mkDerivation { pname = "tailwind"; - version = "0.2.0.0"; - sha256 = "08m4mkk3fsrzpna3747gc2ln981nd7x17p3kzzvirs7p6js513yh"; + version = "0.3.0.0"; + sha256 = "0dklmlwa4mmg43bq7h6na1qlyy6jjkq2xdq1vg3agvcy1y8b2bzs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base bytestring containers data-default deriving-aeson - directory filepath filepattern lens monad-logger mtl - neat-interpolation profunctors relude safe-exceptions temporary - text time unliftio which with-utf8 + directory filepath filepattern monad-logger mtl neat-interpolation + optics-th profunctors relude safe-exceptions temporary text time + unliftio which with-utf8 ]; executableHaskellDepends = [ - base data-default filepath filepattern lens monad-logger - optparse-applicative parser-combinators relude with-utf8 + base data-default filepath filepattern monad-logger optics-core + optics-th optparse-applicative parser-combinators relude with-utf8 ]; description = "Tailwind wrapped in Haskell"; license = lib.licenses.mit; @@ -268130,42 +268298,6 @@ self: { }) {}; "telegram-bot-simple" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, blaze-html, bytestring - , cookie, cron, dhall, filepath, hashable, http-api-data - , http-client, http-client-tls, http-types, monad-control, mtl - , optparse-applicative, pretty-show, prettyprinter, profunctors - , QuickCheck, random, servant, servant-blaze, servant-client - , servant-multipart-api, servant-multipart-client, servant-server - , signal, split, stm, template-haskell, text, time, transformers - , unordered-containers, uuid, warp - }: - mkDerivation { - pname = "telegram-bot-simple"; - version = "0.4.4"; - sha256 = "1qlw4qn773rq3dz97ifrd3vp38xas46hmgxp05r1pmbphw1ncyr8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - 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-api servant-multipart-client split stm - template-haskell text time transformers unordered-containers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base blaze-html bytestring cookie cron dhall - filepath hashable http-api-data http-client http-client-tls - http-types monad-control mtl optparse-applicative pretty-show - prettyprinter profunctors QuickCheck random servant servant-blaze - servant-client servant-multipart-api servant-multipart-client - servant-server signal split stm template-haskell text time - transformers unordered-containers uuid warp - ]; - description = "Easy to use library for building Telegram bots"; - license = lib.licenses.bsd3; - }) {}; - - "telegram-bot-simple_0_4_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron , filepath, hashable, http-api-data, http-client, http-client-tls , monad-control, mtl, pretty-show, profunctors, servant @@ -268188,7 +268320,6 @@ self: { ]; description = "Easy to use library for building Telegram bots"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "telegram-raw-api" = callPackage @@ -270360,27 +270491,6 @@ self: { }) {}; "text-builder" = callPackage - ({ mkDerivation, base-prelude, bytestring, criterion, QuickCheck - , quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck, text, text-builder-dev - }: - mkDerivation { - pname = "text-builder"; - version = "0.6.6.4"; - sha256 = "1vzz5dkynh15vlmpwrrvswbva06vlbaxs73f4scb0r1q9wvcs3cj"; - libraryHaskellDepends = [ - base-prelude bytestring text text-builder-dev - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict text builder"; - license = lib.licenses.mit; - }) {}; - - "text-builder_0_6_6_5" = callPackage ({ mkDerivation, base-prelude, bytestring, criterion, QuickCheck , quickcheck-instances, rerebase, tasty, tasty-hunit , tasty-quickcheck, text, text-builder-dev @@ -270399,33 +270509,9 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict text builder"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "text-builder-dev" = callPackage - ({ mkDerivation, base, bytestring, criterion, deferred-folds - , QuickCheck, quickcheck-instances, rerebase, split, tasty - , tasty-hunit, tasty-quickcheck, text, text-conversions, tostring - , transformers - }: - mkDerivation { - pname = "text-builder-dev"; - version = "0.2"; - sha256 = "0q1spsc4v28kmfan1gjk44ajlgmbpr2sldrnjfdxvk9ldwbndc1h"; - libraryHaskellDepends = [ - base bytestring deferred-folds split text text-conversions tostring - transformers - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "Edge of developments for \"text-builder\""; - license = lib.licenses.mit; - }) {}; - - "text-builder-dev_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, criterion, deferred-folds , QuickCheck, quickcheck-instances, rerebase, split, tasty , tasty-hunit, tasty-quickcheck, text, text-conversions, tostring @@ -270446,7 +270532,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "Edge of developments for \"text-builder\""; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "text-containers" = callPackage @@ -282623,6 +282708,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "union-color" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "union-color"; + version = "0.1.2.0"; + sha256 = "1412axanb5nqnxra3559nyid5cyrxasdnpv28xq5fgp7x7ykirj2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Unify verious color formats"; + license = lib.licenses.bsd3; + }) {}; + "union-find" = callPackage ({ mkDerivation, base, containers, transformers }: mkDerivation { @@ -282667,8 +282764,8 @@ self: { }: mkDerivation { pname = "unionmount"; - version = "0.1.0.0"; - sha256 = "05i7bh8dg8bcm8070hxdh8fc2y0l2v25bvsqmbvnlbrlfcijphg6"; + version = "0.2.0.0"; + sha256 = "0hh577kwg6981141g62f4w95lyyhjn3a461sy28822gd3lpwlwlm"; libraryHaskellDepends = [ async base bytestring containers data-default directory filepath filepattern fsnotify lvar monad-logger mtl relude text time @@ -283311,33 +283408,6 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, doctest - , gauge, ghc-prim, Glob, hashable, hedgehog, microlens - , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog - , text, transformers, unordered-containers, utf8-string, vector - }: - mkDerivation { - pname = "universum"; - version = "1.7.2"; - sha256 = "1ka7q5vr9xkf8z5mzpkp648mpf8az7b14lnhbvfakg3v5xy3f7gb"; - revision = "1"; - editedCabalFile = "17w3zpbv5ap9as506fn43xlnh6sqxni8mmczlp5l86hvn7zd8y6z"; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim hashable microlens - microlens-mtl mtl safe-exceptions stm text transformers - unordered-containers utf8-string vector - ]; - testHaskellDepends = [ - base bytestring doctest Glob hedgehog tasty tasty-hedgehog text - ]; - benchmarkHaskellDepends = [ - base containers gauge text unordered-containers - ]; - description = "Custom prelude used in Serokell"; - license = lib.licenses.mit; - }) {}; - - "universum_1_7_3" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, microlens , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog @@ -283360,7 +283430,6 @@ self: { ]; description = "Custom prelude used in Serokell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "unix_2_7_2_2" = callPackage @@ -283795,6 +283864,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "unordered-containers_0_2_18_0" = callPackage + ({ mkDerivation, base, bytestring, ChasingBottoms, containers + , deepseq, hashable, hashmap, HUnit, mtl, nothunks, QuickCheck + , random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck + , template-haskell + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.18.0"; + sha256 = "09cvqdqaqbf0z5i0hbkgn7hkz44plniznj6zimdx0a86i6lhq3b2"; + libraryHaskellDepends = [ base deepseq hashable template-haskell ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit nothunks QuickCheck + random tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq hashable hashmap mtl random + tasty-bench + ]; + description = "Efficient hashing-based container types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "unordered-containers-rematch" = callPackage ({ mkDerivation, base, hashable, hspec, HUnit, rematch , unordered-containers @@ -285410,8 +285503,8 @@ self: { ({ mkDerivation, base, ListLike, time, uu-interleaved }: mkDerivation { pname = "uu-parsinglib"; - version = "2.9.1.1"; - sha256 = "0v5vcxfix04hmwc7ajni4xrv0g099pr2j79bqx1n24s1cvimlpyj"; + version = "2.9.2"; + sha256 = "1p86hszbvvmgmkcsksb8rdw27989xnjwrwgza9ddippbj6iapm9b"; libraryHaskellDepends = [ base ListLike time uu-interleaved ]; description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, interleaving, idiomatic parser combinators"; license = lib.licenses.mit; @@ -289004,8 +289097,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.16.2"; - sha256 = "1wawlq1x9nw9g5iynf8mhlv36876skpvfalfpnvdh55hfw4qznzh"; + version = "3.17"; + sha256 = "1vq9z2zif300hw49vfy7wbv830nc8wqxyxmzdgd59s4lprp40lrb"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -289037,8 +289130,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.5.6"; - sha256 = "1d8nnv31f35k2qn232vx8g3w06vbvik0ih98g7m7lrv0bqi74i12"; + version = "0.5.7"; + sha256 = "071pv6bci17ccmwkdxvvc72yb4aakr7lvlq8r9spdfksjmmb4kjx"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -299427,23 +299520,23 @@ self: { "yapb" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hashable - , hspec, mtl, network, process, regex-tdfa, transformers + , hspec, mtl, network, process, regex-tdfa, timeit, transformers }: mkDerivation { pname = "yapb"; - version = "0.2.1"; - sha256 = "00xc5q5yp9f76sd227mp11mb62k1yxhczgq30c6sh66cqxrjidwc"; + version = "0.2.3"; + sha256 = "14909qgfvz19jqyj64y2mjg4nzrd3kk3zffg53mf6715y49y6npb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring deepseq directory hashable hspec mtl network - process regex-tdfa transformers + process regex-tdfa timeit transformers ]; executableHaskellDepends = [ - base deepseq hspec mtl regex-tdfa transformers + base deepseq hspec mtl regex-tdfa timeit transformers ]; testHaskellDepends = [ - base deepseq hspec mtl process transformers + base deepseq hspec mtl process timeit transformers ]; description = "Yet Another Parser Builder (YAPB)"; license = lib.licenses.bsd3; @@ -301200,6 +301293,26 @@ self: { broken = true; }) {}; + "yesod-markdown_0_12_6_13" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , directory, hspec, pandoc, persistent, shakespeare, text + , xss-sanitize, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-markdown"; + version = "0.12.6.13"; + sha256 = "0wk7pmg0rxb28vkplm3npcrr2mkxaailvvf7scgsggczqslfszq9"; + libraryHaskellDepends = [ + base blaze-html blaze-markup bytestring directory pandoc persistent + shakespeare text xss-sanitize yesod-core yesod-form + ]; + testHaskellDepends = [ base blaze-html hspec text ]; + description = "Tools for using markdown in a yesod application"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "yesod-media-simple" = callPackage ({ mkDerivation, base, bytestring, diagrams-cairo, diagrams-core , diagrams-lib, directory, JuicyPixels, vector, yesod @@ -301233,30 +301346,6 @@ self: { }) {}; "yesod-page-cursor" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , hspec-expectations-lifted, http-link-header, http-types, lens - , lens-aeson, monad-logger, mtl, network-uri, persistent - , persistent-sqlite, persistent-template, scientific, text, time - , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test - }: - mkDerivation { - pname = "yesod-page-cursor"; - version = "2.0.0.9"; - sha256 = "13wvivls1yqaanvkc9bpbiwx6qxa78ffgivm4qws4fyicqp628ak"; - libraryHaskellDepends = [ - aeson base bytestring containers http-link-header network-uri text - unliftio yesod-core - ]; - testHaskellDepends = [ - aeson base bytestring hspec hspec-expectations-lifted - http-link-header http-types lens lens-aeson monad-logger mtl - persistent persistent-sqlite persistent-template scientific text - time unliftio unliftio-core wai-extra yesod yesod-core yesod-test - ]; - license = lib.licenses.mit; - }) {}; - - "yesod-page-cursor_2_0_0_10" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , hspec-expectations-lifted, http-link-header, http-types, lens , lens-aeson, monad-logger, mtl, network-uri, persistent @@ -301278,7 +301367,6 @@ self: { time unliftio unliftio-core wai-extra yesod yesod-core yesod-test ]; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-paginate" = callPackage @@ -301315,29 +301403,6 @@ self: { }) {}; "yesod-paginator" = callPackage - ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces - , persistent, QuickCheck, quickcheck-classes, safe, text - , transformers, uri-encode, yesod-core, yesod-test - }: - mkDerivation { - pname = "yesod-paginator"; - version = "1.1.1.0"; - sha256 = "06zbmklxpxlxy422k01phanj5zj940mm67gjn9vnz5lrs798q7cj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-markup path-pieces persistent safe text transformers - uri-encode yesod-core - ]; - testHaskellDepends = [ - base doctest hspec QuickCheck quickcheck-classes yesod-core - yesod-test - ]; - description = "A pagination approach for yesod"; - license = lib.licenses.bsd3; - }) {}; - - "yesod-paginator_1_1_2_1" = callPackage ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces , persistent, QuickCheck, quickcheck-classes, safe, text , transformers, uri-encode, yesod-core, yesod-test @@ -301358,7 +301423,6 @@ self: { ]; description = "A pagination approach for yesod"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-paypal-rest" = callPackage @@ -301669,28 +301733,6 @@ self: { }) {}; "yesod-routes-flow" = callPackage - ({ mkDerivation, attoparsec, base, classy-prelude, containers - , hspec, hspec-expectations, semigroups, shakespeare, system-fileio - , system-filepath, text, yesod-core - }: - mkDerivation { - pname = "yesod-routes-flow"; - version = "3.0.0.1"; - sha256 = "18pw4m7dbj2j35frpl08r940sibdbwl8mzw3c3jgrzxb5ahj6p1w"; - libraryHaskellDepends = [ - attoparsec base classy-prelude containers system-fileio - system-filepath text yesod-core - ]; - testHaskellDepends = [ - attoparsec base classy-prelude containers hspec hspec-expectations - semigroups shakespeare system-fileio system-filepath text - yesod-core - ]; - description = "Generate Flow routes for Yesod"; - license = lib.licenses.mit; - }) {}; - - "yesod-routes-flow_3_0_0_2" = callPackage ({ mkDerivation, attoparsec, base, classy-prelude, containers , hspec, hspec-expectations, semigroups, shakespeare, system-fileio , system-filepath, text, yesod-core @@ -301710,7 +301752,6 @@ self: { ]; description = "Generate Flow routes for Yesod"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-routes-typescript" = callPackage From 216f2754c5fc561d429342edbcb0ade6c56b010e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Apr 2022 02:01:33 +0200 Subject: [PATCH 18/62] niv: build using up to date dependencies Upstream finally cut a new release with some adjustments allowing niv to be built using the Stackage LTS solver. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6c9f7499ce33..2d46a8eff49a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1045,12 +1045,6 @@ self: super: { # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; - # 2022-03-20: niv is unmaintained we pin stuff to keep it running - niv = generateOptparseApplicativeCompletion "niv" (super.niv.overrideScope (self: super: { - optparse-applicative = self.optparse-applicative_0_15_1_0; - aeson = self.aeson_1_5_6_0; - })); - ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu; stack = diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 7100aeeb7fde..a9cbdfe035e0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -95,7 +95,7 @@ self: super: builtins.intersectAttrs super { sfml-audio = appendConfigureFlag "--extra-include-dirs=${pkgs.openal}/include/AL" super.sfml-audio; # avoid compiling twice by providing executable as a separate output (with small closure size) - niv = enableSeparateBinOutput super.niv; + niv = enableSeparateBinOutput (generateOptparseApplicativeCompletion "niv" super.niv); ormolu = enableSeparateBinOutput super.ormolu; ghcid = enableSeparateBinOutput super.ghcid; From 3bde7576132241b83f37d53d09bac5ba8458a1ee Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Apr 2022 02:42:56 +0200 Subject: [PATCH 19/62] haskellPackages.hint: disable tests These currently fail when trying to execute cabal-install, interestingly with EFAULT. --- pkgs/development/haskell-modules/configuration-arm.nix | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index 2ea0f56634b8..f3b65167ea66 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -62,7 +62,6 @@ self: super: { headroom = dontCheck super.headroom; hgeometry = dontCheck super.hgeometry; hhp = dontCheck super.hhp; - hint = dontCheck super.hint; hls-splice-plugin = dontCheck super.hls-splice-plugin; hsakamai = dontCheck super.hsakamai; hsemail-ns = dontCheck super.hsemail-ns; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a9cbdfe035e0..5b9164711ea0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -998,4 +998,7 @@ self: super: builtins.intersectAttrs super { hls-tactics-plugin = dontCheck super.hls-tactics-plugin; hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin; hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin; + + # Wants to execute cabal-install to (re-)build itself + hint = dontCheck super.hint; } From 504b2dba55b3c95e6507a80803f9671e07dcf65c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 06:53:43 +0000 Subject: [PATCH 20/62] armadillo: 10.8.2 -> 11.0.0 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 14400f8ebf95..8d57ce5b1568 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.8.2"; + version = "11.0.0"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-if3YmL9r/3X278OjAYF+Tt51K5qAkn+wfuNYsT41OSI="; + sha256 = "sha256-f91PBBpiTNm/I8nYSYLZGI7HA1L6jqA0YanU2hFl8NM="; }; nativeBuildInputs = [ cmake ]; From dedab357c81905e785d13a7162c58d9b6e797eda Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Thu, 7 Apr 2022 17:33:34 +0400 Subject: [PATCH 21/62] super-slicer: 2.3.57.10 -> 2.3.57.12 --- pkgs/applications/misc/prusa-slicer/super-slicer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index c3037f0da8d2..41ba78622708 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -5,8 +5,8 @@ let description = "PrusaSlicer fork with more features and faster development cycle"; versions = { - stable = { version = "2.3.57.10"; sha256 = "sha256-/1oZgmZpRoizVpklKaI12qP4bVIGYyVpybmuCIz3Y0M="; }; - latest = { version = "2.3.57.10"; sha256 = "sha256-/1oZgmZpRoizVpklKaI12qP4bVIGYyVpybmuCIz3Y0M="; }; + stable = { version = "2.3.57.12"; sha256 = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw=="; }; + latest = { version = "2.3.57.12"; sha256 = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw=="; }; }; override = { version, sha256 }: super: { From f0da4d8ea28992b9f619e50ccf63efc146dcf788 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 7 Apr 2022 18:53:54 +0200 Subject: [PATCH 22/62] haskell.packages.ghc922.hls-fourmolu-plugin: jailbreak --- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index b55429da65b5..3a9e9f06fbe9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -213,7 +213,9 @@ self: super: { regex-rure = doDistribute (markUnbroken super.regex-rure); jacinda = doDistribute super.jacinda; some = doJailbreak super.some; - fourmolu = super.fourmolu_0_5_0_1; + fourmolu = super.fourmolu_0_6_0_0; + # hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0 + hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.2.0"; doJailbreak super.hls-fourmolu-plugin; implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables; From 490ec6a9c1e6a5693f1759bc9432804216a941f5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 8 Apr 2022 00:35:11 +0200 Subject: [PATCH 23/62] release-haskell.nix: test all haskell based elmPackages --- pkgs/top-level/release-haskell.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ef2a8737e677..4eb8d040a7da 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -242,7 +242,15 @@ let zsh-git-prompt ; - elmPackages.elm = pkgsPlatforms.elmPackages.elm; + # Members of the elmPackages set that are Haskell derivations + elmPackages = { + inherit (pkgsPlatforms.elmPackages) + elm + elm-format + elm-instrument + elmi-to-json + ; + }; # GHCs linked to musl. pkgsMusl.haskell.compiler = lib.recursiveUpdate From 826f849af768a1079ecd803ddad2419734fc8778 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 07:52:52 +0000 Subject: [PATCH 24/62] lrzip: 0.650 -> 0.651 --- pkgs/tools/compression/lrzip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index b14fb347d210..3bb1e29f0347 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation rec { pname = "lrzip"; - version = "0.650"; + version = "0.651"; src = fetchFromGitHub { owner = "ckolivas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rHjaTgNVGfnGio4geuWRfPds5BqcXJu7p8XJh83rRTs="; + sha256 = "sha256-Mb324ojtLV0S10KhL7Vjf3DhSOtCy1pFMTzvLkTnpXM="; }; postPatch = lib.optionalString stdenv.isDarwin '' From ec2a87e36df0d19d484d6c0af2b44d09870204c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 11:08:15 +0000 Subject: [PATCH 25/62] mongodb-compass: 1.31.0 -> 1.31.1 --- pkgs/tools/misc/mongodb-compass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 4560e14c697f..84a0dbde8e9a 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.31.0"; + version = "1.31.1"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-kzGBb8h03jPCqpwKPXeqB3yPTGgvVsl1DjIyCbNgjqM="; + sha256 = "sha256-sC3ghtOA+Zp7LuAwry460WvyWXXw35aQESlaWznfZYk="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; From 55cfd2ef53583e60e8f337a93ae1db9b1a3d7ca3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 14:25:22 +0000 Subject: [PATCH 26/62] nm-tray: 0.4.3 -> 0.5.0 --- pkgs/tools/networking/networkmanager/tray.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/tray.nix b/pkgs/tools/networking/networkmanager/tray.nix index ea9ff73b4e33..69b1e3023b04 100644 --- a/pkgs/tools/networking/networkmanager/tray.nix +++ b/pkgs/tools/networking/networkmanager/tray.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "nm-tray"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "palinek"; repo = pname; rev = version; - sha256 = "08c86kd613wlvw9571q7a3lb7g6skyyasjw6h1g543rbl4jn2c2v"; + sha256 = "sha256-JTH1cmkgdW2aRWMYPRvOAvCJz0ClCIpjUtcWcqJQGSU="; }; postPatch = '' From 59cb94fb28181b9d974ba0fd9812cbb87c144e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Fri, 8 Apr 2022 17:18:32 +0200 Subject: [PATCH 27/62] python3Packages.astropy-extension-helpers: 0.1 -> 1.0.0 --- .../python-modules/astropy-extension-helpers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix index 8e5a2fda3301..7bf838860b38 100644 --- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "extension-helpers"; - version = "0.1"; + version = "1.0.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "10iqjzmya2h4sk765dlm1pbqypwlqyh8rw59a5m9i63d3klnz2mc"; + sha256 = "ca1bfac67c79cf4a7a0c09286ce2a24eec31bf17715818d0726318dd0e5050e6"; }; nativeBuildInputs = [ From 0637d548543b75be9de785bc22d2ccb79974f1a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 15:51:25 +0000 Subject: [PATCH 28/62] doit: 0.34.2 -> 0.35.0 --- pkgs/development/python-modules/doit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix index 95b7adc474af..71cc9f69654c 100644 --- a/pkgs/development/python-modules/doit/default.nix +++ b/pkgs/development/python-modules/doit/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "doit"; - version = "0.34.2"; + version = "0.35.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-OIER+Kals7RGIM7rKH0FhZJ8hdDW0/h5DTT7tFwM9sM="; + sha256 = "sha256-cVoyLIdMTLhiOU46DWn/MlcrUln1cDb7/cEFPEwB00g="; }; propagatedBuildInputs = [ From bd1e8ccfefc954e61861c3ee106e7a5474fe1a4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Apr 2022 16:23:23 +0000 Subject: [PATCH 29/62] octave: 6.4.0 -> 7.1.0 --- pkgs/development/interpreters/octave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 1bd78a8a2d4e..01c0520b8662 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -114,12 +114,12 @@ let }; self = mkDerivation rec { - version = "6.4.0"; + version = "7.1.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-tI8z1Pzq85TPvqc6jIUAAJNtg6QXOaJPdWi1sKezms0="; + sha256 = "sha256-1KnYHz9ntKbgfLeoDcsQrV6RdvzDB2LHCoFYCmS4sLY="; }; buildInputs = [ From d7c3643e6e1e242a4e692b51d43a80f0c7b3a1e3 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Fri, 8 Apr 2022 22:48:34 +0200 Subject: [PATCH 30/62] tor-browser-bundle-bin: 11.0.9 -> 11.0.10 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 28e11814029c..12ff0aa75ec4 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0.9"; + version = "11.0.10"; lang = "en-US"; @@ -98,7 +98,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0cl01bx64d6bmajknj7085nzc6841adkp65fz531r3y6nnpwr9ds"; + sha256 = "1j39v01bb97hkhkfvz7xyfmv6y0sjjcymvn3sa9ahz2av1xlrplp"; }; i686-linux = fetchurl { @@ -107,7 +107,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0j6alhm1pqp7fb6nk55vzvr1qjz6gyd3vn6v2dkkvj9mgm57x1j5"; + sha256 = "0vh913z828ncb8pwz461xx61ylxqp44rf9iah7n6lzda7hcw79r3"; }; }; in From 4eeab0f0ab8db80a572d1fd223a3c004af5d5b2e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 8 Apr 2022 15:13:52 +0200 Subject: [PATCH 31/62] haskell.compiler.ghcHEAD: 9.3.20211111 -> 9.3.20220406 --- pkgs/development/compilers/ghc/head.nix | 6 +++--- .../haskell-modules/configuration-ghc-head.nix | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 07ea6bda2458..a2afb7400c20 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -42,7 +42,7 @@ # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt -, version ? "9.3.20211111" +, version ? "9.3.20220406" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -186,8 +186,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "cc635da167fdec2dead0603b0026cb841f0aa645"; - sha256 = "1lj76l546zriwkcn2r7i5a4j35bx9fh5iggwfz2xvhh8aq8j2i46"; + rev = "c44432db254d2fc960d7864e080cb50e65dfa7c6"; + sha256 = "0xagijcfcw3a19s6dmh6z7085lvkrakys3lcby4ncq1v0syh507h"; }; enableParallelBuilding = true; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 9c7895d4fe6d..bc65e209911e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -17,23 +17,25 @@ self: super: { llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC 8.7.x core libraries. + # Disable GHC core libraries. array = null; base = null; binary = null; bytestring = null; Cabal = null; + Cabal-syntax = null; containers = null; deepseq = null; directory = null; + exceptions = null; filepath = null; + ghc-bignum = null; ghc-boot = null; ghc-boot-th = null; - ghc-bignum = null; ghc-compact = null; ghc-heap = null; - ghci = null; ghc-prim = null; + ghci = null; haskeline = null; hpc = null; integer-gmp = null; @@ -51,7 +53,6 @@ self: super: { transformers = null; unix = null; xhtml = null; - exceptions = null; # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; From 876b195ecc9f596c9f84670a511fb047c201b0f6 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 9 Apr 2022 11:31:22 +0100 Subject: [PATCH 32/62] mame: add updateScript --- pkgs/applications/emulators/mame/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index ce3fb3d06aed..b9172ab7f91e 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -18,6 +18,7 @@ , SDL2 , SDL2_ttf , which +, writeScript }: let @@ -93,6 +94,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = writeScript "mame-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts jq + + set -eu -o pipefail + + latest_version=$(curl -s https://api.github.com/repos/mamedev/mame/releases/latest | jq --raw-output .tag_name) + update-source-version mame "''${latest_version/mame0/0.}" + ''; + meta = with lib; { description = "Is a multi-purpose emulation framework"; homepage = "https://www.mamedev.org/"; From aec46d1e405726abffa3c421be86951ecc552165 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 9 Apr 2022 11:31:38 +0100 Subject: [PATCH 33/62] mame: 0.239 -> 0.242 --- pkgs/applications/emulators/mame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index b9172ab7f91e..aebe64d5bca4 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.239"; + version = "0.242"; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}"; - sha256 = "sha256-svclBaFkp4d6db+zWZNvZP8vWIFz/7M5N1M6WseOFEk="; + sha256 = "sha256-06iKM9cpjXuNvChQTPjhb9oQptC4KTZEoxzZk8+x3/k="; }; hardeningDisable = [ "fortify" ]; From d186f76cefb58b61e5c8a72a7188b269032116f7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 9 Apr 2022 12:30:20 +0100 Subject: [PATCH 34/62] mame: use system libraries when possible --- pkgs/applications/emulators/mame/default.nix | 52 ++++++++++++++++---- 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index aebe64d5bca4..f72ca128f1a2 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -2,23 +2,34 @@ , stdenv , alsa-lib , CoreAudioKit +, expat , fetchFromGitHub +, flac , fontconfig , ForceFeedback +, glm , installShellFiles +, libjpeg , libpcap , libpulseaudio , libXi , libXinerama +, lua5 , makeDesktopItem , makeWrapper , pkg-config +, portaudio +, portmidi +, pugixml , python3 , qtbase +, rapidjson , SDL2 , SDL2_ttf +, utf8proc , which , writeScript +, zlib }: let @@ -44,22 +55,47 @@ stdenv.mkDerivation rec { }; hardeningDisable = [ "fortify" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" "-Wno-error=missing-braces" ]; makeFlags = [ - "TOOLS=1" - "USE_LIBSDL=1" "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" + "TOOLS=1" + "USE_LIBSDL=1" + # "USE_SYSTEM_LIB_ASIO=1" + "USE_SYSTEM_LIB_EXPAT=1" + "USE_SYSTEM_LIB_FLAC=1" + "USE_SYSTEM_LIB_GLM=1" + "USE_SYSTEM_LIB_JPEG=1" + "USE_SYSTEM_LIB_LUA=1" + "USE_SYSTEM_LIB_PORTAUDIO=1" + "USE_SYSTEM_LIB_PORTMIDI=1" + "USE_SYSTEM_LIB_PUGIXML=1" + "USE_SYSTEM_LIB_RAPIDJSON=1" + "USE_SYSTEM_LIB_UTF8PROC=1" + "USE_SYSTEM_LIB_ZLIB=1" ]; dontWrapQtApps = true; # https://docs.mamedev.org/initialsetup/compilingmame.html - buildInputs = - [ SDL2 SDL2_ttf qtbase ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio libXinerama libXi fontconfig ] - ++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ]; + buildInputs = [ + expat + zlib + flac + lua5 + portmidi + portaudio + utf8proc + libjpeg + rapidjson + pugixml + glm + SDL2 + SDL2_ttf + qtbase + ] + ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio libXinerama libXi fontconfig ] + ++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ]; nativeBuildInputs = [ python3 pkg-config which makeWrapper installShellFiles ]; @@ -110,7 +146,5 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd3 gpl2Plus ]; platforms = platforms.unix; maintainers = with maintainers; [ thiagokokada ]; - # macOS needs more time to build - timeout = 24 * 3600; }; } From f2f10367b9e1b955d4f0fdf41ba6d44daac05a89 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 9 Apr 2022 13:11:15 +0200 Subject: [PATCH 35/62] haskell.compiler.ghc8107Binary: build on aarch64 on Hydra According to local testing, the bindist is below 1GB on aarch64-linux which is below the Hydra output limit. --- pkgs/development/compilers/ghc/8.10.7-binary.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index 7b10f60affda..bf3ace0240c5 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -418,7 +418,6 @@ stdenv.mkDerivation rec { # long as the evaluator runs on a platform that supports # `pkgsMusl`. platforms = builtins.attrNames ghcBinDists.${distSetName}; - hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms; maintainers = with lib.maintainers; [ prusnak domenkozar From 7f4f71d3e7f915a694ef1089243c4ce098219fac Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 9 Apr 2022 13:36:42 +0100 Subject: [PATCH 36/62] mame: add patch to disable PDF documentation --- ...-Added-PDF-documentation-to-dist.mak.patch | 37 +++++++++++++++++++ pkgs/applications/emulators/mame/default.nix | 11 ++++-- 2 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/emulators/mame/0001-Revert-Added-PDF-documentation-to-dist.mak.patch diff --git a/pkgs/applications/emulators/mame/0001-Revert-Added-PDF-documentation-to-dist.mak.patch b/pkgs/applications/emulators/mame/0001-Revert-Added-PDF-documentation-to-dist.mak.patch new file mode 100644 index 000000000000..cee425eaa93d --- /dev/null +++ b/pkgs/applications/emulators/mame/0001-Revert-Added-PDF-documentation-to-dist.mak.patch @@ -0,0 +1,37 @@ +From 54aebffc4584ee68149d4b5b64ceaa79a82b8427 Mon Sep 17 00:00:00 2001 +From: Thiago Kenji Okada +Date: Sat, 9 Apr 2022 13:16:08 +0100 +Subject: [PATCH] Revert "Added PDF documentation to dist.mak" + +This reverts commit c0e93076232e794c919231e4386445d78b2d80b1. +--- + dist.mak | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/dist.mak b/dist.mak +index edbb4cd67cb..c378dfdf708 100644 +--- a/dist.mak ++++ b/dist.mak +@@ -109,7 +109,7 @@ GEN_FOLDERS := $(addprefix $(STAGEDIR)/,$(CREATED_DIRS)) + COPY_BINARIES := $(addprefix $(STAGEDIR)/,$(addsuffix $(EXE),$(BINARIES))) + COPY_FILES := $(addprefix $(STAGEDIR)/,$(COPIED_FILES)) + +-all: $(COPY_BINARIES) $(COPY_FILES) $(STAGEDIR)/docs/MAME.pdf ++all: $(COPY_BINARIES) $(COPY_FILES) + + clean: + $(SILENT) rm -rf $(STAGEDIR) +@@ -124,10 +124,4 @@ $(STAGEDIR)/%: $(BINDIR)/% | $(GEN_FOLDERS) + $(STAGEDIR)/%: % | $(GEN_FOLDERS) + $(call COPY,$<,$@) + +-$(STAGEDIR)/docs/MAME.pdf: docs/build/latex/MAME.pdf | $(GEN_FOLDERS) +- $(call COPY,$<,$@) +- +-docs/build/latex/MAME.pdf: +- $(MAKE) -C docs latexpdf +- + .PHONY: all clean +-- +2.33.1 + diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index f72ca128f1a2..40ac402627e0 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -99,10 +99,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 pkg-config which makeWrapper installShellFiles ]; - # by default MAME assumes that paths with stock resources - # are relative and that you run MAME changing to - # install directory, so we add absolute paths here patches = [ + # MAME is now generating the PDF documentation on its release script since commit: + # https://github.com/mamedev/mame/commit/c0e93076232e794c919231e4386445d78b2d80b1 + # however this needs sphinx+latex to build, and it is available in the website + # anyway for those who need it + ./0001-Revert-Added-PDF-documentation-to-dist.mak.patch + # by default MAME assumes that paths with stock resources + # are relative and that you run MAME changing to + # install directory, so we add absolute paths here ./emuopts.patch ]; From bba4dd5dd2b26d4be1c10434c56de5f83c9a81a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Sat, 9 Apr 2022 14:20:10 +0200 Subject: [PATCH 37/62] python3Packages.pyvo: init at 1.3 --- .../python-modules/pyvo/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/pyvo/default.nix diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix new file mode 100644 index 000000000000..715cf0196aa4 --- /dev/null +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchPypi +, astropy +, pillow +, pythonOlder +, pytestCheckHook +, pytest-astropy +, requests +, requests-mock +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pyvo"; + version = "1.3"; + + disabled = pythonOlder "3.8"; # according to setup.cfg + + src = fetchPypi { + inherit pname version; + sha256 = "846a54a05a8ddb47a8c2cc3077434779b0e4ccc1b74a7a5408593cb673307d67"; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + astropy + requests + ]; + + checkInputs = [ + pillow + pytestCheckHook + pytest-astropy + requests-mock + ]; + + disabledTestPaths = [ + # touches network + "pyvo/dal/tests/test_datalink.py" + ]; + + pythonImportsCheck = [ "pyvo" ]; + + meta = with lib; { + description = "Astropy affiliated package for accessing Virtual Observatory data and services"; + homepage = "github.com/astropy/pyvo"; + license = licenses.bsd3; + maintainers = with maintainers; [ smaret ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad2f91731238..b4c69b3c2e7a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8490,6 +8490,8 @@ in { pyvmomi = callPackage ../development/python-modules/pyvmomi { }; + pyvo = callPackage ../development/python-modules/pyvo { }; + pyvolumio = callPackage ../development/python-modules/pyvolumio { }; pyvoro = callPackage ../development/python-modules/pyvoro { }; From 9b227257e9de7d8ce04954ab556e64ee8218ce9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Sat, 9 Apr 2022 16:40:19 +0200 Subject: [PATCH 38/62] python3Packages.astroquery: fix build and restore tests --- .../python-modules/astroquery/default.nix | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index 8853b1e9e08d..a022c80b16b9 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -6,8 +6,12 @@ , keyring , beautifulsoup4 , html5lib +, matplotlib +, pillow , pytest , pytest-astropy +, pytestCheckHook +, pyvo , astropy-helpers , isPy3k }: @@ -24,21 +28,39 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ]; + propagatedBuildInputs = [ + astropy + requests + keyring + beautifulsoup4 + html5lib + pyvo + ]; nativeBuildInputs = [ astropy-helpers ]; - # Tests disabled until pytest-astropy has been updated to include pytest-astropy-header - doCheck = false; - checkInputs = [ pytest pytest-astropy ]; + # Disable automatic update of the astropy-helper module + postPatch = '' + substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" + ''; + + checkInputs = [ + matplotlib + pillow + pytest + pytest-astropy + pytestCheckHook + ]; # Tests must be run in the build directory. The tests create files # in $HOME/.astropy so we need to set HOME to $TMPDIR. - checkPhase = '' + preCheck = '' + export HOME=$TMPDIR cd build/lib - HOME=$TMPDIR pytest ''; + pythonImportsCheck = [ "astroquery" ]; + meta = with pkgs.lib; { description = "Functions and classes to access online data resources"; homepage = "https://astroquery.readthedocs.io/"; From 38a9ef814bcbcc9e6265c99fe1e47cb67b06ac7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 16:03:05 +0000 Subject: [PATCH 39/62] ryujinx: 1.1.91 -> 1.1.100 --- pkgs/applications/emulators/ryujinx/default.nix | 6 +++--- pkgs/applications/emulators/ryujinx/deps.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 1c731718887a..e235b2c80fb4 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.91"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.100"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "3f4fb8f73a6635dbdca9dd11738c3a793f53ac65"; - sha256 = "1amky7a2rikl5sg8y0y6il0jjqwhjgxw0d2ivynfhmhz2v2ciwwi"; + rev = "26a881176eb6513a98889648e0d5b7fe647cd0e3"; + sha256 = "09wjygkdr9sr0hwv77czi0x5xw8y585k9pghdm5s3iqjn9gbb45k"; }; dotnet-sdk = dotnetCorePackages.sdk_6_0; diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index f8cdee576e9e..c8127b0f3e51 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -11,7 +11,7 @@ (fetchNuGet { pname = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) (fetchNuGet { pname = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; }) - (fetchNuGet { pname = "LibHac"; version = "0.16.0"; sha256 = "1kivnf4c4km1a8y0sl34z9gfazlivna0x31q0065n0sz13g82spi"; }) + (fetchNuGet { pname = "LibHac"; version = "0.16.1"; sha256 = "131qnqa1asdmymwdvpjza6w646b05jzn1cxjdxgwh7qdcdb77xyx"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq"; }) From 99be8cc32d79425550775ead29bd4f1162f25061 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 9 Apr 2022 17:30:00 +0100 Subject: [PATCH 40/62] python3Packages.gremlinpython: 3.5.1 -> 3.6.0 --- .../python-modules/gremlinpython/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index c9ab433d9816..3f7ca1011b52 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -15,25 +15,18 @@ buildPythonPackage rec { pname = "gremlinpython"; - version = "3.5.1"; + version = "3.6.0"; # pypi tarball doesn't include tests src = fetchFromGitHub { owner = "apache"; repo = "tinkerpop"; rev = version; - sha256 = "1vlhxq0f2hanhkv6f17dxgbwr7gnbnh1kkkq0lxcwkbm2l0rdrlr"; + sha256 = "0gyf3a0zbh1grc1vr9zzpqm5yfcjvn0f1akw9l1arq36isqwvydn"; }; sourceRoot = "source/gremlin-python/src/main/python"; postPatch = '' substituteInPlace setup.py \ - --replace 'aenum>=1.4.5,<3.0.0' 'aenum' \ - --replace 'aiohttp>=3.7.0,<=3.7.4' 'aiohttp' \ - --replace 'PyHamcrest>=1.9.0,<2.0.0' 'PyHamcrest' \ - --replace 'radish-bdd==0.8.6' 'radish-bdd' \ - --replace 'mock>=3.0.5,<4.0.0' 'mock' \ - --replace 'pytest>=4.6.4,<5.0.0' 'pytest' \ - --replace 'importlib-metadata<3.0.0' 'importlib-metadata' \ --replace 'pytest-runner==5.2' ' ' ''; @@ -59,6 +52,7 @@ buildPythonPackage rec { # disable custom pytest report generation preCheck = '' substituteInPlace setup.cfg --replace 'addopts' '#addopts' + export TEST_TRANSACTIONS='false' ''; # many tests expect a running tinkerpop server From 88e6baf83235bcca1e4335f5978f69b4126f70cf Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 9 Apr 2022 19:51:20 +0300 Subject: [PATCH 41/62] octave: Remove JIT support (removed upstream) --- pkgs/development/interpreters/octave/default.nix | 9 +-------- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 01c0520b8662..2fcdab95509e 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -58,9 +58,6 @@ , qtscript ? null , qscintilla ? null , qttools ? null -# - JIT compiler for loops: -, enableJIT ? false -, llvm ? null , libiconv , darwin }: @@ -173,7 +170,6 @@ let texinfo ] ++ lib.optionals (sundials != null) [ sundials ] - ++ lib.optionals enableJIT [ llvm ] ++ lib.optionals enableQt [ qtscript qttools @@ -199,7 +195,6 @@ let ++ lib.optionals enableReadline [ "--enable-readline" ] ++ lib.optionals stdenv.isDarwin [ "--with-x=no" ] ++ lib.optionals enableQt [ "--with-qt=5" ] - ++ lib.optionals enableJIT [ "--enable-jit" ] ; # Keep a copy of the octave tests detailed results in the output @@ -220,7 +215,7 @@ let inherit portaudio; inherit jdk; inherit python; - inherit enableQt enableJIT enableReadline enableJava; + inherit enableQt enableReadline enableJava; buildEnv = callPackage ./build-env.nix { octave = self; inherit octavePackages wrapOctave; @@ -236,8 +231,6 @@ let license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin doronbehar ]; description = "Scientific Programming Language"; - # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT - broken = enableJIT; platforms = if overridePlatforms == null then (lib.platforms.linux ++ lib.platforms.darwin) else overridePlatforms; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9efd05c4f9f9..4ac2462f314e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13963,11 +13963,6 @@ with pkgs; python = python3; mkDerivation = stdenv.mkDerivation; }; - octave-jit = callPackage ../development/interpreters/octave { - python = python3; - enableJIT = true; - mkDerivation = stdenv.mkDerivation; - }; octaveFull = libsForQt5.callPackage ../development/interpreters/octave { python = python3; enableQt = true; From 84b7eb9a1819a787f2c6ae557bc295988254b86e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 17:17:55 +0000 Subject: [PATCH 42/62] remind: 03.04.02 -> 04.00.00 --- pkgs/tools/misc/remind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 6d5e0e37703b..da2a969aafc2 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "03.04.02"; + version = "04.00.00"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-kjDcO0l39l2KJXo0elZesKZWDZoSoUXIu1Ua7IxWY4w="; + sha256 = "sha256-I7bmsO3EAUnmo2KoIy5myxXuZB8tzs5kCEXpG550x8Y="; }; propagatedBuildInputs = tclLibraries; From 003f0f801a26b03f3730e45cb4516deed21bbd29 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 9 Apr 2022 18:50:22 +0100 Subject: [PATCH 43/62] witness: 0.1.6 -> 0.1.7 --- pkgs/tools/security/witness/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix index bb15d9d72cc0..921d524be6ac 100644 --- a/pkgs/tools/security/witness/default.nix +++ b/pkgs/tools/security/witness/default.nix @@ -2,16 +2,15 @@ buildGoModule rec { pname = "witness"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "testifysec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/35hIA6Wm/F5hwyLZbt4JXpwWISWbzVAWrX29r6pejY="; + sha256 = "sha256-fkY3/UmHzggmysrae8VCY3NMBxC/LcWoQcXBELEzJlM="; }; - - vendorSha256 = "sha256-vXDsHHJknw9hsHx1mJA2c0CWwFbRXjCjitNWPh6V4yw="; + vendorSha256 = "sha256-ajWIjQXLvFQB1AVYyGjyWMrWIyue/d1uU5HHNf4/UcU="; nativeBuildInputs = [ installShellFiles ]; @@ -38,6 +37,14 @@ buildGoModule rec { --zsh <($out/bin/witness completion zsh) ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/witness --help + $out/bin/witness version | grep "v${version}" + runHook postInstallCheck + ''; + meta = with lib; { description = "A pluggable framework for software supply chain security. Witness prevents tampering of build materials and verifies the integrity of the build process from source to target"; longDescription = '' From 605ba3fa7b52c48af2e2588eac1c708b6f18cdad Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 9 Apr 2022 18:53:08 +0100 Subject: [PATCH 44/62] mame: use lua 5.3 --- pkgs/applications/emulators/mame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 40ac402627e0..a024433e3edf 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -14,7 +14,7 @@ , libpulseaudio , libXi , libXinerama -, lua5 +, lua5_3 , makeDesktopItem , makeWrapper , pkg-config @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { expat zlib flac - lua5 + lua5_3 portmidi portaudio utf8proc From 00db31b93c8004348ec1954606c4ac88b9207ed5 Mon Sep 17 00:00:00 2001 From: squalus Date: Sat, 9 Apr 2022 11:18:04 -0700 Subject: [PATCH 45/62] librewolf: 98.0.2-1 -> 99.0-1 --- .../networking/browsers/firefox/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/firefox/librewolf/src.json index f24353089488..d209a83ab9df 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/src.json +++ b/pkgs/applications/networking/browsers/firefox/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "98.0.2-1", + "packageVersion": "99.0-1", "source": { - "rev": "98.0.2-1", - "sha256": "033l6mjmhfhf7b8p652s7ziw8zz725082hhzzvr3ahi498wshkx6" + "rev": "99.0-1", + "sha256": "0x9c19h4l1djhdq48ylnqjrrfkk2zalfpgj57cba5jqxl2fhglx3" }, "firefox": { - "version": "98.0.2", - "sha512": "b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e" + "version": "99.0", + "sha512": "08f6d5a668140c4275aba6df463ed3af596043dfe5f27573583afbc1e9f6b27ebca79a52ce2c9598261c631b400b5378744e9e70f51ef9c4098b419e9904aa7c" } } From c9346a6ac842706b2b3533603300654b515abf3f Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 29 Mar 2022 00:17:20 -0700 Subject: [PATCH 46/62] bluespec: 2021.07 -> 2022.01 Current bsc releases ship a tarball of the expected version of the yices source, so switch to using that rather than gamble on the nixpkgs yices version. Signed-off-by: David Anderson --- .../development/compilers/bluespec/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index d89ed3e0d49f..ae28923871c0 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchurl , autoconf , automake , fontconfig @@ -18,20 +19,27 @@ , gmp-static , verilog , asciidoctor -, tex }: +, tex +, which +}: let ghcWithPackages = ghc.withPackages (g: (with g; [ old-time regex-compat syb split ])); in stdenv.mkDerivation rec { pname = "bluespec"; - version = "2021.07"; + version = "2022.01"; src = fetchFromGitHub { owner = "B-Lang-org"; repo = "bsc"; rev = version; - sha256 = "0gw8wyp65lpkyfhv3laazz9qypdl8qkp1j7cqp0gv11592a9p5qw"; + sha256 = "sha256-ivTua3MLa8akma3MGkhsqwSdwswYX916kywKdlj7TqY="; + }; + + yices-src = fetchurl { + url = "https://github.com/B-Lang-org/bsc/releases/download/${version}/yices-src-for-bsc-${version}.tar.gz"; + sha256 = "sha256-ey5yIIVFZyG4EnYGqbIJqmxK1rZ70FWM0Jz+2hIoGXE="; }; enableParallelBuilding = true; @@ -43,8 +51,7 @@ in stdenv.mkDerivation rec { postUnpack = '' mkdir -p $sourceRoot/src/vendor/yices/v2.6/yices2 - # XXX: only works because yices.src isn't a tarball. - cp -av ${yices.src}/* $sourceRoot/src/vendor/yices/v2.6/yices2 + tar -C $sourceRoot/src/vendor/yices/v2.6/yices2 -xf ${yices-src} chmod -R +rwX $sourceRoot/src/vendor/yices/v2.6/yices2 ''; @@ -68,6 +75,7 @@ in stdenv.mkDerivation rec { libX11 # tcltk tcl tk + which xorg.libXft zlib ]; From 1c334eff79c1f0cace046bbda1ee05f190f5eca6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 18:31:51 +0000 Subject: [PATCH 47/62] gallery-dl: 1.21.0 -> 1.21.1 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index dc5dedbd1ad9..46bd189fcf8a 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.21.0"; + version = "1.21.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-D/K+C7IX4VGv+FFYuPQEqwVYSjiDcSeElVunVMiFWI8="; + sha256 = "sha256-oLVrYM7F9JFDYgQL/XgJS9LeUexqcSlvmkwyAk1bpoY="; }; propagatedBuildInputs = [ requests yt-dlp ]; From 6dd377e367e011f365e558b0039a8bf67d250961 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 22:00:13 +0000 Subject: [PATCH 48/62] ocamlPackages.ptime: 0.8.5 -> 0.8.6 Co-authored-by: sternenseemann --- pkgs/development/ocaml-modules/ptime/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index ac30876520a6..169cf4ce16f5 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -1,14 +1,16 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, js_of_ocaml , jsooSupport ? true }: stdenv.mkDerivation rec { - version = "0.8.5"; + version = "0.8.6"; pname = "ocaml${ocaml.version}-ptime"; + minimalOCamlVersion = "4.03"; + src = fetchurl { url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz"; - sha256 = "1fxq57xy1ajzfdnvv5zfm7ap2nf49znw5f9gbi4kb9vds942ij27"; + sha256 = "sha256-gy/fUsfUHUZx1A/2sQMQIFMHl1V+QO3zHAsEnZT/lkI="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; @@ -16,8 +18,6 @@ stdenv.mkDerivation rec { strictDeps = true; - propagatedBuildInputs = [ result ]; - buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}"; inherit (topkg) installPhase; From 8f6854ac153547ed49399c3b1b74325211bb4223 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 19:08:52 +0000 Subject: [PATCH 49/62] scaleway-cli: 2.4.0 -> 2.5.1 --- pkgs/tools/admin/scaleway-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 436c62906261..75e14391736d 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.4.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "yYzcziEKPSiMvw9LWd60MkHmYFAvN7Qza6Z117NOOv0="; + sha256 = "sha256-a8imZN3APQEb9ntQOzOKGBEiPKmb5ZYC9ZKnOuLiElc="; }; - vendorSha256 = "7cGVeja1YE96PEV1IRklyh6MeMDFAP+2TpYvvFkBYnQ="; + vendorSha256 = "sha256-aaYS0WqNa8997kdV38blUsYovtUHHtEUXCTG9vwv2ko="; # some tests require network access to scaleway's API, failing when sandboxed doCheck = false; From 26846a348e53fde832072344adda423818c0bdda Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Apr 2022 21:19:49 +0200 Subject: [PATCH 50/62] httpx: 1.2.0 -> 1.2.1 --- pkgs/tools/security/httpx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 0d87780cee49..ae36d76c562c 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-zNK/OBDo6cL0uZHosulusdOviYZMD2TCusE+0Mn330g="; + sha256 = "sha256-yp0mLHpBS23MUVOla7y3Rb2esM5J+Q8mZy1+mgdUtXo="; }; - vendorSha256 = "sha256-a6Tpz4jPQbtiWt6OyDKy+xbRx6EBwADyqTkvBnyusdQ="; + vendorSha256 = "sha256-udEfjTdRcyjeUWb1d5gRBmoC0H0tl2+oSS7ac+ff5ew="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; From c67fa73bf9bb4aaea660118c7cd79b1dc9841905 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Apr 2022 21:26:06 +0200 Subject: [PATCH 51/62] python3Packages.astropy-extension-helpers: disable on older Python releases --- .../astropy-extension-helpers/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix index 7bf838860b38..90162d431caf 100644 --- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -3,6 +3,7 @@ , fetchPypi , findutils , pytestCheckHook +, pythonOlder , setuptools-scm }: @@ -11,6 +12,8 @@ buildPythonPackage rec { version = "1.0.0"; format = "pyproject"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; sha256 = "ca1bfac67c79cf4a7a0c09286ce2a24eec31bf17715818d0726318dd0e5050e6"; @@ -22,7 +25,10 @@ buildPythonPackage rec { patches = [ ./permissions.patch ]; - checkInputs = [ findutils pytestCheckHook ]; + checkInputs = [ + findutils + pytestCheckHook + ]; # avoid import mismatch errors, as conftest.py is copied to build dir pytestFlagsArray = [ @@ -37,6 +43,6 @@ buildPythonPackage rec { description = "Utilities for building and installing packages in the Astropy ecosystem"; homepage = "https://github.com/astropy/extension-helpers"; license = licenses.bsd3; - maintainers = [ maintainers.rmcgibbo ]; + maintainers = with maintainers; [ rmcgibbo ]; }; } From 851000e64e907dd5293bd4e079b4ab8bfbee5e79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Apr 2022 21:32:26 +0200 Subject: [PATCH 52/62] python3Packages.aio-georss-client: 0.9 -> 0.10 --- pkgs/development/python-modules/aio-georss-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-georss-client/default.nix b/pkgs/development/python-modules/aio-georss-client/default.nix index 586cc6b74a82..f62c8b1bcfb7 100644 --- a/pkgs/development/python-modules/aio-georss-client/default.nix +++ b/pkgs/development/python-modules/aio-georss-client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aio-georss-client"; - version = "0.9"; + version = "0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-georss-client"; rev = "v${version}"; - sha256 = "sha256-cnOW9Ey6WdL2bAqPop5noETn12OeeKsMkWHKGmYCjJU="; + sha256 = "sha256-g/BlRRBImJihVlAfSMsPIPV0GJns0/pStF8TKSxpDI4="; }; propagatedBuildInputs = [ From 2d8f379ee0f0482265237d71416b31304b197c11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Apr 2022 21:32:56 +0200 Subject: [PATCH 53/62] python3Packages.aio-georss-gdacs: 0.6 -> 0.7 --- pkgs/development/python-modules/aio-georss-gdacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-georss-gdacs/default.nix b/pkgs/development/python-modules/aio-georss-gdacs/default.nix index b33e2e35ee1c..96e105fab213 100644 --- a/pkgs/development/python-modules/aio-georss-gdacs/default.nix +++ b/pkgs/development/python-modules/aio-georss-gdacs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aio-georss-gdacs"; - version = "0.6"; + version = "0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-georss-gdacs"; rev = "v${version}"; - sha256 = "sha256-sUHVmueu70ZnXP8KoJ2mDzzEedzXYHM2yeGC4oVsZZU="; + sha256 = "sha256-6z0l0PcFTQgOBj8cBgBMPJIqWG53u7h4WbYkBqU4FNE="; }; propagatedBuildInputs = [ From c92de4744196b390d2cf11e5d631f37cffa0ae96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Apr 2022 21:37:34 +0200 Subject: [PATCH 54/62] python3Packages.ghapi: 0.1.19 -> 0.1.20 --- pkgs/development/python-modules/ghapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ghapi/default.nix b/pkgs/development/python-modules/ghapi/default.nix index 428215eeee59..3c648b4a4560 100644 --- a/pkgs/development/python-modules/ghapi/default.nix +++ b/pkgs/development/python-modules/ghapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ghapi"; - version = "0.1.19"; + version = "0.1.20"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "ghapi"; rev = version; - sha256 = "sha256-UV2cfotRad9jg/X3pOysKJyMi4/XKt24kf6F4aw4vcI="; + sha256 = "sha256-Pry+qCHCt+c+uwkLaoTVUY1KblESj6kcNtMfGwK1rfk="; }; propagatedBuildInputs = [ From bc2af61be5579e04f2fee34f234f007f17cf8434 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Apr 2022 21:40:34 +0200 Subject: [PATCH 55/62] python3Packages.hahomematic: 1.0.6 -> 1.1.0 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index e946e59fea3f..2b35bf5c6c98 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.0.6"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-mqB6Sal+gt2i9h9HHZNVJ/HXPrF7Fe4MC7EKpJR3JMY="; + sha256 = "sha256-qdOkF8Ob2vYzmIlFM7LbrcuvMWLk4Pd+DTSe3E+8Df8="; }; propagatedBuildInputs = [ From 96f5fb2a139bd479593f2f186cf5969858f4ccc9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Apr 2022 21:43:41 +0200 Subject: [PATCH 56/62] python3Packages.losant-rest: 1.16.0 -> 1.16.1 --- pkgs/development/python-modules/losant-rest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 6dac34a9f7a8..8056e93c51a7 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.16.0"; + version = "1.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - sha256 = "sha256-1beURMpQ2klwupcd4wJZud6MnAKzwXPvVlobk/eSvXo="; + sha256 = "sha256-mdSqGeVfZTSW65eQiYerjlq6afq2dyYjUi38DVsI6wQ="; }; propagatedBuildInputs = [ From e27f7cdd74b2711dc87ed31ace326e2986eda349 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Apr 2022 21:49:19 +0200 Subject: [PATCH 57/62] python3Packages.slixmpp: 1.8.1 -> 1.8.2 --- pkgs/development/python-modules/slixmpp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 4743639c43d1..375f910e5f84 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.8.1"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QgTIC+4JtAD9nnS+fJKZwF0aJEIrFmPHkYg8cPgXmcA="; + hash = "sha256-U7lD2iVy2gS5Ktop4PVKg+cUbIg4MJt+m6tH5aOb1Y4="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Exclude live tests "tests/live_test.py" + "tests/test_xep_0454.py" ]; pythonImportsCheck = [ From 180b51bf25b74e0ced3611c1663643f426bca3cc Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 9 Apr 2022 22:19:05 +0200 Subject: [PATCH 58/62] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 7 +++++++ .../transitive-broken.yaml | 4 ++++ .../haskell-modules/hackage-packages.nix | 17 +++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7e21b7e07621..d44618e3cb6e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -453,6 +453,7 @@ broken-packages: - botpp - bottom - boundingboxes + - bower-json - bowntz - bpath - braid @@ -1318,6 +1319,7 @@ broken-packages: - ert - escape-artist - escoger + - espial - esqueleto-pgcrypto - ess - essence-of-live-coding-gloss-example @@ -1925,6 +1927,7 @@ broken-packages: - haquery - harchive - HARM + - HarmTrace-Base - haroonga - harp - harpy @@ -2108,6 +2111,7 @@ broken-packages: - heidi - hein - heist-async + - heist-emanote - helic - helisp - hell @@ -2733,6 +2737,7 @@ broken-packages: - json-extra - json-fu - json-litobj + - jsonlogic - jsonnet - json-pointer - json-pointy @@ -2953,6 +2958,7 @@ broken-packages: - lifetimes - lifted-protolude - lifter + - lifx-lan - ligature - light - lilypond @@ -4668,6 +4674,7 @@ broken-packages: - smtps-gmail - smuggler - smuggler2 + - snack - snake - snake-game - snap-accept diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 188e3069ede3..7b527b41d856 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2249,6 +2249,7 @@ dont-distribute-packages: - hsx-xhtml - html-kure - html-presentation-text + - htoml-parse - hts - htsn-import - http-client-auth @@ -2426,6 +2427,7 @@ dont-distribute-packages: - json-togo - json-tokens - json2-hdbc + - jsonlogic-aeson - jsons-to-schema - jspath - jvm @@ -2526,6 +2528,7 @@ dont-distribute-packages: - language-python-colour - language-qux - language-spelling + - large-anon - lat - latest-npm-version - latex-formulae-hakyll @@ -3647,6 +3650,7 @@ dont-distribute-packages: - soundgen - source-code-server - spade + - spago - sparkle - sparrow - sparsebit diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c5e220df683e..2773110b39b4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10026,6 +10026,8 @@ self: { ]; description = "Parsing and unambiguously representing musical chords"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "HasBigDecimal" = callPackage @@ -46661,6 +46663,8 @@ self: { ]; description = "Read bower.json from Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bowntz" = callPackage @@ -88764,6 +88768,8 @@ self: { ]; description = "Espial is an open-source, web-based bookmarking server"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "esqueleto" = callPackage @@ -130038,6 +130044,8 @@ self: { ]; description = "An Haskell template system supporting both HTML5 and XML"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "helf" = callPackage @@ -145944,6 +145952,7 @@ self: { ]; description = "Parse TOML values produced by htoml-megaparsec package"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "htrace" = callPackage @@ -159945,6 +159954,8 @@ self: { ]; description = "JsonLogic Evaluation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "jsonlogic-aeson" = callPackage @@ -159965,6 +159976,7 @@ self: { ]; description = "JsonLogic Aeson Support"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "jsonnet" = callPackage @@ -166256,6 +166268,7 @@ self: { ]; description = "Scalable anonymous records"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "large-generics" = callPackage @@ -170140,6 +170153,8 @@ self: { ]; description = "LIFX LAN API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ligature" = callPackage @@ -251796,6 +251811,8 @@ self: { ]; description = "Strict ByteString Parser Combinator"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snake" = callPackage From 0a793b83f3fb9036a769e598eda222caafe7c27e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Apr 2022 22:31:02 +0200 Subject: [PATCH 59/62] python3Packages.asdf-standard: init at 1.0.1 --- .../python-modules/asdf-standard/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/asdf-standard/default.nix diff --git a/pkgs/development/python-modules/asdf-standard/default.nix b/pkgs/development/python-modules/asdf-standard/default.nix new file mode 100644 index 000000000000..3a9b6efb704c --- /dev/null +++ b/pkgs/development/python-modules/asdf-standard/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, importlib-resources +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "asdf-standard"; + version = "1.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "asdf_standard"; + inherit version; + hash = "sha256-HK8GceEm9K7DETreG1BjhYNpp2klXPu7vNLWfazFtZI="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; + + # Circular dependency on asdf + doCheck = false; + + pythonImportsCheck = [ + "asdf_standard" + ]; + + meta = with lib; { + description = "Standards document describing ASDF"; + homepage = "https://github.com/asdf-format/asdf-standard"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad2f91731238..e101349d8c97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -643,6 +643,8 @@ in { asdf = callPackage ../development/python-modules/asdf { }; + asdf-standard = callPackage ../development/python-modules/asdf-standard { }; + ase = callPackage ../development/python-modules/ase { }; asgi-csrf = callPackage ../development/python-modules/asgi-csrf { }; From ae3b36d8053bbb581cd5220c3f3440cbb532ab5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Apr 2022 22:42:04 +0200 Subject: [PATCH 60/62] python3Package.asdf-transform-schemas: init at 0.2.2 --- .../asdf-transform-schemas/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/asdf-transform-schemas/default.nix diff --git a/pkgs/development/python-modules/asdf-transform-schemas/default.nix b/pkgs/development/python-modules/asdf-transform-schemas/default.nix new file mode 100644 index 000000000000..8333e25f01aa --- /dev/null +++ b/pkgs/development/python-modules/asdf-transform-schemas/default.nix @@ -0,0 +1,46 @@ +{ lib +, asdf-standard +, buildPythonPackage +, fetchPypi +, importlib-resources +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "asdf-transform-schemas"; + version = "0.2.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "asdf_transform_schemas"; + inherit version; + hash = "sha256-9xqTCe0+vQmxk3roV8lM7JKIeHBEDrPphou77XJlaxU="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + asdf-standard + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; + + # Circular dependency on asdf + doCheck = false; + + pythonImportsCheck = [ + "asdf_transform_schemas" + ]; + + meta = with lib; { + description = "ASDF schemas for validating transform tags"; + homepage = "https://github.com/asdf-format/asdf-transform-schemas"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e101349d8c97..20a85ea1f1d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -645,6 +645,8 @@ in { asdf-standard = callPackage ../development/python-modules/asdf-standard { }; + asdf-transform-schemas = callPackage ../development/python-modules/asdf-transform-schemas { }; + ase = callPackage ../development/python-modules/ase { }; asgi-csrf = callPackage ../development/python-modules/asgi-csrf { }; From 9dba703fbd4c74f5712cb4a6114b51b079fe75c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Apr 2022 22:47:52 +0200 Subject: [PATCH 61/62] python3Packages.asdf: 2.10.1 -> 2.11.0 --- .../python-modules/asdf/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 122020c271f9..5087884074d8 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -1,10 +1,13 @@ { lib +, asdf-standard +, asdf-transform-schemas , astropy , buildPythonPackage , fetchPypi , importlib-resources , jmespath , jsonschema +, lz4 , numpy , packaging , pytest-astropy @@ -17,18 +20,23 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.10.1"; - disabled = pythonOlder "3.6"; + version = "2.11.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-9+Vp8ps3I5Oe/sgWTrLtcnS91ICwsoPXWDPw9Z0QhAk="; + hash = "sha256-FEWXGSkneduhO9+YlzrZvpJHUsI7TeagVLwBdMEIRvw="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ + asdf-standard + asdf-transform-schemas jmespath jsonschema numpy @@ -40,8 +48,9 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest-astropy astropy + lz4 + pytest-astropy pytestCheckHook ]; @@ -49,11 +58,13 @@ buildPythonPackage rec { export PY_IGNORE_IMPORTMISMATCH=1 ''; - pythonImportsCheck = [ "asdf" ]; + pythonImportsCheck = [ + "asdf" + ]; meta = with lib; { description = "Python tools to handle ASDF files"; - homepage = "https://github.com/spacetelescope/asdf"; + homepage = "https://github.com/asdf-format/asdf"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; From c60f46b8f341ab04fcf51b89d872f9507d5bd91e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 22:31:21 +0000 Subject: [PATCH 62/62] matrix-synapse-tools.synadm: 0.33.1 -> 0.34 --- pkgs/servers/matrix-synapse/tools/synadm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/servers/matrix-synapse/tools/synadm.nix index 46c9add3d88e..c06999cf3102 100644 --- a/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -4,12 +4,12 @@ with python3Packages; buildPythonApplication rec { pname = "synadm"; - version = "0.33.1"; + version = "0.34"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eIpRyx1iErZuB3n+Sl231BE47ckIXYzaelod7OtdSF8="; + sha256 = "sha256-pM1nY8j7W1aeWv7/H+9Sz9jo4u1sax/fuKPtx0JKtL8="; }; postPatch = ''