diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-08 00:02:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-08 00:02:31 +0000 |
| commit | 4bf238a8fbdad042a3912cc1638cca9fd671ddb2 (patch) | |
| tree | debc566ba79164bc02f05fc883455c35b1895573 /pkgs | |
| parent | 533c68a3300039a131c67579aaf07946c22abfa0 (diff) | |
| parent | be313a93bbad89e29ce84475c61c79f665bc53ba (diff) | |
| download | nixpkgs-4bf238a8fbdad042a3912cc1638cca9fd671ddb2.tar nixpkgs-4bf238a8fbdad042a3912cc1638cca9fd671ddb2.tar.gz nixpkgs-4bf238a8fbdad042a3912cc1638cca9fd671ddb2.tar.bz2 nixpkgs-4bf238a8fbdad042a3912cc1638cca9fd671ddb2.tar.lz nixpkgs-4bf238a8fbdad042a3912cc1638cca9fd671ddb2.tar.xz nixpkgs-4bf238a8fbdad042a3912cc1638cca9fd671ddb2.tar.zst nixpkgs-4bf238a8fbdad042a3912cc1638cca9fd671ddb2.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs')
60 files changed, 1834 insertions, 943 deletions
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 1208db44241..107b5794f73 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -93,10 +93,10 @@ let }; }); - buildGateway = { pname, version, src, license, description, wmClass, ... }: + buildGateway = { pname, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit pname version src wmClass jdk; - product = "Gateway"; + inherit pname version src wmClass jdk product; + productShort = "Gateway"; meta = with lib; { homepage = "https://www.jetbrains.com/remote-development/gateway/"; inherit description license platforms; @@ -127,9 +127,9 @@ let }).overrideAttrs (attrs: { postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv + patchelf --set-interpreter $interp $out/goland*/plugins/go-plugin/lib/dlv/linux/dlv - chmod +x $out/goland*/plugins/go/lib/dlv/linux/dlv + chmod +x $out/goland*/plugins/go-plugin/lib/dlv/linux/dlv # fortify source breaks build since delve compiles with -O0 wrapProgram $out/bin/goland \ @@ -328,6 +328,7 @@ in gateway = buildGateway rec { pname = "gateway"; + product = "JetBrains Gateway"; version = products.gateway.version; description = "Your single entry point to all remote development environments"; license = lib.licenses.unfree; diff --git a/pkgs/applications/editors/jetbrains/update.py b/pkgs/applications/editors/jetbrains/update.py index fe57f75c72e..1c22acf8e74 100755 --- a/pkgs/applications/editors/jetbrains/update.py +++ b/pkgs/applications/editors/jetbrains/update.py @@ -64,7 +64,7 @@ def update_product(name, product): build = latest_build(channel) new_version = build["@version"] new_build_number = build["@fullNumber"] - if "EAP" not in channel["@name"]: + if all(x not in channel["@name"] for x in ["EAP", "Gateway"]): version_or_build_number = new_version else: version_or_build_number = new_build_number diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 3908bd1d9ef..5d54b1150bc 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,56 +3,50 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2022.2.4", - "sha256": "d88794c698d7bf4d970ba102b85166d5f8c3cb08c4ed5b4cbc150bb505320fab", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.4.tar.gz", - "version-major-minor": "2022.2", - "build_number": "222.4345.21" + "version": "2022.3.1", + "sha256": "cd057a0aa96cf5b4216a436136a1002e6f3dc578bcd8a69f98d6908381b03526", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1.tar.gz", + "build_number": "223.8214.51" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2022.2.5", - "sha256": "55b28f3b79eda126fe778e2945804d50b1145503737f1b5e25ab6ae2d2a0e3ae", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5.tar.gz", - "version-major-minor": "2022.1.1", - "build_number": "222.4345.5" + "version": "2022.3.2", + "sha256": "e542111e490fbbc80d3aebcbbc343b29e17bf6766d7b708675618d8e49b6ee83", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2.tar.gz", + "build_number": "223.8214.62" }, "gateway": { - "update-channel": "Gateway EAP", + "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2022.3 EAP", - "sha256": "4868baed9350065c1db760f07a09badd1473132af640cc19330e20c8a0940d7d", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.tar.gz", - "version-major-minor": "2022.3", - "build_number": "223.6646.21" + "version": "2022.3.1", + "sha256": "7bfe02c1b414c2fc095deab35fa40ed29a129bfa76efc3e31a2785f0f37fa778", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51.tar.gz", + "build_number": "223.8214.51" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2022.2.4", - "sha256": "e39aaae39e6021e87cece7622c51860d23e2a5b5ac2683fb67d369ec7d609084", - "url": "https://download.jetbrains.com/go/goland-2022.2.4.tar.gz", - "version-major-minor": "2022.2", - "build_number": "222.4345.24" + "version": "2022.3.1", + "sha256": "566eada40511cd06727d69047e8a6a1e75b06ebade93d1ea78262fc2715c8a38", + "url": "https://download.jetbrains.com/go/goland-2022.3.1.tar.gz", + "build_number": "223.8214.59" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "4ba5faafad48d58db5099fae080ae2238086d3d9803080082de8efe35d8bf4ed", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "4c3514642ce6c86e5343cc29b01c06ddc9c55f134bcb6650de5d7d36205799e8", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1.tar.gz", + "build_number": "223.8214.52" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", - "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz", - "version": "2022.2.3", - "sha256": "7454d7e0b8f4e3d8d805dde645d28b842101bd77aea8b29125880c592e6b8c85", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3-no-jbr.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", + "version": "2022.3.1", + "sha256": "ce807ba3a776e14f85dbd38f2744fc97e54318561eddd1c265f0d2cacc2565da", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1.tar.gz", + "build_number": "223.8214.52" }, "mps": { "update-channel": "MPS RELEASE", @@ -60,118 +54,106 @@ "version": "2022.2", "sha256": "aaee4d2bb9bc34d0b4bc62c7ef08139cc6144b433ba1675ef306e6d3d95e37a1", "url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2.tar.gz", - "version-major-minor": "2022.2", "build_number": "222.3345.1295" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "2376cd043bb941524df62db40f9125b1c693be11df80a41fd5b3dd9dcd3446e9", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.15" + "version": "2022.3.1", + "sha256": "222e8cf974f70a77c92f03b34c38645bfe72a2dd4da20d7154f40375db54709b", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1.tar.gz", + "build_number": "223.8214.64", + "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "cb03d44599a03419c0c63fc917846fca28c9ea664ed2b2a1c36240dcffb2a387", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.3.tar.gz", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.1", + "sha256": "b243103f27cfb763106a2f5667d8f201562154755ce9746e81e88c80acd7b316", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1.tar.gz", + "build_number": "223.8214.51" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "c73750a2e27ed2410741a739071a920cca9844608a81f07735ed2e35a024cca1", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.3.tar.gz", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.1", + "sha256": "8f845077cc0fa3582348ee3d76a69ff001391b3f3d63a9b279b8039fd6e07622", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.tar.gz", + "build_number": "223.8214.51" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "2fdff8616fd1574a0ef7baaed855aa39a1254ea164b74d1b4dda11241e58ab2d", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4167.23" + "version": "2022.3.1", + "sha256": "d785f02e355983c6762248860052a81f75b392e25b585ff5a913aeaa2a2a3010", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.tar.gz", + "build_number": "223.8214.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "a8c3412db30ab7bd8b8601b0a50c95dc48a412391f1c33df27c47cf5d2204257", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "4d2adb310b14fb38afcaa2da5c254c2fc0bede109e597eed6d3c36837497591f", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1.tar.gz", + "build_number": "223.8214.60" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2022.2.3", - "sha256": "1d7d464bbcb83d5af48359aeda6aa7d165038bfaa1f26fef1019761eb278fa22", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.tar.gz", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "d78bd6494cced51fe77d87c07040fa3a29e8af917317399036af161c56afd927", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1.tar.gz", + "build_number": "223.8214.51" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2022.2.4", - "sha256": "b72fae2bee3bd10374d10a4efb86888d289931080d5321385ede30373d31a55a", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.4.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.21" + "version": "2022.3.1", + "sha256": "e6246c929e0d0b9340b66dd282572d67db7bf6031d5789f197be8817de54b186", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1.dmg", + "build_number": "223.8214.51" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2022.2.5", - "sha256": "cdf0302b0ab65d3dfce4e48004ef45873c9912c844d2e3c82bfe19de2b11cfda", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5.dmg", - "version-major-minor": "2022.1.1", - "build_number": "222.4345.5" + "version": "2022.3.2", + "sha256": "3c91269f04bd6f6df0ae8f2042c029097f56c2ccbc45db95b4f66e87e9d4a320", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2.dmg", + "build_number": "223.8214.62" }, "gateway": { - "update-channel": "Gateway EAP", + "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2022.3 EAP", - "sha256": "2db71a052501db41d5cfe142f1a6e3178fe02830f0da127d00fbf93a4629c61b", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.dmg", - "version-major-minor": "2022.3", - "build_number": "223.6646.21" + "version": "2022.3.1", + "sha256": "4b86b523b02f2df5150bc965bcef7e1a0bf7a7e6d2233a3a2603529a8577dd43", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51.dmg", + "build_number": "223.8214.51" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2022.2.4", - "sha256": "456957075636f7f9ccffbd8d3bd37d2218547289a2cbce043bb9e32c436654f6", - "url": "https://download.jetbrains.com/go/goland-2022.2.4.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.24" + "version": "2022.3.1", + "sha256": "296d5da052b59a00b0930cf6eea07eb2e5ed4eb1417ee505b013c6d83ffda2e1", + "url": "https://download.jetbrains.com/go/goland-2022.3.1.dmg", + "build_number": "223.8214.59" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2022.2.3", - "sha256": "6ec3721d9961918a14630eaf068765eeba97e71baecd95ec67510dc25c8bd1b1", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "8ea8b1ceebde397950592708b55f277ca43856b4013f597ccbf385bb75a42c72", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1.dmg", + "build_number": "223.8214.52" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2022.2.3", - "sha256": "df780c841398532e090adc2c6af35a7fbcdd29fddb37e5a68f33d61a9032d5a3", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "5278cf5ded9464b284fa568f2b453eb5b207a0c75e26354bfb66ef8e96be85e6", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1.dmg", + "build_number": "223.8214.52" }, "mps": { "update-channel": "MPS RELEASE", @@ -179,118 +161,106 @@ "version": "2022.2", "sha256": "4e36c60d281596c220287ab2191165be37ef01c3c54ab5f5e4e535c8b81bc754", "url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2-macos.dmg", - "version-major-minor": "2022.2", "build_number": "222.3345.1295" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2022.2.3", - "sha256": "8dbe5cd8e31c7f6bc6795db6946e2430c82f0aa2c13e7805c40733428b02241d", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.15" + "version": "2022.3.1", + "sha256": "a2ea7d0f1fd9810a46a3f3fea5f47475fe8b325514488f46ee4dace474388fa4", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1.dmg", + "build_number": "223.8214.64", + "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2022.2.3", - "sha256": "01eec651f6e8d92e1bfe5688aeb179ad5eb92e77ef77d102793d4848f8efc0d4", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.3.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.1", + "sha256": "adfb73d85ffb30c2abf715a6c6a0a2ed64a047a3016021a2cb61838457c66a81", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1.dmg", + "build_number": "223.8214.51" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2022.2.3", - "sha256": "920326a35589fee80e70b84d23184daf1d3efc8ecf4ec8c273c2bf2ec764a5b7", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.3.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.1", + "sha256": "2e3bff74a53df74ceee0ac182ffc2f22248317ced0a33f8c0014b1ed504d9650", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.dmg", + "build_number": "223.8214.51" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2022.2.3", - "sha256": "aa02c2c621d356486a0b698a45d773f5830ff4ef431940059f82e8d3c17a2335", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4167.23" + "version": "2022.3.1", + "sha256": "9d73b21e558db89ac24a406187cb96e506e320ca0154e8db6aeac7ff960c8944", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.dmg", + "build_number": "223.8214.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2022.2.3", - "sha256": "a04700159fcf3bfed74d196edc4c1150e5906dc4730d06ffd017b6bbb9bc853b", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "3b23165c3ea9ef3d87233a64005bee4fbf98c99df5d60410a1418e022ce032d6", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1.dmg", + "build_number": "223.8214.60" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2022.2.3", - "sha256": "e6532a9a840c3508cdf26511200fbba34ec9a275154d717538019f72ebc5fc51", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "ea2fb464cf8ba0bf553115cd0f006cb4dab729cbde941de2fc86588024abe8b9", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1.dmg", + "build_number": "223.8214.51" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2022.2.4", - "sha256": "2b95358770cd56b94b46e4bcb86080e2c97771c0f34ad50543de206bb3c81d47", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.4-aarch64.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.21" + "version": "2022.3.1", + "sha256": "85ee94f4dac126ee2b87ab225f9be6fa828a0c17e067b896f541fd25599411ef", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1-aarch64.dmg", + "build_number": "223.8214.51" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2022.2.5", - "sha256": "8ff78e440e4753adc8dbd4ee408fde114f7d9c65ee780f012b917498b63993ee", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5-aarch64.dmg", - "version-major-minor": "2022.1.1", - "build_number": "222.4345.5" + "version": "2022.3.2", + "sha256": "13c8503f190e82b00949b26312873976a10c64dcca036ecc6ce9547b69341658", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2-aarch64.dmg", + "build_number": "223.8214.62" }, "gateway": { - "update-channel": "Gateway EAP", + "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2022.3 EAP", - "sha256": "513d3a271c5ff20fdc5c22f6e28eb21cfbb283d01ade2d11f33bb7eb79317410", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21-aarch64.dmg", - "version-major-minor": "2022.3", - "build_number": "223.6646.21" + "version": "2022.3.1", + "sha256": "555ca346ec41de06223d3a4b5e9247809e07c8339bff0d139b624634c812c8e5", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51-aarch64.dmg", + "build_number": "223.8214.51" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2022.2.4", - "sha256": "f1b1bb4f28a09b23a185fc2437792a3125b2c8856fa533c9bcb09b7eef16fe09", - "url": "https://download.jetbrains.com/go/goland-2022.2.4-aarch64.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.24" + "version": "2022.3.1", + "sha256": "5873200406e91ca64df50470eb20f907c568f5d95b7488cb4c3b3d3eb8353df4", + "url": "https://download.jetbrains.com/go/goland-2022.3.1-aarch64.dmg", + "build_number": "223.8214.59" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "333c70caf452034ae332cdded4d24a71592049b4045725eb57826a0b997d1c7a", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "394478e3f2a2ea1788a5c2ef9c5a9db72531462b4db921483d24a08f7c260a43", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1-aarch64.dmg", + "build_number": "223.8214.52" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "9e5c32fffd17d651d8d875c2588a067902a9ebb9bf815d06aabfd75b9f4ee3cd", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "1e9454c2500e1ec0d490e19d175a30f4441ffd30200a5a1041ecbeff3c66c7e4", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1-aarch64.dmg", + "build_number": "223.8214.52" }, "mps": { "update-channel": "MPS RELEASE", @@ -298,62 +268,56 @@ "version": "2022.2", "url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2-macos-aarch64.dmg", "sha256": "bdc83d9c7a3430cc2b0b0361a9e4eab82e951bfe87f0e4754106d09850947077", - "version-major-minor": "2022.2", "build_number": "222.3345.1295" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "0dee8fe654cccdafa73b65da1a2ef844401a9438ecee726fe6f6af1f09d07c38", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.15" + "version": "2022.3.1", + "sha256": "7658bcf3433d8f6b983136cc3f3edae5c02053d6983a59c273448f246ea3bcef", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1-aarch64.dmg", + "build_number": "223.8214.64", + "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "6b87c85f6b5b3262904b34d0bbb6775d2654610685a8bca9977b147644b113ea", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.1", + "sha256": "6574cfd20a586fcbdfbac2ea0fa903ea078c1702fd9e5145c33c7c8dc4506388", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1-aarch64.dmg", + "build_number": "223.8214.51" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "59d9553ab01de9460984f082c12fb0586aeb84eb00a4501bab358e516f1f6847", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.2", - "build_number": "222.4345.23" + "version": "2022.3.1", + "sha256": "640e4088d976820808d4571c8060b473ab6cfde34699d5913ec3c528ca70faac", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1-aarch64.dmg", + "build_number": "223.8214.51" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "5dd892ed16dd1bc819a97ffb62cdfbb3b60c6019581ba18358afc5c0a39585f5", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4167.23" + "version": "2022.3.1", + "sha256": "d25ba49504c22e8669b8e15033cb6e944e9948ecbb0394ba4bbd5804f1f6657f", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1-aarch64.dmg", + "build_number": "223.8214.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "cd7a967c2745aca566569a320eb276773638d05fcd25839db18a098803d2c5f4", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "d0ec036ed67146beb46059a6ec9aa07d8caa2225e141183fe1d47e27170ad71a", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1-aarch64.dmg", + "build_number": "223.8214.60" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2022.2.3", - "sha256": "7ffd746e5e33f2d69f7b8c39920f67de149f183a0d372d20f3f6bc4febf2e355", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3-aarch64.dmg", - "version-major-minor": "2022.1", - "build_number": "222.4345.14" + "version": "2022.3.1", + "sha256": "f63d2708cccc57bd404b782137f11e5dabf012df0c18aabf900743c4f02daa97", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1-aarch64.dmg", + "build_number": "223.8214.51" } } } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ef8468d2cc9..51b9107d3e7 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -502,8 +502,8 @@ final: prev: src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "5b04ae9824a493809c0f2365526400c234db40d9"; - sha256 = "03wng2g4rrn9j095sjj50jbp32fgqxljrdcpa0rqg4hip5p31wpv"; + rev = "3eafbd28ae573fa665121a6e058a450cf3fe8573"; + sha256 = "03l1h9vqkxzknjah5x2w2yci2n24gifnnk7bhns8s26rvlckf99i"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-01-04"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "0f51c3b01bdafc7f8ad2ece4aacef089f952e884"; - sha256 = "1isc4vximvs2pmmks1sdfpyrj6sphvqdybfk26vqgsx22m6h7nl0"; + rev = "69c1dc8b5f3d215d4a0538265b2d257c2ed7a8fa"; + sha256 = "00jr9s90i03zkl076pa0knc0k9dx1xcc98ajlrxw3dkq38kbshiy"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -595,12 +595,12 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2022-08-24"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "9892a40d4cf970a2916a984544b7f984fc12f55c"; - sha256 = "1dbhvbaiabc8f9p3vfch3pkail2zx234g048mywl005s90d339kz"; + rev = "a7445c340fb7a0529f3c413eb99d3f8d29f50ba2"; + sha256 = "1rj1c4jljz83w1509y39lagmr86xngivzsjzngrdivnw3swbc59y"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -835,12 +835,12 @@ final: prev: barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-01-04"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "1b4a0b6ea6216fee8702857c1e1fcd816abca423"; - sha256 = "0hz24rz4d82pvrndr6s26qlv4b83pfrizd99p4wdbdllnfy8jr2a"; + rev = "fc72ed04e87df12efbdcea25e6f0dce9d5229b6b"; + sha256 = "0cfa2cqvscaai26yfjmxnv740p351v1dgqdg1v3snrmhj3m5i7bw"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -857,6 +857,18 @@ final: prev: meta.homepage = "https://github.com/chriskempson/base16-vim/"; }; + bat-vim = buildVimPluginFrom2Nix { + pname = "bat.vim"; + version = "2022-11-14"; + src = fetchFromGitHub { + owner = "jamespwilliams"; + repo = "bat.vim"; + rev = "cc038af97410bfc8da2e29f7eefa51f565346993"; + sha256 = "17f9vwy3qfyl553hddah5zbj8gwww772frlvw51zskf9phdg17la"; + }; + meta.homepage = "https://github.com/jamespwilliams/bat.vim/"; + }; + bats-vim = buildVimPluginFrom2Nix { pname = "bats.vim"; version = "2013-07-03"; @@ -1819,12 +1831,12 @@ final: prev: com-cloudedmountain-ide-neovim = buildVimPluginFrom2Nix { pname = "com.cloudedmountain.ide.neovim"; - version = "2022-05-19"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "Domeee"; repo = "com.cloudedmountain.ide.neovim"; - rev = "d5d6c5151e8643abfabd22e9fe7e31467c679be2"; - sha256 = "1h2379ibzadv7549i13zjzavya7n7q8z532awvwqdr8incja5b4c"; + rev = "d479b806f06cd6714e321cf88e94aae858e8274e"; + sha256 = "0nwp8drcy1bxd493gmi3bz41yw0avpvbfwx9dq03x9kxsjc81rsz"; }; meta.homepage = "https://github.com/Domeee/com.cloudedmountain.ide.neovim/"; }; @@ -1843,12 +1855,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2023-01-05"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "ab00bcf5aa979c53f2f40dc2655c03e24f4ef50f"; - sha256 = "19i3yh93jx7ja0la8a639nzih7pd8a9nm1nr5wm2y7ijzccbqhyx"; + rev = "e89df176e8b38e931b7e71a470f923a317976d86"; + sha256 = "0m3a76bxwbkv48z5hrzz5cr1c5xryvnigl6qvfgzwp5i63laamqx"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1999,12 +2011,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2022-11-26"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "0be93ef60f075a247bb5de9e29d447dc8a888ff0"; - sha256 = "07nzyswzd8bidx9by7lf60dcz51f1klfz0wnc2gfx5vq7qy3jjpq"; + rev = "d2e69a13b32e8574decfe81ea275292234eba6ea"; + sha256 = "0b1f0dx5xknm83b0ydq8ndf4207a5nqzvsbjzh4rngwxpc5kf5nc"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2047,12 +2059,12 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2022-12-20"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "81eb5d1bc2eddad5ff0b4e3c1c4be5c09bdfaa63"; - sha256 = "1hyv1iccy4fjpmdq16rl8pplhnrnz71nxjsndyf955q029l06ics"; + rev = "5b911f2d8ecccc684c13fdb8af4145cca19dc3cf"; + sha256 = "13ckm0b8hgji4brmfw4dnc0spm8hslx2s4bg0vi8sll5i7vphpdd"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -4091,12 +4103,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-01-06"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "102bc2722e73d0dcebd6c90b45a41cb33e0660cb"; - sha256 = "0y02z8crwhlcips24gq4b3vrbpbiwbi6xv6clhhp94awfvfzq1jc"; + rev = "8798ccc95031225e3b2241bd8b2d26c2452b06c4"; + sha256 = "0n5ga8nfh5qc0abd6zwj4bibk72wpjkqx76qx5aw9r69w70mjqnq"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4499,12 +4511,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-01-06"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "d12c18db89211f641c9e324abce81fb600fd1d91"; - sha256 = "0jgyfhmxl6jgxhq4nh0sdd6v1k97fl7i0g2a201zwijkxir64di1"; + rev = "6224e879acc5ec25e2baae2a1c3d3cfe804e2486"; + sha256 = "177gkyd7dyw24yrv3mfb6aip63nrxqf45vlrksl67bbq0q6kkak9"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4703,12 +4715,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-01-06"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "73831cbe979fb3b385ed8e61626d16d9306a1f06"; - sha256 = "0xc9c9707lnq4hn86zw2kfkshb7dhhgis8ikk4sqpkyzl86bm0wv"; + rev = "369d520350b4c1af40630f90c3703444c40c065a"; + sha256 = "1335n3jplxirwg1dyn52lzsni0dw7viv9sm3bqa8ib7fn051f4fx"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5135,12 +5147,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-01-04"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "3e3294631ef23599b9fccb87dee2592c73d11c60"; - sha256 = "1c0ihfhw7jg4abks9b58cqzlrvmvkkm48hssygc6azblpxybz5jg"; + rev = "2b873a75159ec0c8d160da029392b1c4e31e1927"; + sha256 = "0mvgwysgb78hxa80zik7nxfbagvhm6gwkclaq62vr7iyjsy4ranx"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5303,36 +5315,36 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2022-12-31"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "414b43f99da0a827c3ce897161fc67c3bb6a5d83"; - sha256 = "14xjz0yav5idjm24b8l7zqlgralfhhbzgycaxybzlh9ndn7ldhni"; + rev = "fee5ce9bdc3dff4706a29b012e75025ab376becb"; + sha256 = "0filcj1dzjcxppbw951mr3iwpqf24y5r5af61l0iqb6crfd085xl"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-01-02"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "c6a60b8476e146f22e47b378d8f52ed7b35dd8a1"; - sha256 = "0235ljraa6cbwb81jhijw10i3kc1xlmiq01qwzgqz8saacd26ccr"; + rev = "b8310d053c8859a159828054f930be8fdb18eb2d"; + sha256 = "1hbrbxvs990a6fg3qr3mis8d9wpg9az675wx9yj0dlaisb0sq7kf"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2023-01-02"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "9fe707327c539cf092b8e6c4e7ba82e906ee0d06"; - sha256 = "0j3aqf294967q6b55vjj96mw1ki0dx6306mjvglj52bkl9ya5nhc"; + rev = "ba749799e48a8c5065106989eb8bf9915b51081d"; + sha256 = "0xqdz4qb0sdb9g2hdgm5c2ry0m3ar78hyp0n93k92dwd1v575996"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -5451,8 +5463,8 @@ final: prev: src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "333625ced9d42bbc9c1db812dd844cd35ce3fa62"; - sha256 = "05ka3g5kxqqsgfjlxs3nv152f48616zyl7hm3p9axrni1ajghvzd"; + rev = "6677c99d89050fa940ffc320fe780fb52baa68ac"; + sha256 = "0ry0w633jsbv0v27xn6b3j1k2k9dpkr91aq5a2d9cp65rs0gl5xn"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5471,12 +5483,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-01-06"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "22ce3282f37f2ad5e1e827510cbaf1d691cb957a"; - sha256 = "1z2dbz631fxsd8kx4zax8cl61k93q0dbh5z65rh3f8bdiaakm7y7"; + rev = "47a3e92a9b3a2f7604d4a9eefd1d55518554a89d"; + sha256 = "1b7a5al09bnq1a3315gmg5dwxsw560dksqg3kqrphbx80g6v3f74"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5579,12 +5591,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-01-05"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "6830a1ed04f89e6d556cb6bcc200433173004307"; - sha256 = "0kgb5j4xxh7s0zwrhcz8gl9y8bai25cl9ix5anizma6rvr5x42il"; + rev = "915558963709ea17c5aa246ca1c9786bfee6ddb4"; + sha256 = "02212ji1br69rqjwhn86k02bkz1kcawkq29j9sflkmjj8hjcahc0"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5663,12 +5675,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2023-01-05"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "0645a36bb4398e8721b8e8b5d9029f89ec14055d"; - sha256 = "1v6p3d9jpm3s8j8vrbl982wa8harxx4jxvfwfj5s5gb7cn6pi76s"; + rev = "c059d724434f2e320fd59c398084e33dd2e6706b"; + sha256 = "1n501d2lvscjgvk90ylz797ph6wc7apb830f288s6qn7lh7f0878"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -6059,12 +6071,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-01-04"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "e69978a39e4d3262b09ce6a316beff384f443e3b"; - sha256 = "0dz6l7kd2jzdg9a7b8zi718rvsdpa885asif7ncx9yf7b6f12mk6"; + rev = "41dc4e017395d73af0333705447e858b7db1f75e"; + sha256 = "1vpxgnid3a66b1bh6zk3l2h014bbykvpzz9s9d55cb6591kmbsa1"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6227,12 +6239,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2023-01-05"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "b74e327596d6795d61b4719a3ee7418768859d66"; - sha256 = "09yp4ymsmwicks2w8v0gx26j2nk71m1kqkzpmkrmbwyrh7zbb9qx"; + rev = "8418bdb156822a780d00a86b50a0fe1c0bcf6200"; + sha256 = "17mklxh1vaf24kjkndj9c7cnc0kagcnl985vafd3iqbphpbyb3np"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -6299,24 +6311,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-01-03"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "bac962caf472a4404ed3ce1ba2fcaf32f8002951"; - sha256 = "1nzyxf05a420cyjz1844sjkc8yw4ihnv2f2ig014gqgj3spijxpx"; + rev = "f2ee30998eb4e191ed9931719a4e3b28be35494b"; + sha256 = "0881z195zzqm5lp9q1vas5dzi54qxrhd91gd9fz06w77c3ki5spa"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-01-05"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "68e8181dbcf29330716d380e5669f2cd838eadb5"; - sha256 = "1ai2h0083vcd23znia74qrycqbcyf711vkwf5m9kv11jrwa718bl"; + rev = "ef0cd56e482bf82be82afd6afc69268fc6037475"; + sha256 = "1pwydn801jvvahy491zhisfkmyk7n96lxvyj5msch3jjfg14whqw"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6359,12 +6371,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-12-31"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "d816761ec1ea4a605689bc5f4111088459cf74d4"; - sha256 = "0h60nhvwn81q83nvg5cj2j4jwglpa2wbvlyk1fy1l09zjrjpzm8x"; + rev = "a8c86f48c1030acee22b9e071e3c531de77bf253"; + sha256 = "0karac6sjlzx9cljhz2fprwc4ayyab0c7ywjv6j0vxj81bq3pr01"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6418,12 +6430,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-12-09"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "05e1072f63f6c194ac6e867b567e6b437d3d4622"; - sha256 = "1b53nrmzga6bkf6cdck3hdwjyrlslyrsa7jv55198jy153y8qq2z"; + rev = "7f55bc36eddec87597167a97de5b690997edaf7d"; + sha256 = "00vzb60399h45rykgs0fma7nxqs24z0bi7q6wqvzbb3ggmyin43k"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6782,8 +6794,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "95fb27dfcf6330ac482a99545d7440ac6729851b"; - sha256 = "1dvslfyjccjpdcca1566bp7y3fqn6f3cqkp1b44cw3gzz5kaf78s"; + rev = "9d81624fbcedd3dd43b38d7e13a1e7b3f873d8cd"; + sha256 = "0y3qn0rwlwp720517lwg35f09b30b591hprbvb6hgvn1waw2ljzc"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -8189,12 +8201,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-01-06"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "18fc02b499b368287e3aa267ec0b0d22afc0f19b"; - sha256 = "01g6pfy13bp9ms5ccx62myxxzqzy9rwmrp8aclc2biylrlh9jg27"; + rev = "04af51dbfb17c2afa0b8d82b0e842e0638201ca9"; + sha256 = "16m9k42cy4kd5a067y7wnbzzqizms74837n9p5hqj3l1s429vr1v"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8454,12 +8466,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-01-04"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "449a8adf079967f0ec01ca9a90851fa4d07c1633"; - sha256 = "1w7yh0zjnaa9c8wmylrpp6zh621w1pqbf4lbvl33gyzwgx778yx2"; + rev = "c7dae6b68c541ccb2bb6fdf113649234acb176e6"; + sha256 = "1hbkwipaw61g1fxmvkvmgf5x2j9nxx3639mxr57jbfqp17zdfrnm"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8766,12 +8778,12 @@ final: prev: vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2021-03-20"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "3f0c8faadf0c5b68bcf40785c1c42e3731bfa522"; - sha256 = "1w9zim2v1av3f43z8q7zh0ia8dgjxjwnvmzd4j3y25vy25avn0lb"; + rev = "aa3428b734ddbd0105615832843f619774a6871e"; + sha256 = "0dnv1ixhzrgafd7kqpx8hp0r1snyqfxw80psnbxsr6qcwzawb2da"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -9702,12 +9714,12 @@ final: prev: vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-12-27"; + version = "2023-01-06"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "ecf07480687a13fe1bd3899270a6c9c99de51f4b"; - sha256 = "0ahynkl4nilvkqqfhf625l5js33bjya6acqq1qn7cnhr0xhriyhd"; + rev = "f4ead480930a37dd2b0cf917a8c387ed36c2d86a"; + sha256 = "00nmcsna4z1p8i5k74jykzci16by2ga2lf904f1aya0yhwpwrjg2"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -11084,12 +11096,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-01-04"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "c4bae1f79b065d47cfe2af45c9f1a6576acce9df"; - sha256 = "00zay5ngbq8qcvwndc1q9mpaln1lxavviz4k8rwa9lzcanvbfyi8"; + rev = "500987604d356738068ee3bf320a82dfa9fbfc1f"; + sha256 = "13cmpckspqpn5xxhcwpwg2ldb647vdw04ks7r1hxqd9fn93kwvhz"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -12826,12 +12838,12 @@ final: prev: vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2023-01-02"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "18f0c7fc1e7181e6422247505727d7111c5da544"; - sha256 = "0ws9sz3sz4izfh6chrvj8p00np37n16n48mrzispdm3ph8nb1ii3"; + rev = "7073840ab137c9f09d3d1a835d765e40faf715e3"; + sha256 = "1bz37lxnx97l2zdvjm0dgjs0rdlyw9hbaxwzf1cxzwsv4x46rx9n"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -13499,12 +13511,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2023-01-04"; + version = "2023-01-07"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "b7e0b1f16c20bc1ea0515851bc5740d1c1f18444"; - sha256 = "08ywhwgs1wh76ac3jkz6f8v2kmg28d04pfbwqvpzvqq4bdr0pbfm"; + rev = "802219ba26409f325a5575e3b684b6cb054e2cc5"; + sha256 = "0flj4bq58s57wdf2x81lqsdpzm3h263s6v6xi76kisj7k3ykwiw0"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 90f7be1e38f..07fc87a7172 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -70,6 +70,7 @@ https://github.com/ayu-theme/ayu-vim/,, https://github.com/romgrk/barbar.nvim/,, https://github.com/utilyre/barbecue.nvim/,, https://github.com/chriskempson/base16-vim/,, +https://github.com/jamespwilliams/bat.vim/,HEAD, https://github.com/vim-scripts/bats.vim/,, https://github.com/rbgrouleff/bclose.vim/,, https://github.com/max397574/better-escape.nvim/,, diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 3c43d715c01..5bf231ec924 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -4,17 +4,17 @@ with ocamlPackages; buildDunePackage rec { pname = "jackline"; - version = "unstable-2021-12-28"; + version = "unstable-2022-05-27"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "ca1012098d123c555e9fa5244466d2e009521700"; - sha256 = "1j1azskcdrp4g44rv3a4zylkzbzpcs23zzzrx94llbgssw6cd9ih"; + rev = "d8f7c504027a0dd51966b2b7304d6daad155a05b"; + hash = "sha256-6SWYl2mB0g8JNVHBeTnZEbzOaTmVbsRMMEs+3j/ewwk="; }; nativeBuildInpts = [ @@ -28,20 +28,21 @@ buildDunePackage rec { mirage-crypto-pk x509 domain-name - ocaml_lwt + lwt otr astring ptime notty sexplib hex - uutf uchar - uuseg uucp + uuseg + uutf dns-client cstruct base64 + happy-eyeballs-lwt ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 1d9febd9a64..6c95c7557eb 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -9,23 +9,31 @@ rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "1.6.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-144yn/QQPIZJOgqKFUWjB7KCmEKfNpj6XjMGhTpQdEQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-4gEE2JCYNxPOV47w/wMRvYn5YJdgvlYl+fkk6qcXLr8="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + cargoHash = "sha256-IYk01mueNZu791LPdkB79VaxsFXZbqEFDbpw1ckYTMo="; - cargoHash = "sha256-zUeI01EyXsuoKzHbpVu3jyA3H2aBk6wMY+GW3h3v8vc="; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; meta = with lib; { description = "Twitch chat in the terminal"; homepage = "https://github.com/Xithrius/twitch-tui"; + changelog = "https://github.com/Xithrius/twitch-tui/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.taha ]; }; diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index ddfaf584021..eb5097a1b0e 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -9,21 +9,21 @@ let appName = "LibreOffice.app"; scriptName = "soffice"; - version = "7.3.3"; + version = "7.4.3"; dist = { aarch64-darwin = rec { arch = "aarch64"; archSuffix = arch; url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; - sha256 = "50ed3deb8d9c987516e2687ebb865bca15486c69da79f1b6d74381e43f2ec863"; + sha256 = "cf95f9ecd4451d27e8304cea3ba116675267bdf75f08fbb60e0d8917f86edc04"; }; x86_64-darwin = rec { arch = "x86_64"; archSuffix = "x86-64"; url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; - sha256 = "fb2f9bb90eee34a22af3a2bf2854ef5b76098302b3c41d13d4f543f0d72b994f"; + sha256 = "fe569ba23bb74eb3e86974537dd80e504debe5fd8526a00edbad6be4da18986a"; }; }; in diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index e18e844a17b..9ef7aa2d03d 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "78541d36393ac3dd0ffa32b4a9af15fecdefb5d1", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/78541d36393ac3dd0ffa32b4a9af15fecdefb5d1.tar.gz", - "sha256": "1qwjkjlz9sw1jnsarin6803vj68bfm3iyysfwxaifga5w4dsrqcs", - "msg": "Update from Hackage at 2022-12-30T22:03:31Z" + "commit": "9f677e1d2267621375d22e3f6c1a25246678be4c", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/9f677e1d2267621375d22e3f6c1a25246678be4c.tar.gz", + "sha256": "0y2mbj8dwfgdz5pzdq682clab10xgnqlrfv1najx53yy5jf63pcv", + "msg": "Update from Hackage at 2023-01-06T18:29:38Z" } diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 15073bfec10..5f0953b1bca 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -353,6 +353,8 @@ stdenv.mkDerivation ({ ''; ${if targetPlatform.isGhcjs then "configureScript" else null} = "emconfigure ./configure"; + # GHC currently ships an edited config.sub so ghcjs is accepted which we can not rollback + ${if targetPlatform.isGhcjs then "dontUpdateAutotoolsGnuConfigScripts" else null} = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index cf433511586..8a42a0825aa 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2022-12-08"; + version = "unstable-2023-01-06"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/021a48f4b4942462154b06fd81429a248638f87f.tar.gz"; - sha256 = "1is1q5mqi86vzy3ni2959hr95gs9hwd5wiz92hanfli3infg00xc"; + url = "https://github.com/NixOS/cabal2nix/archive/d24f4eab2352468510fb81e276aab9d62e94b561.tar.gz"; + sha256 = "16d3mf4d622gns1myx9mwx39sx0l9wndybxn5ik00x0pxnmh7f36"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6cbc88547bc..5af3c76a9e3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -66,10 +66,6 @@ self: super: { # > https://github.com/roelvandijk/numerals numerals = doJailbreak (dontCheck super.numerals); - # Too stricut upper bound on time - # https://github.com/acw/rate-limit/issues/9 - rate-limit = doJailbreak super.rate-limit; - # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; @@ -478,12 +474,6 @@ self: super: { # https://github.com/kkardzis/curlhs/issues/6 curlhs = dontCheck super.curlhs; - # Too strict upper bounds on bytestring & time - # https://github.com/barrucadu/irc-conduit/issues/35 - irc-conduit = doJailbreak super.irc-conduit; - # https://github.com/barrucadu/irc-client/issues/77 - irc-client = doJailbreak super.irc-client; - # https://github.com/hvr/token-bucket/issues/3 token-bucket = dontCheck super.token-bucket; @@ -654,12 +644,15 @@ self: super: { }) newer; # * The standard libraries are compiled separately. - # * We need multiple patches from master to fix compilation with + # * We need a patch from master to fix compilation with # updated dependencies (haskeline and megaparsec) which can be - # removed when the next idris release (1.3.4 probably) comes - # around. + # removed when the next idris release comes around. idris = self.generateOptparseApplicativeCompletions [ "idris" ] - (doJailbreak (dontCheck super.idris)); + (appendPatch (fetchpatch { + name = "idris-libffi-0.2.patch"; + url = "https://github.com/idris-lang/Idris-dev/commit/6d6017f906c5aa95594dba0fd75e7a512f87883a.patch"; + hash = "sha256-wyLjqCyLh5quHMOwLM5/XjlhylVC7UuahAM79D8+uls="; + }) (doJailbreak (dontCheck super.idris))); # Too strict bound on hspec # https://github.com/lspitzner/multistate/issues/9#issuecomment-1367853016 @@ -1357,9 +1350,7 @@ self: super: { haskell-language-server = (lib.pipe super.haskell-language-server [ dontCheck (disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways … - (assert super.hls-call-hierarchy-plugin.version == "1.1.0.0"; disableCabalFlag "callHierarchy") # Disabled temporarily: https://github.com/haskell/haskell-language-server/pull/3431 ]).overrideScope (lself: lsuper: { - hls-call-hierarchy-plugin = null; # For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix, # because some packages, like ormolu, need a newer Cabal version. # ghc-paths is special because it depends on Cabal for building @@ -1977,12 +1968,6 @@ self: super: { "--skip" "/toJsonSerializer/should generate valid JSON/" ] ++ drv.testFlags or []; }) super.hschema-aeson; - # https://github.com/ssadler/aeson-quick/issues/3 - aeson-quick = overrideCabal (drv: { - testFlags = [ - "-p" "!/asLens.set/&&!/complex.set/&&!/multipleKeys.set/" - ] ++ drv.testFlags or []; - }) super.aeson-quick; # https://github.com/minio/minio-hs/issues/165 minio-hs = overrideCabal (drv: { testFlags = [ @@ -2110,12 +2095,9 @@ self: super: { # https://github.com/zellige/hs-geojson/issues/29 geojson = dontCheck super.geojson; - # Support network >= 3.1.2 - # https://github.com/erebe/wstunnel/pull/107 - wstunnel = appendPatch (fetchpatch { - url = "https://github.com/erebe/wstunnel/pull/107/commits/47c1f62bdec1dbe77088d9e3ceb6d872f922ce34.patch"; - sha256 = "sha256-fW5bVbAGQxU/gd9zqgVNclwKraBtUjkKDek7L0c4+O0="; - }) super.wstunnel; + # Test suite doesn't compile + # https://github.com/erebe/wstunnel/issues/145 + wstunnel = dontCheck super.wstunnel; # Test data missing from sdist # https://github.com/ngless-toolkit/ngless/issues/152 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 77a9f16f4a2..70771427435 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -560,6 +560,7 @@ broken-packages: - cabal-meta - cabal-mon - cabal-nirvana + - cabal-plan-bounds - cabal-progdeps - cabalQuery - CabalSearch @@ -853,6 +854,7 @@ broken-packages: - Conscript - consistent - console-program + - constable - const-math-ghc-plugin - constrained - constrained-categories @@ -2323,7 +2325,6 @@ broken-packages: - HLogger - hlongurl - hls-brittany-plugin - - hls-call-hierarchy-plugin - hls-haddock-comments-plugin - hls-selection-range-plugin - hls-stan-plugin @@ -2661,7 +2662,6 @@ broken-packages: - identifiers - idiii - idna2008 - - idris - IDynamic - ieee-utils - iexcloud @@ -4327,6 +4327,7 @@ broken-packages: - rattle - rattletrap - raven-haskell-scotty + - raylib-imgui - raz - rbst - rclient diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 3ff14c0e1d5..557efdd9dee 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -192,6 +192,7 @@ dont-distribute-packages: - HROOT-hist - HROOT-io - HROOT-math + - HROOT-net - HROOT-tree - HRay - HSGEP @@ -672,7 +673,10 @@ dont-distribute-packages: - array-forth - arraylist - ascii-cows + - ascii-superset_1_2_4_0 - ascii-table + - ascii-th_1_1_1_0 + - ascii_1_4_2_0 - asic - asil - assert4hs-hspec @@ -1027,6 +1031,7 @@ dont-distribute-packages: - comfort-array - comfort-array-shape - comfort-fftw + - comfort-glpk - commsec - commsec-keyexchange - comonad-random @@ -1395,6 +1400,7 @@ dont-distribute-packages: - ewe - exference - exinst-aeson + - exinst-base - exinst-bytes - exinst-cereal - exinst-deepseq diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f3ca49b1871..a882824043b 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -359,6 +359,17 @@ self: super: builtins.intersectAttrs super { preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"''; }) super.ghcide; + # At least on 1.3.4 version on 32-bit architectures tasty requires + # unbounded-delays via .cabal file conditions. + tasty = overrideCabal (drv: { + libraryHaskellDepends = + (drv.libraryHaskellDepends or []) + ++ lib.optionals (!(pkgs.stdenv.hostPlatform.isAarch64 + || pkgs.stdenv.hostPlatform.isx86_64)) [ + self.unbounded-delays + ]; + }) super.tasty; + tasty-discover = overrideCabal (drv: { # Depends on itself for testing preBuild = '' @@ -800,6 +811,14 @@ self: super: builtins.intersectAttrs super { # time random = dontCheck super.random; + # https://github.com/Gabriella439/nix-diff/pull/74 + nix-diff = overrideCabal (drv: { + postPatch = '' + substituteInPlace src/Nix/Diff/Types.hs \ + --replace "{-# OPTIONS_GHC -Wno-orphans #-}" "{-# OPTIONS_GHC -Wno-orphans -fconstraint-solver-iterations=0 #-}" + ''; + }) (doJailbreak (dontCheck super.nix-diff)); + # mockery's tests depend on hspec-discover which dependso on mockery for its tests mockery = dontCheck super.mockery; # same for logging-facade @@ -840,7 +859,11 @@ self: super: builtins.intersectAttrs super { buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ]; postInstall = drv.postInstall or "" + '' wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${ - pkgs.lib.makeBinPath [ pkgs.nvchecker pkgs.nix-prefetch ] + pkgs.lib.makeBinPath [ + pkgs.nvchecker + pkgs.nix-prefetch + pkgs.nix-prefetch-docker + ] }" ''; }) super.nvfetcher); @@ -851,7 +874,11 @@ self: super: builtins.intersectAttrs super { (overrideCabal { doCheck = pkgs.postgresql.doCheck; }) ]; - cachix = super.cachix.override { nix = pkgs.nixVersions.nix_2_10; }; + cachix = super.cachix.override { + nix = pkgs.nixVersions.nix_2_10; + fsnotify = super.fsnotify_0_4_1_0; + hnix-store-core = super.hnix-store-core_0_6_1_0; + }; hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_10; }; hercules-ci-cnix-expr = diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index bf1f2c387ad..4b7201bb6ac 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -11,7 +11,12 @@ let in { pname -, dontStrip ? (ghc.isGhcjs or false) +# Note that ghc.isGhcjs != stdenv.hostPlatform.isGhcjs. +# ghc.isGhcjs implies that we are using ghcjs, a project separate from GHC. +# (mere) stdenv.hostPlatform.isGhcjs means that we are using GHC's JavaScript +# backend. The latter is a normal cross compilation backend and needs little +# special accomodation. +, dontStrip ? (ghc.isGhcjs or false || stdenv.hostPlatform.isGhcjs) , version, revision ? null , sha256 ? null , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; } @@ -171,7 +176,7 @@ let # Pass the "wrong" C compiler rather than none at all so packages that just # use the C preproccessor still work, see # https://github.com/haskell/cabal/issues/6466 for details. - "--with-gcc=${(if stdenv.hasCC then stdenv else buildPackages.stdenv).cc.targetPrefix}cc" + "--with-gcc=${if stdenv.hasCC then "$CC" else "$CC_FOR_BUILD"}" ] ++ optionals stdenv.hasCC [ "--with-ld=${stdenv.cc.bintools.targetPrefix}ld" "--with-ar=${stdenv.cc.bintools.targetPrefix}ar" @@ -246,7 +251,10 @@ let allPkgconfigDepends = pkg-configDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends; - depsBuildBuild = [ nativeGhc ]; + depsBuildBuild = [ nativeGhc ] + # CC_FOR_BUILD may be necessary if we have no C preprocessor for the host + # platform. See crossCabalFlags above for more details. + ++ lib.optionals (!stdenv.hasCC) [ buildPackages.stdenv.cc ]; collectedToolDepends = buildTools ++ libraryToolDepends ++ executableToolDepends ++ optionals doCheck testToolDepends ++ @@ -316,7 +324,9 @@ stdenv.mkDerivation ({ inherit src; inherit depsBuildBuild nativeBuildInputs; - buildInputs = otherBuildInputs ++ optionals (!isLibrary) propagatedBuildInputs; + buildInputs = otherBuildInputs ++ optionals (!isLibrary) propagatedBuildInputs + # For patchShebangsAuto in fixupPhase + ++ optionals stdenv.hostPlatform.isGhcjs [ nodejs ]; propagatedBuildInputs = optionals isLibrary propagatedBuildInputs; LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f49e34b1f4d..80aefc91730 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8416,7 +8416,7 @@ self: { libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ fuse ]; preConfigure = '' - sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${fuse}/lib@" HFuse.cabal + sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${lib.getLib fuse}/lib@" HFuse.cabal ''; description = "HFuse is a binding for the Linux FUSE library"; license = lib.licenses.bsd3; @@ -9318,115 +9318,143 @@ self: { }) {inherit (pkgs) gsl;}; "HROOT" = callPackage - ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core - , HROOT-graf, HROOT-hist, HROOT-io, HROOT-math, HROOT-tree - , template-haskell + ({ mkDerivation, base, Cabal, HROOT-core, HROOT-graf, HROOT-hist + , HROOT-io, HROOT-math, HROOT-net, HROOT-tree, process }: mkDerivation { pname = "HROOT"; - version = "0.9.0.1"; - sha256 = "1mc3lhwjdrwv32hbl5q6j293gmifla9hk815sxayz35g3h9pg9p8"; + version = "0.10.0.2"; + sha256 = "1si50g4dhjphg1lqji8wlihgn1wnshsarhl5gjhc8107absddbmb"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base fficxx fficxx-runtime HROOT-core HROOT-graf HROOT-hist - HROOT-io HROOT-math HROOT-tree template-haskell + base HROOT-core HROOT-graf HROOT-hist HROOT-io HROOT-math HROOT-net + HROOT-tree ]; description = "Haskell binding to the ROOT data analysis framework"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; }) {}; "HROOT-core" = callPackage - ({ mkDerivation, base, fficxx, fficxx-runtime, template-haskell }: + ({ mkDerivation, base, Cabal, fficxx, fficxx-runtime, process + , stdcxx, template-haskell + }: mkDerivation { pname = "HROOT-core"; - version = "0.9.0.1"; - sha256 = "1qxadv3kdd0wn3vb6jk65h9qr1ihr775zsrn2pp2z1xhlj3d8g85"; + version = "0.10.0.2"; + sha256 = "0cis7fjm1lisn9ipfxk8dkxdxdr8kpfrfp21ac2y6chcappxxpjp"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base fficxx fficxx-runtime template-haskell + base fficxx fficxx-runtime stdcxx template-haskell ]; description = "Haskell binding to ROOT Core modules"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; broken = true; }) {}; "HROOT-graf" = callPackage - ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core - , HROOT-hist, template-haskell + ({ mkDerivation, base, Cabal, fficxx, fficxx-runtime, HROOT-core + , HROOT-hist, process, stdcxx, template-haskell }: mkDerivation { pname = "HROOT-graf"; - version = "0.9.0.1"; - sha256 = "1a1i7slarqz64k8v02m6lbrjay11xsr88i2siy8gygqshp6ncf4r"; + version = "0.10.0.2"; + sha256 = "0qfcqla07cz06xw09xdh5jnsixrrl5f4l1gxsf2cg2x2nl4yvpna"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base fficxx fficxx-runtime HROOT-core HROOT-hist template-haskell + base fficxx fficxx-runtime HROOT-core HROOT-hist stdcxx + template-haskell ]; description = "Haskell binding to ROOT Graf modules"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; }) {}; "HROOT-hist" = callPackage - ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core - , template-haskell + ({ mkDerivation, base, Cabal, fficxx, fficxx-runtime, HROOT-core + , process, stdcxx, template-haskell }: mkDerivation { pname = "HROOT-hist"; - version = "0.9.0.1"; - sha256 = "059hlsqn394hd3805hzrm85khvycwd9dnsbjrks9lmbr7sz13aad"; + version = "0.10.0.2"; + sha256 = "0xyh3xnjpfz0218jg0r67kl1frw9gf2m11bnjlaxvqlzfnrxgxr0"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base fficxx fficxx-runtime HROOT-core template-haskell + base fficxx fficxx-runtime HROOT-core stdcxx template-haskell ]; description = "Haskell binding to ROOT Hist modules"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; }) {}; "HROOT-io" = callPackage - ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core - , template-haskell + ({ mkDerivation, base, Cabal, fficxx, fficxx-runtime, HROOT-core + , process, stdcxx, template-haskell }: mkDerivation { pname = "HROOT-io"; - version = "0.9.0.1"; - sha256 = "0jx3ikypvynpd2mfyya86jqdmjl4i12fzvsmn66yksx32hgcksqw"; + version = "0.10.0.2"; + sha256 = "0h36jpc8ljwhk6rmv6i7i8mls0s0lcii3fdjaa23r9bbrl76jgk4"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base fficxx fficxx-runtime HROOT-core template-haskell + base fficxx fficxx-runtime HROOT-core stdcxx template-haskell ]; description = "Haskell binding to ROOT IO modules"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; }) {}; "HROOT-math" = callPackage - ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core - , template-haskell + ({ mkDerivation, base, Cabal, fficxx, fficxx-runtime, HROOT-core + , process, stdcxx, template-haskell }: mkDerivation { pname = "HROOT-math"; - version = "0.9.0.1"; - sha256 = "12cx3m67mdisi7k675gd4ifa2zmbhqywpgb1slacwzdjlqazhs96"; + version = "0.10.0.2"; + sha256 = "1sgj7lr0j7yik0x6fy6vfiv2qqw1b58yhm2z8fq765x3ypilj24m"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base fficxx fficxx-runtime HROOT-core template-haskell + base fficxx fficxx-runtime HROOT-core stdcxx template-haskell ]; description = "Haskell binding to ROOT Math modules"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; }) {}; + "HROOT-net" = callPackage + ({ mkDerivation, base, Cabal, fficxx, fficxx-runtime, HROOT-core + , HROOT-io, process, RHTTP, stdcxx, template-haskell + }: + mkDerivation { + pname = "HROOT-net"; + version = "0.10.0.2"; + sha256 = "1lw0zkb8wmd5raa1fbjaw5l3r6kvvll72vs4rmdjqmg0rld3hgnk"; + setupHaskellDepends = [ base Cabal process ]; + libraryHaskellDepends = [ + base fficxx fficxx-runtime HROOT-core HROOT-io stdcxx + template-haskell + ]; + librarySystemDepends = [ RHTTP ]; + description = "Haskell binding to ROOT Net modules"; + license = lib.licenses.lgpl21Plus; + hydraPlatforms = lib.platforms.none; + }) {RHTTP = null;}; + "HROOT-tree" = callPackage - ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core - , template-haskell + ({ mkDerivation, base, Cabal, fficxx, fficxx-runtime, HROOT-core + , process, stdcxx, template-haskell }: mkDerivation { pname = "HROOT-tree"; - version = "0.9.0.1"; - sha256 = "1whcigrfm0mmnkazby0ycgsz3x9182r00zwh569b0lbbg0m5qbj4"; + version = "0.10.0.2"; + sha256 = "1k5sfd9a02hgbxq9slsvaxw40l0i6nyvw0ihjs1v7lamsicd8b7y"; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - base fficxx fficxx-runtime HROOT-core template-haskell + base fficxx fficxx-runtime HROOT-core stdcxx template-haskell ]; description = "Haskell binding to ROOT Tree modules"; - license = lib.licenses.lgpl21Only; + license = lib.licenses.lgpl21Plus; hydraPlatforms = lib.platforms.none; }) {}; @@ -10424,6 +10452,8 @@ self: { pname = "HaskellNet"; version = "0.6.0.1"; sha256 = "08rwi28q46md2d25l1h6s6hdqf8c2c47is5w5vyydbqx6pmfdc73"; + revision = "1"; + editedCabalFile = "0c5ixp7nl0h9nixr3g079wvjvs7j6hra2va5hnj93bsjbcm350k3"; libraryHaskellDepends = [ array base base64 bytestring cryptohash-md5 mime-mail mtl network network-bsd old-time pretty text @@ -10432,6 +10462,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "HaskellNet_0_6_0_2" = callPackage + ({ mkDerivation, array, base, base64, bytestring, cryptohash-md5 + , mime-mail, mtl, network, network-bsd, old-time, pretty, text + }: + mkDerivation { + pname = "HaskellNet"; + version = "0.6.0.2"; + sha256 = "0lqdqch6qwfrf89hfmvvcna2wgvhzx02v0cwsm7bbhq258alfapj"; + libraryHaskellDepends = [ + array base base64 bytestring cryptohash-md5 mime-mail mtl network + network-bsd old-time pretty text + ]; + description = "Client support for POP3, SMTP, and IMAP"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "HaskellNet-SSL" = callPackage ({ mkDerivation, base, bytestring, connection, data-default , HaskellNet, network, network-bsd @@ -15706,6 +15753,8 @@ self: { pname = "OpenGLRaw"; version = "3.3.4.1"; sha256 = "07nk0rgm6jcxz6yshwhv5lj5frs6371w3hdjxwa4biws2kmbs6hj"; + revision = "1"; + editedCabalFile = "15abvqkxc08lx9d44323izccfp7bqfiljnd587zn80vdvmkzs6zc"; libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; @@ -21093,8 +21142,8 @@ self: { pname = "TypeCompose"; version = "0.9.14"; sha256 = "0msss17lrya6y5xfvxl41xsqs6yr09iw6m1px4xlwin72xwly0sn"; - revision = "1"; - editedCabalFile = "1pxg6az5vkl0zvs3zdvvvnhxqawd9fkkd44jmzzzyyibppgni6x4"; + revision = "2"; + editedCabalFile = "1ghzj47mfjs1vqai93gh1mmsk92jz1bx0azfzxm0jmnwkgr3vlnh"; libraryHaskellDepends = [ base base-orphans ]; description = "Type composition classes & instances"; license = lib.licenses.bsd3; @@ -24971,8 +25020,8 @@ self: { }: mkDerivation { pname = "adhoc-fixtures"; - version = "0.1.0.0"; - sha256 = "16m8a2b2z8n3zxr8dash6k1fq16ks7vi3dza751sd12ay7m0gn2w"; + version = "0.1.0.1"; + sha256 = "1cxrk9nikkvy3c190g2vamv1f7i71v2g080fpzjp6wzspm7r32gy"; libraryHaskellDepends = [ base safe-exceptions yarl ]; testHaskellDepends = [ base hspec hspec-core hspec-discover safe-exceptions yarl @@ -24988,8 +25037,8 @@ self: { }: mkDerivation { pname = "adhoc-fixtures-hspec"; - version = "0.1.0.0"; - sha256 = "0xzgq11lwm66wi3sdlxxpqjgv9wfrysjvn28zyrjrq791vmlg0p9"; + version = "0.1.0.1"; + sha256 = "0vd882cna6p7bn58ynmiih9jjv4az0kxf3294v1cl7gw7hclmaqk"; libraryHaskellDepends = [ adhoc-fixtures base hspec yarl ]; testHaskellDepends = [ adhoc-fixtures base hspec hspec-core hspec-discover safe-exceptions @@ -35050,6 +35099,8 @@ self: { pname = "ascii"; version = "1.2.4.0"; sha256 = "1rsv9ah0jvf66w3k4smh67wpbm03xl4pdyj8svmdy49hbpihimwi"; + revision = "2"; + editedCabalFile = "00pw1px9ggp6aq9pvimxj9q746b74cgc0pz4rn22q40mdqjadhwl"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -35059,6 +35110,28 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii_1_4_2_0" = callPackage + ({ mkDerivation, ascii-case, ascii-caseless, ascii-char + , ascii-group, ascii-numbers, ascii-predicates, ascii-superset + , ascii-th, base, bytestring, hspec, text + }: + mkDerivation { + pname = "ascii"; + version = "1.4.2.0"; + sha256 = "0ql2g9fapm9vzdfpnvax7884cl80s1s61ki98mmy6mjxszlry9jp"; + libraryHaskellDepends = [ + ascii-case ascii-caseless ascii-char ascii-group ascii-numbers + ascii-predicates ascii-superset ascii-th base bytestring text + ]; + testHaskellDepends = [ + ascii-case ascii-caseless ascii-char ascii-group ascii-numbers + ascii-predicates ascii-superset ascii-th base bytestring hspec text + ]; + description = "The ASCII character set and encoding"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-art-to-unicode" = callPackage ({ mkDerivation, base, comonad, doctest, strict }: mkDerivation { @@ -35087,6 +35160,19 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-case_1_0_1_2" = callPackage + ({ mkDerivation, ascii-char, base, hashable, hspec }: + mkDerivation { + pname = "ascii-case"; + version = "1.0.1.2"; + sha256 = "17gqpc65ffy4ipf0bhrs5nyqcmn6fxpx859m03wzm5m2y7ki67nd"; + libraryHaskellDepends = [ ascii-char base hashable ]; + testHaskellDepends = [ ascii-char base hspec ]; + description = "ASCII letter case"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-caseless" = callPackage ({ mkDerivation, ascii-case, ascii-char, base, hashable, hspec }: mkDerivation { @@ -35113,12 +35199,12 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii-char_1_0_0_17" = callPackage + "ascii-char_1_0_1_0" = callPackage ({ mkDerivation, base, hashable, hspec }: mkDerivation { pname = "ascii-char"; - version = "1.0.0.17"; - sha256 = "1562gkfvrcjygs9qpyswsk25d4m2pxblmmbb0hw8jsaml2jwsyss"; + version = "1.0.1.0"; + sha256 = "1fls3yw3gs36hwqp32pn7mfibkspx5a80k32wybzc3hfp4qyymlv"; libraryHaskellDepends = [ base hashable ]; testHaskellDepends = [ base hspec ]; description = "A Char type representing an ASCII character"; @@ -35169,6 +35255,19 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-group_1_0_0_15" = callPackage + ({ mkDerivation, ascii-char, base, hashable, hedgehog }: + mkDerivation { + pname = "ascii-group"; + version = "1.0.0.15"; + sha256 = "006b4idi63hz8x54a5fmx5isypdvif8q4ijf274dr93n0c9wh1di"; + libraryHaskellDepends = [ ascii-char base hashable ]; + testHaskellDepends = [ ascii-char base hedgehog ]; + description = "ASCII character groups"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-holidays" = callPackage ({ mkDerivation, base, random, random-shuffle, terminfo, time }: mkDerivation { @@ -35206,14 +35305,16 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii-numbers_1_1_0_1" = callPackage + "ascii-numbers_1_1_0_2" = callPackage ({ mkDerivation, ascii-case, ascii-char, ascii-superset, base , bytestring, hashable, hedgehog, invert, text }: mkDerivation { pname = "ascii-numbers"; - version = "1.1.0.1"; - sha256 = "1zb37db0vpcnh63izq9m62p2an1w496ljh7d196k0i1w76j2jhiy"; + version = "1.1.0.2"; + sha256 = "0dqqnqrn3hvmjgakm6vzbidlik4p483wcslcwr60qbxa1v5lmznv"; + revision = "2"; + editedCabalFile = "19x9mh11pb7j4ykf9vicprn6mlhcb9gwsk82gh5yk366k4r172d7"; libraryHaskellDepends = [ ascii-case ascii-char ascii-superset base bytestring hashable text ]; @@ -35240,12 +35341,12 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii-predicates_1_0_1_1" = callPackage + "ascii-predicates_1_0_1_2" = callPackage ({ mkDerivation, ascii-char, base, hedgehog }: mkDerivation { pname = "ascii-predicates"; - version = "1.0.1.1"; - sha256 = "1r8kd5p17jd46298wp7b1rvfg86g752k2x45ppqikrbkqv9vkvmc"; + version = "1.0.1.2"; + sha256 = "0awk97iib6rzrpsh7322f09sj6rkmhkn1hrgsw0zxq0w0bfp7kyj"; libraryHaskellDepends = [ ascii-char base ]; testHaskellDepends = [ ascii-char base hedgehog ]; description = "Various categorizations of ASCII characters"; @@ -35315,18 +35416,20 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii-superset_1_0_1_14" = callPackage - ({ mkDerivation, ascii-char, base, bytestring, hashable, hedgehog - , text + "ascii-superset_1_2_4_0" = callPackage + ({ mkDerivation, ascii-case, ascii-caseless, ascii-char, base + , bytestring, hashable, hspec, text }: mkDerivation { pname = "ascii-superset"; - version = "1.0.1.14"; - sha256 = "1zggxgxwdc8cd224dgmrq0bijgi0adv233ysnpaw97sa9m6mgmb6"; + version = "1.2.4.0"; + sha256 = "0gh7k9fjh5l2a8xdd964gd4fy0lmfz9y0pnfykx7wiqiqirv2v4y"; libraryHaskellDepends = [ - ascii-char base bytestring hashable text + ascii-case ascii-caseless ascii-char base bytestring hashable text + ]; + testHaskellDepends = [ + ascii-case ascii-caseless ascii-char base hspec text ]; - testHaskellDepends = [ ascii-char base hedgehog text ]; description = "Representing ASCII with refined supersets"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -35369,19 +35472,23 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii-th_1_0_0_12" = callPackage - ({ mkDerivation, ascii-char, ascii-superset, base, bytestring - , hedgehog, template-haskell, text + "ascii-th_1_1_1_0" = callPackage + ({ mkDerivation, ascii-case, ascii-caseless, ascii-char + , ascii-superset, base, bytestring, hspec, template-haskell, text }: mkDerivation { pname = "ascii-th"; - version = "1.0.0.12"; - sha256 = "1kdqkd7sq8kb8ymy4p45w39ndr7z2jcjy9c5ws227hrhglam9pcy"; + version = "1.1.1.0"; + sha256 = "1jfjj7rir0bbbasvdb11ymcpjk4zv0br5sk2839hnnlgam9a75g5"; + revision = "1"; + editedCabalFile = "06dsa4nrpvy1sm4hr4q6ydgjizf4r7s9xvlc9ra4f8mawsq85zx6"; libraryHaskellDepends = [ - ascii-char ascii-superset base template-haskell + ascii-case ascii-caseless ascii-char ascii-superset base + template-haskell ]; testHaskellDepends = [ - ascii-char ascii-superset base bytestring hedgehog text + ascii-case ascii-caseless ascii-char ascii-superset base bytestring + hspec text ]; description = "Template Haskell support for ASCII"; license = lib.licenses.asl20; @@ -37737,6 +37844,25 @@ self: { license = lib.licenses.mit; }) {}; + "autodocodec-yaml_0_2_0_3" = callPackage + ({ mkDerivation, autodocodec, autodocodec-schema, base, bytestring + , containers, path, path-io, safe-coloured-text, scientific, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "autodocodec-yaml"; + version = "0.2.0.3"; + sha256 = "00cf3zz0jgnqq45rkpf5a9jlds16rgfc15ndhv1fgq7yz935g93f"; + libraryHaskellDepends = [ + autodocodec autodocodec-schema base bytestring containers path + path-io safe-coloured-text scientific text unordered-containers + vector yaml + ]; + description = "Autodocodec interpreters for yaml"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "autoexporter" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { @@ -38391,6 +38517,31 @@ self: { mainProgram = "aws-cloudfront-signed-cookies"; }) {}; + "aws-cloudfront-signed-cookies_0_2_0_12" = callPackage + ({ mkDerivation, aeson, aeson-pretty, asn1-encoding, asn1-types + , base, base64-bytestring, bytestring, cookie, cryptonite, hedgehog + , lens, lens-aeson, neat-interpolation, optparse-applicative, pem + , text, time, vector + }: + mkDerivation { + pname = "aws-cloudfront-signed-cookies"; + version = "0.2.0.12"; + sha256 = "1gdam3h8ir1lz8phhj03ckiv0f371xl79adi4kz2yqk2ayvcixhv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty asn1-encoding asn1-types base base64-bytestring + bytestring cookie cryptonite lens lens-aeson optparse-applicative + pem text time vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hedgehog neat-interpolation ]; + description = "Generate signed cookies for AWS CloudFront"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "aws-cloudfront-signed-cookies"; + }) {}; + "aws-cloudfront-signer" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, crypto-pubkey-types, RSA, time @@ -46486,8 +46637,8 @@ self: { }: mkDerivation { pname = "blockfrost-api"; - version = "0.7.0.0"; - sha256 = "0s2ri7g6gxfkcvpf5z7s08qhs60snbpxz75gjaw9bab3h49aadnc"; + version = "0.7.1.0"; + sha256 = "0dy2xspnmy9487zgjaws250kp5qnip3ir8qwnn57ah92h3z1w0mj"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deriving-aeson lens QuickCheck quickcheck-instances safe-money servant @@ -46511,8 +46662,8 @@ self: { }: mkDerivation { pname = "blockfrost-client"; - version = "0.7.0.0"; - sha256 = "19gf6shsjikhrbd898504vapii2x49h7pnzv86r1k45ypmibhira"; + version = "0.7.1.0"; + sha256 = "1cr3zb69hradfc02di523vhykp0y8v8mpyzc37xw8i3phrgasw57"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51720,8 +51871,8 @@ self: { }: mkDerivation { pname = "cabal-cache"; - version = "1.0.5.5"; - sha256 = "0474z8cw2wikqg3bnsxqj4rxy13n5l8p06fq72l4klh01s8i1qfl"; + version = "1.0.5.4"; + sha256 = "15jg140ly7rska7v8ihvd383q9lj4i5c18rzjad4yi8f78jjciqb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52543,6 +52694,27 @@ self: { mainProgram = "cabal-plan"; }) {}; + "cabal-plan-bounds" = callPackage + ({ mkDerivation, base, bytestring, cabal-plan, Cabal-syntax + , containers, optparse-applicative, text + }: + mkDerivation { + pname = "cabal-plan-bounds"; + version = "0.1.0.1"; + sha256 = "1s8ljyp8bi0h637abxq4ma2m5bx8cpiw5ib6n50npprycv9h3v04"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cabal-plan Cabal-syntax containers + optparse-applicative text + ]; + description = "Derives cabal bounds from build plans"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-plan-bounds"; + broken = true; + }) {}; + "cabal-progdeps" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { @@ -53269,33 +53441,34 @@ self: { , cachix-api, concurrent-extra, conduit, conduit-extra , conduit-zstd, containers, cookie, cryptonite, dhall, directory , ed25519, either, extra, filepath, fsnotify - , hercules-ci-cnix-store, here, hspec, hspec-discover, http-client - , http-client-tls, http-conduit, http-types, inline-c-cpp, katip - , lukko, lzma-conduit, megaparsec, memory, mmorph, netrc, nix - , optparse-applicative, pretty-terminal, prettyprinter, process - , protolude, resourcet, retry, safe-exceptions, servant - , servant-auth, servant-auth-client, servant-client - , servant-client-core, servant-conduit, stm, stm-chans, stm-conduit - , systemd, temporary, text, time, unix, unordered-containers - , uri-bytestring, uuid, vector, versions, websockets, wuss + , hercules-ci-cnix-store, here, hnix-store-core, hspec + , hspec-discover, http-client, http-client-tls, http-conduit + , http-types, inline-c-cpp, katip, lukko, lzma-conduit, megaparsec + , memory, mmorph, netrc, nix, optparse-applicative, pretty-terminal + , prettyprinter, process, protolude, resourcet, retry + , safe-exceptions, servant, servant-auth, servant-auth-client + , servant-client, servant-client-core, servant-conduit, stm + , stm-chans, stm-conduit, systemd, temporary, text, time, unix + , unordered-containers, uri-bytestring, uuid, vector, versions + , websockets, wuss }: mkDerivation { pname = "cachix"; - version = "1.1"; - sha256 = "1pqh02jqkd90zxjfyjknavr8zly5yp046ac727klxq2x8gw9hq5r"; + version = "1.2"; + sha256 = "1fvm565651rd0wlx3rhsrm3x8fa1jjvpkp9xgrcj8pnpi5dsn07w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring cachix-api concurrent-extra conduit conduit-extra conduit-zstd containers cookie cryptonite dhall directory ed25519 either extra filepath - fsnotify hercules-ci-cnix-store here http-client http-client-tls - http-conduit http-types inline-c-cpp katip lukko lzma-conduit - megaparsec memory mmorph netrc optparse-applicative pretty-terminal - prettyprinter process protolude resourcet retry safe-exceptions - servant servant-auth servant-auth-client servant-client - servant-client-core servant-conduit stm stm-chans stm-conduit - systemd temporary text time unix unordered-containers + fsnotify hercules-ci-cnix-store here hnix-store-core http-client + http-client-tls http-conduit http-types inline-c-cpp katip lukko + lzma-conduit megaparsec memory mmorph netrc optparse-applicative + pretty-terminal prettyprinter process protolude resourcet retry + safe-exceptions servant servant-auth servant-auth-client + servant-client servant-client-core servant-conduit stm stm-chans + stm-conduit systemd temporary text time unix unordered-containers uri-bytestring uuid vector versions websockets wuss ]; libraryPkgconfigDepends = [ nix ]; @@ -53325,8 +53498,8 @@ self: { }: mkDerivation { pname = "cachix-api"; - version = "1.1"; - sha256 = "19zh0znah72mqkb4ns4288wq0y02r4ah0pbfvn68lrc02yjf9bhs"; + version = "1.2"; + sha256 = "1i3z0arn8cwglbsq8kxzcpp2ghypv7i03crpplbn0myk8wzflxdy"; libraryHaskellDepends = [ aeson async base base16-bytestring bytestring conduit cookie cryptonite deepseq deriving-aeson exceptions http-api-data @@ -54018,8 +54191,8 @@ self: { }: mkDerivation { pname = "candid"; - version = "0.4"; - sha256 = "17l3qyprkn4ffnpxxh1359f61f4qpbmbxwaclxiqr8aahjsk2d2z"; + version = "0.4.0.1"; + sha256 = "14np7yakm97d6scw5ldlsjacri317wwyingwsys7987zk01dfcln"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57453,12 +57626,13 @@ self: { }) {}; "check-cfg-ambiguity" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, doctest, QuickCheck }: mkDerivation { pname = "check-cfg-ambiguity"; - version = "0.0.0.1"; - sha256 = "1qdg707a8yq61s5rs677yc8wp00sxdrf4vpr2r3c98q2psbkxl1n"; + version = "0.1.0.0"; + sha256 = "0iswfg7m9qnhr1128xbhaa06ai2rhnr7c781y7z92v29xd7mjyjg"; libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base doctest QuickCheck ]; description = "Checks context free grammar for ambiguity using brute force up to given limit"; license = lib.licenses.bsd3; }) {}; @@ -60102,21 +60276,14 @@ self: { }: mkDerivation { pname = "clerk"; - version = "0.1.0.1"; - sha256 = "0djxny7h6g4j49zyhak6369ycl2idd2jqy906g8frghlkvkbyy8z"; - isLibrary = true; - isExecutable = true; + version = "0.1.0.2"; + sha256 = "0nbli8pj7v4wblbji2hqlkwbh98iiclg7vpbg6qsa91bw8p4nwmd"; libraryHaskellDepends = [ base bytestring containers data-default lens mtl text time transformers xlsx ]; - executableHaskellDepends = [ - base bytestring containers data-default lens mtl text time - transformers xlsx - ]; description = "Declaratively describe spreadsheets and generate xlsx"; license = lib.licenses.bsd3; - mainProgram = "clerk"; }) {}; "cless" = callPackage @@ -61628,6 +61795,8 @@ self: { pname = "co-log-concurrent"; version = "0.5.1.0"; sha256 = "07qmx9z03vmgq2cgz4352fsav7r1nx8n7svmrhg2lkdiyp0j7a59"; + revision = "2"; + editedCabalFile = "1ldh0c0927ay8wpamybaw66cz4rz3jskv8iwvxlxw8mmr4pwyvk0"; libraryHaskellDepends = [ base co-log-core stm ]; description = "Asynchronous backend for co-log library"; license = lib.licenses.mpl20; @@ -62151,10 +62320,8 @@ self: { ({ mkDerivation, base, profunctors }: mkDerivation { pname = "coercible-subtypes"; - version = "0.2.0.0"; - sha256 = "0n8g69l3iwcy588yj29b7qsac8n8cl44ibb62a36x9n2jpgz5xif"; - revision = "1"; - editedCabalFile = "09573n1g66j1zqipjp5mzspbkzyijwqhgx6xjn0jlf69vglx22rj"; + version = "0.3.0.0"; + sha256 = "14swbn5509wb46iwgp2lj8hqi3ca82jacgq028cmwz35zsc1zjds"; libraryHaskellDepends = [ base profunctors ]; description = "Coercible but only in one direction"; license = lib.licenses.bsd3; @@ -63237,6 +63404,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "comfort-glpk" = callPackage + ({ mkDerivation, base, comfort-array, deepseq + , doctest-exitcode-stdio, doctest-lib, glpk, glpk-headers + , non-empty, QuickCheck, utility-ht + }: + mkDerivation { + pname = "comfort-glpk"; + version = "0.0"; + sha256 = "16cg5bc1a04zz23bhgfai9bgllwdkl975j9l7r9im8l9qn7ah1xy"; + libraryHaskellDepends = [ + base comfort-array deepseq glpk-headers non-empty utility-ht + ]; + librarySystemDepends = [ glpk ]; + testHaskellDepends = [ + base comfort-array doctest-exitcode-stdio doctest-lib QuickCheck + utility-ht + ]; + description = "Linear Programming using GLPK and comfort-array"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glpk;}; + "comfort-graph" = callPackage ({ mkDerivation, base, containers, doctest-exitcode-stdio , QuickCheck, semigroups, transformers, utility-ht @@ -66977,6 +67166,20 @@ self: { broken = true; }) {}; + "constable" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "constable"; + version = "0.1.0.0"; + sha256 = "0hz63w3h7if70701kzclvcjr1310ycfcm9y46xfv8mgbs4kjp2xx"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + description = "A safe interface for Const summarization"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "constaparser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, vector }: mkDerivation { @@ -68361,6 +68564,27 @@ self: { license = lib.licenses.mit; }) {}; + "cookie_0_4_6" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, deepseq + , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + , time + }: + mkDerivation { + pname = "cookie"; + version = "0.4.6"; + sha256 = "1ajbcsk4k0jc6v2fqn36scs6l8wa6fq46gd54pak75rbqdbajhcc"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq text time + ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + text time + ]; + description = "HTTP cookie parsing and rendering"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "cookies" = callPackage ({ mkDerivation, base, bytestring, chronos, hashable, text, time }: mkDerivation { @@ -70021,8 +70245,8 @@ self: { }: mkDerivation { pname = "crc32c"; - version = "0.0.0"; - sha256 = "1y008mi1livbm6rpc4rj4nnrkwqqm7xk92sdf14r5iqwj8nnh209"; + version = "0.1.0"; + sha256 = "0b7minx4d0801nbyryz9jx680hlbrx6incwnhrz7g0dgpw0fhw0b"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ @@ -71631,6 +71855,8 @@ self: { pname = "csound-catalog"; version = "0.7.6"; sha256 = "0gida0g314hl8nyn5ybbv57yjf10mhjmsdmhk5vgblvhnc95ks36"; + revision = "1"; + editedCabalFile = "0jjpnm5v161d0g36kd9jqqasfzq2g2qaqn95pyb87bkrsrhrqnac"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -71661,6 +71887,8 @@ self: { pname = "csound-expression"; version = "5.4.3"; sha256 = "00hd0sb1787cx7yppg2f3zkd3y8d75fsmf460qnsxc77m4qw5388"; + revision = "1"; + editedCabalFile = "0fd6ln4kgf3cvj396l5w4zzl5zfkaf6ylqhly86lajr72mypf1nr"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -71680,6 +71908,8 @@ self: { pname = "csound-expression-dynamic"; version = "0.3.9"; sha256 = "0cj1g7x06y9b8dky6k2dixv8gxxrcdjvlr8big5fld34w8k39cn6"; + revision = "2"; + editedCabalFile = "061j05spmhh9nsk77f75bqnh75l0w3xhyv1897rkfpp9gz9k5rrv"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse deriving-compat hashable transformers wl-pprint @@ -71698,6 +71928,8 @@ self: { pname = "csound-expression-opcodes"; version = "0.0.5.1"; sha256 = "0h1a9yklsqbykhdinmk8znm7kfg0jd1k394cx2lirpdxn136kbcm"; + revision = "1"; + editedCabalFile = "1jia50zyv8kp0x66igy3bzmhgdgw87cc75gjsw2q1lmd7l82pxky"; libraryHaskellDepends = [ base csound-expression-dynamic csound-expression-typed transformers ]; @@ -71716,6 +71948,8 @@ self: { pname = "csound-expression-typed"; version = "0.2.7"; sha256 = "1mh1mfyi2vx8ykyc1ca8vpbi545fkp7f0ss5nw6dkykl6zm7pj6d"; + revision = "1"; + editedCabalFile = "05vfq1cjznkpaxsficvdccn47z5qa69ykx1ff43zyri5bab3zqzq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic @@ -71733,6 +71967,8 @@ self: { pname = "csound-sampler"; version = "0.0.10.1"; sha256 = "1c2g83a0n4y1fvq3amj9m2hygg9rbpl5x8zsicb52qjm7vjing2i"; + revision = "1"; + editedCabalFile = "09x2bb3ar7c1av0n7988405i3canmk8jxb8a59jn2zdrm0fh7jlz"; libraryHaskellDepends = [ base csound-expression transformers ]; description = "A musical sampler based on Csound"; license = lib.licenses.bsd3; @@ -71816,17 +72052,18 @@ self: { "css-selectors" = callPackage ({ mkDerivation, aeson, alex, array, base, binary, blaze-markup - , bytestring, data-default, Decimal, happy, hashable, QuickCheck - , shakespeare, template-haskell, test-framework + , bytestring, data-default-class, Decimal, deepseq, happy, hashable + , QuickCheck, shakespeare, template-haskell, test-framework , test-framework-quickcheck2, text, zlib }: mkDerivation { pname = "css-selectors"; - version = "0.4.0.3"; - sha256 = "1jz7s5lpfgs6axzkmwp2is1mhsn8jsb52ahxv8my07lx0yvy1g7v"; + version = "0.5.0.0"; + sha256 = "0k51bs3dqfzrq76fa37z8f9n02nw9gkvb04l1yzbcs3a2fvwdnsq"; libraryHaskellDepends = [ - aeson array base binary blaze-markup bytestring data-default - Decimal hashable QuickCheck shakespeare template-haskell text zlib + aeson array base binary blaze-markup bytestring data-default-class + Decimal deepseq hashable QuickCheck shakespeare template-haskell + text zlib ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -73050,6 +73287,22 @@ self: { license = lib.licenses.mit; }) {}; + "d10_1_0_1_2" = callPackage + ({ mkDerivation, base, hashable, hedgehog, template-haskell }: + mkDerivation { + pname = "d10"; + version = "1.0.1.2"; + sha256 = "138mhpl9yhaxbd98m1n5g8h4skbb4agyf7igl1ar3mr6snfhilas"; + libraryHaskellDepends = [ + base hashable hedgehog template-haskell + ]; + testHaskellDepends = [ base hashable hedgehog template-haskell ]; + doHaddock = false; + description = "Digits 0-9"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "d3d11binding" = callPackage ({ mkDerivation, base, c-storable-deriving, d3d11, D3DCompiler , d3dx11, d3dxof, dxgi, dxguid, vect, Win32 @@ -76975,8 +77228,8 @@ self: { }: mkDerivation { pname = "debug-me"; - version = "1.20220324"; - sha256 = "0zpg45bfqnlcnxh8kg2yy336qq9zb01g0ypqf7s2la33kxgck8n5"; + version = "1.20221231"; + sha256 = "1bwbrxgnsjd1n9za0c1hlsrciq75zkjp1vbs3vzz0m6pj0j405li"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -80096,8 +80349,8 @@ self: { pname = "diagrams-cairo"; version = "1.4.2"; sha256 = "094vavgsfn7hxn2h7phvmx82wdhw51vqqv29p8hsvmijf1gxa7c1"; - revision = "2"; - editedCabalFile = "0hn1bbssknzqz3b8r281d4ibzv3fx3n33vaqcixajhcb87wnsi10"; + revision = "3"; + editedCabalFile = "094l4p8kwqbpdrgmkpy93znljl94la7spkmsd2v3lrc8c4i7r022"; libraryHaskellDepends = [ array base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -83549,8 +83802,8 @@ self: { }: mkDerivation { pname = "dnf-repo"; - version = "0.5.2"; - sha256 = "0h3ik35jr1x142lsdififxkh6zz8c0frw3vvfn4nzg7cx5dxa1ng"; + version = "0.5.3"; + sha256 = "0ffg7zajfjfr8r3v33kv0ajv8yx2zl7mm83k1haa94ng85k5b5mm"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -84433,6 +84686,33 @@ self: { license = lib.licenses.mit; }) {}; + "doctest-parallel_0_3_0" = callPackage + ({ mkDerivation, base, base-compat, Cabal, code-page, containers + , deepseq, directory, exceptions, filepath, ghc, ghc-paths, Glob + , hspec, hspec-core, HUnit, mockery, process, QuickCheck, random + , setenv, silently, stringbuilder, syb, template-haskell + , transformers, unordered-containers + }: + mkDerivation { + pname = "doctest-parallel"; + version = "0.3.0"; + sha256 = "121ql1pygbs1cars5mva7lxa96aq0fhn27n3vnn5zqrvdypn3ys4"; + libraryHaskellDepends = [ + base base-compat Cabal code-page containers deepseq directory + exceptions filepath ghc ghc-paths Glob process random syb + template-haskell transformers unordered-containers + ]; + testHaskellDepends = [ + base base-compat code-page containers deepseq directory exceptions + filepath ghc ghc-paths hspec hspec-core HUnit mockery process + QuickCheck setenv silently stringbuilder syb transformers + ]; + doHaddock = false; + description = "Test interactive Haskell examples"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -94147,22 +94427,17 @@ self: { }) {}; "exinst" = callPackage - ({ mkDerivation, base, binary, bytestring, constraints, deepseq - , hashable, profunctors, QuickCheck, singletons, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, base, binary, constraints, deepseq, hashable + , profunctors, QuickCheck, singletons }: mkDerivation { pname = "exinst"; - version = "0.8"; - sha256 = "08axj8yqnqbmxq4yi0fy2rffnkn7lcab2j13b9qlwl5ykc2jrhfh"; + version = "0.9"; + sha256 = "13qsqv1wmz30xvmzznndvzcy2y4qsc52vf21crjrixp38y8in80r"; libraryHaskellDepends = [ base binary constraints deepseq hashable profunctors QuickCheck singletons ]; - testHaskellDepends = [ - base binary bytestring constraints deepseq hashable profunctors - QuickCheck singletons tasty tasty-hunit tasty-quickcheck - ]; description = "Dependent pairs and their instances"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -94171,60 +94446,83 @@ self: { "exinst-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, constraints, exinst - , QuickCheck, singletons, tasty, tasty-quickcheck + , exinst-base, QuickCheck, singletons, tasty, tasty-quickcheck }: mkDerivation { pname = "exinst-aeson"; - version = "0.7.1"; - sha256 = "1rl9sg6bqac944dh4v6xish6fw6x5mr6a937nyq0yrjmg8d3gswp"; + version = "0.9"; + sha256 = "0d4nlx02rr4km0n2g1sc7qk3dzqcbh57lmw3baw3g83xfwmq20r9"; libraryHaskellDepends = [ aeson base constraints exinst singletons ]; testHaskellDepends = [ - aeson base bytestring exinst QuickCheck tasty tasty-quickcheck + aeson base bytestring exinst exinst-base QuickCheck tasty + tasty-quickcheck ]; - description = "Dependent pairs and their instances"; + description = "@exinst@ support for @aeson@ package"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "exinst-base" = callPackage + ({ mkDerivation, base, binary, bytestring, constraints, deepseq + , exinst, hashable, QuickCheck, singletons, singletons-base, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "exinst-base"; + version = "0.9"; + sha256 = "0kv7qxd2brzfbwpiihvwz7ph3vc6g0aysba897brxiifjvr602v0"; + libraryHaskellDepends = [ + base constraints exinst singletons singletons-base + ]; + testHaskellDepends = [ + base binary bytestring deepseq exinst hashable QuickCheck tasty + tasty-quickcheck + ]; + description = "@exinst@ support for @base@ package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; "exinst-bytes" = callPackage ({ mkDerivation, base, binary, bytes, bytestring, cereal - , constraints, exinst, exinst-cereal, QuickCheck, singletons, tasty - , tasty-quickcheck + , constraints, exinst, exinst-base, exinst-cereal, QuickCheck + , singletons, tasty, tasty-quickcheck }: mkDerivation { pname = "exinst-bytes"; - version = "0.7.1"; - sha256 = "0carx1qbs97pxj9bq6splar46myfjz8l0imqmy2nr868sf7an7q5"; + version = "0.9"; + sha256 = "0nla51kwdlspwya5vq8nc52px3f75is4n7qy6xmncsdffmr6bbcl"; libraryHaskellDepends = [ base bytes constraints exinst singletons ]; testHaskellDepends = [ - base binary bytes bytestring cereal exinst exinst-cereal QuickCheck - tasty tasty-quickcheck + base binary bytes bytestring cereal exinst exinst-base + exinst-cereal QuickCheck tasty tasty-quickcheck ]; - description = "Dependent pairs and their instances"; + description = "@exinst@ support for @bytes@ package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; "exinst-cereal" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, constraints - , exinst, QuickCheck, singletons, tasty, tasty-quickcheck + , exinst, exinst-base, QuickCheck, singletons, tasty + , tasty-quickcheck }: mkDerivation { pname = "exinst-cereal"; - version = "0.7.1"; - sha256 = "1ffya75sjy1b60a2c10zymshc8qi1b79rzgpa2mpvlr0glf5i32d"; + version = "0.9"; + sha256 = "19pnrh0z7xyx75hdkk6xqp88j45n2nndnsgc2hz2fxwqyly08cbz"; libraryHaskellDepends = [ base cereal constraints exinst singletons ]; testHaskellDepends = [ - base binary bytestring cereal exinst QuickCheck tasty + base binary bytestring cereal exinst exinst-base QuickCheck tasty tasty-quickcheck ]; - description = "Dependent pairs and their instances"; + description = "@exinst@ support for @cereal@ package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -94256,18 +94554,19 @@ self: { }) {}; "exinst-serialise" = callPackage - ({ mkDerivation, base, binary, constraints, exinst, QuickCheck - , serialise, singletons, tasty, tasty-quickcheck + ({ mkDerivation, base, binary, constraints, exinst, exinst-base + , QuickCheck, serialise, singletons, tasty, tasty-quickcheck }: mkDerivation { pname = "exinst-serialise"; - version = "0.7.1"; - sha256 = "06fqhxcqwam7160i2m0hsmbdkb0q21kv0vy5azilrbphhz4ycfvp"; + version = "0.9"; + sha256 = "0c6hbffyfjbrg3gfdd9wy8yvpwfffb9z9szwivqabr8yigdbhx0d"; libraryHaskellDepends = [ base constraints exinst serialise singletons ]; testHaskellDepends = [ - base binary exinst QuickCheck serialise tasty tasty-quickcheck + base binary exinst exinst-base QuickCheck serialise tasty + tasty-quickcheck ]; description = "Dependent pairs and their instances"; license = lib.licenses.bsd3; @@ -102867,6 +103166,18 @@ self: { license = lib.licenses.mpl20; }) {}; + "free-applicative-t" = callPackage + ({ mkDerivation, base, free, hedgehog, transformers }: + mkDerivation { + pname = "free-applicative-t"; + version = "0.1.0.0"; + sha256 = "15bamiy453fl4a2vygjwfywyqwkd46ddxn2v7g4r0y1v7z3y56yn"; + libraryHaskellDepends = [ base free ]; + testHaskellDepends = [ base hedgehog transformers ]; + description = "Free Applicative Transformer"; + license = lib.licenses.bsd3; + }) {}; + "free-categories" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -106518,8 +106829,8 @@ self: { }: mkDerivation { pname = "gemcap"; - version = "0.1.0"; - sha256 = "0173dhqdcfkkrlj3x3m0fml4rk3sfmiflwfp9bnpja7iq9br2vhf"; + version = "0.1.0.1"; + sha256 = "16ggh7axw9di8b9mwl4hjiqkhl2cqmr9lkd330gshwy8xrrc5ig0"; libraryHaskellDepends = [ base bytestring io-streams network tcp-streams text tls transformers x509 @@ -108877,7 +109188,7 @@ self: { mainProgram = "gh-pocket-knife"; }) {}; - "ghc_9_4_2" = callPackage + "ghc_9_4_4" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, Cabal , containers, deepseq, deriveConstants, directory, exceptions , filepath, genprimopcode, ghc-boot, ghc-heap, ghci, happy, hpc @@ -108886,8 +109197,8 @@ self: { }: mkDerivation { pname = "ghc"; - version = "9.4.2"; - sha256 = "1xqcc807pdlm2108iz138dh90ppa3v9swb0nfd790va1xvqdvn4c"; + version = "9.4.4"; + sha256 = "0s97l24miwwi0i9c1jgf7rqlmlc13qfncvp56d8wax4jzjlaa99c"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -111455,7 +111766,7 @@ self: { ]; libraryPkgconfigDepends = [ cairo ]; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "Cairo bindings"; @@ -112472,7 +112783,7 @@ self: { ]; libraryPkgconfigDepends = [ cairo pango ]; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "Pango bindings"; @@ -112499,7 +112810,7 @@ self: { ]; libraryPkgconfigDepends = [ cairo pango ]; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "PangoCairo bindings"; @@ -119691,6 +120002,8 @@ self: { pname = "graphql-client"; version = "1.2.1"; sha256 = "02wrwb5vgj4px6m178wmfzzy1d2h6018wj106n0j4lzbxyh107iy"; + revision = "1"; + editedCabalFile = "0483nnw03ddv94w02ffr93p5h4aabyv738fbf4qp1v0lrzd54v5k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121838,8 +122151,10 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "4.5.0.9"; - sha256 = "0mlpdfvg8vqylkl64czzc4w397zi3fmm81jvax0l3chjg3bx5i02"; + version = "4.5.0.10"; + sha256 = "0qpr04gv0zjnpigmxzls5jsx3d98cl9127z8ljy743m5j0ff5z6f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ]; librarySystemDepends = [ c libGL libX11 libXcursor libXi libXinerama libXrandr @@ -126488,16 +126803,16 @@ self: { "harfbuzz-pure" = callPackage ({ mkDerivation, base, bytestring, derive-storable, freetype2 - , harfbuzz, parallel, text, utf8-light + , harfbuzz, parallel, text }: mkDerivation { pname = "harfbuzz-pure"; - version = "1.0.0.0"; - sha256 = "1bydw57ab1qlicrs6cav3vk0jzqkvhnwb8c0k7ba48fmjyihi5fp"; + version = "1.0.0.1"; + sha256 = "1icdk19js4kqpw7krk0jl5yqilc52w7wchkylqr5p2zlrm92wp6k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring derive-storable freetype2 text utf8-light + base bytestring derive-storable freetype2 text ]; libraryPkgconfigDepends = [ harfbuzz ]; executableHaskellDepends = [ base bytestring parallel text ]; @@ -127017,6 +127332,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "hashable_1_4_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-array-byte + , deepseq, filepath, ghc-bignum, ghc-prim, HUnit, QuickCheck + , random, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.4.2.0"; + sha256 = "1y73606pcrs7zi6f4f07a5rkhc6620n1bx0adpa6j7xqhbm00h0v"; + libraryHaskellDepends = [ + base bytestring containers data-array-byte deepseq filepath + ghc-bignum ghc-prim text + ]; + testHaskellDepends = [ + base bytestring ghc-prim HUnit QuickCheck random test-framework + test-framework-hunit test-framework-quickcheck2 text unix + ]; + description = "A class for types that can be converted to a hash value"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hashable-accelerate" = callPackage ({ mkDerivation, accelerate, base, template-haskell }: mkDerivation { @@ -128473,6 +128811,8 @@ self: { pname = "haskell-language-server"; version = "1.9.0.0"; sha256 = "1bxf3q4yzchqvasxvidbsr0mzf299w2n11g3m85fmxm4q9bc1lkp"; + revision = "1"; + editedCabalFile = "19y9wid97a2c6x8cx2zq2r0asr8x0wlnvxmrj9qhfpvmk05sqrpm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136366,33 +136706,33 @@ self: { ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, array, async , base, base16-bytestring, binary, brick, bytestring, cereal , containers, cryptonite, data-dword, Decimal, deepseq, directory - , fgl, filemanip, filepath, free, haskeline, here, HUnit, lens + , filemanip, filepath, free, haskeline, here, HUnit, lens , lens-aeson, libff, megaparsec, memory, monad-par, mtl, multiset - , operational, optparse-generic, parsec, process, QuickCheck + , operational, optparse-generic, process, QuickCheck , quickcheck-instances, quickcheck-text, regex, regex-tdfa - , restless-git, rosezipper, s-cargot, scientific, secp256k1 - , semver-range, smt2-parser, spool, tasty, tasty-expected-failure - , tasty-hunit, tasty-quickcheck, temporary, text, time - , transformers, tree-view, tuple, unordered-containers, vector, vty - , witherable, word-wrap, wreq + , restless-git, rosezipper, scientific, secp256k1, smt2-parser + , spool, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, temporary, text, time, transformers, tree-view + , tuple, unordered-containers, vector, vty, witherable, word-wrap + , wreq }: mkDerivation { pname = "hevm"; - version = "0.50.1"; - sha256 = "07s6p22j8cagwyni8f362c0z9cmd7l0xhh6cm0xv1g7kphnla2qp"; + version = "0.50.2"; + sha256 = "1yhz8f175z1qypbdfcnbq47bjri3lv0mc2bcfkw0zza9g09mfcaz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ abstract-par aeson ansi-wl-pprint array async base base16-bytestring binary brick bytestring cereal containers - cryptonite data-dword Decimal deepseq directory fgl filemanip - filepath free haskeline here HUnit lens lens-aeson megaparsec - memory monad-par mtl multiset operational optparse-generic parsec - process QuickCheck quickcheck-instances quickcheck-text regex - regex-tdfa restless-git rosezipper s-cargot scientific semver-range - smt2-parser spool tasty tasty-expected-failure tasty-hunit - tasty-quickcheck temporary text time transformers tree-view tuple - unordered-containers vector vty witherable word-wrap wreq + cryptonite data-dword Decimal deepseq directory filemanip filepath + free haskeline here HUnit lens lens-aeson megaparsec memory + monad-par mtl multiset operational optparse-generic process + QuickCheck quickcheck-instances quickcheck-text regex regex-tdfa + restless-git rosezipper scientific smt2-parser spool tasty + tasty-expected-failure tasty-hunit tasty-quickcheck temporary text + time transformers tree-view tuple unordered-containers vector vty + witherable word-wrap wreq ]; librarySystemDepends = [ libff secp256k1 ]; executableHaskellDepends = [ @@ -136478,6 +136818,22 @@ self: { license = lib.licenses.mit; }) {}; + "hex-text_0_1_0_8" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, hspec, text + }: + mkDerivation { + pname = "hex-text"; + version = "0.1.0.8"; + sha256 = "06zp9hwvds9fss2206c34q1zv80pklhbxcyrirz1xnwl3ml28fb5"; + libraryHaskellDepends = [ base base16-bytestring bytestring text ]; + testHaskellDepends = [ + base base16-bytestring bytestring hspec text + ]; + description = "ByteString-Text hexidecimal conversions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hexchat" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -137146,6 +137502,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hgdal" = callPackage + ({ mkDerivation, base, fficxx, fficxx-runtime, gdal, stdcxx + , template-haskell + }: + mkDerivation { + pname = "hgdal"; + version = "1.0.0.0"; + sha256 = "0zfqa1rgmkch0gj15w9gqavl1lyvyi2i7jsm3n7srnrrhfchxvfb"; + libraryHaskellDepends = [ + base fficxx fficxx-runtime stdcxx template-haskell + ]; + libraryPkgconfigDepends = [ gdal ]; + description = "Haskell binding to the GDAL library"; + license = lib.licenses.bsd2; + }) {inherit (pkgs) gdal;}; + "hgdbmi" = callPackage ({ mkDerivation, base, directory, HUnit, parsec, process, stm , template-haskell, temporary, test-framework, test-framework-hunit @@ -140721,26 +141093,24 @@ self: { }) {}; "hls-call-hierarchy-plugin" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, extra - , filepath, ghc, ghcide, hiedb, hls-plugin-api, hls-test-utils - , lens, lsp, lsp-test, sqlite-simple, text, unordered-containers + ({ mkDerivation, aeson, base, containers, extra, filepath, ghcide + , ghcide-test-utils, hiedb, hls-plugin-api, hls-test-utils, lens + , lsp, lsp-test, sqlite-simple, text, unordered-containers }: mkDerivation { pname = "hls-call-hierarchy-plugin"; - version = "1.1.0.0"; - sha256 = "1010lwrgp3qs3i9rpsphfiq72d8qisvz4jn9rn09h1wdc10bl7sg"; + version = "1.2.0.0"; + sha256 = "0x5568l5n8dr7vnk12msczcabpg5ffqbqs50rg5gfj1w6n673y41"; libraryHaskellDepends = [ - aeson base bytestring containers extra ghc ghcide hiedb - hls-plugin-api lens lsp sqlite-simple text unordered-containers + aeson base containers extra ghcide hiedb hls-plugin-api lens lsp + sqlite-simple text unordered-containers ]; testHaskellDepends = [ - aeson base containers extra filepath hls-test-utils lens lsp - lsp-test text + aeson base containers extra filepath ghcide-test-utils + hls-test-utils lens lsp lsp-test text ]; description = "Call hierarchy plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-change-type-signature-plugin" = callPackage @@ -141954,8 +142324,8 @@ self: { }: mkDerivation { pname = "hmp3-ng"; - version = "2.12.1"; - sha256 = "15fm6kgdlhzz8y9mhfvmhh0dqzicifv6apsiwm964qbxhgv0ww4y"; + version = "2.14.2"; + sha256 = "1qx8gy63m0q2wb4q6aifrfqmdh0vnanvxxwa47jpwv641sxbp1ck"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141964,7 +142334,7 @@ self: { ]; executableSystemDepends = [ ncurses ]; description = "A 2019 fork of an ncurses mp3 player written in Haskell"; - license = "GPL"; + license = lib.licenses.gpl2Plus; mainProgram = "hmp3"; }) {inherit (pkgs) ncurses;}; @@ -142182,7 +142552,7 @@ self: { ]; }) {}; - "hnix-store-core_0_6_0_0" = callPackage + "hnix-store-core_0_6_1_0" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base , base16-bytestring, base64-bytestring, binary, bytestring, cereal , containers, cryptonite, directory, filepath, hashable, hspec @@ -142193,8 +142563,8 @@ self: { }: mkDerivation { pname = "hnix-store-core"; - version = "0.6.0.0"; - sha256 = "1ypwkwc21dx2716chv7qpq75qs7hshy45sdbgwk1h33maisnkn88"; + version = "0.6.1.0"; + sha256 = "1bziw2avcahqn2fpzw40s74kdw9wjvcplp6r2zrg83rbh2k1x73p"; libraryHaskellDepends = [ algebraic-graphs attoparsec base base16-bytestring base64-bytestring bytestring cereal containers cryptonite directory @@ -144758,8 +145128,8 @@ self: { pname = "hpc-lcov"; version = "1.1.0"; sha256 = "009z1i0ddjx7sazybirrpw99675p1fyl84ykg4dyypa7rz81vv3z"; - revision = "1"; - editedCabalFile = "0s1zx98fsa11kl4m34vrcs421pbp5f8za29xl59zp794632jng88"; + revision = "2"; + editedCabalFile = "11sbnn7rdfm7l7k3rcw4g4mvzrbgrw1jlyx726v47j3l39n54qsn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers hpc ]; @@ -148958,6 +149328,25 @@ self: { license = lib.licenses.mit; }) {}; + "hslua-module-text_1_0_3" = callPackage + ({ mkDerivation, base, hslua-core, hslua-marshalling + , hslua-packaging, tasty, tasty-hunit, tasty-lua, text + }: + mkDerivation { + pname = "hslua-module-text"; + version = "1.0.3"; + sha256 = "0gbdsld1f1qwkb311ll7c9mrvnjf7mfqfcgc9n3cnc8l5264s6kv"; + libraryHaskellDepends = [ + base hslua-core hslua-marshalling hslua-packaging text + ]; + testHaskellDepends = [ + base hslua-core hslua-packaging tasty tasty-hunit tasty-lua text + ]; + description = "Lua module for text"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hslua-module-version" = callPackage ({ mkDerivation, base, filepath, hslua-core, hslua-marshalling , hslua-packaging, tasty, tasty-hunit, tasty-lua, text @@ -157689,8 +158078,6 @@ self: { ]; description = "Functional Programming Language with Dependent Types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) gmp;}; "ieee" = callPackage @@ -162664,8 +163051,8 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "1.1.2.2"; - sha256 = "0hhaf7xhy3q48gkp2j01jjiiz0ww9mwwjh8brbqs8phlal03ks70"; + version = "1.1.2.3"; + sha256 = "0lrlq0dr9mahhda3yh2m6xly77kcpvcw3q0sz4s295vh0mmz0ac3"; libraryHaskellDepends = [ base bytestring conduit connection containers contravariant exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale @@ -162695,8 +163082,8 @@ self: { }: mkDerivation { pname = "irc-conduit"; - version = "0.3.0.5"; - sha256 = "02ziqjzqdyaizhrrzlbq4ddkfjfjf58jvwqfzrbf0mf0f5scv9cz"; + version = "0.3.0.6"; + sha256 = "0lr3csc9hp7g7m6x54vjbwdg3yxvl4lsr6818zf6n2r5s0x1vq42"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -166513,8 +166900,8 @@ self: { pname = "json-sop"; version = "0.2.1"; sha256 = "0kzl21669wh9vdxspliflciwrkn5wamwwyg96aqrm4ybdqscpcn4"; - revision = "1"; - editedCabalFile = "04xr0bx28hnp32w8hcqn3bfn90ncgimx1izdwh856jwgmqwj3v7b"; + revision = "2"; + editedCabalFile = "1izlsx427d3c485hlfi1agb2c7gmbnp43736694ia72y1vkcfvh0"; libraryHaskellDepends = [ aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector @@ -169655,6 +170042,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "ki-effectful" = callPackage + ({ mkDerivation, base, effectful-core, ki, stm, tasty, tasty-hunit + }: + mkDerivation { + pname = "ki-effectful"; + version = "0.1.0.0"; + sha256 = "00r7f666kzjvx54hpvq3aiq09a9zqja0x22bff94l4pdzrpx8ch2"; + libraryHaskellDepends = [ base effectful-core ki stm ]; + testHaskellDepends = [ base effectful-core stm tasty tasty-hunit ]; + description = "Adaptation of the ki library for the effectful ecosystem"; + license = lib.licenses.mit; + }) {}; + "ki-unlifted" = callPackage ({ mkDerivation, base, ki, unliftio-core }: mkDerivation { @@ -174159,6 +174559,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "lazy-cache" = callPackage + ({ mkDerivation, base, clock, hashable, hspec, hspec-discover + , HUnit, psqueues + }: + mkDerivation { + pname = "lazy-cache"; + version = "0.2.0.0"; + sha256 = "0645xv18m0l5pzwqfg974bwg92457na95i8hkfgvhnjrsbb3ijff"; + libraryHaskellDepends = [ base clock hashable psqueues ]; + testHaskellDepends = [ base clock hashable hspec HUnit ]; + testToolDepends = [ hspec-discover ]; + description = "Library for caching IO action that leverages on GHC RTS implementation"; + license = lib.licenses.mpl20; + }) {}; + "lazy-csv" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -174513,6 +174928,18 @@ self: { broken = true; }) {}; + "ldtk-types" = callPackage + ({ mkDerivation, aeson, base, text }: + mkDerivation { + pname = "ldtk-types"; + version = "0.1.0.0"; + sha256 = "0gf99imncx6b50jjv6nn6zf37xxq8kimhp14lxymbi86k6xl204z"; + libraryHaskellDepends = [ aeson base text ]; + testHaskellDepends = [ aeson base text ]; + description = "Datatypes and Aeson instances for parsing LDtk"; + license = lib.licenses.bsd3; + }) {}; + "leaf" = callPackage ({ mkDerivation, base, blaze-html, directory, filepath, pandoc , split @@ -177120,7 +177547,7 @@ self: { version = "0.1.1"; sha256 = "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi"; configureFlags = [ - "--extra-include-dir=${libxml2.dev}/include/libxml2" + "--extra-include-dir=${lib.getDev libxml2}/include/libxml2" ]; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ libxml2 ]; @@ -183028,8 +183455,8 @@ self: { }: mkDerivation { pname = "lumberjack"; - version = "1.0.1.0"; - sha256 = "0xyza6k73cnqldzqaaqrrx33lwk75gd6qkp85b7byckdkvyy8akh"; + version = "1.0.2.0"; + sha256 = "1yr1l1i5snmbc7h7aykc15mkynw5jcyzx9569hs4svcd92x0lf04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185808,6 +186235,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "mason_0_2_6" = callPackage + ({ mkDerivation, array, base, bytestring, ghc-prim, network, text + }: + mkDerivation { + pname = "mason"; + version = "0.2.6"; + sha256 = "10z98igmpswwdfak4b42p5c9rx14fj9zi2j5jb3b194ihi82dnd7"; + libraryHaskellDepends = [ + array base bytestring ghc-prim network text + ]; + description = "Fast and extensible bytestring builder"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "massiv" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions , primitive, random, scheduler, unliftio-core, vector @@ -187959,6 +188401,18 @@ self: { license = lib.licenses.asl20; }) {}; + "memfd_1_0_1_1" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "memfd"; + version = "1.0.1.1"; + sha256 = "1ngd65ixj4ydjp6aqhs1md6vck6mwyf12j5jc425gxnpvmbzwvw8"; + libraryHaskellDepends = [ base transformers ]; + description = "Open temporary anonymous Linux file handles"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "meminfo" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers }: mkDerivation { @@ -193607,10 +194061,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "monadplus"; - version = "1.4.2"; - sha256 = "15b5320wdpmdp5slpphnc1x4rhjch3igw245dp2jxbqyvchdavin"; - revision = "1"; - editedCabalFile = "11v5zdsb9mp1rxvgcrxcr2xnc610xi16krwa9r4i5d6njmphfbdp"; + version = "1.4.3"; + sha256 = "1gwy7kkcp696plfsbry22nvvqnainyv1n1van8yzskilz26k2yc5"; libraryHaskellDepends = [ base ]; description = "Haskell98 partial maps and filters over MonadPlus"; license = lib.licenses.bsd3; @@ -196540,6 +196992,8 @@ self: { pname = "mu-persistent"; version = "0.3.1.0"; sha256 = "0xhqp2ljgh9vjga1crqvb2gk3al3v0mw26aivd1pyi6rq9ncwcca"; + revision = "1"; + editedCabalFile = "15yhvp3snhj8b8lba5p14lgka8vsfm61pdn9m9ks661yy18f17zi"; libraryHaskellDepends = [ base monad-logger mu-schema persistent resource-pool resourcet transformers @@ -203142,22 +203596,29 @@ self: { }) {}; "nix-diff" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , directory, filepath, mtl, nix-derivation, optparse-applicative - , patience, process, text, unix, vector + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , directory, filepath, generic-arbitrary, mtl, nix-derivation + , optparse-applicative, patience, process, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, tasty-silver, text + , typed-process, uniplate, unix, vector }: mkDerivation { pname = "nix-diff"; - version = "1.0.18"; - sha256 = "0pqz207zywcs38w8yaq5qgbsps7vx0zf2wykaxq9zs43d74ygh64"; - revision = "2"; - editedCabalFile = "06zc80l50zaa7xp7svdfj5xvflim42g4j4jdkcbx1m5irr9384s1"; - isLibrary = false; + version = "1.0.19"; + sha256 = "0iscad4ydgg1365k64bzxn15pl4jnsv17jbzda4s0fs9ff4c5ias"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers directory filepath + generic-arbitrary mtl nix-derivation optparse-applicative patience + process QuickCheck quickcheck-instances text uniplate vector + ]; executableHaskellDepends = [ - attoparsec base bytestring containers directory filepath mtl - nix-derivation optparse-applicative patience process text unix - vector + aeson base bytestring containers mtl optparse-applicative text unix + ]; + testHaskellDepends = [ + aeson base bytestring containers mtl tasty tasty-quickcheck + tasty-silver text typed-process ]; description = "Explain why two Nix derivations differ"; license = lib.licenses.bsd3; @@ -205717,8 +206178,8 @@ self: { }: mkDerivation { pname = "nvfetcher"; - version = "0.5.0.0"; - sha256 = "0kglvniiqa3plxn973sl7dww75lxar5sf8ipjmgjryv9b0wxbv30"; + version = "0.6.0.0"; + sha256 = "0hhfnz5q076z92g1m4yx7y5qsxfimngkqx9r0781hkrcdmi1g2x8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206075,8 +206536,8 @@ self: { }: mkDerivation { pname = "oath"; - version = "0.0"; - sha256 = "1vrspqs9inhdwavz39z0fy05kjpbklz07qm4irx6h9w1552xwb77"; + version = "0.1.1"; + sha256 = "0n9zj2ygmjnkpi9viy97fz3qsyg2gryx0kkv5rvdh8bkimspvhm4"; libraryHaskellDepends = [ base stm stm-delay ]; testHaskellDepends = [ async base futures promise streamly unsafe-promises @@ -207671,6 +208132,27 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "oops" = callPackage + ({ mkDerivation, base, base-compat, doctest, doctest-discover, Glob + , hedgehog, hedgehog-quickcheck, hspec, hspec-discover + , hw-hspec-hedgehog, lens, mtl, QuickCheck, template-haskell + , transformers + }: + mkDerivation { + pname = "oops"; + version = "0.1.2.0"; + sha256 = "025vgnlnilja8sn66w34iy7vc83cpidg3vcvjl1vf1inmncsydrh"; + libraryHaskellDepends = [ base mtl QuickCheck transformers ]; + testHaskellDepends = [ + base base-compat doctest doctest-discover Glob hedgehog + hedgehog-quickcheck hspec hw-hspec-hedgehog lens QuickCheck + template-haskell + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Combinators for handling errors of many types in a composable way"; + license = lib.licenses.mit; + }) {}; + "op" = callPackage ({ mkDerivation, base, containers, doctest }: mkDerivation { @@ -209131,19 +209613,19 @@ self: { }) {}; "openweathermap" = callPackage - ({ mkDerivation, aeson, base, directory, http-api-data, http-client - , optparse-applicative, servant, servant-client - , servant-client-core, time, xdg-basedir + ({ mkDerivation, aeson, base, bytestring, directory, http-api-data + , http-client-tls, optparse-applicative, servant, servant-client + , servant-client-core, text, time, xdg-basedir }: mkDerivation { pname = "openweathermap"; - version = "0.2.0"; - sha256 = "1sd8rflm3zakpgm5va9rwdw9si4cbqyvdmpysw55ly6mzgvfxad1"; + version = "0.3.0"; + sha256 = "0v6gq42jms12nmprcracarj9rbmqgbfx9sr3q87r230fbzjgq4hb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base http-api-data http-client servant servant-client - servant-client-core + aeson base bytestring http-api-data http-client-tls servant + servant-client servant-client-core text ]; executableHaskellDepends = [ base directory optparse-applicative time xdg-basedir @@ -210370,24 +210852,23 @@ self: { mainProgram = "ormolu"; }) {}; - "ormolu_0_5_1_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring - , Cabal-syntax, containers, Diff, directory, dlist, exceptions + "ormolu_0_5_2_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, binary, bytestring + , Cabal-syntax, containers, Diff, directory, dlist, file-embed , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, QuickCheck, syb, template-haskell, temporary, text - , th-lift-instances + , path, path-io, QuickCheck, syb, temporary, text }: mkDerivation { pname = "ormolu"; - version = "0.5.1.0"; - sha256 = "186pa7wpsqipy1vwk1h5w3a5akjknsmmkc18x4i1fvrpigbrcbw9"; + version = "0.5.2.0"; + sha256 = "1ai2wza4drirvf9pb7qsf03kii5jiayqs49c19ir93jd0ak9pi96"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal array base bytestring Cabal-syntax containers - Diff directory dlist exceptions filepath ghc-lib-parser megaparsec - MemoTrie mtl syb template-haskell text th-lift-instances + ansi-terminal array base binary bytestring Cabal-syntax containers + Diff directory dlist file-embed filepath ghc-lib-parser megaparsec + MemoTrie mtl syb text ]; executableHaskellDepends = [ base containers filepath ghc-lib-parser gitrev optparse-applicative @@ -210395,7 +210876,7 @@ self: { ]; testHaskellDepends = [ base containers directory filepath ghc-lib-parser hspec - hspec-megaparsec megaparsec path path-io QuickCheck temporary text + hspec-megaparsec path path-io QuickCheck temporary text ]; testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; @@ -213904,8 +214385,8 @@ self: { }: mkDerivation { pname = "parser-unbiased-choice-monad-embedding"; - version = "0.0.0.3"; - sha256 = "0p8w52f5bmf1y9b6zw5sc8dhhbm4lf8ld59j52a50piyyyl9y0xi"; + version = "0.0.0.4"; + sha256 = "1gp44c30xj37kym32j7vkl103ks0arb13xjrsar1zmlzzafa9fhz"; libraryHaskellDepends = [ base containers Earley srcloc ]; testHaskellDepends = [ base doctest lexer-applicative regex-applicative @@ -214819,6 +215300,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "path-io_1_8_0" = callPackage + ({ mkDerivation, base, containers, directory, dlist, exceptions + , filepath, hspec, path, temporary, time, transformers, unix-compat + }: + mkDerivation { + pname = "path-io"; + version = "1.8.0"; + sha256 = "1iq6yj5kj8i20sr4h8rabway76hk0xmy9mi499xv22php3vb79l3"; + libraryHaskellDepends = [ + base containers directory dlist exceptions filepath path temporary + time transformers unix-compat + ]; + testHaskellDepends = [ + base directory exceptions filepath hspec path transformers + unix-compat + ]; + description = "Interface to ‘directory’ package for users of ‘path’"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "path-like" = callPackage ({ mkDerivation, base, path }: mkDerivation { @@ -214932,8 +215434,8 @@ self: { pname = "paths"; version = "0.2.0.0"; sha256 = "18pzjlnmx7w79riig7qzyhw13jla92lals9lwayl23qr02ndna4v"; - revision = "3"; - editedCabalFile = "15h5fqql4jj950lm5yddpxczcbslckq9sg2ygdgqlmahjw8mwnnf"; + revision = "4"; + editedCabalFile = "0zf4aij0jq4g77nzgr9b54f305h9gy8yjdzbp3cmpyschxbh16pd"; libraryHaskellDepends = [ base bytestring deepseq directory filepath template-haskell text time @@ -216866,7 +217368,7 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; - "persistent_2_14_4_3" = callPackage + "persistent_2_14_4_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 @@ -216877,8 +217379,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.14.4.3"; - sha256 = "057jsf32csrnvfavlz3zgk70ql6y5b8xx4zkmwfg4g6ghsh8gkcv"; + version = "2.14.4.4"; + sha256 = "10i75da5rd5ydg17x93i3jkfx51cywxn37l4km1lr9p35lzhyfa3"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers deepseq fast-logger http-api-data lift-type @@ -217848,8 +218350,10 @@ self: { }: mkDerivation { pname = "pg-entity"; - version = "0.0.4.0"; - sha256 = "0j3q31rsqv6pl86lcdl6hwbdnbjy00lv9v2nvi7vdd18wksy85bf"; + version = "0.0.4.1"; + sha256 = "0fr0lzr7l31ai134c87jgqabw619ggj478ynq9mp1fq37hd11rbp"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring colourista exceptions monad-control parsec pg-transact postgresql-simple resource-pool safe-exceptions @@ -219548,8 +220052,8 @@ self: { }: mkDerivation { pname = "ping"; - version = "0.1.0.3"; - sha256 = "1h57p53vakjxm3g6inp9wvj5pp71qb0mpcrxbaa707w8v9lyvwwi"; + version = "0.1.0.4"; + sha256 = "0kj2fh6079xy20mk6ikjvmyb19zf21nglblhzazcmcbk921bmffm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -222629,6 +223133,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "poly_0_5_1_0" = callPackage + ({ mkDerivation, base, deepseq, finite-typelits, mod, primitive + , QuickCheck, quickcheck-classes, quickcheck-classes-base + , semirings, tasty, tasty-bench, tasty-quickcheck, vector + , vector-algorithms, vector-sized + }: + mkDerivation { + pname = "poly"; + version = "0.5.1.0"; + sha256 = "0ycjdan9l92glnqr0lms2kdjfs5dg9c2ky2w2rdmrc6nzzxajd9k"; + libraryHaskellDepends = [ + base deepseq finite-typelits primitive semirings vector + vector-algorithms vector-sized + ]; + testHaskellDepends = [ + base finite-typelits mod QuickCheck quickcheck-classes + quickcheck-classes-base semirings tasty tasty-quickcheck vector + vector-sized + ]; + benchmarkHaskellDepends = [ + base deepseq mod semirings tasty-bench vector + ]; + description = "Polynomials"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "poly-arity" = callPackage ({ mkDerivation, base, constraints }: mkDerivation { @@ -224918,6 +225449,21 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; + "postgresql-libpq_0_9_5_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }: + mkDerivation { + pname = "postgresql-libpq"; + version = "0.9.5.0"; + sha256 = "0w2l687r9z92snvd0cjyv3dxghgr5alyw0vc2c6bp2600pc2nnfi"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring unix ]; + librarySystemDepends = [ postgresql ]; + testHaskellDepends = [ base bytestring ]; + description = "low-level binding to libpq"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) postgresql;}; + "postgresql-libpq-notify" = callPackage ({ mkDerivation, async, base, hspec, postgres-options , postgresql-libpq, stm, text, tmp-postgres @@ -229905,8 +230451,8 @@ self: { }: mkDerivation { pname = "proto-lens-jsonpb"; - version = "0.2.1"; - sha256 = "0ax5zkg9qa7mh4x38nchahr1n1x2wyaasplknig4hgza7xkcmmas"; + version = "0.2.2"; + sha256 = "1vbaq2qzva5in2fq0nlka39pqgm0xwsqdfjxikhiw8sx7aj7biy3"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring proto-lens-runtime text vector @@ -232214,6 +232760,8 @@ self: { pname = "qbe"; version = "1.1.0.0"; sha256 = "0hjllz846a7dyfrvjgqhjlkbhzbwhqdrvn3x0hijly01allcypr2"; + revision = "1"; + editedCabalFile = "0sxss7jkdp2g01wsgwb3zyrbd5bc5lcjd6vg5ygfci8bx1ikhjkc"; libraryHaskellDepends = [ base bytestring deepseq hashable prettyprinter text text-short ]; @@ -235912,8 +236460,8 @@ self: { ({ mkDerivation, base, stm, time, time-units }: mkDerivation { pname = "rate-limit"; - version = "1.4.2"; - sha256 = "0zb19vwzyj1vg890776r3bprmjzhs9kr2r1vqa42nxv9nvwvnljm"; + version = "1.4.3"; + sha256 = "0xhksvhl0cr5kfvdfnlk78jrn4kvj2h54x19ixp356b4xxijdy9x"; libraryHaskellDepends = [ base stm time time-units ]; description = "A basic library for rate-limiting IO actions"; license = lib.licenses.bsd3; @@ -236246,6 +236794,8 @@ self: { libraryHaskellDepends = [ base h-raylib ]; description = "Haskell bindings for rlImGui"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "raz" = callPackage @@ -237989,8 +238539,8 @@ self: { }: mkDerivation { pname = "redis-glob"; - version = "0.1.0.2"; - sha256 = "0lm0bnl562bvxl3mdh0qkjl6jj10zglmyg4qwlylx3qicpdqf4lw"; + version = "0.1.0.3"; + sha256 = "11cq30hl284cqgbsy5n4nn9aq7y84cca4skkv0ib9b6ddn97gbkf"; libraryHaskellDepends = [ ascii-char ascii-superset base bytestring megaparsec ]; @@ -244129,11 +244679,10 @@ self: { }: mkDerivation { pname = "ridley"; - version = "0.3.4.0"; - sha256 = "0ml6hcngszn6jnk0qdilxzjzjsn4i36bvr98g61dai5589892j86"; + version = "0.3.4.1"; + sha256 = "03y25hcmh38psf5gs28aa21ibkcg16d3kk2xmv073v50b14dxysr"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ async auto-update base containers ekg-core ekg-prometheus-adapter exceptions inline-c katip microlens microlens-th mtl process @@ -245217,8 +245766,8 @@ self: { ({ mkDerivation, base, optparse-applicative, rollbar-client }: mkDerivation { pname = "rollbar-cli"; - version = "0.1.0"; - sha256 = "1fspvwhgng251m5paps2nj3x73c1bms4s9y202nbdnil0wb1wdlf"; + version = "1.0.0"; + sha256 = "17lhvd4b4jfiy577jf00zw36y01xih792ylwrpw0ih1ljj90n14z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245239,8 +245788,8 @@ self: { }: mkDerivation { pname = "rollbar-client"; - version = "0.1.0"; - sha256 = "18ca2mrvl7kn226jnrv2yaqwanx6spf0sg034asp5bwnhn15fvb9"; + version = "1.0.0"; + sha256 = "0jpd2cizqm17f7645s5l3nbnjmc2qprww4hr5nwdi0z22kqvvqia"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245288,8 +245837,8 @@ self: { }: mkDerivation { pname = "rollbar-wai"; - version = "0.1.0"; - sha256 = "19a1pngqprnmpl4547vssbha4nzjj9930ln4qyv8yk4skqkvny4j"; + version = "1.0.0"; + sha256 = "0s8lnm99af4n3496axvxl05sj5g79i9gfwpgk35h4dvjqdf6kvzb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245312,8 +245861,8 @@ self: { }: mkDerivation { pname = "rollbar-yesod"; - version = "0.1.0"; - sha256 = "1azz0braw91mcw3gibixgpa6bd6z76k8q742qzai3xz1pivdf09f"; + version = "1.0.0"; + sha256 = "1hiaiks0qw692932hpliddk56zrz984nq7bfqh9k5ia4ymik1zbn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250633,8 +251182,8 @@ self: { pname = "sdl2"; version = "2.5.4.0"; sha256 = "1g35phifz49kxk48s8jmgglxhxl79cbzc1cg2qlgk0vdpxpin8ym"; - revision = "1"; - editedCabalFile = "19kr714da3lp064h1ky1bxwgkcrjy2ks5qby6214fj99dg7rxipr"; + revision = "2"; + editedCabalFile = "1yxzq4gb6ig3d94lc76i5d50fa0j1fxr1wdlmgwhkvlfd4xnh6sg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -256515,8 +257064,8 @@ self: { }: mkDerivation { pname = "sexpresso"; - version = "1.2.1.0"; - sha256 = "18di6krrrclilp74fazwlsfcq3jym9mmya8q0x2vm2cdgbpjm8mi"; + version = "1.2.2.0"; + sha256 = "1lzh70zx5lnjbz0h95icdl06lmcig8d093frk46fdydgzl3z9mgw"; libraryHaskellDepends = [ base bifunctors containers megaparsec recursion-schemes text ]; @@ -257931,19 +258480,18 @@ self: { }) {}; "shh" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, doctest, filepath, markdown-unlit, mtl, process, split - , stringsearch, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, temporary, unix, utf8-string + ({ mkDerivation, async, base, bytestring, Cabal, cabal-doctest + , containers, deepseq, directory, doctest, filepath, markdown-unlit + , mtl, process, PyF, split, stringsearch, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, unix, utf8-string }: mkDerivation { pname = "shh"; - version = "0.7.2.0"; - sha256 = "0rcjvkpxdwvhgn7i1dindhbskr8kwgm977kxgi2xcv398c71014y"; - revision = "1"; - editedCabalFile = "054bjhpkni3nr6zsilj77gdgb2yw5s1gzm257zz4kigpjjjndr0a"; + version = "0.7.2.1"; + sha256 = "1p46q07mdk9w6agm5ggy34r62fqw6zlx4d32pkby852piy7aknnv"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base bytestring containers deepseq directory filepath mtl process split stringsearch template-haskell unix utf8-string @@ -257952,8 +258500,8 @@ self: { async base bytestring deepseq directory temporary unix ]; testHaskellDepends = [ - async base bytestring directory doctest filepath tasty tasty-hunit - tasty-quickcheck utf8-string + async base bytestring directory doctest filepath PyF tasty + tasty-hunit tasty-quickcheck utf8-string ]; testToolDepends = [ markdown-unlit ]; description = "Simple shell scripting from Haskell"; @@ -257965,10 +258513,8 @@ self: { ({ mkDerivation, base, hostname, shh, tasty, time }: mkDerivation { pname = "shh-extras"; - version = "0.1.0.1"; - sha256 = "0w4ddjszs0lrpr4zcggcwb80bg3yd8lr628jngmh4a05ypv3hxkk"; - revision = "2"; - editedCabalFile = "1sfj2li0p0bq1dmk85i74jmgcz28vb2q151d16rcjzx8x07kyrq4"; + version = "0.1.0.2"; + sha256 = "0yax761d0xgc8nqg8h7y69fb1mwf88w73sznh3kffhlaladavskx"; libraryHaskellDepends = [ base hostname shh time ]; testHaskellDepends = [ base tasty ]; description = "Utility functions for using shh"; @@ -261111,6 +261657,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "skew-list" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, hashable + , indexed-traversable, QuickCheck, ral, strict, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "skew-list"; + version = "0.1"; + sha256 = "1j0rc1s3mpf933wl4fifik62d68hx1py8g8wwxz69ynfhjhf9fa2"; + libraryHaskellDepends = [ + base deepseq hashable indexed-traversable QuickCheck strict + ]; + testHaskellDepends = [ + base indexed-traversable QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base containers criterion ral vector ]; + description = "Random access lists: skew binary"; + license = lib.licenses.bsd3; + }) {}; + "skews" = callPackage ({ mkDerivation, async, base, bytestring, deque, envy, hspec , network, websockets @@ -264802,8 +265369,8 @@ self: { pname = "sockets-and-pipes"; version = "0.3"; sha256 = "0hlq64nh7iw7brn11j7xhy1zcmk0iczarg7ig7z2i7ny11czi73l"; - revision = "1"; - editedCabalFile = "15jp7k379madgg5rd3rzlnz3502114yzd1yiwcrvmcj6bdhcnrf9"; + revision = "2"; + editedCabalFile = "02vwkv8qvm270rybn68yb6n7z387g1bv2iwn4pa397l94225ny7l"; libraryHaskellDepends = [ aeson ascii async attoparsec base blaze-html bytestring containers directory filepath list-transformer network network-simple relude @@ -268952,8 +269519,8 @@ self: { }: mkDerivation { pname = "stackctl"; - version = "1.1.3.0"; - sha256 = "16skijv82199x4q2w563bk9xcmwd4i6mdavdr89p16cf8mwqrr7m"; + version = "1.1.3.1"; + sha256 = "0mzn546zjgqjiky4mv19ap1qa6xxdf280qkmq041d9sj5s4xp2vh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -268965,7 +269532,9 @@ self: { uuid yaml ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base bytestring hspec mtl QuickCheck yaml ]; + testHaskellDepends = [ + aeson base bytestring hspec mtl QuickCheck yaml + ]; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "stackctl"; @@ -273896,6 +274465,8 @@ self: { pname = "successors"; version = "0.1.0.3"; sha256 = "15pydjb9f7ycjclv5qq0ll8iaf8vpb6241ja858vkkfpz4rsciyv"; + revision = "1"; + editedCabalFile = "10vsqfgpzrc1mr27956s0r84hy37vz2dvq7klskn74qisnhv52kz"; libraryHaskellDepends = [ base ]; description = "An applicative functor to manage successors"; license = lib.licenses.mit; @@ -275254,6 +275825,33 @@ self: { mainProgram = "Swish"; }) {}; + "swish_0_10_3_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , HUnit, intern, mtl, network-uri, polyparse, semigroups + , test-framework, test-framework-hunit, text, time + }: + mkDerivation { + pname = "swish"; + version = "0.10.3.0"; + sha256 = "0qn3nmgxiyvvxv1hxdc6lgc5q8n53kj8lmdzvvjnq4q8s5mh5lhn"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable intern mtl network-uri + polyparse text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hashable HUnit network-uri semigroups + test-framework test-framework-hunit text time + ]; + description = "A semantic web toolkit"; + license = lib.licenses.lgpl21Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "Swish"; + }) {}; + "swiss" = callPackage ({ mkDerivation, base, bytestring, parallel, time }: mkDerivation { @@ -276801,8 +277399,8 @@ self: { }: mkDerivation { pname = "synthesizer-dimensional"; - version = "0.8.1"; - sha256 = "0a8frn0k4dc0kh71arcqpc1z4dilr8c7yqpp6j80llh12lrcp6f4"; + version = "0.8.1.1"; + sha256 = "0giaa6v2yvb0amvdzdv5bq7dsns9pgbzv7sgjdi4a4zy0x4gmhc4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -283250,8 +283848,8 @@ self: { }: mkDerivation { pname = "text-replace"; - version = "0.1.0.2"; - sha256 = "13c0iz17x0snfhv6nmwns79j601aqnc8pvxrbn3gz7sprxwf330j"; + version = "0.1.0.3"; + sha256 = "17pxhf42r5f2zm74jivkwljsz5vyjzvvdln00jlvhryrg7vb3dah"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers text ]; @@ -284133,6 +284731,21 @@ self: { license = lib.licenses.mit; }) {}; + "th-letrec" = callPackage + ({ mkDerivation, base, containers, some, template-haskell + , transformers + }: + mkDerivation { + pname = "th-letrec"; + version = "0.1"; + sha256 = "0z9j8a7p9m5kp3zzia593zbzfmqc6himrzzjfk7nplv6vfh36yah"; + libraryHaskellDepends = [ + base containers some template-haskell transformers + ]; + description = "Implicit (recursive) let insertion"; + license = lib.licenses.bsd3; + }) {}; + "th-lift" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction }: @@ -291966,8 +292579,8 @@ self: { }: mkDerivation { pname = "twirp"; - version = "0.2.0.1"; - sha256 = "05np0zvnvy8wrm9lirrkwhd0n8f44j4xwr6lrywxxy9r00mx8bbl"; + version = "0.2.2.0"; + sha256 = "1n69f1pwcw0ig7j92yi94hh50c5jyn03bc7y5gybw2ajz412iz2h"; libraryHaskellDepends = [ aeson base bytestring http-media http-types proto-lens proto-lens-jsonpb proto-lens-runtime servant text wai @@ -294911,6 +295524,18 @@ self: { license = lib.licenses.asl20; }) {}; + "unfork_1_0_0_1" = callPackage + ({ mkDerivation, async, base, safe-exceptions, stm }: + mkDerivation { + pname = "unfork"; + version = "1.0.0.1"; + sha256 = "0rg2aklr77ba3k1kbd57p42jj0w23rc7rir1iczfskcdj7ki2rjm"; + libraryHaskellDepends = [ async base safe-exceptions stm ]; + description = "Make any action thread safe"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "unfree" = callPackage ({ mkDerivation, base, deepseq, hashable, recursion-schemes, tasty , tasty-hunit @@ -295310,12 +295935,12 @@ self: { }: mkDerivation { pname = "unicode-tricks"; - version = "0.11.0.0"; - sha256 = "0f1r8s69if5hjqy1p13b30f8wnbc52sya4zdcw3krwvmizwqq3dh"; + version = "0.12.1.0"; + sha256 = "139hrmxqw1f4gchv8wlyy3x1xfwcv5zzpdz0f3b6xm6v4zbwy101"; libraryHaskellDepends = [ base containers data-default deepseq hashable QuickCheck text ]; - testHaskellDepends = [ base hashable hspec QuickCheck ]; + testHaskellDepends = [ base hashable hspec QuickCheck text ]; testToolDepends = [ hspec-discover ]; description = "Functions to work with unicode blocks more convenient"; license = lib.licenses.bsd3; @@ -306360,8 +306985,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "2.4.0"; - sha256 = "1lwg1a4i7gb0l58bsyn1sg2q31ns79ldw4nv6hbnh4rqq1rv7vx4"; + version = "2.4.1"; + sha256 = "1z17w8q0s1pgqrxx7f1zijy1j4fwl8x2f5r9y11i0vcsqlx12pi9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -306473,8 +307098,8 @@ self: { }: mkDerivation { pname = "welford-online-mean-variance"; - version = "0.1.0.2"; - sha256 = "041z3vgbnv2q6a9w80rjws3y0lwb56z1ws2ic8pyx79dvjb0y55q"; + version = "0.1.0.4"; + sha256 = "0nzr6krkaa39h9v25hbagnw1f2g45dqrv8ifhvh16m4k7xf17xla"; libraryHaskellDepends = [ base cereal deepseq vector ]; testHaskellDepends = [ base cereal deepseq QuickCheck tasty tasty-discover @@ -307262,6 +307887,26 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "witch_1_1_6_0" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit, tagged + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "witch"; + version = "1.1.6.0"; + sha256 = "0bhrf3c3djchi2y0rcz015g34a4g8f1pfc8r89kpqbf2pfd8gw73"; + libraryHaskellDepends = [ + base bytestring containers tagged template-haskell text time + ]; + testHaskellDepends = [ + base bytestring containers HUnit tagged text time transformers + ]; + description = "Convert values from one type into another"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -308919,8 +309564,8 @@ self: { }: mkDerivation { pname = "wstunnel"; - version = "0.4.1.0"; - sha256 = "022x4g1ya5676v7q0q3rzwn6rzlnz74f8xwwp3mnvyih025cx770"; + version = "0.5.0.0"; + sha256 = "0qm6n009p9lyb5iy5rbrlwvcfcqdnlpxvc5cy02f3xyf9h8ikwkp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -309603,21 +310248,21 @@ self: { }) {}; "xdg-basedir-compliant" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , hspec, path, polysemy, polysemy-plugin, polysemy-zoo, QuickCheck - , split + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, path, polysemy, polysemy-plugin, polysemy-zoo + , QuickCheck, split }: mkDerivation { pname = "xdg-basedir-compliant"; - version = "1.1.0"; - sha256 = "15m38hhfa5bx5nsp7xmwjv4xk3rzw0ci1mnx8hivi7j7yk8xwc5s"; + version = "1.2.0"; + sha256 = "1sqr202bi12acchvnj44n12bf4ay9k6w8yqysnzy35sfl373cch5"; libraryHaskellDepends = [ - base bytestring directory filepath path polysemy polysemy-plugin - polysemy-zoo split + base bytestring containers directory filepath path polysemy + polysemy-plugin polysemy-zoo split ]; testHaskellDepends = [ - aeson base bytestring directory filepath hspec path polysemy - polysemy-plugin polysemy-zoo QuickCheck split + aeson base bytestring containers directory filepath hspec path + polysemy polysemy-plugin polysemy-zoo QuickCheck split ]; description = "XDG Basedir"; license = lib.licenses.bsd3; @@ -311046,8 +311691,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.45"; - sha256 = "0p64z535lk338f247gvddc6c4326xs41ar817whdvzj2910pyn86"; + version = "0.46"; + sha256 = "0glpiq7c0qwfcxnc2flgzj7afm5m1a9ghzwwcq7f8q27m21kddrd"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index a702f9fd3f3..c3c0687d2cf 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -351,8 +351,14 @@ in with passthru; stdenv.mkDerivation ({ license = lib.licenses.psfl; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ fridh thiagokokada ]; - # Higher priority than Python 3.x so that `/bin/python` points to `/bin/python2` - # in case both 2 and 3 are installed. - priority = -100; + knownVulnerabilities = [ + "Python 2.7 has reached its end of life after 2020-01-01. See https://www.python.org/doc/sunset-python-2/." + # Quote: That means that we will not improve it anymore after that day, + # even if someone finds a security problem in it. You should upgrade to + # Python 3 as soon as you can. [..] So, in 2008, we announced that we + # would sunset Python 2 in 2015, and asked people to upgrade before + # then. Some did, but many did not. So, in 2014, we extended that + # sunset till 2020. + ]; }; } // crossCompileEnv) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 09f824a4eaf..a497b6d5f66 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -234,13 +234,13 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "9"; + patch = "11"; }; - sha256 = "sha256-ObCXKVb2VIzlgoAZ264SUDwy1svpGivs+I0+QsxSGXs="; + sha256 = "sha256-ERevtmgx2k6m852NIIR4enRon9AineC+MB+e2bJVCTw="; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; - python = __splicedPackages.python27; + python = __splicedPackages.pythonInterpreters.pypy27_prebuilt; inherit passthruFun; inherit (darwin) libunwind; inherit (darwin.apple_sdk.frameworks) Security; @@ -251,13 +251,13 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "9"; + patch = "11"; }; - sha256 = "sha256-Krqh6f4ewOIzyfvDd6DI6aBjQICo9PMOtomDAfZhjBI="; + sha256 = "sha256-sPMWb7Klqt/VzrnbXN1feSmg7MygK0omwNrgSS98qOo="; pythonVersion = "3.9"; db = db.override { dbmSupport = !stdenv.isDarwin; }; - python = __splicedPackages.python27; + python = __splicedPackages.pypy27; inherit passthruFun; inherit (darwin) libunwind; inherit (darwin.apple_sdk.frameworks) Security; @@ -266,24 +266,26 @@ in { pypy38 = __splicedPackages.pypy39.override { self = __splicedPackages.pythonInterpreters.pypy38; pythonVersion = "3.8"; - sha256 = "sha256-W12dklbxKhKa+DhOL1gb36s7wPu+OgpIDZwdLpVJDrE="; - }; - pypy37 = __splicedPackages.pypy39.override { - self = __splicedPackages.pythonInterpreters.pypy37; - pythonVersion = "3.7"; - sha256 = "sha256-cEJhY7GU7kYAmYbuptlCYJij/7VS2c29PfqmSkc3P0k="; + sha256 = "sha256-TWdpv8pzc06GZv1wUDt86wam4lkRDmFzMbs4mcpOYFg="; }; + pypy37 = throw "pypy37 has been removed from nixpkgs since it is no longer supported upstream"; # Added 2023-01-04 + pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix { # Not included at top-level self = __splicedPackages.pythonInterpreters.pypy27_prebuilt; sourceVersion = { major = "7"; minor = "3"; - patch = "9"; + patch = "11"; }; - sha256 = "sha256-FyqSiwCWp+ALfVj1I/VzAMNcPef4IkkeKnvIRTdcI/g="; # linux64 + sha256 = { + aarch64-linux = "sha256-6pJNod7+kyXvdg4oiwT5hGFOQFWA9TIetqXI9Tm9QVo="; + x86_64-linux = "sha256-uo7ZWKkFwHNaTP/yh1wlCJlU3AIOCH2YKw/6W52jFs0="; + aarch64-darwin = "sha256-zFaWq0+TzTSBweSZC13t17pgrAYC+hiQ02iImmxb93E="; + x86_64-darwin = "sha256-Vt7unCJkD1aGw1udZP2xzjq9BEWD5AePCxccov0qGY4="; + }.${stdenv.system}; pythonVersion = "2.7"; inherit passthruFun; }; @@ -294,9 +296,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "9"; + patch = "11"; }; - sha256 = "sha256-RoGMs9dLlrNHh1SDQ9Jm4lYrUx3brzMDg7qTD/GTDtU="; # linux64 + sha256 = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE="; # linux64 pythonVersion = "3.9"; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 0c3b73e9fd5..801099dd44b 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -156,7 +156,7 @@ in with passthru; stdenv.mkDerivation rec { ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} ${lib.optionalString stdenv.isDarwin '' - install_name_tool -change @rpath/libpypy${optionalString isPy3k "3"}-c.dylib $out/lib/libpypy${optionalString isPy3k "3"}-c.dylib $out/bin/${executable} + install_name_tool -change @rpath/lib${executable}-c.dylib $out/lib/lib${executable}-c.dylib $out/bin/${executable} ''} # verify cffi modules @@ -173,7 +173,8 @@ in with passthru; stdenv.mkDerivation rec { homepage = "http://pypy.org/"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; - platforms = [ "aarch64-linux" "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; + broken = stdenv.isDarwin && stdenv.isAarch64; maintainers = with maintainers; [ andersk ]; }; } diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 69de6e94e37..7c5d94f4744 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -1,18 +1,18 @@ { lib , stdenv , fetchurl +, autoPatchelfHook , python-setup-hook , self -, which # Dependencies , bzip2 -, sqlite -, zlib -, openssl , expat +, gdbm , ncurses6 +, sqlite , tcl-8_5 , tk-8_5 +, zlib # For the Python package set , packageOverrides ? (self: super: {}) , sourceVersion @@ -46,18 +46,7 @@ let pname = "${passthru.executable}_prebuilt"; version = with sourceVersion; "${major}.${minor}.${patch}"; - majorVersion = substring 0 1 pythonVersion; - - deps = [ - bzip2 - sqlite - zlib - openssl - expat - ncurses6 - tcl-8_5 - tk-8_5 - ]; + majorVersion = lib.versions.major pythonVersion; in with passthru; stdenv.mkDerivation { inherit pname version; @@ -67,9 +56,22 @@ in with passthru; stdenv.mkDerivation { inherit sha256; }; - buildInputs = [ which ]; + buildInputs = [ + bzip2 + expat + gdbm + ncurses6 + sqlite + tcl-8_5 + tk-8_5 + zlib + ]; + + nativeBuildInputs = [ autoPatchelfHook ]; installPhase = '' + runHook preInstall + mkdir -p $out echo "Moving files to $out" mv -t $out bin include lib @@ -78,24 +80,20 @@ in with passthru; stdenv.mkDerivation { rm $out/bin/*.debug - echo "Patching binaries" - interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf))) - patchelf --set-interpreter $interpreter \ - --set-rpath $out/lib \ - $out/bin/pypy* - - pushd $out - - find ./lib -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \; - find ./lib -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \; - echo "Removing bytecode" - find . -name "__pycache__" -type d -depth -exec rm -rf {} \; - popd + find . -name "__pycache__" -type d -depth -delete # Include a sitecustomize.py file cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + runHook postInstall + ''; + + preFixup = '' + find $out/{lib,lib_pypy*} -name "*.so" \ + -exec patchelf \ + --replace-needed libtinfow.so.6 libncursesw.so.6 \ + --replace-needed libgdbm.so.4 libgdbm_compat.so.4 {} \; ''; doInstallCheck = true; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index 877a00efa48..444d4330951 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -1,16 +1,18 @@ { lib , stdenv , fetchurl +, autoPatchelfHook , python-setup-hook , self -, which # Dependencies , bzip2 -, zlib , expat +, gdbm , ncurses6 +, sqlite , tcl-8_5 , tk-8_5 +, zlib # For the Python package set , packageOverrides ? (self: super: {}) , sourceVersion @@ -44,57 +46,72 @@ let pname = "${passthru.executable}_prebuilt"; version = with sourceVersion; "${major}.${minor}.${patch}"; - majorVersion = substring 0 1 pythonVersion; + majorVersion = lib.versions.major pythonVersion; - deps = [ - bzip2 - zlib - expat - ncurses6 - tcl-8_5 - tk-8_5 - ]; + downloadUrls = { + aarch64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-aarch64.tar.bz2"; + x86_64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; + aarch64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_arm64.tar.bz2"; + x86_64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_x86_64.tar.bz2"; + }; in with passthru; stdenv.mkDerivation { inherit pname version; src = fetchurl { - url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; + url = downloadUrls.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); inherit sha256; }; - buildInputs = [ which ]; + buildInputs = [ + bzip2 + expat + gdbm + ncurses6 + sqlite + tcl-8_5 + tk-8_5 + zlib + ]; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; installPhase = '' + runHook preInstall + mkdir -p $out/lib echo "Moving files to $out" mv -t $out bin include lib-python lib_pypy site-packages - mv lib/libffi.so.6* $out/lib/ - - mv $out/bin/libpypy*-c.so $out/lib/ - - rm $out/bin/*.debug - - echo "Patching binaries" - interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf))) - patchelf --set-interpreter $interpreter \ - --set-rpath $out/lib \ - $out/bin/pypy* - - pushd $out - find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \; - find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \; + mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ + ${lib.optionalString stdenv.isLinux '' + mv lib/libffi.so.6* $out/lib/ + rm $out/bin/*.debug + ''} echo "Removing bytecode" - find . -name "__pycache__" -type d -depth -exec rm -rf {} \; - popd + find . -name "__pycache__" -type d -depth -delete # Include a sitecustomize.py file cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + runHook postInstall + ''; + + preFixup = lib.optionalString (stdenv.isLinux) '' + find $out/{lib,lib_pypy*} -name "*.so" \ + -exec patchelf \ + --replace-needed libtinfow.so.6 libncursesw.so.6 \ + --replace-needed libgdbm.so.4 libgdbm_compat.so.4 {} \; + '' + lib.optionalString (stdenv.isDarwin) '' + install_name_tool \ + -change \ + @rpath/lib${executable}-c.dylib \ + $out/lib/lib${executable}-c.dylib \ + $out/bin/${executable} ''; - doInstallCheck = true; + # Native libraries are not working in darwin + doInstallCheck = !stdenv.isDarwin; # Check whether importing of (extension) modules functions installCheckPhase = let @@ -124,7 +141,7 @@ in with passthru; stdenv.mkDerivation { homepage = "http://pypy.org/"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = lib.mapAttrsToList (arch: _: arch) downloadUrls; }; } diff --git a/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch b/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch index 15d03830e07..cf1bcddeba6 100644 --- a/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch +++ b/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch @@ -1,14 +1,18 @@ --- a/lib_pypy/_tkinter/tklib_build.py +++ b/lib_pypy/_tkinter/tklib_build.py -@@ -17,19 +17,14 @@ elif sys.platform == 'win32': +@@ -17,23 +17,14 @@ elif sys.platform == 'win32': incdirs = [] linklibs = ['tcl85', 'tk85'] libdirs = [] -elif sys.platform == 'darwin': - # homebrew +- homebrew = os.environ.get('HOMEBREW_PREFIX', '') - incdirs = ['/usr/local/opt/tcl-tk/include'] - linklibs = ['tcl8.6', 'tk8.6'] -- libdirs = ['/usr/local/opt/tcl-tk/lib'] +- libdirs = [] +- if homebrew: +- incdirs.append(homebrew + '/include') +- libdirs.append(homebrew + '/opt/tcl-tk/lib') else: # On some Linux distributions, the tcl and tk libraries are # stored in /usr/include, so we must check this case also diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index cbfddde09a0..c1003a6e33f 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-ebho47mXbcSE1ZspygroiXvpbOTTbTKu1dk1p6Mwd1k="; }; + # This is actually bug in musl. It is already fixed in trunc and + # this patch won't be necessary with musl > 1.2.3. + # + # https://git.musl-libc.org/cgit/musl/commit/?id=b50eb8c36c20f967bd0ed70c0b0db38a450886ba + patches = lib.optional stdenv.hostPlatform.isMusl ./gsasl.patch; + buildInputs = [ libidn libkrb5 ]; configureFlags = [ "--with-gssapi-impl=mit" ]; diff --git a/pkgs/development/libraries/gsasl/gsasl.patch b/pkgs/development/libraries/gsasl/gsasl.patch new file mode 100644 index 00000000000..572d3034967 --- /dev/null +++ b/pkgs/development/libraries/gsasl/gsasl.patch @@ -0,0 +1,21 @@ +GNU libc and Musl libc have different ideas what + + strverscmp("UNKNOWN", "2.2.0") + +should return. Hopefully nobody depend on this particular behaviour in +practice. + +--- a/tests/version.c 1970-01-01 00:00:00.000000000 -0000 ++++ b/tests/version.c 1970-01-01 00:00:00.000000000 -0000 +@@ -111,11 +111,5 @@ + exit_code = EXIT_FAILURE; + } + +- if (gsasl_check_version ("UNKNOWN")) +- { +- printf ("FAIL: gsasl_check_version (UNKNOWN)\n"); +- exit_code = EXIT_FAILURE; +- } +- + return exit_code; + } diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix index c0d2e73f94e..b4c865dbd11 100644 --- a/pkgs/development/libraries/robin-map/default.nix +++ b/pkgs/development/libraries/robin-map/default.nix @@ -1,24 +1,28 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake }: stdenv.mkDerivation rec { pname = "robin-map"; - version = "1.0.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "Tessil"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-4OW7PHow+O7R4t5+6iPV3E+1+6XPhqxrL1LQZitmCzQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-axVMJHTnGW2c4kGcYhEEAvKbVKYA2oxiYfwjiz7xh6Q="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; meta = with lib; { - homepage = "https://github.com/Tessil/robin-map"; description = "C++ implementation of a fast hash map and hash set using robin hood hashing"; + homepage = "https://github.com/Tessil/robin-map"; + changelog = "https://github.com/Tessil/robin-map/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index a305061984a..538f02c3b2c 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.4.0"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "v${version}"; - hash = "sha256-cdCKcwpQ+u3CkMiPfMf6DnH2SYc7ab8q5W72aEEnNx4="; + hash = "sha256-OOmcJB1o0cmAFj1n2obr0lxZxT5fYs2awftHQ6VMLUs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiosmtplib/default.nix b/pkgs/development/python-modules/aiosmtplib/default.nix index 699425233e1..44873b08448 100644 --- a/pkgs/development/python-modules/aiosmtplib/default.nix +++ b/pkgs/development/python-modules/aiosmtplib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiosmtplib"; - version = "2.0.0"; + version = "2.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "cole"; repo = pname; rev = "v${version}"; - hash = "sha256-NdGap6sl+3tqr/8jhDSDsun/4SiuznfqLf1banIp9EQ="; + hash = "sha256-Py/44J9J8FdrsSpEM2/DR2DQH8x8Ub7y0FPIN2gcmmA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix index 0634165fb51..bd693ead16c 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-dbfs"; - version = "2.0.4"; + version = "2.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-taevteFOSJMXGLBkw0oTMF7YzpfRxZTRSlrRtcwFa78="; + hash = "sha256-WQyYgjEe2oxNXBcHMhFXJ++XlIWf/rtJylvb6exwg7k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index 578a6159e23..743c2a3bb44 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.9"; + version = "0.0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nbZ/tcv9caUtGywn74ekrdq0S1AGB2kY2II8mW0Cc6c="; + hash = "sha256-C8JoaQMQMtbu+spRuQEnFyUvTKVhnqcAVgRESsRO33k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 4c931d06fc2..9bbbda304df 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "3.1.1"; + version = "3.1.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DajXu8aZAZyr7o0fGH9do9i/z+UqMMkcMXjbETtWa1g="; + hash = "sha256-/CJQHcjXZBarHHIndXkCPOHL8OANG8RJgTX3tTZEYLA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 9972918a7c2..cc7a57e7ebb 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.16.2"; + version = "2.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5qyk97b06tuH+FEJBhd1Y1GOFYfIt7FivPjhyede9BY="; + hash = "sha256-AsEcoAmOg+J/g8P5o51PzO9R5z0Nce9zQ/EiIYhmaFw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index dfa8c22c5cb..513d034b530 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.10.0"; + version = "3.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0/bTCi1BhTrM8VJLuFZ9gZc0uwZqpAhcwoPt25flvkI="; + hash = "sha256-M7JhzttLvWMPC9AEJN/X9ofIFBtNzWGgXjnun8k1CwA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lightwave/default.nix b/pkgs/development/python-modules/lightwave/default.nix index ba937f7700d..1f90a32748d 100644 --- a/pkgs/development/python-modules/lightwave/default.nix +++ b/pkgs/development/python-modules/lightwave/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "lightwave"; - version = "0.20"; + version = "0.21"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jhffMDhgQ257ZQxvidiRgBSnZvzLJFKNU2NZ8AyGTGc="; + hash = "sha256-h/ztEY473XjvUCWu6vr7FA3WSYPHaLKNMc2fpu/wRC0="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index 173dc92bbc4..47e649ae3f7 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oralb-ble"; - version = "0.14.3"; + version = "0.15.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-L6i/XnsPsxO1qltfWOoGV/NpPpZj73w95ScdcBTkdlo="; + hash = "sha256-c5bsynNozFkY1VtAesKFXpwC81d8iZd48kFBHPRf43M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyduke-energy/default.nix b/pkgs/development/python-modules/pyduke-energy/default.nix index 35ab4e5af83..9a0d329bad6 100644 --- a/pkgs/development/python-modules/pyduke-energy/default.nix +++ b/pkgs/development/python-modules/pyduke-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyduke-energy"; - version = "1.0.2"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mjmeli"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-0fxFZQr8Oti17egBvpvE92YsIZ+Jf8gYRh0J2g5WTIc="; + hash = "sha256-g+s9YaVFOCKaBGR5o9cPk4kcIW4BffFHTtmDNE8f/zE="; }; propagatedBuildInputs = [ @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for the Duke Energy API"; homepage = "https://github.com/mjmeli/pyduke-energy"; + changelog = "https://github.com/mjmeli/pyduke-energy/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index a647f53150a..c827507a16b 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.0.11"; + version = "0.2.0.12"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = "refs/tags/${version}"; - hash = "sha256-XG4+UQL8M5G8Y19PNTBAL51XJRE48qorE8FapaiddYI="; + hash = "sha256-RHwsKNbjKPMp0Ddc3eEsJbLwCAgbFd+5hpzUABYnTso="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index 22e7b4897e0..a0855cd3f0f 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.11.0"; + version = "0.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scottbonline"; repo = "sense"; - rev = version; - hash = "sha256-QX8CPf3o0IaAhjWYeUjDoAgktNrh/sSRjFhOweAxxco="; + rev = "refs/tags/${version}"; + hash = "sha256-lfqQelAHh/xJH1jPz3JK32AIEA7ghUP6Mnya2M34V/w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index f6378cfce9e..338112f8d7f 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.6.12"; + version = "1.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RHDW2A9mC0zIpjNqUUhXvWDBWj7r4O+9FTFRYUqoAXw="; + sha256 = "sha256-EQ7kdX14WkmH4b40W2sXplZdJw9SICYBpy6lPbMx8WY="; }; postPatch = '' diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index eac02f3ff73..1f148ec1d03 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -1,24 +1,32 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, CoreServices +}: rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.2.8"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-UFuU3y+v1V7Llc+IrWbh7kz8uUyCsxJO2zJhE6zwjSg="; + rev = "refs/tags/v${version}"; + hash = "sha256-vmvv08cAYNfzlHXrCwfL37U39TS8VQIOJGMgDHc99ME="; }; - cargoSha256 = "sha256-CPugHGkYbJG6WrguuGt/CnHq6NvRZ2fP2hgPIuIGGqc="; + cargoHash = "sha256-2HR0ClsbCjHiZKmPJkv3NnJyDmdR1rw+TD7UuHLk1Sg="; - buildInputs = lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optional stdenv.isDarwin [ + CoreServices + ]; meta = with lib; { description = "Background rust code checker"; homepage = "https://github.com/Canop/bacon"; + changelog = "https://github.com/Canop/bacon/blob/v${version}/CHANGELOG.md"; license = licenses.agpl3Only; - maintainers = [ maintainers.FlorianFranzen ]; + maintainers = with maintainers; [ FlorianFranzen ]; }; } diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 780e489cd84..14925b92968 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "datree"; - version = "1.8.8"; + version = "1.8.12"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; - rev = version; - hash = "sha256-R0wYkckmNIcTElll39vrnK5nMLqbx3C/+cQtogNwmP8="; + rev = "refs/tags/${version}"; + hash = "sha256-xuaiho5hKSFcwCj2P5QGyvGmPUbcErIbVkkX5kGii8E="; }; - vendorHash = "sha256-m3O5AoAHSM6rSnmL5N7V37XU38FADb0Edt/EZvvb2u4="; + vendorHash = "sha256-mkVguYzjNGgFUdATjGfenCx3h97LS3SEOkYo3CuP9fA="; nativeBuildInputs = [ installShellFiles ]; @@ -51,6 +51,7 @@ buildGoModule rec { objects. ''; homepage = "https://datree.io/"; + changelog = "https://github.com/datreeio/datree/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ azahi jceb ]; }; diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/development/tools/electron-fiddle/default.nix new file mode 100644 index 00000000000..5bfdb06600d --- /dev/null +++ b/pkgs/development/tools/electron-fiddle/default.nix @@ -0,0 +1,163 @@ +{ buildFHSUserEnv +, electron_20 +, fetchFromGitHub +, fetchYarnDeps +, fixup_yarn_lock +, git +, lib +, makeDesktopItem +, nodejs-16_x +, stdenvNoCC +, util-linux +, zip +}: + +let + pname = "electron-fiddle"; + version = "0.31.0"; + electron = electron_20; + nodejs = nodejs-16_x; + + src = fetchFromGitHub { + owner = "electron"; + repo = "fiddle"; + rev = "v${version}"; + hash = "sha256-GueLG+RYFHi3PVVxBTtpTHhfjygcQ6ZCbrp5n5I1gBM="; + }; + + inherit (nodejs.pkgs) yarn; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-WVH1A0wtQl5nR1hvaL6mzm/7XBvo311FPKmsxB82e4U="; + }; + + electronDummyMirror = "https://electron.invalid/"; + electronDummyDir = "nix"; + electronDummyFilename = + builtins.baseNameOf (builtins.head (electron.src.urls)); + electronDummyHash = + builtins.hashString "sha256" "${electronDummyMirror}${electronDummyDir}"; + + unwrapped = stdenvNoCC.mkDerivation { + pname = "${pname}-unwrapped"; + inherit version src; + + nativeBuildInputs = [ fixup_yarn_lock git nodejs util-linux yarn zip ]; + + configurePhase = '' + export HOME=$TMPDIR + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror ${offlineCache} + yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules + + mkdir -p ~/.cache/electron/${electronDummyHash} + cp -ra '${electron}/lib/electron' "$TMPDIR/electron" + chmod -R u+w "$TMPDIR/electron" + (cd "$TMPDIR/electron" && zip -0Xr ~/.cache/electron/${electronDummyHash}/${electronDummyFilename} .) + ''; + + buildPhase = '' + ELECTRON_CUSTOM_VERSION='${electron.version}' \ + ELECTRON_MIRROR='${electronDummyMirror}' \ + ELECTRON_CUSTOM_DIR='${electronDummyDir}' \ + ELECTRON_CUSTOM_FILENAME='${electronDummyFilename}' \ + yarn --offline run package + ''; + + installPhase = '' + mkdir -p "$out/lib/electron-fiddle/resources" + cp "out/Electron Fiddle-"*/resources/app.asar "$out/lib/electron-fiddle/resources/" + mkdir -p "$out/share/icons/hicolor/scalable/apps" + cp assets/icons/fiddle.svg "$out/share/icons/hicolor/scalable/apps/electron-fiddle.svg" + ''; + }; + + desktopItem = makeDesktopItem { + name = "electron-fiddle"; + desktopName = "Electron Fiddle"; + comment = "The easiest way to get started with Electron"; + genericName = "Electron Fiddle"; + exec = "electron-fiddle %U"; + icon = "electron-fiddle"; + startupNotify = true; + categories = [ "GNOME" "GTK" "Utility" ]; + mimeTypes = [ "x-scheme-handler/electron-fiddle" ]; + }; + +in +buildFHSUserEnv { + name = "electron-fiddle"; + runScript = "${electron}/bin/electron ${unwrapped}/lib/electron-fiddle/resources/app.asar"; + extraInstallCommands = '' + mkdir -p "$out/share/icons/hicolor/scalable/apps" + ln -s "${unwrapped}/share/icons/hicolor/scalable/apps/electron-fiddle.svg" "$out/share/icons/hicolor/scalable/apps/" + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications"/*.desktop "$out/share/applications/" + ''; + targetPkgs = pkgs: + with pkgs; + map lib.getLib [ + # for electron-fiddle itself + udev + + # for running Electron 22.0.0 inside + alsa-lib + atk + cairo + cups + dbus + expat + glib + gtk3 + libdrm + libnotify + libxkbcommon + mesa + nspr + nss + pango + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxcb + + # for running Electron before 18.3.5/19.0.5/20.0.0 inside + gdk-pixbuf + + # for running Electron before 16.0.0 inside + xorg.libxshmfence + + # for running Electron before 11.0.0 inside + xorg.libXcursor + xorg.libXi + xorg.libXrender + xorg.libXtst + + # for running Electron before 10.0.0 inside + xorg.libXScrnSaver + + # for running Electron before 8.0.0 inside + libuuid + + # for running Electron before 4.0.0 inside + fontconfig + + # for running Electron before 3.0.0 inside + gnome2.GConf + + # Electron 2.0.8 is the earliest working version, due to + # https://github.com/electron/electron/issues/13972 + ]; + + meta = with lib; { + description = "The easiest way to get started with Electron"; + homepage = "https://www.electronjs.org/fiddle"; + license = licenses.mit; + maintainers = with maintainers; [ andersk ]; + platforms = electron.meta.platforms; + }; +} diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix index 5b275f82346..18856838c58 100644 --- a/pkgs/development/tools/language-servers/metals/default.nix +++ b/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.11.9"; + version = "0.11.10"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-CJ34OZOAM0Le9U0KSe0nKINnxA3iUgqUMtS06YnjvVo="; + outputHash = "sha256-CNLBDsyiEOmMGA9r8eU+3z75VYps21kHnLpB1LYC7W4="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index 88a3027206f..c22d1f31f9d 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -10,25 +10,32 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.24.1"; + version = "0.24.3"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; - rev = "v${version}"; - sha256 = "sha256-vVbIwYfjU3Fmqwd7H7xZNYfrZlgMNdsxPGKLCjc6Ud0="; + rev = "refs/tags/v${version}"; + hash = "sha256-ggB6gDlIuHPgJJg9TsHXHOKAm7+6OjXzoAT74YUB1n8="; }; - cargoSha256 = "sha256-uiz7SwHDL7NQroiTO2gK/WA5AS9LTQram73cAU60Lac="; + cargoHash = "sha256-gBVcQzuJNDwdC59gaOYqvaJDP46wJ9CglYbSPt3zkZ8="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security curl ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + curl + ]; meta = with lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; homepage = "https://github.com/sunng87/cargo-release"; + changelog = "https://github.com/crate-ci/cargo-release/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gerschtli ]; }; diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index c5dd92d5c44..30fda10323e 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.15.0"; + version = "0.15.2"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hhw5jzdquehkdq6iEtQQW6Z2Cu3+J2o2p10VGPOVcCs="; + sha256 = "sha256-+YRyShALdDQDfh5XDY36R29SzbBjlT8mCIucwJ++KrQ="; }; - cargoSha256 = "sha256-AE4yk6r02h04P3GmEh7te+GHg8k9/gQpJ+I19o9j9I0="; + cargoSha256 = "sha256-wwsFqoQXasCKfnCBF4qGFIoD7Kj53K9IKQ1auuqTPAM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/the-legend-of-edgar/default.nix b/pkgs/games/the-legend-of-edgar/default.nix index d099bbf2a42..1efc1c13554 100644 --- a/pkgs/games/the-legend-of-edgar/default.nix +++ b/pkgs/games/the-legend-of-edgar/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { pname = "the-legend-of-edgar"; - version = "1.35"; + version = "1.36"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "riksweeney"; repo = "edgar"; rev = version; - hash = "sha256-ojy4nEW9KiSte/AoFUMPrKCxvIeQpMVIL4ileHiBydo="; + hash = "sha256-u2mg4hpcjPXzuZjYKIC4lgqGJPFRB9baHvaiu/YafZw="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/bpfmon/default.nix b/pkgs/os-specific/linux/bpfmon/default.nix index 32781d36549..c75b9375e3b 100644 --- a/pkgs/os-specific/linux/bpfmon/default.nix +++ b/pkgs/os-specific/linux/bpfmon/default.nix @@ -1,22 +1,34 @@ -{ stdenv, fetchFromGitHub, lib, libpcap, yascreen }: +{ lib +, stdenv +, fetchFromGitHub +, libpcap +, yascreen +}: stdenv.mkDerivation rec { pname = "bpfmon"; - version = "2.50"; + version = "2.51"; src = fetchFromGitHub { owner = "bbonev"; repo = "bpfmon"; - rev = "v${version}"; - sha256 = "sha256-x4EuGZBtg45bD9q1B/6KwjDRXXeRsdFmRllREsech+E="; + rev = "refs/tags/v${version}"; + hash = "sha256-EGRxWq94BWceYXunzcOpMQv4g7cMjVCEWMR0ULGN2Jg="; }; - buildInputs = [ libpcap yascreen ]; - makeFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ + libpcap + yascreen + ]; + + makeFlags = [ + "PREFIX=$(out)" + ]; meta = with lib; { description = "BPF based visual packet rate monitor"; homepage = "https://github.com/bbonev/bpfmon"; + changelog = "https://github.com/bbonev/bpfmon/releases/tag/v${version}"; maintainers = with maintainers; [ arezvov ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index c2ea9d7a784..d3439b582a4 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -1,27 +1,34 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "gobgpd"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; - rev = "v${version}"; - sha256 = "sha256-W03RUxuDo5+YiHAf7yIfzYl0zXi7fwQf1DBqcgLejJs="; + rev = "refs/tags/v${version}"; + hash = "sha256-aVvzbWMh/r1k3AKDHipWkwEevYPj8Xfix8PfIMYXiTM="; }; - vendorSha256 = "sha256-FxfER3THsA7NRuQKEdWQxgUN0SiNI00hGUMVD+3BaG4="; + vendorHash = "sha256-9Vi8qrcFC2SazcGVgAf1vbKvxd8rTMgye63wSCaFonk="; postConfigure = '' export CGO_ENABLED=0 ''; ldflags = [ - "-s" "-w" "-extldflags '-static'" + "-s" + "-w" + "-extldflags '-static'" ]; - subPackages = [ "cmd/gobgpd" ]; + subPackages = [ + "cmd/gobgpd" + ]; meta = with lib; { description = "BGP implemented in Go"; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index f27b8188907..3af259d0e72 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -37,64 +37,6 @@ stdenv.mkDerivation { buildInputs = [ libkrb5 ]; - patches = [ - # Import of code from autoconf-archive - (fetchpatch { - url = "https://git.openafs.org/?p=openafs.git;a=patch;h=d8205bbb482554812fbe66afa3c337d991a247b6"; - hash = "sha256-ohkjSux+S3+6slh6uZIw5UJXlvhy9UUDpDlP0YFRwmw="; - }) - # Use autoconf-archive m4 from src/external - (fetchBase64Patch { - url = "https://gerrit.openafs.org/changes/14944/revisions/ea2a0e128d71802f61b8da2e44de3c6325c5f328/patch"; - hash = "sha256-PAUk/MXL5p8xwhn40/UGmo3UIhvl1PB2FwgqhmqsjJ4="; - }) - # cf: Use common macro to test compiler flags - (fetchpatch { - url = "https://git.openafs.org/?p=openafs.git;a=patch;h=790824ff749b6ee01c4d7101493cbe8773ef41c6"; - hash = "sha256-Zc7AjCsH7eTmZJWCrx7ci1tBjEAgcFXS9lY1YBeboLA="; - }) - # Linux-5.17: kernel func complete_and_exit renamed - (fetchBase64Patch { - url = "https://gerrit.openafs.org/changes/14945/revisions/a714e865efe41aa1112f6f9c8479112660dacd6f/patch"; - hash = "sha256-zvyR/GOPJeAbG6ySRRMp44oT5tPujUwybyU0XR/5Xyc="; - }) - # Linux-5.17: Kernel build uses -Wcast-function-type - (fetchBase64Patch { - url = "https://gerrit.openafs.org/changes/14946/revisions/449d1faf87e2841e80be38cf2b4a5cf5ff4df2d8/patch"; - hash = "sha256-3bRTHYeMRIleLhob56m2Xt0dWzIMDo3QrytY0K1/q7c="; - }) - # afs: Introduce afs_IsDCacheFresh - (fetchpatch { - url = "https://git.openafs.org/?p=openafs.git;a=patch;h=0d8ce846ab2e6c45166a61f04eb3af271cbd27db"; - hash = "sha256-+xgRYVXz8XpT5c4Essc4VEn9Fj53vasAYhcFkK0oCBc="; - }) - # LINUX: Don't panic on some file open errors - (fetchpatch { - url = "https://git.openafs.org/?p=openafs.git;a=patch;h=af73b9a3b1fc625694807287c0897391feaad52d"; - hash = "sha256-k0d+Gav1LApU24SaMI0pmR3gGfWyicqdCpTpVJLcx7U="; - }) - # Linux-5.18 replace set_page_dirty with dirty_folio - (fetchpatch { - url = "https://git.openafs.org/?p=openafs.git;a=patch;h=6aa129e743e882cf30c35afd67eabf82274c5fca"; - hash = "sha256-8R0rdKYs7+Zl1sdizOZzpBjy6e9J+42R9HzsNUa/PQ4="; - }) - # afs: introduce afs_alloc_ncr/afs_free_ncr - (fetchpatch { - url = "https://git.openafs.org/?p=openafs.git;a=patch;h=209eb92448001e59525413610356070d8e4f10a0"; - hash = "sha256-t455gTaK5U+m0qcyKjTqnWTOb4qz6VN/JYZzRAAV8kM="; - }) - # afs: introduce get_dcache_readahead - (fetchpatch { - url = "https://git.openafs.org/?p=openafs.git;a=patch;h=44e24ae5d7dc41e54d23638d5f64ab2e81e43ad0"; - hash = "sha256-gtUNDSHAq+RY1Rm17YcxcUALy7FEBQf9k8/ELQlPORU="; - }) - # Linux-5.18: replace readpages with readahead - (fetchBase64Patch { - url = "https://gerrit.openafs.org/changes/14953/revisions/0497b0cd7bffb6335ab9bcbf5a1310b8c6a4b299/patch"; - hash = "sha256-a5pd+CHHPr1mGxsF7tSlaBqoiKw2IGr1mJ7EaDHDJSw="; - }) - ]; - hardeningDisable = [ "pic" ]; configureFlags = [ @@ -102,7 +44,6 @@ stdenv.mkDerivation { "--sysconfdir=/etc" "--localstatedir=/var" "--with-gssapi" - "--disable-linux-d_splice-alias-extra-iput" ]; preConfigure = '' @@ -133,6 +74,6 @@ stdenv.mkDerivation { license = licenses.ipl10; platforms = platforms.linux; maintainers = with maintainers; [ andersk maggesi spacefrogg ]; - broken = kernel.isHardened || kernel.kernelAtLeast "5.19"; + broken = kernel.isHardened; }; } diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix index b8ea522fe4f..507ce99957c 100644 --- a/pkgs/servers/openafs/1.8/srcs.nix +++ b/pkgs/servers/openafs/1.8/srcs.nix @@ -1,16 +1,16 @@ { fetchurl }: rec { - version = "1.8.8.1"; + version = "1.8.9"; src = fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "sha256-58S+1wdbzWQC4/DC1bnb52rS7jxf1d3DlzozVsoj70Q="; + hash = "sha256-0SYXi+H0LMoYy3wMJpGsNUUY43kBcBUKdrvSX00VHwY="; }; srcs = [ src (fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "sha256-y17O3C4WS+o7SMayydbxw2v96R0GikxiqciF30j+jms="; + hash = "sha256-75HoVOq0qnQmhSWVSkHCoq0KLq9TDqoiu55L9FOxWTk="; }) ]; } diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix index f59c0b6cc3c..6af33c31dbf 100644 --- a/pkgs/servers/sftpgo/default.nix +++ b/pkgs/servers/sftpgo/default.nix @@ -1,17 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "sftpgo"; - version = "2.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; - rev = "v${version}"; - sha256 = "sha256-A4+YmChUPn+6P0rBuzYcABXyjXRZWY5KS1YcFZHCrYo="; + rev = "refs/tags/v${version}"; + hash = "sha256-bI4IiYzVorocITkip+Xev3t7vGeMVmqCZn7oR1mAPpI="; }; - vendorHash = "sha256-kwluXCkbclrfRsrdqSxb5+TCBpVPZmDmrbpzR+yuQdQ="; + vendorHash = "sha256-+i6jUImDMrsDnIPjIp8uM2BR1IYMqWG1OmvA2w/AfVQ="; ldflags = [ "-s" @@ -36,8 +40,9 @@ buildGoModule rec { --fish <($out/bin/sftpgo gen completion fish) ''; - meta = { + meta = with lib; { homepage = "https://github.com/drakkan/sftpgo"; + changelog = "https://github.com/drakkan/sftpgo/releases/tag/v${version}"; description = "Fully featured and highly configurable SFTP server"; longDescription = '' Fully featured and highly configurable SFTP server @@ -46,7 +51,7 @@ buildGoModule rec { local filesystem, encrypted local filesystem, S3 (compatible) Object Storage, Google Cloud Storage, Azure Blob Storage, SFTP. ''; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ thenonameguy ]; + license = licenses.agpl3Only; + maintainers = with maintainers; [ thenonameguy ]; }; } diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 947f10521e7..c7aaea9ba6b 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.48.2"; + version = "0.48.3"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-cAIEfkWCRvYcoDshQDye3lPebMsBAsF4/nfPsP6xnB8="; + hash = "sha256-1qX/Ec4KJzEzjqxO83/Fhed1kOoKNGja5+1oULGvkaw="; }; vendorHash = "sha256-6/TT3/98wBH9oMbPOzgvwN2nxj4RSbL2vxSMFlM5sgo="; diff --git a/pkgs/tools/archivers/pax/default.nix b/pkgs/tools/archivers/pax/default.nix index cfba3754c81..feacf73fe87 100644 --- a/pkgs/tools/archivers/pax/default.nix +++ b/pkgs/tools/archivers/pax/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, utmp }: +{ lib, stdenv, fetchurl, utmp, musl-fts }: stdenv.mkDerivation rec { pname = "pax"; @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1p18nxijh323f4i1s2pg7pcr0557xljl5avv8ll5s9nfr34r5j0w"; }; - buildInputs = lib.optional stdenv.isDarwin utmp; + buildInputs = lib.optional stdenv.isDarwin utmp + ++ lib.optional stdenv.hostPlatform.isMusl musl-fts; + + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts"; buildPhase = '' sh Build.sh -r -tpax diff --git a/pkgs/tools/misc/btdu/default.nix b/pkgs/tools/misc/btdu/default.nix index 7651e36d537..f3dcdf8e259 100644 --- a/pkgs/tools/misc/btdu/default.nix +++ b/pkgs/tools/misc/btdu/default.nix @@ -1,27 +1,35 @@ -{stdenv, lib, fetchurl, dub, ncurses, ldc, zlib, removeReferencesTo }: +{ lib +, stdenv +, fetchurl +, dub +, ncurses +, ldc +, zlib +, removeReferencesTo +}: let - _d_ae_ver = "0.0.3184"; - _d_btrfs_ver = "0.0.12"; + _d_ae_ver = "0.0.3228"; + _d_btrfs_ver = "0.0.13"; _d_ncurses_ver = "0.0.149"; _d_emsi_containers_ver = "0.9.0"; in stdenv.mkDerivation rec { pname = "btdu"; - version = "0.4.1"; + version = "0.5.0"; srcs = [ (fetchurl { url = "https://github.com/CyberShadow/${pname}/archive/v${version}.tar.gz"; - sha256 = "265c63ee82067f6b5dc44b47c9ec58be5e13c654f31035c60a7e375ffa4082c9"; + sha256 = "90ba4d8997575993e9d39a503779fb32b37bb62b8d9386776e95743bfc859606"; }) (fetchurl { url = "https://github.com/CyberShadow/ae/archive/v${_d_ae_ver}.tar.gz"; - sha256 = "74c17146ecde7ec4ba159eae4f88c74a5ef40cc200eabf97a0648f5abb5fde5e"; + sha256 = "6b3da61d9f7f1a7343dbe5691a16482cabcd78532b7c09ed9d63eb1934f1b9d8"; }) (fetchurl { url = "https://github.com/CyberShadow/d-btrfs/archive/v${_d_btrfs_ver}.tar.gz"; - sha256 = "cf2b1fa3e94a0aa239d465adbac239514838835283521d632f571948aa517f92"; + sha256 = "05a59cd64000ce2af9bd0578ef5118ab4d10de0ec50410ba0d4e463f01cfaa4e"; }) (fetchurl { url = "https://github.com/D-Programming-Deimos/ncurses/archive/v${_d_ncurses_ver}.tar.gz"; @@ -76,6 +84,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sampling disk usage profiler for btrfs"; homepage = "https://github.com/CyberShadow/btdu"; + changelog = "https://github.com/CyberShadow/btdu/releases/tag/v${version}"; license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ atila ]; diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix index 984adf51f5d..4ce363f7d4b 100644 --- a/pkgs/tools/misc/star-history/default.nix +++ b/pkgs/tools/misc/star-history/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "star-history"; - version = "1.0.8"; + version = "1.0.9"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ya2wUcO/2V/JHJ005p63j9Qu6oQehGYDhCYE7a5MBDA="; + sha256 = "sha256-el1+Ok8dRaBZMghSvE2xb5RvYq0AQfjeneWrb1so1/s="; }; - cargoSha256 = "sha256-zmgOQNaodZrl/rsYOpv6nTu/IDaQYQ94jeUg3LOvvuA="; + cargoSha256 = "sha256-VHneYfHr+W1r/B22I3DKIC2XvT8ZjeZIGfTDkneXJss="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 100e9126582..b9391d7000f 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -9,18 +9,20 @@ buildGoModule rec { pname = "gdu"; - version = "5.21.0"; + version = "5.21.1"; src = fetchFromGitHub { owner = "dundee"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-7zVYki4sA5jsnxWye0ouUwAOwKUBf/TiZDqFuXTm45w="; + rev = "refs/tags/v${version}"; + hash = "sha256-QxepFU/ZQWVH19AeoSnXAAUhLO6VKmrZIIpVw1tTft4="; }; - vendorSha256 = "sha256-UP6IdJLc93gRP4vwKKOJl3sNt4sOFeYXjvwk8QM+D48="; + vendorHash = "sha256-UP6IdJLc93gRP4vwKKOJl3sNt4sOFeYXjvwk8QM+D48="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; ldflags = [ "-s" @@ -50,7 +52,8 @@ buildGoModule rec { the performance gain is not so huge. ''; homepage = "https://github.com/dundee/gdu"; + changelog = "https://github.com/dundee/gdu/releases/tag/v${version}"; license = with licenses; [ mit ]; - maintainers = [ maintainers.fab maintainers.zowoq ]; + maintainers = with maintainers; [ fab zowoq ]; }; } diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 3bbd805f9c7..b0221745026 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.30.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "mdcat"; rev = "mdcat-${version}"; - sha256 = "sha256-tVkRHyWTpl6dubSDtVJVYkHQOfZDR75vUWmI0lp9tI0="; + sha256 = "sha256-B+VPz0uT+mdMfh/v2Rq3s8JUEmHk+pv53Xt/HVBpW8M="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-cinO426Q6TO6a1i63ff892kicnPxNrs6tJFpqPYuVWc="; + cargoSha256 = "sha256-qpmzg1pmR4zv6wmwPB2ysgGU4v/QebpwKFpjbszEb/Q="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7cf3dcc6e3..774e9ea3d28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14559,10 +14559,13 @@ with pkgs; haskell = callPackage ./haskell-packages.nix { }; haskellPackages = dontRecurseIntoAttrs - # Prefer native-bignum to avoid linking issues with gmp - (if stdenv.hostPlatform.isStatic - then haskell.packages.native-bignum.ghc92 - else haskell.packages.ghc92); + # JS backend is only available for GHC >= 9.6 + (if stdenv.hostPlatform.isGhcjs + then haskell.packages.native-bignum.ghcHEAD + # Prefer native-bignum to avoid linking issues with gmp + else if stdenv.hostPlatform.isStatic + then haskell.packages.native-bignum.ghc92 + else haskell.packages.ghc92); # haskellPackages.ghc is build->host (it exposes the compiler used to build the # set, similarly to stdenv.cc), but pkgs.ghc should be host->target to be more @@ -17413,6 +17416,8 @@ with pkgs; egypt = callPackage ../development/tools/analysis/egypt { }; + electron-fiddle = callPackage ../development/tools/electron-fiddle { }; + elf2uf2-rs = callPackage ../development/embedded/elf2uf2-rs { }; elfinfo = callPackage ../development/tools/misc/elfinfo { }; @@ -29794,9 +29799,7 @@ with pkgs; streamdeck-ui = libsForQt5.callPackage ../applications/misc/streamdeck-ui { }; - super-productivity = callPackage ../applications/office/super-productivity { - electron = electron_17; - }; + super-productivity = callPackage ../applications/office/super-productivity { }; inherit (callPackages ../development/libraries/wlroots {}) wlroots_0_14 diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 0a419ae7cf0..b8719294f98 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -159,6 +159,8 @@ in /* Javacript */ ghcjs = mapTestOnCross lib.systems.examples.ghcjs { haskell.packages.ghcjs.hello = nativePlatforms; + haskell.packages.native-bignum.ghcHEAD.hello = nativePlatforms; + haskellPackages.hello = nativePlatforms; }; /* Linux on Raspberrypi */ diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 94f83522956..ee7e64f1ffa 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -345,6 +345,13 @@ let ; }; }; + + pkgsCross.ghcjs.haskellPackages = { + inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskellPackages) + ghc + hello + ; + }; }) (versionedCompilerJobs { # Packages which should be checked on more than the |